@stripe/stripe-react-native 0.56.0 → 0.57.1

package/android/src/main/java/com/reactnativestripesdk/CardFormView.kt

@@ -2,12 +2,11 @@ package com.reactnativestripesdk
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
-import android.graphics.Color
 import android.os.Build
 import android.text.InputFilter
 import android.view.View
-import android.view.View.OnFocusChangeListener
 import android.widget.FrameLayout
+import androidx.core.graphics.toColorInt
 import androidx.core.view.setMargins
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.PixelUtil
@@ -18,6 +17,7 @@ import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import com.reactnativestripesdk.utils.PostalCodeUtilities
+import com.reactnativestripesdk.utils.getIntOr
 import com.reactnativestripesdk.utils.getIntOrNull
 import com.reactnativestripesdk.utils.getValOr
 import com.reactnativestripesdk.utils.hideSoftKeyboard
@@ -36,6 +36,7 @@ import com.stripe.android.view.CardInputListener
 class CardFormView(
   private val context: ThemedReactContext,
 ) : FrameLayout(context) {
+  @SuppressLint("PrivateResource")
   private var cardForm: CardFormView =
     CardFormView(context, null, com.stripe.android.R.style.StripeCardFormView_Borderless)
   private var dangerouslyGetFullCardDetails: Boolean = false
@@ -77,7 +78,7 @@ class CardFormView(
     cardForm.setPreferredNetworks(mapToPreferredNetworks(preferredNetworks))
   }
 
-  @SuppressLint("RestrictedApi")
+  @SuppressLint("RestrictedApi", "VisibleForTests")
   private fun setCountry(countryString: String?) {
     if (countryString != null) {
       cardFormViewBinding.countryLayout.setSelectedCountryCode(CountryCode(countryString))
@@ -126,27 +127,20 @@ class CardFormView(
     cardNumberEditText.clearFocus()
   }
 
-  fun requestClearFromJS() {
-    multilineWidgetBinding.etCardNumber.setText("")
-    multilineWidgetBinding.etCvc.setText("")
-    multilineWidgetBinding.etExpiry.setText("")
-    cardFormViewBinding.postalCode.setText("")
-  }
-
   private fun onChangeFocus() {
     UIManagerHelper
       .getEventDispatcherForReactTag(context, id)
       ?.dispatchEvent(CardFocusChangeEvent(context.surfaceId, id, currentFocusedField))
   }
 
-  @SuppressLint("RestrictedApi")
+  @SuppressLint("RestrictedApi", "VisibleForTests")
   fun setCardStyle(value: ReadableMap?) {
     val backgroundColor = getValOr(value, "backgroundColor", null)
     val textColor = getValOr(value, "textColor", null)
-    val borderWidth = getIntOrNull(value, "borderWidth")
+    val borderWidth = value.getIntOrNull("borderWidth")
     val borderColor = getValOr(value, "borderColor", null)
-    val borderRadius = getIntOrNull(value, "borderRadius") ?: 0
-    val fontSize = getIntOrNull(value, "fontSize")
+    val borderRadius = value.getIntOr("borderRadius", 0)
+    val fontSize = value.getIntOrNull("fontSize")
     val fontFamily = getValOr(value, "fontFamily")
     val placeholderColor = getValOr(value, "placeholderColor", null)
     val textErrorColor = getValOr(value, "textErrorColor", null)
@@ -169,19 +163,19 @@ class CardFormView(
 
     textColor?.let {
       for (binding in editTextBindings) {
-        binding.setTextColor(Color.parseColor(it))
+        binding.setTextColor(it.toColorInt())
       }
-      cardFormViewBinding.countryLayout.countryAutocomplete.setTextColor(Color.parseColor(it))
+      cardFormViewBinding.countryLayout.countryAutocomplete.setTextColor(it.toColorInt())
     }
     textErrorColor?.let {
       for (binding in editTextBindings) {
-        binding.setErrorColor(Color.parseColor(it))
-        cardFormViewBinding.postalCode.setErrorColor(Color.parseColor(it))
+        binding.setErrorColor(it.toColorInt())
+        cardFormViewBinding.postalCode.setErrorColor(it.toColorInt())
       }
     }
     placeholderColor?.let {
       for (binding in placeholderTextBindings) {
-        binding.defaultHintTextColor = ColorStateList.valueOf(Color.parseColor(it))
+        binding.defaultHintTextColor = ColorStateList.valueOf(it.toColorInt())
       }
     }
     fontSize?.let {
@@ -205,7 +199,7 @@ class CardFormView(
     }
     cursorColor?.let {
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        val color = Color.parseColor(it)
+        val color = it.toColorInt()
         for (binding in editTextBindings) {
           binding.textCursorDrawable?.setTint(color)
           binding.textSelectHandle?.setTint(color)
@@ -224,16 +218,16 @@ class CardFormView(
           .build(),
       ).also { shape ->
         shape.strokeWidth = 0.0f
-        shape.strokeColor = ColorStateList.valueOf(Color.parseColor("#000000"))
-        shape.fillColor = ColorStateList.valueOf(Color.parseColor("#FFFFFF"))
+        shape.strokeColor = ColorStateList.valueOf("#000000".toColorInt())
+        shape.fillColor = ColorStateList.valueOf("#FFFFFF".toColorInt())
         borderWidth?.let {
           shape.strokeWidth = PixelUtil.toPixelFromDIP(it.toDouble())
         }
         borderColor?.let {
-          shape.strokeColor = ColorStateList.valueOf(Color.parseColor(it))
+          shape.strokeColor = ColorStateList.valueOf(it.toColorInt())
         }
         backgroundColor?.let {
-          shape.fillColor = ColorStateList.valueOf(Color.parseColor(it))
+          shape.fillColor = ColorStateList.valueOf(it.toColorInt())
         }
       }
   }
@@ -245,16 +239,18 @@ class CardFormView(
   private fun setListeners() {
     cardForm.setCardValidCallback { isValid, _ ->
       if (isValid) {
-        cardForm.cardParams?.let {
+        cardForm.paymentMethodCreateParams?.let {
           val cardParamsMap = it.toParamMap()["card"] as HashMap<*, *>
+
+          @SuppressLint("RestrictedApi")
           val cardDetails: MutableMap<String, Any> =
             mutableMapOf(
               "expiryMonth" to cardParamsMap["exp_month"] as Int,
               "expiryYear" to cardParamsMap["exp_year"] as Int,
-              "last4" to it.last4,
-              "brand" to mapCardBrand(it.brand),
-              "postalCode" to (it.address?.postalCode ?: ""),
-              "country" to (it.address?.country ?: ""),
+              "last4" to (it.cardLast4() ?: ""),
+              "brand" to mapCardBrand(cardForm.brand),
+              "postalCode" to (it.billingDetails?.address?.postalCode ?: ""),
+              "country" to (it.billingDetails?.address?.country ?: ""),
             )
 
           if (dangerouslyGetFullCardDetails) {
@@ -277,8 +273,8 @@ class CardFormView(
           cardAddress =
             Address
               .Builder()
-              .setPostalCode(it.address?.postalCode)
-              .setCountry(it.address?.country)
+              .setPostalCode(it.billingDetails?.address?.postalCode)
+              .setCountry(it.billingDetails?.address?.country)
               .build()
 
           cardFormViewBinding.cardMultilineWidget.paymentMethodCard?.let { params ->
@@ -340,7 +336,7 @@ class CardFormView(
       )
   }
 
-  @SuppressLint("RestrictedApi")
+  @SuppressLint("RestrictedApi", "VisibleForTests")
   private fun createPostalCodeInputFilter(): InputFilter {
     return InputFilter { charSequence, start, end, _, _, _ ->
       if (cardFormViewBinding.countryLayout.getSelectedCountryCode() == CountryCode.US) {

package/android/src/main/java/com/reactnativestripesdk/{CollectBankAccountLauncherFragment.kt → CollectBankAccountLauncherManager.kt}

@@ -1,15 +1,16 @@
 package com.reactnativestripesdk
 
-import com.facebook.react.bridge.Promise
+import android.annotation.SuppressLint
+import androidx.activity.ComponentActivity
 import com.facebook.react.bridge.ReactApplicationContext
 import com.reactnativestripesdk.utils.ErrorType
-import com.reactnativestripesdk.utils.StripeFragment
+import com.reactnativestripesdk.utils.StripeUIManager
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createResult
 import com.reactnativestripesdk.utils.mapFromFinancialConnectionsEvent
 import com.reactnativestripesdk.utils.mapFromPaymentIntentResult
 import com.reactnativestripesdk.utils.mapFromSetupIntentResult
-import com.reactnativestripesdk.utils.removeFragment
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
 import com.stripe.android.financialconnections.FinancialConnections
 import com.stripe.android.model.PaymentIntent
 import com.stripe.android.model.SetupIntent
@@ -18,18 +19,20 @@ import com.stripe.android.payments.bankaccount.CollectBankAccountConfiguration
 import com.stripe.android.payments.bankaccount.CollectBankAccountLauncher
 import com.stripe.android.payments.bankaccount.navigation.CollectBankAccountResult
 
-class CollectBankAccountLauncherFragment : StripeFragment() {
-  private lateinit var context: ReactApplicationContext
-  private lateinit var publishableKey: String
-  private var stripeAccountId: String? = null
-  private lateinit var clientSecret: String
-  private var isPaymentIntent: Boolean = false
-  private lateinit var collectParams: CollectBankAccountConfiguration.USBankAccount
-  private lateinit var promise: Promise
+@OptIn(ReactNativeSdkInternal::class)
+class CollectBankAccountLauncherManager(
+  context: ReactApplicationContext,
+  private val publishableKey: String,
+  private val stripeAccountId: String? = null,
+  private val clientSecret: String,
+  private val isPaymentIntent: Boolean,
+  private val collectParams: CollectBankAccountConfiguration.USBankAccount,
+) : StripeUIManager(context) {
   private lateinit var collectBankAccountLauncher: CollectBankAccountLauncher
 
-  override fun prepare() {
-    collectBankAccountLauncher = createBankAccountLauncher()
+  override fun onPresent() {
+    val activity = getCurrentActivityOrResolveWithError(promise) ?: return
+    collectBankAccountLauncher = createBankAccountLauncher(activity)
 
     val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
     if (stripeSdkModule != null) {
@@ -63,17 +66,18 @@ class CollectBankAccountLauncherFragment : StripeFragment() {
     FinancialConnections.clearEventListener()
   }
 
-  private fun createBankAccountLauncher(): CollectBankAccountLauncher =
-    CollectBankAccountLauncher.create(this) { result ->
+  private fun createBankAccountLauncher(activity: ComponentActivity): CollectBankAccountLauncher =
+    @SuppressLint("RestrictedApi")
+    CollectBankAccountLauncher.create(activity, signal) { result ->
       when (result) {
         is CollectBankAccountResult.Completed -> {
           val intent = result.response.intent
           if (intent.status === StripeIntent.Status.RequiresPaymentMethod) {
-            promise.resolve(
+            promise?.resolve(
               createError(ErrorType.Canceled.toString(), "Bank account collection was canceled."),
             )
           } else if (intent.status === StripeIntent.Status.RequiresConfirmation) {
-            promise.resolve(
+            promise?.resolve(
               if (isPaymentIntent) {
                 createResult(
                   "paymentIntent",
@@ -87,39 +91,14 @@ class CollectBankAccountLauncherFragment : StripeFragment() {
         }
 
         is CollectBankAccountResult.Cancelled -> {
-          promise.resolve(
+          promise?.resolve(
             createError(ErrorType.Canceled.toString(), "Bank account collection was canceled."),
           )
         }
 
         is CollectBankAccountResult.Failed -> {
-          promise.resolve(createError(ErrorType.Failed.toString(), result.error))
+          promise?.resolve(createError(ErrorType.Failed.toString(), result.error))
         }
       }
-      removeFragment(context)
     }
-
-  companion object {
-    internal const val TAG = "collect_bank_account_launcher_fragment"
-
-    fun create(
-      context: ReactApplicationContext,
-      publishableKey: String,
-      stripeAccountId: String? = null,
-      clientSecret: String,
-      isPaymentIntent: Boolean,
-      collectParams: CollectBankAccountConfiguration.USBankAccount,
-      promise: Promise,
-    ): CollectBankAccountLauncherFragment {
-      val instance = CollectBankAccountLauncherFragment()
-      instance.context = context
-      instance.publishableKey = publishableKey
-      instance.stripeAccountId = stripeAccountId
-      instance.clientSecret = clientSecret
-      instance.isPaymentIntent = isPaymentIntent
-      instance.collectParams = collectParams
-      instance.promise = promise
-      return instance
-    }
-  }
 }

package/android/src/main/java/com/reactnativestripesdk/CustomPaymentMethodActivity.kt

@@ -22,6 +22,7 @@ import java.lang.ref.WeakReference
 class CustomPaymentMethodActivity : ReactActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     // Disable the transition animation to make it truly invisible
+    @Suppress("DEPRECATION")
     overridePendingTransition(0, 0)
     super.onCreate(savedInstanceState)
   }
@@ -53,6 +54,7 @@ class CustomPaymentMethodActivity : ReactActivity() {
   override fun finish() {
     super.finish()
     // Disable the exit animation as well
+    @Suppress("DEPRECATION")
     overridePendingTransition(0, 0)
 
     // Clear the weak reference when finished

package/android/src/main/java/com/reactnativestripesdk/EmbeddedPaymentElementView.kt

@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -22,7 +21,6 @@ import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.uimanager.ThemedReactContext
-import com.reactnativestripesdk.toWritableMap
 import com.reactnativestripesdk.utils.KeepJsAwakeTask
 import com.reactnativestripesdk.utils.mapFromConfirmationToken
 import com.reactnativestripesdk.utils.mapFromCustomPaymentMethod
@@ -196,7 +194,7 @@ class EmbeddedPaymentElementView(
                 val stripeSdkModule =
                   try {
                     requireStripeSdkModule()
-                  } catch (ex: IllegalArgumentException) {
+                  } catch (_: IllegalArgumentException) {
                     return@Builder CreateIntentResult.Failure(
                       cause =
                         Exception(
@@ -242,7 +240,7 @@ class EmbeddedPaymentElementView(
                 val stripeSdkModule =
                   try {
                     requireStripeSdkModule()
-                  } catch (ex: IllegalArgumentException) {
+                  } catch (_: IllegalArgumentException) {
                     return@Builder CreateIntentResult.Failure(
                       cause =
                         Exception(
@@ -295,9 +293,6 @@ class EmbeddedPaymentElementView(
       }
 
     val embedded = rememberEmbeddedPaymentElement(builder)
-    var height by remember {
-      mutableIntStateOf(0)
-    }
 
     // collect events: configure, confirm, clear
     LaunchedEffect(Unit) {
@@ -348,10 +343,8 @@ class EmbeddedPaymentElementView(
       }
     }
 
-    val density = LocalDensity.current
-
     Box {
-      measuredEmbeddedElement(
+      MeasuredEmbeddedElement(
         reportHeightChange = { h -> reportHeightChange(h) },
       ) {
         embedded.Content()
@@ -360,7 +353,7 @@ class EmbeddedPaymentElementView(
   }
 
   @Composable
-  private fun measuredEmbeddedElement(
+  private fun MeasuredEmbeddedElement(
     reportHeightChange: (Float) -> Unit,
     content: @Composable () -> Unit,
   ) {

package/android/src/main/java/com/reactnativestripesdk/EmbeddedPaymentElementViewManager.kt

@@ -3,24 +3,22 @@ package com.reactnativestripesdk
 import android.annotation.SuppressLint
 import android.content.Context
 import com.facebook.react.bridge.Dynamic
-import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.ReadableType
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.EmbeddedPaymentElementViewManagerDelegate
 import com.facebook.react.viewmanagers.EmbeddedPaymentElementViewManagerInterface
-import com.reactnativestripesdk.PaymentSheetFragment.Companion.buildCustomerConfiguration
-import com.reactnativestripesdk.PaymentSheetFragment.Companion.buildGooglePayConfig
 import com.reactnativestripesdk.addresssheet.AddressSheetView
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
 import com.reactnativestripesdk.utils.PaymentSheetException
+import com.reactnativestripesdk.utils.asMapOrNull
 import com.reactnativestripesdk.utils.getBooleanOr
+import com.reactnativestripesdk.utils.getIntegerList
+import com.reactnativestripesdk.utils.getStringList
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
 import com.reactnativestripesdk.utils.parseCustomPaymentMethods
-import com.reactnativestripesdk.utils.toBundleObject
 import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
 import com.stripe.android.paymentelement.EmbeddedPaymentElement
 import com.stripe.android.paymentelement.ExperimentalCustomPaymentMethodsApi
@@ -55,10 +53,10 @@ class EmbeddedPaymentElementViewManager :
     view: EmbeddedPaymentElementView,
     cfg: Dynamic,
   ) {
-    val readableMap = cfg.asMap()
+    val readableMap = cfg.asMapOrNull()
     if (readableMap == null) return
 
-    val rowSelectionBehaviorType = parseRowSelectionBehavior(readableMap)
+    val rowSelectionBehaviorType = mapToRowSelectionBehaviorType(readableMap)
     view.rowSelectionBehaviorType.value = rowSelectionBehaviorType
 
     val elementConfig = parseElementConfiguration(readableMap, view.context)
@@ -78,7 +76,7 @@ class EmbeddedPaymentElementViewManager :
     view: EmbeddedPaymentElementView,
     cfg: Dynamic,
   ) {
-    val readableMap = cfg.asMap()
+    val readableMap = cfg.asMapOrNull()
     if (readableMap == null) return
 
     // Detect which callback type to use based on the presence of the confirmation token handler
@@ -102,91 +100,43 @@ class EmbeddedPaymentElementViewManager :
     context: Context,
   ): EmbeddedPaymentElement.Configuration {
     val merchantDisplayName = map.getString("merchantDisplayName").orEmpty()
-    val allowsDelayedPaymentMethods: Boolean =
-      if (map.hasKey("allowsDelayedPaymentMethods") &&
-        map.getType("allowsDelayedPaymentMethods") == ReadableType.Boolean
-      ) {
-        map.getBoolean("allowsDelayedPaymentMethods")
-      } else {
-        false // default
-      }
-    var defaultBillingDetails: PaymentSheet.BillingDetails? = null
-    val billingDetailsMap = map.getMap("defaultBillingDetails")
-    if (billingDetailsMap != null) {
-      val addressBundle = billingDetailsMap.getMap("address")
-      val address =
-        PaymentSheet.Address(
-          addressBundle?.getString("city"),
-          addressBundle?.getString("country"),
-          addressBundle?.getString("line1"),
-          addressBundle?.getString("line2"),
-          addressBundle?.getString("postalCode"),
-          addressBundle?.getString("state"),
-        )
-      defaultBillingDetails =
-        PaymentSheet.BillingDetails(
-          address,
-          billingDetailsMap.getString("email"),
-          billingDetailsMap.getString("name"),
-          billingDetailsMap.getString("phone"),
-        )
-    }
+    val allowsDelayedPaymentMethods = map.getBooleanOr("allowsDelayedPaymentMethods", false)
+    val defaultBillingDetails = buildBillingDetails(map.getMap("defaultBillingDetails"))
 
     val customerConfiguration =
       try {
-        buildCustomerConfiguration(toBundleObject(map))
-      } catch (error: PaymentSheetException) {
+        buildCustomerConfiguration(map)
+      } catch (_: PaymentSheetException) {
         throw Error() // TODO handle error
       }
 
-    val googlePayConfig = buildGooglePayConfig(toBundleObject(map.getMap("googlePay")))
-    val linkConfig = PaymentSheetFragment.buildLinkConfig(toBundleObject(map.getMap("link")))
+    val googlePayConfig = buildGooglePayConfig(map.getMap("googlePay"))
+    val linkConfig = buildLinkConfig(map.getMap("link"))
     val shippingDetails =
       map.getMap("defaultShippingDetails")?.let {
         AddressSheetView.buildAddressDetails(it)
       }
     val appearance =
       try {
-        buildPaymentSheetAppearance(toBundleObject(map.getMap("appearance")), context)
-      } catch (error: PaymentSheetAppearanceException) {
+        buildPaymentSheetAppearance(map.getMap("appearance"), context)
+      } catch (_: PaymentSheetAppearanceException) {
         throw Error() // TODO handle error
       }
-    val billingConfigParams = map.getMap("billingDetailsCollectionConfiguration")
     val billingDetailsConfig =
-      PaymentSheet.BillingDetailsCollectionConfiguration(
-        name = mapToCollectionMode(billingConfigParams?.getString("name")),
-        phone = mapToCollectionMode(billingConfigParams?.getString("phone")),
-        email = mapToCollectionMode(billingConfigParams?.getString("email")),
-        address = mapToAddressCollectionMode(billingConfigParams?.getString("address")),
-        attachDefaultsToPaymentMethod =
-          billingConfigParams?.getBooleanOr("attachDefaultsToPaymentMethod", false) ?: false,
+      buildBillingDetailsCollectionConfiguration(
+        map.getMap("billingDetailsCollectionConfiguration"),
       )
-    val allowsRemovalOfLastSavedPaymentMethod =
-      if (map.hasKey("allowsRemovalOfLastSavedPaymentMethod")) {
-        map.getBoolean("allowsRemovalOfLastSavedPaymentMethod")
-      } else {
-        true
-      }
+    val allowsRemovalOfLastSavedPaymentMethod = map.getBooleanOr("allowsRemovalOfLastSavedPaymentMethod", true)
     val primaryButtonLabel = map.getString("primaryButtonLabel")
-    val paymentMethodOrder = map.getStringArrayList("paymentMethodOrder")
+    val paymentMethodOrder = map.getStringList("paymentMethodOrder")
 
-    val formSheetAction =
-      map
-        .getMap("formSheetAction")
-        ?.getString("type")
-        ?.let { type ->
-          when (type) {
-            "confirm" -> EmbeddedPaymentElement.FormSheetAction.Confirm
-            else -> EmbeddedPaymentElement.FormSheetAction.Continue
-          }
-        }
-        ?: EmbeddedPaymentElement.FormSheetAction.Continue
+    val formSheetAction = mapToFormSheetAction(map)
 
     val configurationBuilder =
       EmbeddedPaymentElement.Configuration
         .Builder(merchantDisplayName)
         .formSheetAction(formSheetAction)
-        .allowsDelayedPaymentMethods(allowsDelayedPaymentMethods ?: false)
+        .allowsDelayedPaymentMethods(allowsDelayedPaymentMethods)
         .defaultBillingDetails(defaultBillingDetails)
         .customer(customerConfiguration)
         .googlePay(googlePayConfig)
@@ -197,28 +147,16 @@ class EmbeddedPaymentElementViewManager :
         .preferredNetworks(
           mapToPreferredNetworks(
             map
-              .getIntegerArrayList("preferredNetworks")
+              .getIntegerList("preferredNetworks")
               ?.let { ArrayList(it) },
           ),
         ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
-        .cardBrandAcceptance(mapToCardBrandAcceptance(toBundleObject(map)))
+        .cardBrandAcceptance(mapToCardBrandAcceptance(map))
         .embeddedViewDisplaysMandateText(
-          if (map.hasKey("embeddedViewDisplaysMandateText") &&
-            map.getType("embeddedViewDisplaysMandateText") == ReadableType.Boolean
-          ) {
-            map.getBoolean("embeddedViewDisplaysMandateText")
-          } else {
-            true // default value
-          },
-        )
-        // Serialize original ReadableMap because toBundleObject cannot keep arrays of objects
-        .customPaymentMethods(
+          map.getBooleanOr("embeddedViewDisplaysMandateText", true),
+        ).customPaymentMethods(
           parseCustomPaymentMethods(
-            toBundleObject(map.getMap("customPaymentMethodConfiguration")).apply {
-              map.getMap("customPaymentMethodConfiguration")?.let { readable ->
-                putSerializable("customPaymentMethodConfigurationReadableMap", readable.toHashMap())
-              }
-            },
+            map.getMap("customPaymentMethodConfiguration"),
           ),
         )
 
@@ -228,23 +166,8 @@ class EmbeddedPaymentElementViewManager :
     return configurationBuilder.build()
   }
 
-  private fun parseRowSelectionBehavior(map: ReadableMap): RowSelectionBehaviorType {
-    val rowSelectionBehavior =
-      map
-        .getMap("rowSelectionBehavior")
-        ?.getString("type")
-        ?.let { type ->
-          when (type) {
-            "immediateAction" -> RowSelectionBehaviorType.ImmediateAction
-            else -> RowSelectionBehaviorType.Default
-          }
-        }
-        ?: RowSelectionBehaviorType.Default
-    return rowSelectionBehavior
-  }
-
   private fun parseIntentConfiguration(map: ReadableMap): PaymentSheet.IntentConfiguration {
-    val intentConfig = PaymentSheetFragment.buildIntentConfiguration(toBundleObject(map))
+    val intentConfig = buildIntentConfiguration(map)
     return intentConfig ?: throw IllegalArgumentException("IntentConfiguration is null")
   }
 
@@ -257,35 +180,32 @@ class EmbeddedPaymentElementViewManager :
   }
 }
 
-/**
- * Returns a List of Strings if the key exists and points to an array of strings, or null otherwise.
- */
-fun ReadableMap.getStringArrayList(key: String): List<String>? {
-  if (!hasKey(key) || getType(key) != ReadableType.Array) return null
-  val array: ReadableArray = getArray(key) ?: return null
-
-  val result = mutableListOf<String>()
-  for (i in 0 until array.size()) {
-    // getString returns null if the element isn't actually a string
-    array.getString(i)?.let { result.add(it) }
-  }
-  return result
+internal fun mapToRowSelectionBehaviorType(map: ReadableMap?): RowSelectionBehaviorType {
+  val rowSelectionBehavior =
+    map
+      ?.getMap("rowSelectionBehavior")
+      ?.getString("type")
+      ?.let { type ->
+        when (type) {
+          "immediateAction" -> RowSelectionBehaviorType.ImmediateAction
+          else -> RowSelectionBehaviorType.Default
+        }
+      }
+      ?: RowSelectionBehaviorType.Default
+  return rowSelectionBehavior
 }
 
-/**
- * Returns a List of Ints if the key exists and points to an array of numbers, or null otherwise.
- */
-fun ReadableMap.getIntegerArrayList(key: String): List<Int>? {
-  if (!hasKey(key) || getType(key) != ReadableType.Array) return null
-  val array: ReadableArray = getArray(key) ?: return null
-
-  val result = mutableListOf<Int>()
-  for (i in 0 until array.size()) {
-    // getType check to skip non-number entries
-    if (array.getType(i) == ReadableType.Number) {
-      // if it's actually a float/double, this will truncate; adjust as needed
-      result.add(array.getInt(i))
-    }
-  }
-  return result
+internal fun mapToFormSheetAction(map: ReadableMap?): EmbeddedPaymentElement.FormSheetAction {
+  val formSheetAction =
+    map
+      ?.getMap("formSheetAction")
+      ?.getString("type")
+      ?.let { type ->
+        when (type) {
+          "confirm" -> EmbeddedPaymentElement.FormSheetAction.Confirm
+          else -> EmbeddedPaymentElement.FormSheetAction.Continue
+        }
+      }
+      ?: EmbeddedPaymentElement.FormSheetAction.Continue
+  return formSheetAction
 }

package/android/src/main/java/com/reactnativestripesdk/EventEmitterCompat.kt

@@ -32,10 +32,6 @@ class EventEmitterCompat(
     invoke("onFinancialConnectionsEvent", value)
   }
 
-  fun emitOnOrderTrackingCallback() {
-    invoke("onOrderTrackingCallback")
-  }
-
   fun emitOnCustomerAdapterFetchPaymentMethodsCallback() {
     invoke("onCustomerAdapterFetchPaymentMethodsCallback")
   }
@@ -72,10 +68,6 @@ class EventEmitterCompat(
     invoke("embeddedPaymentElementDidUpdateHeight", value)
   }
 
-  fun emitEmbeddedPaymentElementWillPresent() {
-    invoke("embeddedPaymentElementWillPresent")
-  }
-
   fun emitEmbeddedPaymentElementDidUpdatePaymentOption(value: ReadableMap?) {
     invoke("embeddedPaymentElementDidUpdatePaymentOption", value)
   }