@stripe/stripe-react-native 0.57.0 → 0.57.2

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

@@ -2,11 +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.widget.FrameLayout
+import androidx.core.graphics.toColorInt
 import androidx.core.view.setMargins
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.PixelUtil
@@ -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,20 +127,13 @@ 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)
@@ -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())
         }
       }
   }
@@ -247,6 +241,8 @@ class CardFormView(
       if (isValid) {
         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,
@@ -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/CollectBankAccountLauncherManager.kt

@@ -1,5 +1,6 @@
 package com.reactnativestripesdk
 
+import android.annotation.SuppressLint
 import androidx.activity.ComponentActivity
 import com.facebook.react.bridge.ReactApplicationContext
 import com.reactnativestripesdk.utils.ErrorType
@@ -66,6 +67,7 @@ class CollectBankAccountLauncherManager(
   }
 
   private fun createBankAccountLauncher(activity: ComponentActivity): CollectBankAccountLauncher =
+    @SuppressLint("RestrictedApi")
     CollectBankAccountLauncher.create(activity, signal) { result ->
       when (result) {
         is CollectBankAccountResult.Completed -> {

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
@@ -56,6 +54,10 @@ class EmbeddedPaymentElementView(
       val intentConfiguration: PaymentSheet.IntentConfiguration,
     ) : Event
 
+    data class Update(
+      val intentConfiguration: PaymentSheet.IntentConfiguration,
+    ) : Event
+
     data object Confirm : Event
 
     data object ClearPaymentOption : Event
@@ -196,7 +198,7 @@ class EmbeddedPaymentElementView(
                 val stripeSdkModule =
                   try {
                     requireStripeSdkModule()
-                  } catch (ex: IllegalArgumentException) {
+                  } catch (_: IllegalArgumentException) {
                     return@Builder CreateIntentResult.Failure(
                       cause =
                         Exception(
@@ -242,7 +244,7 @@ class EmbeddedPaymentElementView(
                 val stripeSdkModule =
                   try {
                     requireStripeSdkModule()
-                  } catch (ex: IllegalArgumentException) {
+                  } catch (_: IllegalArgumentException) {
                     return@Builder CreateIntentResult.Failure(
                       cause =
                         Exception(
@@ -295,9 +297,6 @@ class EmbeddedPaymentElementView(
       }
 
     val embedded = rememberEmbeddedPaymentElement(builder)
-    var height by remember {
-      mutableIntStateOf(0)
-    }
 
     // collect events: configure, confirm, clear
     LaunchedEffect(Unit) {
@@ -327,6 +326,47 @@ class EmbeddedPaymentElementView(
             }
           }
 
+          is Event.Update -> {
+            val elemConfig = latestElementConfig
+            if (elemConfig == null) {
+              val payload =
+                Arguments.createMap().apply {
+                  putString("message", "Cannot update: no element configuration exists")
+                }
+              requireStripeSdkModule().eventEmitter.emitEmbeddedPaymentElementLoadingFailed(payload)
+              requireStripeSdkModule().eventEmitter.emitEmbeddedPaymentElementUpdateComplete(null)
+              return@collect
+            }
+
+            val result =
+              embedded.configure(
+                intentConfiguration = ev.intentConfiguration,
+                configuration = elemConfig,
+              )
+
+            when (result) {
+              is EmbeddedPaymentElement.ConfigureResult.Succeeded -> {
+                val payload =
+                  Arguments.createMap().apply {
+                    putString("status", "succeeded")
+                  }
+                requireStripeSdkModule().eventEmitter.emitEmbeddedPaymentElementUpdateComplete(payload)
+              }
+              is EmbeddedPaymentElement.ConfigureResult.Failed -> {
+                val err = result.error
+                val msg = err.localizedMessage ?: err.toString()
+                val failPayload =
+                  Arguments.createMap().apply {
+                    putString("message", msg)
+                  }
+                requireStripeSdkModule().eventEmitter.emitEmbeddedPaymentElementLoadingFailed(failPayload)
+                requireStripeSdkModule().eventEmitter.emitEmbeddedPaymentElementUpdateComplete(null)
+              }
+            }
+
+            latestIntentConfig = ev.intentConfiguration
+          }
+
           is Event.Confirm -> {
             embedded.confirm()
           }
@@ -348,10 +388,8 @@ class EmbeddedPaymentElementView(
       }
     }
 
-    val density = LocalDensity.current
-
     Box {
-      measuredEmbeddedElement(
+      MeasuredEmbeddedElement(
         reportHeightChange = { h -> reportHeightChange(h) },
       ) {
         embedded.Content()
@@ -360,7 +398,7 @@ class EmbeddedPaymentElementView(
   }
 
   @Composable
-  private fun measuredEmbeddedElement(
+  private fun MeasuredEmbeddedElement(
     reportHeightChange: (Float) -> Unit,
     content: @Composable () -> Unit,
   ) {
@@ -419,6 +457,10 @@ class EmbeddedPaymentElementView(
     events.trySend(Event.Configure(config, intentConfig))
   }
 
+  fun update(intentConfig: PaymentSheet.IntentConfiguration) {
+    events.trySend(Event.Update(intentConfig))
+  }
+
   fun confirm() {
     events.trySend(Event.Confirm)
   }

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

@@ -2,28 +2,32 @@ package com.reactnativestripesdk
 
 import android.annotation.SuppressLint
 import android.content.Context
+import com.facebook.react.bridge.Arguments
 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.bridge.WritableArray
+import com.facebook.react.bridge.WritableMap
 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.PaymentSheetManager.Companion.buildCustomerConfiguration
-import com.reactnativestripesdk.PaymentSheetManager.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.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
 import com.stripe.android.paymentelement.EmbeddedPaymentElement
 import com.stripe.android.paymentelement.ExperimentalCustomPaymentMethodsApi
 import com.stripe.android.paymentsheet.PaymentSheet
+import org.json.JSONArray
+import org.json.JSONObject
 
 @ReactModule(name = EmbeddedPaymentElementViewManager.NAME)
 class EmbeddedPaymentElementViewManager :
@@ -54,10 +58,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)
@@ -77,7 +81,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
@@ -101,45 +105,18 @@ 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 addressMap = billingDetailsMap.getMap("address")
-      val address =
-        PaymentSheet.Address(
-          addressMap?.getString("city"),
-          addressMap?.getString("country"),
-          addressMap?.getString("line1"),
-          addressMap?.getString("line2"),
-          addressMap?.getString("postalCode"),
-          addressMap?.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(map)
-      } catch (error: PaymentSheetException) {
+      } catch (_: PaymentSheetException) {
         throw Error() // TODO handle error
       }
 
     val googlePayConfig = buildGooglePayConfig(map.getMap("googlePay"))
-    val linkConfig = PaymentSheetManager.buildLinkConfig(map.getMap("link"))
+    val linkConfig = buildLinkConfig(map.getMap("link"))
     val shippingDetails =
       map.getMap("defaultShippingDetails")?.let {
         AddressSheetView.buildAddressDetails(it)
@@ -147,45 +124,24 @@ class EmbeddedPaymentElementViewManager :
     val appearance =
       try {
         buildPaymentSheetAppearance(map.getMap("appearance"), context)
-      } catch (error: PaymentSheetAppearanceException) {
+      } 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)
@@ -196,19 +152,13 @@ class EmbeddedPaymentElementViewManager :
         .preferredNetworks(
           mapToPreferredNetworks(
             map
-              .getIntegerArrayList("preferredNetworks")
+              .getIntegerList("preferredNetworks")
               ?.let { ArrayList(it) },
           ),
         ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
         .cardBrandAcceptance(mapToCardBrandAcceptance(map))
         .embeddedViewDisplaysMandateText(
-          if (map.hasKey("embeddedViewDisplaysMandateText") &&
-            map.getType("embeddedViewDisplaysMandateText") == ReadableType.Boolean
-          ) {
-            map.getBoolean("embeddedViewDisplaysMandateText")
-          } else {
-            true // default value
-          },
+          map.getBooleanOr("embeddedViewDisplaysMandateText", true),
         ).customPaymentMethods(
           parseCustomPaymentMethods(
             map.getMap("customPaymentMethodConfiguration"),
@@ -221,23 +171,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 = PaymentSheetManager.buildIntentConfiguration(map)
+    val intentConfig = buildIntentConfiguration(map)
     return intentConfig ?: throw IllegalArgumentException("IntentConfiguration is null")
   }
 
@@ -248,37 +183,90 @@ class EmbeddedPaymentElementViewManager :
   override fun clearPaymentOption(view: EmbeddedPaymentElementView) {
     view.clearPaymentOption()
   }
-}
 
-/**
- * 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) }
+  override fun update(
+    view: EmbeddedPaymentElementView,
+    intentConfigurationJson: String?,
+  ) {
+    intentConfigurationJson?.let { json ->
+      try {
+        val jsonObject = JSONObject(json)
+        val cfg = jsonToWritableMap(jsonObject)
+        val intentConfig = buildIntentConfiguration(cfg)
+        if (intentConfig != null) {
+          view.update(intentConfig)
+        }
+      } catch (e: Exception) {
+        android.util.Log.e("EmbeddedPaymentElement", "Failed to parse intent config JSON", e)
+      }
+    }
   }
-  return result
-}
 
-/**
- * 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
+  private fun jsonToWritableMap(json: JSONObject): WritableMap {
+    val map = Arguments.createMap()
+    val keys = json.keys()
+    while (keys.hasNext()) {
+      val key = keys.next()
+      when (val value = json.get(key)) {
+        is Boolean -> map.putBoolean(key, value)
+        is Int -> map.putInt(key, value)
+        is Double -> map.putDouble(key, value)
+        is Long -> map.putDouble(key, value.toDouble())
+        is String -> map.putString(key, value)
+        is JSONObject -> map.putMap(key, jsonToWritableMap(value))
+        is JSONArray -> map.putArray(key, jsonToWritableArray(value))
+        JSONObject.NULL -> map.putNull(key)
+        else -> map.putString(key, value.toString())
+      }
+    }
+    return map
+  }
 
-  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))
+  private fun jsonToWritableArray(json: JSONArray): WritableArray {
+    val array = Arguments.createArray()
+    for (i in 0 until json.length()) {
+      when (val value = json.get(i)) {
+        is Boolean -> array.pushBoolean(value)
+        is Int -> array.pushInt(value)
+        is Double -> array.pushDouble(value)
+        is Long -> array.pushDouble(value.toDouble())
+        is String -> array.pushString(value)
+        is JSONObject -> array.pushMap(jsonToWritableMap(value))
+        is JSONArray -> array.pushArray(jsonToWritableArray(value))
+        JSONObject.NULL -> array.pushNull()
+        else -> array.pushString(value.toString())
+      }
     }
+    return array
   }
-  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
+}
+
+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)
   }
@@ -92,6 +84,10 @@ class EventEmitterCompat(
     invoke("embeddedPaymentElementLoadingFailed", value)
   }
 
+  fun emitEmbeddedPaymentElementUpdateComplete(value: ReadableMap?) {
+    invoke("embeddedPaymentElementUpdateComplete", value)
+  }
+
   fun emitOnCustomPaymentMethodConfirmHandlerCallback(value: ReadableMap?) {
     invoke("onCustomPaymentMethodConfirmHandlerCallback", value)
   }