@primer-io/react-native 2.27.2 → 2.28.0

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,8 +1,8 @@
-arguments=--init-script /var/folders/wt/mqwpc4jx2kjgqf88mzm5qvx40000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/wt/mqwpc4jx2kjgqf88mzm5qvx40000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+arguments=--init-script /var/folders/wt/mqwpc4jx2kjgqf88mzm5qvx40000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/wt/mqwpc4jx2kjgqf88mzm5qvx40000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
 auto.sync=true
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.project.dir=../../example/android
+connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
 java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home

package/android/build.gradle

@@ -154,7 +154,7 @@ dependencies {
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
-  implementation 'io.primer:android:2.32.4'
+  implementation 'io.primer:android:2.33.1'
   testImplementation 'io.mockk:mockk:1.13.11'
   testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
   testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'

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

@@ -15,9 +15,9 @@ import io.primer.android.completion.PrimerResumeDecisionHandler
 import io.primer.android.domain.PrimerCheckoutData
 import io.primer.android.domain.action.models.PrimerClientSession
 import io.primer.android.domain.error.models.PrimerError
-import io.primer.android.domain.payments.additionalInfo.MultibancoCheckoutAdditionalInfo
-import io.primer.android.domain.payments.additionalInfo.PrimerCheckoutAdditionalInfo
-import io.primer.android.domain.payments.additionalInfo.PromptPayCheckoutAdditionalInfo
+import io.primer.android.vouchers.multibanco.MultibancoCheckoutAdditionalInfo
+import io.primer.android.payments.core.additionalInfo.PrimerCheckoutAdditionalInfo
+import io.primer.android.qrcode.QrCodeCheckoutAdditionalInfo
 import io.primer.android.domain.tokenization.models.PrimerPaymentMethodData
 import io.primer.android.domain.tokenization.models.PrimerPaymentMethodTokenData
 import kotlinx.serialization.encodeToString
@@ -173,7 +173,7 @@ class PrimerRNEventListener : PrimerCheckoutListener {
 
   override fun onAdditionalInfoReceived(additionalInfo: PrimerCheckoutAdditionalInfo) {
     if (implementedRNCallbacks?.isOnCheckoutAdditionalInfoImplemented == true) {
-      if (additionalInfo is PromptPayCheckoutAdditionalInfo) {
+      if (additionalInfo is QrCodeCheckoutAdditionalInfo) {
         sendEvent?.invoke(
           PrimerEvents.ON_CHECKOUT_RECEIVED_ADDITIONAL_INFO.eventName,
           JSONObject(Json.encodeToString(additionalInfo.toCheckoutAdditionalInfoRN())).apply {

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

@@ -24,10 +24,10 @@ import io.primer.android.components.domain.core.models.PrimerHeadlessUniversalCh
 import io.primer.android.domain.PrimerCheckoutData
 import io.primer.android.domain.action.models.PrimerClientSession
 import io.primer.android.domain.error.models.PrimerError
-import io.primer.android.domain.payments.additionalInfo.MultibancoCheckoutAdditionalInfo
-import io.primer.android.domain.payments.additionalInfo.PrimerCheckoutAdditionalInfo
-import io.primer.android.domain.payments.additionalInfo.PromptPayCheckoutAdditionalInfo
-import io.primer.android.domain.payments.additionalInfo.AchAdditionalInfo
+import io.primer.android.vouchers.multibanco.MultibancoCheckoutAdditionalInfo
+import io.primer.android.payments.core.additionalInfo.PrimerCheckoutAdditionalInfo
+import io.primer.android.qrcode.QrCodeCheckoutAdditionalInfo
+import io.primer.android.stripe.ach.api.additionalInfo.AchAdditionalInfo
 import io.primer.android.domain.tokenization.models.PrimerPaymentMethodData
 import io.primer.android.domain.tokenization.models.PrimerPaymentMethodTokenData
 import io.primer.android.Primer
@@ -250,7 +250,7 @@ class PrimerRNHeadlessUniversalCheckoutListener(
   override fun onCheckoutAdditionalInfoReceived(additionalInfo: PrimerCheckoutAdditionalInfo) {
     if (implementedRNCallbacks?.isOnCheckoutAdditionalInfoImplemented == true) {
       when (additionalInfo) {
-        is PromptPayCheckoutAdditionalInfo -> {
+        is QrCodeCheckoutAdditionalInfo -> {
             sendEvent?.invoke(
                 PrimerHeadlessUniversalCheckoutEvent.ON_CHECKOUT_ADDITIONAL_INFO.eventName,
                 JSONObject(json.encodeToString(additionalInfo.toCheckoutAdditionalInfoRN())).apply {

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

@@ -11,8 +11,10 @@ import com.primerioreactnative.components.manager.vault.PrimerRNHeadlessUniversa
 import com.primerioreactnative.components.manager.redirect.PrimerRNHeadlessUniversalCheckoutBanksComponent
 import com.primerioreactnative.components.manager.klarna.PrimerRNHeadlessUniversalCheckoutKlarnaComponent
 import com.primerioreactnative.components.manager.klarna.PrimerKlarnaPaymentViewManager
+import com.primerioreactnative.components.manager.googlePay.PrimerGooglePayButtonManager
 import com.primerioreactnative.components.manager.ach.PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent
 import com.primerioreactnative.components.manager.ach.PrimerRNAchMandateManager
+import com.primerioreactnative.components.manager.googlePay.PrimerGooglePayButtonConstantsModule
 import kotlinx.serialization.json.Json
 
 class ReactNativePackage : ReactPackage {
@@ -31,14 +33,18 @@ class ReactNativePackage : ReactPackage {
       PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent(reactContext),
       PrimerRNAchMandateManager(reactContext),
       //region Component with redirect components
-      PrimerRNHeadlessUniversalCheckoutBanksComponent(reactContext)
+      PrimerRNHeadlessUniversalCheckoutBanksComponent(reactContext),
       //endregion
+      // region Google Pay Helpers
+      PrimerGooglePayButtonConstantsModule(reactContext),
+      // endregion
     )
   }
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
     return mutableListOf(
-      PrimerKlarnaPaymentViewManager(reactContext)
+      PrimerKlarnaPaymentViewManager(),
+      PrimerGooglePayButtonManager()
     )
   }
 }

package/android/src/main/java/com/primerioreactnative/components/datamodels/manager/raw/cardRedirect/PrimerRNCardRedirectData.kt

@@ -1,6 +1,6 @@
 package com.primerioreactnative.components.datamodels.manager.raw.cardRedirect
 
-import io.primer.android.components.domain.core.models.bancontact.PrimerBancontactCardData
+import io.primer.android.bancontact.PrimerBancontactCardData
 import kotlinx.serialization.Serializable
 
 @Serializable

package/android/src/main/java/com/primerioreactnative/components/datamodels/manager/raw/phoneNumber/PrimerRNPhoneNumberData.kt

@@ -1,6 +1,6 @@
 package com.primerioreactnative.components.datamodels.manager.raw.phoneNumber
 
-import io.primer.android.components.domain.core.models.phoneNumber.PrimerPhoneNumberData
+import io.primer.android.phoneNumber.PrimerPhoneNumberData
 import kotlinx.serialization.Serializable
 
 @Serializable

package/android/src/main/java/com/primerioreactnative/components/datamodels/manager/raw/retailOutlets/PrimerRNRetailOutletData.kt

@@ -1,6 +1,6 @@
 package com.primerioreactnative.components.datamodels.manager.raw.retailOutlets
 
-import io.primer.android.components.domain.core.models.retailOutlet.PrimerRetailerData
+import io.primer.android.PrimerRetailerData
 import kotlinx.serialization.Serializable
 
 @Serializable

package/android/src/main/java/com/primerioreactnative/components/datamodels/manager/raw/retailOutlets/RNRetailOutletsList.kt

@@ -1,6 +1,6 @@
 package com.primerioreactnative.components.datamodels.manager.raw.retailOutlets
 
-import io.primer.android.data.payments.configure.retailOutlets.RetailOutletsList
+import io.primer.android.RetailOutletsList
 import kotlinx.serialization.Serializable
 
 @Serializable

package/android/src/main/java/com/primerioreactnative/components/datamodels/manager/{asset/PrimerRNAsset.kt → resource/Resources.kt}

@@ -6,24 +6,48 @@ import com.primerioreactnative.components.assets.AssetsManager
 import com.primerioreactnative.components.assets.AssetsManager.drawableToBitmap
 import com.primerioreactnative.components.assets.PaymentMethodAssetFileProvider.getFileForPaymentMethodAsset
 import io.primer.android.components.ui.assets.PrimerPaymentMethodAsset
+import io.primer.android.components.ui.assets.PrimerPaymentMethodNativeView
 import kotlinx.serialization.Serializable
 
+@Serializable
+sealed interface PrimerRNPaymentMethodResource {
+  val paymentMethodType: String
+  val paymentMethodName: String
+
+  @Serializable
+  data class PrimerRNPaymentMethodAsset(
+    override val paymentMethodType: String,
+    override val paymentMethodName: String,
+    val paymentMethodLogo: PrimerRNPaymentMethodLogo,
+    val paymentMethodBackgroundColor: PrimerRNPaymentMethodBackgroundColor
+  ) : PrimerRNPaymentMethodResource
+
+  @Serializable
+  data class PrimerRNPaymentMethodNativeView(
+    override val paymentMethodType: String,
+    override val paymentMethodName: String,
+    val nativeViewName: String
+  ) : PrimerRNPaymentMethodResource
+}
+
 @Serializable
 data class PrimerRNPaymentMethodAssets(
-  val paymentMethodAssets: List<PrimerRNPaymentMethodAsset>
+  val paymentMethodAssets: List<PrimerRNPaymentMethodResource.PrimerRNPaymentMethodAsset>
+)
+
+@Serializable
+data class PrimerRNPaymentMethodResources(
+  val paymentMethodResources: List<PrimerRNPaymentMethodResource>
 )
 
 @Serializable
 data class PrimerRNPaymentMethodAssetWrapper(
-  val paymentMethodAsset: PrimerRNPaymentMethodAsset
+  val paymentMethodAsset: PrimerRNPaymentMethodResource.PrimerRNPaymentMethodAsset
 )
 
 @Serializable
-data class PrimerRNPaymentMethodAsset(
-  val paymentMethodType: String,
-  val paymentMethodName: String,
-  val paymentMethodLogo: PrimerRNPaymentMethodLogo,
-  val paymentMethodBackgroundColor: PrimerRNPaymentMethodBackgroundColor
+data class PrimerRNPaymentMethodResourceWrapper(
+  val paymentMethodResource: PrimerRNPaymentMethodResource
 )
 
 @Serializable
@@ -45,10 +69,10 @@ data class PrimerCardNetworkAsset(
   val cardNetworkImageURL: String
 )
 
-internal fun PrimerPaymentMethodAsset.toPrimerRNPaymentMethodAsset(
+fun PrimerPaymentMethodAsset.toPrimerRNPaymentMethodAsset(
   reactContext: ReactApplicationContext,
   paymentMethodType: String,
-) = PrimerRNPaymentMethodAsset(
+) = PrimerRNPaymentMethodResource.PrimerRNPaymentMethodAsset(
   paymentMethodType,
   paymentMethodName,
   PrimerRNPaymentMethodLogo(
@@ -90,6 +114,14 @@ internal fun PrimerPaymentMethodAsset.toPrimerRNPaymentMethodAsset(
   )
 )
 
+fun PrimerPaymentMethodNativeView.toPrimerRNPaymentMethodNativeView(paymentMethodType: String) = PrimerRNPaymentMethodResource.PrimerRNPaymentMethodNativeView(
+  paymentMethodType = paymentMethodType,
+  paymentMethodName = paymentMethodName,
+  nativeViewName = when (paymentMethodType) {
+    "GOOGLE_PAY" -> "PrimerGooglePayButton"
+    else -> error("Native view for '$paymentMethodType'is not supported")
+  }
+)
 
 private fun getFileUrl(
   reactContext: ReactApplicationContext,

package/android/src/main/java/com/primerioreactnative/components/manager/NativeViewContainer.kt

@@ -0,0 +1,35 @@
+package com.primerioreactnative.components.manager
+
+import android.util.Log
+import android.view.View
+import android.widget.FrameLayout
+import com.facebook.react.uimanager.ThemedReactContext
+
+class NativeViewContainer(private val context: ThemedReactContext) : FrameLayout(context) {
+    fun addViewImpl(view: View) {
+        addView(view)
+        view.setOnClickListener {
+            (this.parent as? View)?.performClick()
+                ?: run {
+                    Log.e(
+                        "NativeViewContainer",
+                        "Unable to find parent of NativeViewContainer."
+                    )
+                }
+        }
+        viewTreeObserver.addOnGlobalLayoutListener { requestLayout() }
+    }
+
+    override fun requestLayout() {
+        super.requestLayout()
+        post(mLayoutRunnable)
+    }
+
+    private val mLayoutRunnable = Runnable {
+        measure(
+            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+        )
+        layout(left, top, right, bottom)
+    }
+}

package/android/src/main/java/com/primerioreactnative/components/manager/ach/PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent.kt

@@ -24,11 +24,11 @@ import com.primerioreactnative.datamodels.extensions.ach.toUserDetailsRetrievedR
 import com.primerioreactnative.utils.convertJsonToArray
 import com.primerioreactnative.utils.convertJsonToMap
 import com.primerioreactnative.utils.errorTo
-import io.primer.android.components.manager.ach.PrimerHeadlessUniversalCheckoutAchManager
+import io.primer.android.components.ach.PrimerHeadlessUniversalCheckoutAchManager
 import io.primer.android.components.manager.core.composable.PrimerValidationStatus
-import io.primer.android.components.presentation.paymentMethods.nativeUi.stripe.ach.StripeAchUserDetailsComponent
-import io.primer.android.components.presentation.paymentMethods.nativeUi.stripe.ach.composable.AchUserDetailsCollectableData
-import io.primer.android.components.presentation.paymentMethods.nativeUi.stripe.ach.composable.AchUserDetailsStep
+import io.primer.android.stripe.ach.api.component.StripeAchUserDetailsComponent
+import io.primer.android.stripe.ach.api.composable.AchUserDetailsCollectableData
+import io.primer.android.stripe.ach.api.composable.AchUserDetailsStep
 import io.primer.android.domain.error.models.PrimerError
 import com.primerioreactnative.utils.toWritableArray
 import com.primerioreactnative.utils.toWritableMap

package/android/src/main/java/com/primerioreactnative/components/manager/asset/PrimerRNHeadlessUniversalCheckoutAssetManager.kt

@@ -5,23 +5,29 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import io.primer.android.components.ui.assets.PrimerPaymentMethodAsset
+import io.primer.android.components.ui.assets.PrimerPaymentMethodNativeView
 import com.primerioreactnative.components.assets.AssetsManager
 import com.primerioreactnative.components.assets.AssetsManager.drawableToBitmap
 import com.primerioreactnative.components.assets.CardNetworkImageFileProvider.getFileForCardNetworkAsset
 import com.primerioreactnative.components.datamodels.manager.asset.PrimerCardNetworkAsset
 import com.primerioreactnative.components.datamodels.manager.asset.PrimerRNPaymentMethodAssetWrapper
+import com.primerioreactnative.components.datamodels.manager.asset.PrimerRNPaymentMethodResourceWrapper
 import com.primerioreactnative.components.datamodels.manager.asset.PrimerRNPaymentMethodAssets
 import com.primerioreactnative.components.datamodels.manager.asset.toPrimerRNPaymentMethodAsset
+import com.primerioreactnative.components.datamodels.manager.asset.toPrimerRNPaymentMethodNativeView
+import com.primerioreactnative.components.datamodels.manager.asset.PrimerRNPaymentMethodResources
 import com.primerioreactnative.datamodels.ErrorTypeRN
 import com.primerioreactnative.utils.errorTo
 import com.primerioreactnative.utils.toWritableMap
 import io.primer.android.ExperimentalPrimerApi
 import io.primer.android.components.SdkUninitializedException
 import io.primer.android.components.ui.assets.PrimerHeadlessUniversalCheckoutAssetsManager
-import io.primer.android.ui.CardNetwork
+import io.primer.android.configuration.data.model.CardNetwork
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.json.JSONObject
+import com.primerioreactnative.components.manager.googlePay.PrimerGooglePayButtonManager
 
 @ExperimentalPrimerApi
 internal class PrimerRNHeadlessUniversalCheckoutAssetManager(
@@ -123,4 +129,80 @@ internal class PrimerRNHeadlessUniversalCheckoutAssetManager(
       promise.reject(ErrorTypeRN.UnitializedSdkSession.errorId, e.message, e)
     }
   }
+
+  @ReactMethod
+  fun getPaymentMethodResources(promise: Promise) {
+    try {
+      val paymentMethodResources =
+        PrimerHeadlessUniversalCheckoutAssetsManager.getPaymentMethodResources(reactContext)
+      if (paymentMethodResources.isEmpty()) {
+        val exception =
+          ErrorTypeRN.NativeBridgeFailed errorTo "Failed to find resources for this session"
+        promise.reject(exception.errorId, exception.description)
+      }
+      promise.resolve(
+        JSONObject(
+            Json.encodeToString(
+              PrimerRNPaymentMethodResources(paymentMethodResources.map {
+                when (it) {
+                  is PrimerPaymentMethodAsset -> {
+                    it.toPrimerRNPaymentMethodAsset(
+                      reactContext = reactContext, 
+                      paymentMethodType = it.paymentMethodType
+                    )
+                  }
+                  is PrimerPaymentMethodNativeView -> {
+                    PrimerGooglePayButtonManager.updatePrimerGooglePayButtonCreator { 
+                      context -> it.createView(context) 
+                    }
+
+                    it.toPrimerRNPaymentMethodNativeView(
+                      paymentMethodType = it.paymentMethodType
+                    )
+                  }
+                }
+              }
+            )
+          )
+        ).toWritableMap()
+      )
+    } catch (e: SdkUninitializedException) {
+      promise.reject(ErrorTypeRN.UnitializedSdkSession.errorId, e.message, e)
+    }
+  }
+
+  @ReactMethod
+  fun getPaymentMethodResource(paymentMethodTypeStr: String, promise: Promise) {
+    try {
+      val paymentMethodResource =
+        PrimerHeadlessUniversalCheckoutAssetsManager.getPaymentMethodResource(reactContext, paymentMethodTypeStr)
+      promise.resolve(
+        JSONObject(
+            Json.encodeToString(
+                PrimerRNPaymentMethodResourceWrapper(
+                  when (paymentMethodResource) {
+                    is PrimerPaymentMethodAsset -> {
+                      paymentMethodResource.toPrimerRNPaymentMethodAsset(
+                        reactContext = reactContext, 
+                        paymentMethodType = paymentMethodResource.paymentMethodType
+                      )
+                    }
+                    is PrimerPaymentMethodNativeView -> {
+                      PrimerGooglePayButtonManager.updatePrimerGooglePayButtonCreator { 
+                        context -> paymentMethodResource.createView(context) 
+                      }
+  
+                      paymentMethodResource.toPrimerRNPaymentMethodNativeView(
+                        paymentMethodType = paymentMethodResource.paymentMethodType
+                      )
+                    }
+                  }
+                )
+          )
+        ).toWritableMap()
+      )
+    } catch (e: SdkUninitializedException) {
+      promise.reject(ErrorTypeRN.UnitializedSdkSession.errorId, e.message, e)
+    }
+  }
 }

package/android/src/main/java/com/primerioreactnative/components/manager/banks/PrimerRNHeadlessUniversalCheckoutBanksComponent.kt

@@ -26,7 +26,7 @@ import com.primerioreactnative.utils.convertJsonToArray
 import com.primerioreactnative.utils.errorTo
 import io.primer.android.components.manager.banks.composable.BanksCollectableData
 import io.primer.android.components.manager.banks.composable.BanksStep
-import io.primer.android.components.manager.componentWithRedirect.PrimerHeadlessUniversalCheckoutComponentWithRedirectManager
+import io.primer.android.components.componentWithRedirect.PrimerHeadlessUniversalCheckoutComponentWithRedirectManager
 import io.primer.android.components.manager.componentWithRedirect.component.BanksComponent
 import io.primer.android.components.manager.core.composable.PrimerValidationStatus
 import com.primerioreactnative.utils.toWritableArray

package/android/src/main/java/com/primerioreactnative/components/manager/googlePay/PrimerGooglePayButtonConstantsModule.kt

@@ -0,0 +1,39 @@
+package com.primerioreactnative.components.manager.googlePay
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.google.android.gms.wallet.button.ButtonConstants
+
+internal object PrimerGooglePayButtonOptionsMapping {
+
+  fun getOptions(): Map<String, Map<String, Int>> {
+    val themes = hashMapOf<String, Int>()
+    themes["Dark"] = ButtonConstants.ButtonTheme.DARK
+    themes["Light"] = ButtonConstants.ButtonTheme.LIGHT
+
+    val types = hashMapOf<String, Int>()
+    types["Book"] = ButtonConstants.ButtonType.BOOK
+    types["Buy"] = ButtonConstants.ButtonType.BUY
+    types["Checkout"] = ButtonConstants.ButtonType.CHECKOUT
+    types["Donate"] = ButtonConstants.ButtonType.DONATE
+    types["Order"] = ButtonConstants.ButtonType.ORDER
+    types["Pay"] = ButtonConstants.ButtonType.PAY
+    types["Plain"] = ButtonConstants.ButtonType.PLAIN
+    types["Subscribe"] = ButtonConstants.ButtonType.SUBSCRIBE
+
+    return hashMapOf("Themes" to themes, "Types" to types)
+  }
+}
+
+class PrimerGooglePayButtonConstantsModule(reactContext: ReactApplicationContext) :
+  ReactContextBaseJavaModule(reactContext) {
+
+  override fun getConstants(): Map<String, Any> =
+    PrimerGooglePayButtonOptionsMapping.getOptions()
+
+  override fun getName() = NAME
+
+  companion object {
+    private const val NAME = "PrimerGooglePayButtonConstants"
+  }
+}

package/android/src/main/java/com/primerioreactnative/components/manager/googlePay/PrimerGooglePayButtonManager.kt

@@ -0,0 +1,38 @@
+package com.primerioreactnative.components.manager.googlePay
+
+import android.content.Context
+import android.view.View
+import android.widget.TextView
+import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.ThemedReactContext
+import com.primerioreactnative.components.manager.NativeViewContainer
+
+class PrimerGooglePayButtonManager : SimpleViewManager<NativeViewContainer>() {
+  override fun getName() = REACT_CLASS
+
+  override fun createViewInstance(reactContext: ThemedReactContext): NativeViewContainer =
+          NativeViewContainer(reactContext)
+
+  override fun onAfterUpdateTransaction(view: NativeViewContainer) {
+    super.onAfterUpdateTransaction(view)
+    view.addViewImpl(
+      getPrimerGooglePayButtonOrNull(view.context)
+          ?: TextView(view.context).apply { text = "Error loading Google Pay button" }
+      )
+  }
+
+  private fun getPrimerGooglePayButtonOrNull(context: Context): View? {
+    return createPrimerGooglePayButton?.invoke(context) ?: return null
+  }
+
+  companion object {
+    var createPrimerGooglePayButton: ((context: Context) -> View)? = null
+      private set
+
+    fun updatePrimerGooglePayButtonCreator(creator: (context: Context) -> View) {
+      this.createPrimerGooglePayButton = creator
+    }
+
+    const val REACT_CLASS = "PrimerGooglePayButton"
+  }
+}

package/android/src/main/java/com/primerioreactnative/components/manager/klarna/PrimerKlarnaPaymentViewManager.kt

@@ -1,97 +1,34 @@
 package com.primerioreactnative.components.manager.klarna
 
-import android.os.Handler
-import android.os.Looper
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
 import android.widget.TextView
-import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewGroupManager
-import io.primer.android.components.presentation.paymentMethods.nativeUi.klarna.PrimerKlarnaPaymentView
+import com.primerioreactnative.components.manager.NativeViewContainer
+import io.primer.android.klarna.api.ui.PrimerKlarnaPaymentView
 import java.lang.ref.WeakReference
-import java.util.Timer
-import java.util.TimerTask
 
-class PrimerKlarnaPaymentViewManager(private val reactContext: ReactApplicationContext) :
-    ViewGroupManager<ViewGroup>() {
+class PrimerKlarnaPaymentViewManager : SimpleViewManager<NativeViewContainer>() {
   override fun getName() = REACT_CLASS
 
-  override fun createViewInstance(reactContext: ThemedReactContext) =
-      FrameLayout(reactContext).apply {
-        addView(
-            getPrimerKlarnaPaymentViewOrNull(this)
-                ?: PrimerKlarnaPaymentView(context).apply {
-                  addView(TextView(context).apply { text = "Error loading Klarna payment view" })
-                }
-        )
-        alpha = 0f
-      }
+  override fun createViewInstance(reactContext: ThemedReactContext): NativeViewContainer =
+          NativeViewContainer(reactContext)
 
-  private fun getPrimerKlarnaPaymentViewOrNull(parent: ViewGroup): View? {
-    val view = primerKlarnaPaymentView.get() ?: return null
-    val handler = Handler(Looper.getMainLooper())
-    val listener =
-        object : View.OnLayoutChangeListener {
-          private var timer: Timer? = null
-
-          override fun onLayoutChange(
-              v: View?,
-              left: Int,
-              top: Int,
-              right: Int,
-              bottom: Int,
-              oldLeft: Int,
-              oldTop: Int,
-              oldRight: Int,
-              oldBottom: Int
-          ) {
-            val listener = this
-            timer?.cancel()
-            timer =
-                Timer().apply {
-                  schedule(
-                      object : TimerTask() {
-                        override fun run() {
-                          timer?.cancel()
-                          timer = null
-                          handler.post(
-                              Runnable {
-                                view.removeOnLayoutChangeListener(listener)
-                                // Re-layout parent once KlarnaPaymentView loads
-                                layout(view)
-                                parent.alpha = 1f
-                              }
-                          )
-                        }
-                      },
-                      300L
-                  )
-                }
-          }
-        }
-    view.addOnLayoutChangeListener(listener)
-
-    return view
+  override fun onAfterUpdateTransaction(view: NativeViewContainer) {
+    super.onAfterUpdateTransaction(view)
+    view.addViewImpl(
+      getPrimerKlarnaPaymentViewOrNull()
+        ?: TextView(view.context).apply { text = "Error loading Klarna payment view" }
+    )
   }
 
-  private fun layout(view: View) {
-    val oldX = view.getX().toInt()
-    val oldY = view.getY().toInt()
-    val parent = (view.parent as? View)
-    val fallbackWidth = parent?.width ?: Int.MAX_VALUE
-    val fallbackHeight = parent?.height ?: Int.MAX_VALUE
-    view.measure(
-        View.MeasureSpec.makeMeasureSpec(fallbackWidth, View.MeasureSpec.EXACTLY),
-        View.MeasureSpec.makeMeasureSpec(fallbackHeight, View.MeasureSpec.EXACTLY)
-    )
-    view.layout(oldX, oldY, oldX + fallbackWidth, oldY + fallbackHeight)
+  private fun getPrimerKlarnaPaymentViewOrNull(): View? {
+    return primerKlarnaPaymentView.get() ?: return null
   }
 
   companion object {
-    private var primerKlarnaPaymentView: WeakReference<PrimerKlarnaPaymentView?> =
-        WeakReference(null)
+    private var primerKlarnaPaymentView: WeakReference<PrimerKlarnaPaymentView?> = WeakReference(null)
       private set
 
     fun updatePrimerKlarnaPaymentView(view: PrimerKlarnaPaymentView) {

package/android/src/main/java/com/primerioreactnative/components/manager/klarna/PrimerRNHeadlessUniversalCheckoutKlarnaComponent.kt

@@ -29,10 +29,10 @@ import com.primerioreactnative.extensions.putErrors
 import com.primerioreactnative.extensions.putValidationErrors
 import io.primer.android.PrimerSessionIntent
 import io.primer.android.components.manager.core.composable.PrimerValidationStatus
-import io.primer.android.components.manager.klarna.PrimerHeadlessUniversalCheckoutKlarnaManager
-import io.primer.android.components.presentation.paymentMethods.nativeUi.klarna.composable.KlarnaComponent
-import io.primer.android.components.presentation.paymentMethods.nativeUi.klarna.models.KlarnaPaymentCollectableData
-import io.primer.android.components.presentation.paymentMethods.nativeUi.klarna.models.KlarnaPaymentStep
+import io.primer.android.klarna.PrimerHeadlessUniversalCheckoutKlarnaManager
+import io.primer.android.klarna.api.component.KlarnaComponent
+import io.primer.android.klarna.api.composable.KlarnaPaymentCollectableData
+import io.primer.android.klarna.api.composable.KlarnaPaymentStep
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

package/android/src/main/java/com/primerioreactnative/components/manager/raw/PrimerRNHeadlessUniversalCheckoutRawManager.kt

@@ -19,7 +19,7 @@ import io.primer.android.components.SdkUninitializedException
 import io.primer.android.components.domain.exception.UnsupportedPaymentMethodManagerException
 import io.primer.android.components.manager.raw.PrimerHeadlessUniversalCheckoutRawDataManager
 import io.primer.android.components.manager.raw.PrimerHeadlessUniversalCheckoutRawDataManagerInterface
-import io.primer.android.data.payments.configure.retailOutlets.RetailOutletsList
+import io.primer.android.RetailOutletsList
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json

package/android/src/main/java/com/primerioreactnative/datamodels/PrimerClientSessionRN.kt

@@ -1,6 +1,6 @@
 package com.primerioreactnative.datamodels
 
-import io.primer.android.data.configuration.models.CountryCode
+import io.primer.android.configuration.data.model.CountryCode
 import io.primer.android.domain.action.models.*
 import kotlinx.serialization.Serializable
 
@@ -28,6 +28,15 @@ data class PrimerCustomerRN(
 @Serializable
 data class PrimerOrderRN(
   val countryCode: CountryCode?,
+  val shipping: PrimerShippingRN?
+)
+
+@Serializable
+data class PrimerShippingRN(
+  val amount: Int?,
+  val methodId: String?,
+  val methodName: String?,
+  val methodDescription: String?
 )
 
 @Serializable