@primer-io/react-native 2.16.7 → 2.17.0-rc.10

package/android/.project

@@ -16,12 +16,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1659508366811</id>
+			<id>1666872274961</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

package/android/build.gradle

@@ -4,8 +4,8 @@ buildscript {
 
   repositories {
     google()
+    mavenCentral()
     mavenLocal()
-    jcenter()
   }
 
   dependencies {
@@ -61,7 +61,6 @@ android {
 repositories {
   mavenLocal()
   mavenCentral()
-  jcenter()
   google()
 
   def found = false
@@ -137,5 +136,5 @@ dependencies {
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
-  implementation 'io.primer:android:2.16.6'
+  implementation 'io.primer:android:2.17.0-RC8'
 }

package/android/gradle.properties

@@ -1,4 +1,4 @@
-ReactNative_kotlinVersion=1.6.21
+ReactNative_kotlinVersion=1.7.10
 ReactNative_compileSdkVersion=31
 ReactNative_buildToolsVersion=29.0.2
 ReactNative_targetSdkVersion=31

package/android/src/main/java/com/primerioreactnative/PrimerCardNumberEditTextManager.kt

@@ -1,22 +1,7 @@
 package com.primerioreactnative
 
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.GradientDrawable
-import android.view.ViewGroup
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.TextView
-import com.facebook.drawee.backends.pipeline.Fresco
-import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewProps
-import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.views.image.ReactImageView
-import io.primer.android.components.manager.PrimerCardManager
-import io.primer.android.components.manager.PrimerUniversalCheckoutCardManagerInterface
 import io.primer.android.components.ui.widgets.*
 
 val listOfTextInputs = mutableListOf<PrimerEditText>()

package/android/src/main/java/com/primerioreactnative/PrimerRN.kt

@@ -15,7 +15,7 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.json.JSONObject
 
-class PrimerRN(private val reactContext: ReactApplicationContext, private val json: Json) :
+class PrimerRN(reactContext: ReactApplicationContext, private val json: Json) :
   ReactContextBaseJavaModule(reactContext) {
   private var mListener = PrimerRNEventListener()
 
@@ -24,6 +24,7 @@ class PrimerRN(private val reactContext: ReactApplicationContext, private val js
     mListener.sendError = { paramsJson -> onError(paramsJson) }
     mListener.sendErrorWithCheckoutData =
       { paramsJson, checkoutData -> onError(paramsJson, checkoutData) }
+    mListener.onDismissedEvent = { Primer.instance.dismiss(true) }
   }
 
   override fun getName(): String = "NativePrimer"
@@ -110,7 +111,13 @@ class PrimerRN(private val reactContext: ReactApplicationContext, private val js
 
   @ReactMethod
   fun dismiss(promise: Promise) {
-    Primer.instance.dismiss()
+    Primer.instance.dismiss(true)
+    promise.resolve(null)
+  }
+
+  @ReactMethod
+  fun cleanUp(promise: Promise) {
+    Primer.instance.dismiss(true)
     promise.resolve(null)
   }
 
@@ -192,6 +199,12 @@ class PrimerRN(private val reactContext: ReactApplicationContext, private val js
     }
   }
 
+  @ReactMethod
+  fun addListener(eventName: String?) = Unit
+
+  @ReactMethod
+  fun removeListeners(count: Int?) = Unit
+
   private fun startSdk(settings: PrimerSettings) {
     Primer.instance.configure(settings, mListener)
   }

package/android/src/main/java/com/primerioreactnative/PrimerRNEventListener.kt

@@ -37,6 +37,7 @@ class PrimerRNEventListener : PrimerCheckoutListener {
   var sendError: ((error: PrimerErrorRN) -> Unit)? = null
   var sendErrorWithCheckoutData: ((error: PrimerErrorRN, checkoutData: PrimerCheckoutDataRN?) -> Unit)? =
     null
+  var onDismissedEvent: (() -> Unit)? = null
 
   override fun onCheckoutCompleted(checkoutData: PrimerCheckoutData) {
     if (implementedRNCallbacks?.isOnCheckoutCompleteImplemented == true) {
@@ -91,7 +92,12 @@ class PrimerRNEventListener : PrimerCheckoutListener {
     if (implementedRNCallbacks?.isOnClientSessionUpdateImplemented == true) {
       sendEvent?.invoke(
         PrimerEvents.ON_CLIENT_SESSION_UPDATE.eventName,
-        JSONObject(Json.encodeToString(clientSession.toPrimerClientSessionRN()))
+        JSONObject().apply {
+          put(
+            "clientSession",
+            JSONObject(Json.encodeToString(clientSession.toPrimerClientSessionRN()))
+          )
+        }
       )
     } else {
       super.onClientSessionUpdated(clientSession)
@@ -125,7 +131,7 @@ class PrimerRNEventListener : PrimerCheckoutListener {
     resumeToken: String,
     decisionHandler: PrimerResumeDecisionHandler
   ) {
-    if (implementedRNCallbacks?.isOnResumeSuccessImplemented == true) {
+    if (implementedRNCallbacks?.isOnCheckoutResumeImplemented == true) {
       resumeSuccessDecisionHandler = { newClientToken, err ->
         when {
           err != null -> decisionHandler.handleFailure(err.ifBlank { null })
@@ -134,10 +140,9 @@ class PrimerRNEventListener : PrimerCheckoutListener {
         }
       }
 
-      val resumeToken = mapOf(Keys.RESUME_TOKEN to resumeToken)
       sendEvent?.invoke(
         PrimerEvents.ON_RESUME_SUCCESS.eventName,
-        JSONObject(Json.encodeToString(resumeToken))
+        JSONObject(Json.encodeToString(mapOf(Keys.RESUME_TOKEN to resumeToken)))
       )
     } else {
       sendError?.invoke(
@@ -147,8 +152,8 @@ class PrimerRNEventListener : PrimerCheckoutListener {
     }
   }
 
-  override fun onResumePending(additionalInfo: PrimerCheckoutAdditionalInfo?) {
-    if (implementedRNCallbacks?.isOnResumePendingImplemented == true) {
+  override fun onResumePending(additionalInfo: PrimerCheckoutAdditionalInfo) {
+    if (implementedRNCallbacks?.isOnCheckoutPendingImplemented == true) {
       if (additionalInfo is MultibancoCheckoutAdditionalInfo) {
         sendEvent?.invoke(
           PrimerEvents.ON_RESUME_PENDING.eventName,
@@ -166,7 +171,7 @@ class PrimerRNEventListener : PrimerCheckoutListener {
   }
 
   override fun onAdditionalInfoReceived(additionalInfo: PrimerCheckoutAdditionalInfo) {
-    if (implementedRNCallbacks?.isOnCheckoutReceivedAdditionalInfo == true) {
+    if (implementedRNCallbacks?.isOnCheckoutAdditionalInfoImplemented == true) {
       if (additionalInfo is PromptPayCheckoutAdditionalInfo) {
         sendEvent?.invoke(
           PrimerEvents.ON_CHECKOUT_RECEIVED_ADDITIONAL_INFO.eventName,
@@ -190,6 +195,8 @@ class PrimerRNEventListener : PrimerCheckoutListener {
         null
       )
     }
+
+    onDismissedEvent?.invoke()
     removeCallbacksAndHandlers()
   }
 
@@ -206,6 +213,7 @@ class PrimerRNEventListener : PrimerCheckoutListener {
         PrimerErrorRN(
           error.errorId,
           error.description,
+          error.diagnosticsId,
           error.recoverySuggestion
         ), checkoutData?.toPrimerCheckoutDataRN()
       )
@@ -219,7 +227,14 @@ class PrimerRNEventListener : PrimerCheckoutListener {
       primerErrorDecisionHandler = { errorMessage: String? ->
         errorHandler?.showErrorMessage(errorMessage)
       }
-      sendError?.invoke(PrimerErrorRN(error.errorId, error.description, error.recoverySuggestion))
+      sendError?.invoke(
+        PrimerErrorRN(
+          error.errorId,
+          error.description,
+          error.diagnosticsId,
+          error.recoverySuggestion
+        )
+      )
     } else {
       super.onFailed(error, errorHandler)
     }

package/android/src/main/java/com/primerioreactnative/PrimerRNHeadlessUniversalCheckout.kt

@@ -1,21 +1,15 @@
 package com.primerioreactnative
 
 import android.util.Log
-import androidx.core.content.ContextCompat
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.primerioreactnative.datamodels.*
-import com.primerioreactnative.huc.assets.AssetsManager
-import com.primerioreactnative.huc.assets.AssetsManager.drawableToBitmap
-import com.primerioreactnative.huc.assets.AssetsManager.getFile
-import com.primerioreactnative.huc.events.PrimerHeadlessUniversalCheckoutEvent
+import com.primerioreactnative.components.events.PrimerHeadlessUniversalCheckoutEvent
 import com.primerioreactnative.utils.PrimerHeadlessUniversalCheckoutImplementedRNCallbacks
 import com.primerioreactnative.utils.convertJsonToMap
 import com.primerioreactnative.utils.errorTo
 import io.primer.android.ExperimentalPrimerApi
 import io.primer.android.components.PrimerHeadlessUniversalCheckout
-import io.primer.android.components.ui.assets.ImageType
-import io.primer.android.ui.CardNetwork
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -44,10 +38,9 @@ class PrimerRNHeadlessUniversalCheckout(
   fun startWithClientToken(
     clientToken: String,
     settingsStr: String?,
-    errorCallback: Callback,
-    successCallback: Callback
+    promise: Promise
   ) {
-    listener.successCallback = successCallback
+    listener.successCallback = promise
     try {
       val settings =
         if (settingsStr.isNullOrBlank()) PrimerSettingsRN() else json.decodeFromString(
@@ -57,108 +50,22 @@ class PrimerRNHeadlessUniversalCheckout(
         reactContext,
         clientToken,
         settings.toPrimerSettings(),
+        listener,
         listener
       )
     } catch (e: Exception) {
-      errorCallback.invoke(
-        json.encodeToString(
-          ErrorTypeRN.NativeBridgeFailed errorTo
-            "failed to initialise PrimerHeadlessUniversalCheckout SDK, error: $e",
-        )
+      promise.reject(
+        ErrorTypeRN.NativeBridgeFailed.errorId,
+        "failed to initialise PrimerHeadlessUniversalCheckout SDK, error: $e",
       )
     }
   }
 
   @ReactMethod
-  fun showPaymentMethod(paymentMethodTypeStr: String, promise: Promise) {
-      PrimerHeadlessUniversalCheckout.current.showPaymentMethod(
-        reactContext,
-        paymentMethodTypeStr
-      )
-      promise.resolve(null)
-  }
-
-  @ReactMethod
-  fun disposePrimerHeadlessUniversalCheckout() {
+  fun cleanUp(promise: Promise) {
     PrimerHeadlessUniversalCheckout.current.cleanup()
     listener.removeCallbacksAndHandlers()
-  }
-
-  @ReactMethod
-  fun getAssetForPaymentMethodType(
-    paymentMethodType: String,
-    assetType: String,
-    errorCallback: Callback,
-    successCallback: Callback
-  ) {
-
-    val type = ImageType.values().find { it.name.equals(assetType, ignoreCase = true) }
-    when {
-      type == null -> {
-        errorCallback.invoke(
-          json.encodeToString(
-            ErrorTypeRN.AssetMismatch errorTo
-              "You have provided assetType=$assetType, but variable assetType can be 'LOGO' or 'ICON'."
-          )
-        )
-      }
-      else -> {
-        PrimerHeadlessUniversalCheckout.getAsset(paymentMethodType, type)?.let { resourceId ->
-          val file = getFile(reactContext, paymentMethodType)
-          AssetsManager.saveBitmapToFile(
-            file,
-            drawableToBitmap(ContextCompat.getDrawable(reactContext, resourceId)!!),
-          )
-          successCallback.invoke("file://${file.absolutePath}")
-        } ?: run {
-          errorCallback.invoke(
-            json.encodeToString(
-              ErrorTypeRN.AssetMissing errorTo
-                "Failed to find $assetType for $paymentMethodType"
-            )
-          )
-        }
-      }
-    }
-  }
-
-  @ReactMethod
-  fun getAssetForCardNetwork(
-    cardNetworkStr: String,
-    assetType: String,
-    errorCallback: Callback,
-    successCallback: Callback
-  ) {
-    val cardNetwork = CardNetwork.Type.values().find { it.name.equals(cardNetworkStr, ignoreCase = true) }
-    val type = ImageType.values().find { it.name.equals(assetType, ignoreCase = true) }
-    when {
-      cardNetwork == null -> {
-        errorCallback.invoke(
-          json.encodeToString(
-            ErrorTypeRN.InvalidCardNetwork errorTo
-              "Card network for $cardNetworkStr does not exist, make sure you don't have any typos."
-          )
-        )
-      }
-      type == null -> {
-        errorCallback.invoke(
-          json.encodeToString(
-            ErrorTypeRN.AssetMismatch errorTo
-              "You have provided assetType=$assetType, but variable assetType can be 'LOGO' or 'ICON'."
-          )
-        )
-      }
-      else -> {
-        PrimerHeadlessUniversalCheckout.getAsset(cardNetwork).let { resourceId ->
-          val file = getFile(reactContext, cardNetworkStr)
-          AssetsManager.saveBitmapToFile(
-                file,
-                drawableToBitmap(ContextCompat.getDrawable(reactContext, resourceId)!!),
-          )
-          successCallback.invoke("file://${file.absolutePath}")
-        }
-      }
-    }
+    promise.resolve(null)
   }
 
   // region tokenization handlers
@@ -167,16 +74,6 @@ class PrimerRNHeadlessUniversalCheckout(
     listener.handleTokenizationNewClientToken(newClientToken)
     promise.resolve(null)
   }
-
-  @ReactMethod
-  fun handleTokenizationSuccess(promise: Promise) {
-    listener.handleTokenizationSuccess(promise)
-  }
-
-  @ReactMethod
-  fun handleTokenizationFailure(errorMessage: String?, promise: Promise) {
-    listener.handleTokenizationFailure(errorMessage.orEmpty(), promise)
-  }
   // endregion
 
   // region resume handlers
@@ -185,17 +82,14 @@ class PrimerRNHeadlessUniversalCheckout(
     listener.handleResumeNewClientToken(newClientToken)
     promise.resolve(null)
   }
+  // endregion
 
+  // region complete handlers
   @ReactMethod
-  fun handleResumeSuccess(promise: Promise) {
-    listener.handleResumeSuccess(promise)
-  }
-
-  @ReactMethod
-  fun handleResumeFailure(errorMessage: String?, promise: Promise) {
-    listener.handleResumeFailure(errorMessage.orEmpty(), promise)
+  fun handleCompleteFlow(promise: Promise) {
+    promise.resolve(null)
   }
-  // endregion
+  // endregion complete handlers
 
   // region payment handlers
   @ReactMethod
@@ -229,6 +123,12 @@ class PrimerRNHeadlessUniversalCheckout(
     }
   }
 
+  @ReactMethod
+  fun addListener(eventName: String?) = Unit
+
+  @ReactMethod
+  fun removeListeners(count: Int?) = Unit
+
   private fun onError(exception: PrimerErrorRN, checkoutDataRN: PrimerCheckoutDataRN? = null) {
     val params = Arguments.createMap()
     val errorJson = JSONObject(Json.encodeToString(exception))

package/android/src/main/java/com/primerioreactnative/PrimerRNHeadlessUniversalCheckoutListener.kt

@@ -1,20 +1,21 @@
 package com.primerioreactnative
 
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.Promise
+import com.primerioreactnative.components.datamodels.core.PrimerRNAvailablePaymentMethods
+import com.primerioreactnative.components.datamodels.core.toPrimerRNHeadlessUniversalCheckoutPaymentMethod
+import com.primerioreactnative.components.events.PrimerHeadlessUniversalCheckoutEvent
 import com.primerioreactnative.datamodels.*
 import com.primerioreactnative.extensions.toCheckoutAdditionalInfoRN
 import com.primerioreactnative.extensions.toPrimerCheckoutDataRN
 import com.primerioreactnative.extensions.toPrimerClientSessionRN
 import com.primerioreactnative.extensions.toPrimerPaymentMethodDataRN
-import com.primerioreactnative.huc.events.PrimerHeadlessUniversalCheckoutEvent
 import com.primerioreactnative.utils.PrimerHeadlessUniversalCheckoutImplementedRNCallbacks
+import com.primerioreactnative.utils.convertJsonToMap
 import com.primerioreactnative.utils.errorTo
-import io.primer.android.ExperimentalPrimerApi
+import io.primer.android.completion.PrimerHeadlessUniversalCheckoutResumeDecisionHandler
 import io.primer.android.completion.PrimerPaymentCreationDecisionHandler
-import io.primer.android.completion.PrimerResumeDecisionHandler
 import io.primer.android.components.PrimerHeadlessUniversalCheckoutListener
+import io.primer.android.components.PrimerHeadlessUniversalCheckoutUiListener
 import io.primer.android.components.domain.core.models.PrimerHeadlessUniversalCheckoutPaymentMethod
 import io.primer.android.domain.PrimerCheckoutData
 import io.primer.android.domain.action.models.PrimerClientSession
@@ -26,11 +27,10 @@ import io.primer.android.domain.tokenization.models.PrimerPaymentMethodData
 import io.primer.android.domain.tokenization.models.PrimerPaymentMethodTokenData
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import org.json.JSONArray
 import org.json.JSONObject
 
-@OptIn(ExperimentalPrimerApi::class)
-class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckoutListener {
+class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckoutListener,
+  PrimerHeadlessUniversalCheckoutUiListener {
   private var paymentCreationDecisionHandler: ((errorMessage: String?) -> Unit)? = null
   private var tokenizeSuccessDecisionHandler: ((resumeToken: String?, errorMessage: String?) -> Unit)? =
     null
@@ -44,37 +44,44 @@ class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckou
   var sendErrorWithCheckoutData: ((error: PrimerErrorRN, checkoutData: PrimerCheckoutDataRN?) -> Unit)? =
     null
 
-  var successCallback: Callback? = null
+  var successCallback: Promise? = null
 
   override fun onAvailablePaymentMethodsLoaded(paymentMethods: List<PrimerHeadlessUniversalCheckoutPaymentMethod>) {
+    val availablePaymentMethods =
+      JSONObject(
+        Json.encodeToString(
+          PrimerRNAvailablePaymentMethods(
+            paymentMethods.map { it.toPrimerRNHeadlessUniversalCheckoutPaymentMethod() }
+          )
+        )
+      )
+
     sendEvent?.invoke(
-      PrimerHeadlessUniversalCheckoutEvent.ON_HUC_AVAILABLE_PAYMENT_METHODS_LOADED.eventName,
-      JSONObject().apply {
-        put("paymentMethodTypes", JSONArray(paymentMethods.map { it.paymentMethodType }))
-      }
+      PrimerHeadlessUniversalCheckoutEvent.ON_AVAILABLE_PAYMENT_METHODS_LOAD.eventName,
+      availablePaymentMethods
     )
-    successCallback?.invoke(
-      Arguments.fromList(paymentMethods.map { it.paymentMethodType })
+    successCallback?.resolve(
+      convertJsonToMap(availablePaymentMethods)
     )
   }
 
   override fun onPreparationStarted(paymentMethodType: String) {
     sendEvent?.invoke(
-      PrimerHeadlessUniversalCheckoutEvent.ON_HUC_PREPARE_START.eventName,
+      PrimerHeadlessUniversalCheckoutEvent.ON_PREPARE_START.eventName,
       JSONObject(Json.encodeToString(PrimerPaymentMethodDataRN(paymentMethodType)))
     )
   }
 
   override fun onPaymentMethodShowed(paymentMethodType: String) {
     sendEvent?.invoke(
-      PrimerHeadlessUniversalCheckoutEvent.ON_HUC_PAYMENT_METHOD_SHOW.eventName,
+      PrimerHeadlessUniversalCheckoutEvent.ON_PAYMENT_METHOD_SHOW.eventName,
       JSONObject(Json.encodeToString(PrimerPaymentMethodDataRN(paymentMethodType)))
     )
   }
 
   override fun onTokenizationStarted(paymentMethodType: String) {
     sendEvent?.invoke(
-      PrimerHeadlessUniversalCheckoutEvent.ON_HUC_TOKENIZE_START.eventName,
+      PrimerHeadlessUniversalCheckoutEvent.ON_TOKENIZE_START.eventName,
       JSONObject(Json.encodeToString(PrimerPaymentMethodDataRN(paymentMethodType)))
     )
   }
@@ -132,7 +139,12 @@ class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckou
     if (implementedRNCallbacks?.isOnClientSessionUpdateImplemented == true) {
       sendEvent?.invoke(
         PrimerHeadlessUniversalCheckoutEvent.ON_CLIENT_SESSION_UPDATE.eventName,
-        JSONObject(Json.encodeToString(clientSession.toPrimerClientSessionRN()))
+        JSONObject().apply {
+          put(
+            "clientSession",
+            JSONObject(Json.encodeToString(clientSession.toPrimerClientSessionRN()))
+          )
+        }
       )
     } else {
       super.onClientSessionUpdated(clientSession)
@@ -141,16 +153,16 @@ class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckou
 
   override fun onTokenizeSuccess(
     paymentMethodTokenData: PrimerPaymentMethodTokenData,
-    decisionHandler: PrimerResumeDecisionHandler
+    decisionHandler: PrimerHeadlessUniversalCheckoutResumeDecisionHandler
   ) {
     if (implementedRNCallbacks?.isOnTokenizeSuccessImplemented == true) {
       val token = PrimerPaymentInstrumentTokenRN.fromPaymentMethodToken(paymentMethodTokenData)
-      val request = JSONObject(Json.encodeToString(token))
-      tokenizeSuccessDecisionHandler = { newClientToken, err ->
+      val request = JSONObject().apply {
+        put("paymentMethodTokenData", JSONObject(Json.encodeToString(token)))
+      }
+      tokenizeSuccessDecisionHandler = { newClientToken, _ ->
         when {
-          err != null -> decisionHandler.handleFailure(err.ifBlank { null })
           newClientToken != null -> decisionHandler.continueWithNewClientToken(newClientToken)
-          else -> decisionHandler.handleSuccess()
         }
       }
       sendEvent?.invoke(PrimerHeadlessUniversalCheckoutEvent.ON_TOKENIZE_SUCCESS.eventName, request)
@@ -162,37 +174,35 @@ class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckou
     }
   }
 
-  override fun onResumeSuccess(
+  override fun onCheckoutResume(
     resumeToken: String,
-    decisionHandler: PrimerResumeDecisionHandler
+    decisionHandler: PrimerHeadlessUniversalCheckoutResumeDecisionHandler
   ) {
-    if (implementedRNCallbacks?.isOnResumeSuccessImplemented == true) {
-      resumeSuccessDecisionHandler = { newClientToken, err ->
+    if (implementedRNCallbacks?.isOnCheckoutResumeImplemented == true) {
+      resumeSuccessDecisionHandler = { newClientToken, _ ->
         when {
-          err != null -> decisionHandler.handleFailure(err.ifBlank { null })
           newClientToken != null -> decisionHandler.continueWithNewClientToken(newClientToken)
-          else -> decisionHandler.handleSuccess()
         }
       }
 
       val resumeToken = mapOf(Keys.RESUME_TOKEN to resumeToken)
       sendEvent?.invoke(
-        PrimerHeadlessUniversalCheckoutEvent.ON_RESUME_SUCCESS.eventName,
+        PrimerHeadlessUniversalCheckoutEvent.ON_CHECKOUT_SUCCESS.eventName,
         JSONObject(Json.encodeToString(resumeToken))
       )
     } else {
       sendError?.invoke(
         ErrorTypeRN.NativeBridgeFailed
-          errorTo "Callback [onResumeSuccess] should be implemented."
+          errorTo "Callback ${PrimerHeadlessUniversalCheckoutEvent.ON_CHECKOUT_SUCCESS.eventName} should be implemented."
       )
     }
   }
 
-  override fun onResumePending(additionalInfo: PrimerCheckoutAdditionalInfo?) {
-    if (implementedRNCallbacks?.isOnResumePendingImplemented == true) {
+  override fun onResumePending(additionalInfo: PrimerCheckoutAdditionalInfo) {
+    if (implementedRNCallbacks?.isOnCheckoutPendingImplemented == true) {
       if (additionalInfo is MultibancoCheckoutAdditionalInfo) {
         sendEvent?.invoke(
-          PrimerEvents.ON_RESUME_PENDING.eventName,
+          PrimerHeadlessUniversalCheckoutEvent.ON_CHECKOUT_PENDING.eventName,
           JSONObject(Json.encodeToString(additionalInfo.toCheckoutAdditionalInfoRN())).apply {
             remove("type")
           }
@@ -201,16 +211,17 @@ class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckou
     } else {
       sendError?.invoke(
         ErrorTypeRN.NativeBridgeFailed
-          errorTo "Callback [onResumePending] should be implemented."
+          errorTo "Callback [${PrimerHeadlessUniversalCheckoutEvent.ON_CHECKOUT_PENDING.eventName}] " +
+          "should be implemented."
       )
     }
   }
 
-  override fun onAdditionalInfoReceived(additionalInfo: PrimerCheckoutAdditionalInfo) {
-    if (implementedRNCallbacks?.isOnCheckoutReceivedAdditionalInfo == true) {
+  override fun onCheckoutAdditionalInfoReceived(additionalInfo: PrimerCheckoutAdditionalInfo) {
+    if (implementedRNCallbacks?.isOnCheckoutAdditionalInfoImplemented == true) {
       if (additionalInfo is PromptPayCheckoutAdditionalInfo) {
         sendEvent?.invoke(
-          PrimerEvents.ON_CHECKOUT_RECEIVED_ADDITIONAL_INFO.eventName,
+          PrimerHeadlessUniversalCheckoutEvent.ON_CHECKOUT_ADDITIONAL_INFO.eventName,
           JSONObject(Json.encodeToString(additionalInfo.toCheckoutAdditionalInfoRN())).apply {
             remove("type")
           }
@@ -219,7 +230,8 @@ class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckou
     } else {
       sendError?.invoke(
         ErrorTypeRN.NativeBridgeFailed
-          errorTo "Callback [onAdditionalInfoReceived] should be implemented."
+          errorTo "Callback [${PrimerHeadlessUniversalCheckoutEvent.ON_CHECKOUT_ADDITIONAL_INFO.eventName}]" +
+          " should be implemented."
       )
     }
   }
@@ -233,6 +245,7 @@ class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckou
         PrimerErrorRN(
           error.errorId,
           error.description,
+          error.diagnosticsId,
           error.recoverySuggestion
         ), checkoutData?.toPrimerCheckoutDataRN()
       )
@@ -243,7 +256,14 @@ class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckou
 
   override fun onFailed(error: PrimerError) {
     if (implementedRNCallbacks?.isOnErrorImplemented == true) {
-      sendError?.invoke(PrimerErrorRN(error.errorId, error.description, error.recoverySuggestion))
+      sendError?.invoke(
+        PrimerErrorRN(
+          error.errorId,
+          error.description,
+          error.diagnosticsId,
+          error.recoverySuggestion
+        )
+      )
     } else {
       super.onFailed(error)
     }
@@ -254,20 +274,6 @@ class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckou
     tokenizeSuccessDecisionHandler?.invoke(newClientToken, null)
     tokenizeSuccessDecisionHandler = null
   }
-
-  fun handleTokenizationSuccess(promise: Promise) {
-    val error =
-      ErrorTypeRN.NativeBridgeFailed errorTo "PrimerTokenizationHandler's " +
-        "handleSuccess function is not available on HUC."
-    promise.reject(error.errorId, error.description)
-  }
-
-  fun handleTokenizationFailure(errorMessage: String, promise: Promise) {
-    val error =
-      ErrorTypeRN.NativeBridgeFailed errorTo "PrimerTokenizationHandler's " +
-        "handleFailure function is not available on HUC."
-    promise.reject(error.errorId, error.description)
-  }
   // endregion
 
   // region resume handlers
@@ -275,20 +281,6 @@ class PrimerRNHeadlessUniversalCheckoutListener : PrimerHeadlessUniversalCheckou
     resumeSuccessDecisionHandler?.invoke(newClientToken, null)
     resumeSuccessDecisionHandler = null
   }
-
-  fun handleResumeSuccess(promise: Promise) {
-    val error =
-      ErrorTypeRN.NativeBridgeFailed errorTo "PrimerResumeHandler's " +
-        "handleSuccess function is not available on HUC."
-    promise.reject(error.errorId, error.description)
-  }
-
-  fun handleResumeFailure(errorMessage: String, promise: Promise) {
-    val error =
-      ErrorTypeRN.NativeBridgeFailed errorTo "PrimerResumeHandler's " +
-        "handleFailure function is not available on HUC."
-    promise.reject(error.errorId, error.description)
-  }
   // endregion
 
   // region payment create handlers