@primer-io/react-native 2.28.0-beta.1 → 2.29.0

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

@@ -2,7 +2,7 @@ package com.primerioreactnative.components.manager.raw
 
 import com.primerioreactnative.components.events.PrimerHeadlessUniversalCheckoutRawDataManagerEvent
 import com.primerioreactnative.datamodels.PrimerInputValidationErrorRN
-import io.primer.android.ExperimentalPrimerApi
+import io.primer.android.core.ExperimentalPrimerApi
 import io.primer.android.components.domain.core.models.card.PrimerCardMetadata
 import io.primer.android.components.domain.core.models.metadata.PrimerPaymentMethodMetadata
 import io.primer.android.components.domain.error.PrimerInputValidationError

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
 

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

@@ -4,7 +4,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class PrimerErrorRN(
-  val errorId: String? = null,
+  val errorId: String,
   val errorCode: String? = null,
   val description: String? = null,
   val diagnosticsId: String? = null,

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

@@ -36,28 +36,23 @@ data class PrimerPaymentInstrumentTokenRN(
     val cardholderName: String? = null,
     val first6Digits: Int? = null,
     val last4Digits: Int? = null,
+    val accountNumberLast4Digits: Int? = null,
     val expirationMonth: Int? = null,
     val expirationYear: Int? = null,
-    val gocardlessMandateId: String? = null,
     val externalPayerInfo: ExternalPayerInfo? = null,
     val klarnaCustomerToken: String? = null,
     val sessionData: SessionData? = null,
-    // apaya
-    val mx: String? = null,
-    val mnc: Int? = null,
-    val mcc: Int? = null,
-    val hashedIdentifier: String? = null,
-    val currencyCode: String? = null,
-    val productId: String? = null,
-    // async
     val paymentMethodType: String? = null,
-    // bin
     val binData: BinData? = null,
+    val bankName: String? = null
   )
 
   @Serializable
   data class ExternalPayerInfo(
     val email: String,
+    val externalPayerId: String?,
+    val firstName: String?,
+    val lastName: String?
   )
 
   @Serializable

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

@@ -1,6 +1,7 @@
 package com.primerioreactnative.datamodels
 
 import android.content.Context
+import com.google.android.gms.wallet.button.ButtonConstants
 import com.primerioreactnative.extensions.toLocale
 import com.primerioreactnative.extensions.toPrimerDebugOptions
 import com.primerioreactnative.extensions.toPrimerPaymentMethodOptions
@@ -25,20 +26,20 @@ data class PrimerSettingsRN(
 
 @Serializable
 data class LocaleSettingsRN(
-    val languageCode: String? = null,
-    val localeCode: String? = null
+  val languageCode: String? = null,
+  val localeCode: String? = null
 )
 
 @Serializable
 data class PrimerPaymentMethodOptionsRN(
-    @SerialName("android")
-    val androidSettingsRN: AndroidSettingsRN = AndroidSettingsRN(),
-    var cardPaymentOptions: PrimerCardPaymentOptionsRN = PrimerCardPaymentOptionsRN(),
-    var googlePayOptions: PrimerGooglePayOptionsRN = PrimerGooglePayOptionsRN(),
-    var klarnaOptions: PrimerKlarnaOptionsRN = PrimerKlarnaOptionsRN(),
-    var apayaOptions: PrimerApayaOptionsRN = PrimerApayaOptionsRN(),
-    var threeDsOptions: PrimerThreeDsOptionsRN = PrimerThreeDsOptionsRN(),
-    var stripeOptions: PrimerStripeOptionsRN = PrimerStripeOptionsRN(),
+  @SerialName("android")
+  val androidSettingsRN: AndroidSettingsRN = AndroidSettingsRN(),
+  var cardPaymentOptions: PrimerCardPaymentOptionsRN = PrimerCardPaymentOptionsRN(),
+  var googlePayOptions: PrimerGooglePayOptionsRN = PrimerGooglePayOptionsRN(),
+  var klarnaOptions: PrimerKlarnaOptionsRN = PrimerKlarnaOptionsRN(),
+  var apayaOptions: PrimerApayaOptionsRN = PrimerApayaOptionsRN(),
+  var threeDsOptions: PrimerThreeDsOptionsRN = PrimerThreeDsOptionsRN(),
+  var stripeOptions: PrimerStripeOptionsRN = PrimerStripeOptionsRN(),
 )
 
 @Serializable
@@ -49,6 +50,7 @@ data class PrimerUIOptionsRN(
   var isInitScreenEnabled: Boolean = true,
   var isSuccessScreenEnabled: Boolean = true,
   var isErrorScreenEnabled: Boolean = true,
+  var dismissalMechanism: List<String>? = listOf("gestures"),
   var theme: PrimerThemeRN = PrimerThemeRN()
 )
 
@@ -120,8 +122,8 @@ data class PrimerCardPaymentOptionsRN(var is3DSOnVaultingEnabled: Boolean = true
 
 @Serializable
 data class PrimerThreeDsOptionsRN(
-    @SerialName("android")
-    val threeDsOptionsAndroid: PrimerThreeDsAndroidOptionsRN? = null
+  @SerialName("android")
+  val threeDsOptionsAndroid: PrimerThreeDsAndroidOptionsRN? = null
 )
 
 @Serializable
@@ -129,19 +131,21 @@ data class PrimerThreeDsAndroidOptionsRN(val threeDsAppRequestorUrl: String? = n
 
 @Serializable
 data class PrimerGooglePayOptionsRN(
-    var merchantName: String? = null,
-    var allowedCardNetworks: List<String> =
-        listOf("AMEX", "DISCOVER", "JCB", "MASTERCARD", "VISA"),
-    var buttonStyle: GooglePayButtonStyle = GooglePayButtonStyle.BLACK,
-    @SerialName("isCaptureBillingAddressEnabled")
-    var captureBillingAddress: Boolean = false,
-    @SerialName("isExistingPaymentMethodRequired")
-    var existingPaymentMethodRequired: Boolean = false,
-    var shippingAddressParameters: PrimerGoogleShippingAddressParametersRN? = null,
-    @SerialName("requireShippingMethod")
-    var requireShippingMethod: Boolean = false,
-    @SerialName("emailAddressRequired")
-    var emailAddressRequired: Boolean = false
+  var merchantName: String? = null,
+  var allowedCardNetworks: List<String> =
+    listOf("AMEX", "DISCOVER", "JCB", "MASTERCARD", "VISA"),
+  var buttonStyle: GooglePayButtonStyle = GooglePayButtonStyle.BLACK,
+  @SerialName("isCaptureBillingAddressEnabled")
+  var captureBillingAddress: Boolean = false,
+  @SerialName("isExistingPaymentMethodRequired")
+  var existingPaymentMethodRequired: Boolean = false,
+  var shippingAddressParameters: PrimerGoogleShippingAddressParametersRN? = null,
+  @SerialName("requireShippingMethod")
+  var requireShippingMethod: Boolean = false,
+  @SerialName("emailAddressRequired")
+  var emailAddressRequired: Boolean = false,
+  @SerialName("buttonOptions")
+  var buttonOptions: PrimerGooglePayButtonOptionsRN? = null
 )
 
 @Serializable
@@ -149,30 +153,38 @@ data class PrimerGoogleShippingAddressParametersRN(
   var phoneNumberRequired: Boolean = false
 )
 
+@Serializable
+data class PrimerGooglePayButtonOptionsRN(
+  @SerialName("buttonTheme")
+  var buttonTheme: Int? = null,
+  @SerialName("buttonType")
+  var buttonType: Int? = null
+)
+
 @Serializable
 data class PrimerKlarnaOptionsRN(
-    var recurringPaymentDescription: String? = null,
-    @Deprecated("This property is deprecated and will be removed in future release.")
-    var webViewTitle: String? = null,
+  var recurringPaymentDescription: String? = null,
+  @Deprecated("This property is deprecated and will be removed in future release.")
+  var webViewTitle: String? = null,
 )
 
 @Serializable
 data class PrimerStripeOptionsRN(
-    val mandateData: MandateDataRN? = null,
-    val publishableKey: String? = null,
+  val mandateData: MandateDataRN? = null,
+  val publishableKey: String? = null,
 ) {
-    @Serializable
-    data class MandateDataRN(
-        @SerialName("fullMandateText") val fullMandateText: String? = null,
-        @SerialName("fullMandateStringResourceName") val fullMandateStringResName: String? = null,
-        val merchantName: String? = null
-    )
+  @Serializable
+  data class MandateDataRN(
+    @SerialName("fullMandateText") val fullMandateText: String? = null,
+    @SerialName("fullMandateStringResourceName") val fullMandateStringResName: String? = null,
+    val merchantName: String? = null
+  )
 }
 
 @Serializable
 @Deprecated("This class is deprecated and will be removed in future release.")
 data class PrimerApayaOptionsRN(
-    var webViewTitle: String? = null,
+  var webViewTitle: String? = null,
 )
 
 fun PrimerSettingsRN.toPrimerSettings(context: Context) = PrimerSettings(

package/android/src/main/java/com/primerioreactnative/datamodels/extensions/ach/AchUserDetailsCollectableData.kt

@@ -2,7 +2,7 @@ package com.primerioreactnative.datamodels.extensions.ach
 
 import com.primerioreactnative.datamodels.NamedComponentValidatableData
 import com.primerioreactnative.datamodels.ach.AchUserDetailsStepRN
-import io.primer.android.components.presentation.paymentMethods.nativeUi.stripe.ach.composable.AchUserDetailsCollectableData
+import io.primer.android.stripe.ach.api.composable.AchUserDetailsCollectableData
 import kotlinx.serialization.Serializable
 import com.primerioreactnative.datamodels.ach.AchUserDetailsCollectableDataRN
 

package/android/src/main/java/com/primerioreactnative/datamodels/extensions/ach/AchUserDetailsStep.kt

@@ -1,7 +1,7 @@
 package com.primerioreactnative.datamodels.extensions.ach
 
 import com.primerioreactnative.datamodels.ach.AchUserDetailsStepRN
-import io.primer.android.components.presentation.paymentMethods.nativeUi.stripe.ach.composable.AchUserDetailsStep
+import io.primer.android.stripe.ach.api.composable.AchUserDetailsStep
 
 internal fun AchUserDetailsStep.UserDetailsCollected.toUserDetailsCollectedRN() =
     AchUserDetailsStepRN.UserDetailsCollectedRN()

package/android/src/main/java/com/primerioreactnative/extensions/PaymentInstrumentData.kt

@@ -4,21 +4,34 @@ import com.primerioreactnative.datamodels.PrimerPaymentInstrumentTokenRN
 import io.primer.android.data.tokenization.models.PaymentInstrumentData
 
 internal fun PaymentInstrumentData.toPaymentInstrumentDataRN() =
-  PrimerPaymentInstrumentTokenRN.PaymentInstrumentData(
-    network,
-    cardholderName,
-    first6Digits,
-    last4Digits,
-    expirationMonth,
-    expirationYear,
-    gocardlessMandateId,
-    externalPayerInfo?.email?.let { PrimerPaymentInstrumentTokenRN.ExternalPayerInfo(it) },
-    klarnaCustomerToken,
-    sessionData?.let {
+PrimerPaymentInstrumentTokenRN.PaymentInstrumentData(
+    network = network,
+    cardholderName = cardholderName,
+    first6Digits = first6Digits,
+    last4Digits = last4Digits,
+    accountNumberLast4Digits = accountNumberLast4Digits,
+    expirationMonth = expirationMonth,
+    expirationYear = expirationYear,
+    externalPayerInfo = externalPayerInfo?.let { 
+      PrimerPaymentInstrumentTokenRN.ExternalPayerInfo(
+        email = it.email,
+        externalPayerId = it.externalPayerId,
+        firstName = it.firstName,
+        lastName = it.lastName
+      )
+    },
+    klarnaCustomerToken = klarnaCustomerToken,
+    sessionData = sessionData?.let {
       PrimerPaymentInstrumentTokenRN.SessionData(
-        it.recurringDescription,
-        it.billingAddress?.let { PrimerPaymentInstrumentTokenRN.BillingAddress(it.email) })
+        recurringDescription = it.recurringDescription,
+        billingAddress = it.billingAddress?.let { 
+          PrimerPaymentInstrumentTokenRN.BillingAddress(email = it.email) 
+        }
+      )
+    },
+    paymentMethodType = paymentMethodType,
+    binData = binData?.let { 
+      PrimerPaymentInstrumentTokenRN.BinData(network = it.network) 
     },
-    mx, mnc, mcc, hashedIdentifier, currencyCode, productId, paymentMethodType,
-    binData?.let { PrimerPaymentInstrumentTokenRN.BinData(it.network) }
-  )
+    bankName = bankName
+)

package/android/src/main/java/com/primerioreactnative/extensions/PrimerCheckoutAdditionalInfo.kt

@@ -4,17 +4,17 @@ import com.primerioreactnative.datamodels.MultibancoCheckoutAdditionalInfoRN
 import com.primerioreactnative.datamodels.PromptPayCheckoutAdditionalInfoRN
 import com.primerioreactnative.datamodels.XenditCheckoutVoucherAdditionalInfoRN
 import com.primerioreactnative.datamodels.AchAdditionalInfoDisplayMandateRN
-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.XenditCheckoutVoucherAdditionalInfo
-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.vouchers.retailOutlets.XenditCheckoutVoucherAdditionalInfo
+import io.primer.android.stripe.ach.api.additionalInfo.AchAdditionalInfo
 
 internal fun PrimerCheckoutAdditionalInfo.toCheckoutAdditionalInfoRN() = when (this) {
   is MultibancoCheckoutAdditionalInfo ->
     MultibancoCheckoutAdditionalInfoRN(expiresAt, reference, entity)
-  is PromptPayCheckoutAdditionalInfo ->
-    PromptPayCheckoutAdditionalInfoRN(expiresAt, qrCodeUrl, qrCodeBase64)
+  is QrCodeCheckoutAdditionalInfo ->
+  PromptPayCheckoutAdditionalInfoRN(expiresAt.orEmpty(), qrCodeUrl, qrCodeBase64)
   is XenditCheckoutVoucherAdditionalInfo ->
     XenditCheckoutVoucherAdditionalInfoRN(expiresAt, couponCode, retailerName)
   is AchAdditionalInfo.DisplayMandate ->

package/android/src/main/java/com/primerioreactnative/extensions/PrimerIssuingBank.kt

@@ -1,7 +1,7 @@
 package com.primerioreactnative.extensions
 
 import com.primerioreactnative.datamodels.PrimerIssuingBankRN
-import io.primer.android.domain.rpc.banks.models.IssuingBank
+import io.primer.android.banks.implementation.rpc.domain.models.IssuingBank
 
 internal fun IssuingBank.toPrimerIssuingBankRN() =
   PrimerIssuingBankRN(id, name, disabled, iconUrl)

package/android/src/main/java/com/primerioreactnative/extensions/PrimerOrder.kt

@@ -5,6 +5,8 @@ import com.primerioreactnative.datamodels.PrimerShippingRN
 import io.primer.android.domain.action.models.PrimerOrder
 import io.primer.android.domain.action.models.PrimerShipping
 
-internal fun PrimerOrder.toPrimerOrderRN() = PrimerOrderRN(countryCode, shipping?.toPrimerShippingRN())
+internal fun PrimerOrder.toPrimerOrderRN() =
+  PrimerOrderRN(countryCode = countryCode, shipping = shipping?.toPrimerShippingRN())
 
-internal fun PrimerShipping.toPrimerShippingRN() = PrimerShippingRN(amount, methodId, methodName, methodDescription)
+internal fun PrimerShipping.toPrimerShippingRN() =
+  PrimerShippingRN(amount, methodId, methodName, methodDescription)

package/android/src/main/java/com/primerioreactnative/extensions/PrimerPaymentMethodOptionsRN.kt

@@ -6,54 +6,67 @@ import io.primer.android.data.settings.PrimerStripeOptions.MandateData.TemplateM
 import io.primer.android.data.settings.PrimerStripeOptions.MandateData.FullMandateData
 import io.primer.android.data.settings.PrimerStripeOptions.MandateData.FullMandateStringData
 import android.content.Context
+import com.google.android.gms.wallet.button.ButtonConstants
+import com.primerioreactnative.components.manager.googlePay.PrimerGooglePayButtonOptionsMapping
 
 fun PrimerPaymentMethodOptionsRN.toPrimerPaymentMethodOptions(context: Context) =
-    PrimerPaymentMethodOptions(
-        androidSettingsRN.redirectScheme,
-        googlePayOptions.toPrimerGooglePayOptions(),
-        klarnaOptions.toPrimerKlarnaOptions(),
-        threeDsOptions.toPrimerThreeDsOptions(),
-        stripeOptions.toPrimerStripeOptions(context),
-    )
+  PrimerPaymentMethodOptions(
+    androidSettingsRN.redirectScheme,
+    googlePayOptions.toPrimerGooglePayOptions(),
+    klarnaOptions.toPrimerKlarnaOptions(),
+    threeDsOptions.toPrimerThreeDsOptions(),
+    stripeOptions.toPrimerStripeOptions(context),
+  )
 
 fun PrimerGooglePayOptionsRN.toPrimerGooglePayOptions() =
-    PrimerGooglePayOptions(
-        merchantName = merchantName,
-        allowedCardNetworks = allowedCardNetworks,
-        buttonStyle = buttonStyle,
-        captureBillingAddress = captureBillingAddress,
-        existingPaymentMethodRequired = existingPaymentMethodRequired,
-        shippingAddressParameters = shippingAddressParameters?.toPrimerGoogleShippingAddressParameters(),
-        requireShippingMethod = requireShippingMethod,
-        emailAddressRequired = emailAddressRequired
-    )
+  PrimerGooglePayOptions(
+    merchantName = merchantName,
+    allowedCardNetworks = allowedCardNetworks,
+    buttonStyle = buttonStyle,
+    captureBillingAddress = captureBillingAddress,
+    existingPaymentMethodRequired = existingPaymentMethodRequired,
+    shippingAddressParameters = shippingAddressParameters?.toPrimerGoogleShippingAddressParameters(),
+    requireShippingMethod = requireShippingMethod,
+    emailAddressRequired = emailAddressRequired,
+    buttonOptions = buttonOptions?.toPrimerGooglePayButtonOptions() ?: GooglePayButtonOptions()
+  )
 
 fun PrimerGoogleShippingAddressParametersRN.toPrimerGoogleShippingAddressParameters() =
-    PrimerGoogleShippingAddressParameters(phoneNumberRequired)
+  PrimerGoogleShippingAddressParameters(phoneNumberRequired)
+
+fun PrimerGooglePayButtonOptionsRN.toPrimerGooglePayButtonOptions() = GooglePayButtonOptions(
+  buttonType = buttonType ?: ButtonConstants.ButtonType.PAY,
+  buttonTheme = buttonTheme ?: ButtonConstants.ButtonTheme.DARK,
+)
 
 fun PrimerKlarnaOptionsRN.toPrimerKlarnaOptions() =
-    PrimerKlarnaOptions(recurringPaymentDescription, webViewTitle)
+  PrimerKlarnaOptions(recurringPaymentDescription, webViewTitle)
 
 fun PrimerThreeDsOptionsRN.toPrimerThreeDsOptions() =
-    PrimerThreeDsOptions(threeDsOptionsAndroid?.threeDsAppRequestorUrl)
+  PrimerThreeDsOptions(threeDsOptionsAndroid?.threeDsAppRequestorUrl)
 
 fun PrimerStripeOptionsRN.toPrimerStripeOptions(context: Context) =
-    PrimerStripeOptions(mandateData = mandateData?.toMandateData(context), publishableKey = publishableKey)
+  PrimerStripeOptions(
+    mandateData = mandateData?.toMandateData(context),
+    publishableKey = publishableKey
+  )
 
 private fun PrimerStripeOptionsRN.MandateDataRN.toMandateData(context: Context) = when {
-    merchantName != null -> TemplateMandateData(merchantName)
-    fullMandateStringResName != null -> {
-        val stringId = context.getResources().getIdentifier(fullMandateStringResName, "string", context.getPackageName())
-        if (stringId != 0) {
-            FullMandateData(stringId)
-        } else {
-            if (fullMandateText != null) {
-                FullMandateStringData(fullMandateText)
-            } else {
-                error("Missing mandate data")
-            }
-        }
+  merchantName != null -> TemplateMandateData(merchantName)
+  fullMandateStringResName != null -> {
+    val stringId = context.getResources()
+      .getIdentifier(fullMandateStringResName, "string", context.getPackageName())
+    if (stringId != 0) {
+      FullMandateData(stringId)
+    } else {
+      if (fullMandateText != null) {
+        FullMandateStringData(fullMandateText)
+      } else {
+        error("Missing mandate data")
+      }
     }
-    fullMandateText != null -> FullMandateStringData(fullMandateText)
-    else -> error("Missing mandate data")
+  }
+
+  fullMandateText != null -> FullMandateStringData(fullMandateText)
+  else -> error("Missing mandate data")
 }

package/android/src/main/java/com/primerioreactnative/extensions/PrimerUIOptionsRN.kt

@@ -2,11 +2,22 @@ package com.primerioreactnative.extensions
 
 import com.primerioreactnative.datamodels.PrimerUIOptionsRN
 import io.primer.android.ui.settings.PrimerUIOptions
+import io.primer.android.data.settings.DismissalMechanism
 
+@OptIn(kotlin.ExperimentalStdlibApi::class)
 internal fun PrimerUIOptionsRN.toPrimerUIOptions() =
   PrimerUIOptions(
     isInitScreenEnabled,
     isSuccessScreenEnabled,
     isErrorScreenEnabled,
+    buildSet {
+      for (it in dismissalMechanism.orEmpty()) {
+        when (it) {
+          "gestures" -> add(DismissalMechanism.GESTURES)
+          "closeButton" -> add(DismissalMechanism.CLOSE_BUTTON)
+          else -> { /* no-op */ }
+        }
+      } 
+    }.toList().takeIf { it.isNotEmpty() } ?: listOf(DismissalMechanism.GESTURES),
     theme.toPrimerTheme()
   )

package/android/src/main/java/com/primerioreactnative/extensions/klarna/KlarnaPaymentCategory.kt

@@ -1,7 +1,7 @@
 package com.primerioreactnative.extensions.klarna
 
 import com.primerioreactnative.datamodels.klarna.KlarnaPaymentCategoryRN
-import io.primer.android.components.domain.payments.paymentMethods.nativeUi.klarna.models.KlarnaPaymentCategory
+import io.primer.android.klarna.implementation.session.domain.models.KlarnaPaymentCategory
 
 internal fun KlarnaPaymentCategory.toKlarnaPaymentCategoryRN() =
     KlarnaPaymentCategoryRN(

package/android/src/main/java/com/primerioreactnative/extensions/klarna/KlarnaPaymentCategoryRN.kt

@@ -1,7 +1,7 @@
 package com.primerioreactnative.extensions.klarna
 
 import com.primerioreactnative.datamodels.klarna.KlarnaPaymentCategoryRN
-import io.primer.android.components.domain.payments.paymentMethods.nativeUi.klarna.models.KlarnaPaymentCategory
+import io.primer.android.klarna.implementation.session.domain.models.KlarnaPaymentCategory
 
 internal fun KlarnaPaymentCategoryRN.toKlarnaPaymentCategory() =
     KlarnaPaymentCategory(

package/android/src/main/java/com/primerioreactnative/extensions/klarna/KlarnaPaymentCollectableData.kt

@@ -2,8 +2,8 @@ package com.primerioreactnative.extensions.klarna
 
 import com.primerioreactnative.datamodels.klarna.KlarnaPaymentCollectableDataRN.PaymentOptionsRN
 import com.primerioreactnative.datamodels.klarna.KlarnaPaymentCollectableDataRN.FinalizePaymentRN
-import io.primer.android.components.presentation.paymentMethods.nativeUi.klarna.models.KlarnaPaymentCollectableData.PaymentOptions
-import io.primer.android.components.presentation.paymentMethods.nativeUi.klarna.models.KlarnaPaymentCollectableData.FinalizePayment
+import io.primer.android.klarna.api.composable.KlarnaPaymentCollectableData.PaymentOptions
+import io.primer.android.klarna.api.composable.KlarnaPaymentCollectableData.FinalizePayment
 
 internal fun PaymentOptions.toPaymentOptionsRN() =
     PaymentOptionsRN(

package/android/src/main/java/com/primerioreactnative/extensions/klarna/KlarnaPaymentStep.kt

@@ -5,10 +5,10 @@ import com.primerioreactnative.datamodels.klarna.KlarnaPaymentStepRN.PaymentView
 import com.primerioreactnative.datamodels.klarna.KlarnaPaymentStepRN.PaymentSessionAuthorizedRN
 import com.primerioreactnative.datamodels.klarna.KlarnaPaymentStepRN.PaymentSessionFinalizedRN
 import com.primerioreactnative.extensions.klarna.toKlarnaPaymentCategoryRN
-import io.primer.android.components.presentation.paymentMethods.nativeUi.klarna.models.KlarnaPaymentStep.PaymentSessionCreated
-import io.primer.android.components.presentation.paymentMethods.nativeUi.klarna.models.KlarnaPaymentStep.PaymentViewLoaded
-import io.primer.android.components.presentation.paymentMethods.nativeUi.klarna.models.KlarnaPaymentStep.PaymentSessionAuthorized
-import io.primer.android.components.presentation.paymentMethods.nativeUi.klarna.models.KlarnaPaymentStep.PaymentSessionFinalized
+import  io.primer.android.klarna.api.composable.KlarnaPaymentStep.PaymentSessionCreated
+import io.primer.android.klarna.api.composable.KlarnaPaymentStep.PaymentViewLoaded
+import io.primer.android.klarna.api.composable.KlarnaPaymentStep.PaymentSessionAuthorized
+import io.primer.android.klarna.api.composable.KlarnaPaymentStep.PaymentSessionFinalized
 
 internal fun PaymentSessionCreated.toPaymentSessionCreatedRN() =
     PaymentSessionCreatedRN(paymentCategories = paymentCategories.map { it.toKlarnaPaymentCategoryRN() })

package/ios/Sources/DataModels/PrimerSettings+Extensions.swift

@@ -43,12 +43,11 @@ extension PrimerSettings {
                 
                 var shippingOptions: PrimerApplePayOptions.ShippingOptions? = nil
                 if let rnShippingOptions = rnApplePayOptions["shippingOptions"] as? [String: Any] {
-                    let isCaptureShippingAddressEnabled = rnShippingOptions["isCaptureShippingAddressEnabled"] as? Bool ?? false
                     let requireShippingMethod = rnShippingOptions["requireShippingMethod"] as? Bool ?? false
 
-                    var additionalShippingContactFields: [PrimerApplePayOptions.ShippingOptions.AdditionalShippingContactField]? = nil
-                    if let additionalFieldsStrings = rnShippingOptions["additionalShippingContactFields"] as? [String] {
-                        additionalShippingContactFields = additionalFieldsStrings.compactMap { fieldStr in
+                    var shippingContactFields: [PrimerApplePayOptions.RequiredContactField]? = nil
+                    if let requiredFieldsStrings = rnShippingOptions["shippingContactFields"] as? [String] {
+                        shippingContactFields = requiredFieldsStrings.compactMap { fieldStr in
                             switch fieldStr {
                             case "name":
                                 return .name
@@ -56,6 +55,8 @@ extension PrimerSettings {
                                 return .emailAddress
                             case "phoneNumber":
                                 return .phoneNumber
+                            case "postalAddress":
+                                return .postalAddress
                             default:
                                 return nil // Ignore unknown values or handle accordingly
                             }
@@ -63,19 +64,44 @@ extension PrimerSettings {
                     }
 
                     shippingOptions = PrimerApplePayOptions.ShippingOptions(
-                        isCaptureShippingAddressEnabled: isCaptureShippingAddressEnabled,
-                        additionalShippingContactFields: additionalShippingContactFields,
+                        shippingContactFields: shippingContactFields,
                         requireShippingMethod: requireShippingMethod
                     )
                 }
 
+                var billingOptions: PrimerApplePayOptions.BillingOptions? = nil
+                if let rnBillingOptions = rnApplePayOptions["billingOptions"] as? [String: Any] {
+                    var requiredBillingContactFields: [PrimerApplePayOptions.RequiredContactField]? = nil
+                    if let requiredFieldsStrings = rnBillingOptions["requiredBillingContactFields"] as? [String] {
+                        requiredBillingContactFields = requiredFieldsStrings.compactMap { fieldStr in
+                            switch fieldStr {
+                            case "name":
+                                return .name
+                            case "emailAddress":
+                                return .emailAddress
+                            case "phoneNumber":
+                                return .phoneNumber
+                            case "postalAddress":
+                                return .postalAddress
+                            default:
+                                return nil // Ignore unknown values or handle accordingly
+                            }
+                        }
+                    }
+
+                    billingOptions = PrimerApplePayOptions.BillingOptions(
+                        requiredBillingContactFields: requiredBillingContactFields
+                    )
+                }
+
                 applePayOptions = PrimerApplePayOptions(
                     merchantIdentifier: rnApplePayMerchantIdentifier,
                     merchantName: rnApplePayMerchantName,
                     isCaptureBillingAddressEnabled: rnApplePayIsCaptureBillingAddressEnabled,
                     showApplePayForUnsupportedDevice: rnApplePayShowApplePayForUnsupportedDevice,
                     checkProvidedNetworks: rnApplePayCheckProvidedNetworks,
-                    shippingOptions: shippingOptions
+                    shippingOptions: shippingOptions,
+                    billingOptions: billingOptions
                 )
             }
             
@@ -99,6 +125,23 @@ extension PrimerSettings {
                     isInitScreenEnabled: rnUIOptions["isInitScreenEnabled"] as? Bool,
                     isSuccessScreenEnabled: rnUIOptions["isSuccessScreenEnabled"] as? Bool,
                     isErrorScreenEnabled: rnUIOptions["isErrorScreenEnabled"] as? Bool,
+                    dismissalMechanism: {
+                        if let mechanisms = rnUIOptions["dismissalMechanism"] as? [String] {
+                          var dismissalMechanisms: [DismissalMechanism] = []
+                            for mechanism in mechanisms {
+                                switch mechanism {
+                                case "gestures":
+                                    dismissalMechanisms.append(.gestures)
+                                case "closeButton":
+                                    dismissalMechanisms.append(.closeButton)
+                                default:
+                                    break
+                                }
+                            }
+                            return dismissalMechanisms.isEmpty ? nil : dismissalMechanisms
+                        }
+                        return nil
+                    }(),
                     theme: theme)
             }
 

package/ios/Sources/Headless Universal Checkout/Managers/Assets Manager/RNTAssetsManager.m

@@ -18,7 +18,14 @@ RCT_EXTERN_METHOD(getPaymentMethodAsset:(NSString *)paymentMethodType
                       resolver:(RCTPromiseResolveBlock)resolver
                       rejecter:(RCTPromiseRejectBlock)rejecter)
 
+RCT_EXTERN_METHOD(getPaymentMethodResource:(NSString *)paymentMethodType
+                      resolver:(RCTPromiseResolveBlock)resolver
+                      rejecter:(RCTPromiseRejectBlock)rejecter)
+
 RCT_EXTERN_METHOD(getPaymentMethodAssets:(RCTPromiseResolveBlock)resolver
                     rejecter:(RCTPromiseRejectBlock)rejecter)
 
+RCT_EXTERN_METHOD(getPaymentMethodResources:(RCTPromiseResolveBlock)resolver
+                    rejecter:(RCTPromiseRejectBlock)rejecter)
+
 @end