@stripe/stripe-react-native 0.56.0 → 0.57.1

package/android/src/main/java/com/reactnativestripesdk/{PaymentSheetFragment.kt → PaymentSheetManager.kt}

@@ -3,7 +3,6 @@ package com.reactnativestripesdk
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Application
-import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
@@ -14,30 +13,33 @@ import android.os.Handler
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
-import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.graphics.createBitmap
 import androidx.core.graphics.drawable.DrawableCompat
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.reactnativestripesdk.addresssheet.AddressSheetView
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.KeepJsAwakeTask
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
 import com.reactnativestripesdk.utils.PaymentSheetErrorType
 import com.reactnativestripesdk.utils.PaymentSheetException
-import com.reactnativestripesdk.utils.StripeFragment
+import com.reactnativestripesdk.utils.StripeUIManager
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createResult
+import com.reactnativestripesdk.utils.forEachKey
+import com.reactnativestripesdk.utils.getBooleanOr
+import com.reactnativestripesdk.utils.getIntegerList
+import com.reactnativestripesdk.utils.getStringList
 import com.reactnativestripesdk.utils.mapFromConfirmationToken
 import com.reactnativestripesdk.utils.mapFromCustomPaymentMethod
 import com.reactnativestripesdk.utils.mapFromPaymentMethod
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
 import com.reactnativestripesdk.utils.parseCustomPaymentMethods
-import com.reactnativestripesdk.utils.removeFragment
 import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
 import com.stripe.android.model.PaymentMethod
 import com.stripe.android.paymentelement.ConfirmCustomPaymentMethodCallback
 import com.stripe.android.paymentelement.CreateIntentWithConfirmationTokenCallback
@@ -47,7 +49,6 @@ import com.stripe.android.paymentelement.ExperimentalCustomPaymentMethodsApi
 import com.stripe.android.paymentelement.PaymentMethodOptionsSetupFutureUsagePreview
 import com.stripe.android.paymentsheet.CreateIntentCallback
 import com.stripe.android.paymentsheet.CreateIntentResult
-import com.stripe.android.paymentsheet.ExperimentalCustomerSessionApi
 import com.stripe.android.paymentsheet.PaymentOptionResultCallback
 import com.stripe.android.paymentsheet.PaymentSheet
 import com.stripe.android.paymentsheet.PaymentSheetResult
@@ -60,12 +61,17 @@ import kotlinx.coroutines.launch
 import java.io.ByteArrayOutputStream
 import kotlin.Exception
 
-@OptIn(ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class, ExperimentalCustomPaymentMethodsApi::class)
-class PaymentSheetFragment :
-  StripeFragment(),
+@OptIn(
+  ReactNativeSdkInternal::class,
+  ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class,
+  ExperimentalCustomPaymentMethodsApi::class,
+)
+class PaymentSheetManager(
+  context: ReactApplicationContext,
+  private val arguments: ReadableMap,
+  private val initPromise: Promise,
+) : StripeUIManager(context),
   ConfirmCustomPaymentMethodCallback {
-  private lateinit var context: ReactApplicationContext
-  private lateinit var initPromise: Promise
   private var paymentSheet: PaymentSheet? = null
   private var flowController: PaymentSheet.FlowController? = null
   private var paymentIntentClientSecret: String? = null
@@ -73,7 +79,6 @@ class PaymentSheetFragment :
   private var intentConfiguration: PaymentSheet.IntentConfiguration? = null
   private lateinit var paymentSheetConfiguration: PaymentSheet.Configuration
   private var confirmPromise: Promise? = null
-  private var presentPromise: Promise? = null
   private var paymentSheetTimedOut = false
   internal var paymentSheetIntentCreationCallback = CompletableDeferred<ReadableMap>()
   internal var paymentSheetConfirmationTokenCreationCallback = CompletableDeferred<ReadableMap>()
@@ -81,39 +86,40 @@ class PaymentSheetFragment :
 
   @SuppressLint("RestrictedApi")
   @OptIn(ExperimentalCustomPaymentMethodsApi::class)
-  override fun prepare() {
-    val merchantDisplayName = arguments?.getString("merchantDisplayName").orEmpty()
+  override fun onCreate() {
+    val activity = getCurrentActivityOrResolveWithError(initPromise) ?: return
+    val merchantDisplayName = arguments.getString("merchantDisplayName").orEmpty()
     if (merchantDisplayName.isEmpty()) {
       initPromise.resolve(
         createError(ErrorType.Failed.toString(), "merchantDisplayName cannot be empty or null."),
       )
       return
     }
-    val primaryButtonLabel = arguments?.getString("primaryButtonLabel")
-    val googlePayConfig = buildGooglePayConfig(arguments?.getBundle("googlePay"))
-    val linkConfig = buildLinkConfig(arguments?.getBundle("link"))
-    val allowsDelayedPaymentMethods = arguments?.getBoolean("allowsDelayedPaymentMethods")
-    val billingDetailsBundle = arguments?.getBundle("defaultBillingDetails")
-    val billingConfigParams = arguments?.getBundle("billingDetailsCollectionConfiguration")
-    val paymentMethodOrder = arguments?.getStringArrayList("paymentMethodOrder")
+    val primaryButtonLabel = arguments.getString("primaryButtonLabel")
+    val googlePayConfig = buildGooglePayConfig(arguments.getMap("googlePay"))
+    val linkConfig = buildLinkConfig(arguments.getMap("link"))
+    val allowsDelayedPaymentMethods = arguments.getBooleanOr("allowsDelayedPaymentMethods", false)
+    val billingDetailsMap = arguments.getMap("defaultBillingDetails")
+    val billingConfigParams = arguments.getMap("billingDetailsCollectionConfiguration")
+    val paymentMethodOrder = arguments.getStringList("paymentMethodOrder")
     val allowsRemovalOfLastSavedPaymentMethod =
-      arguments?.getBoolean("allowsRemovalOfLastSavedPaymentMethod", true) ?: true
-    paymentIntentClientSecret = arguments?.getString("paymentIntentClientSecret").orEmpty()
-    setupIntentClientSecret = arguments?.getString("setupIntentClientSecret").orEmpty()
+      arguments.getBooleanOr("allowsRemovalOfLastSavedPaymentMethod", true)
+    paymentIntentClientSecret = arguments.getString("paymentIntentClientSecret").orEmpty()
+    setupIntentClientSecret = arguments.getString("setupIntentClientSecret").orEmpty()
     intentConfiguration =
       try {
-        buildIntentConfiguration(arguments?.getBundle("intentConfiguration"))
+        buildIntentConfiguration(arguments.getMap("intentConfiguration"))
       } catch (error: PaymentSheetException) {
         initPromise.resolve(createError(ErrorType.Failed.toString(), error))
         return
       }
 
     // Determine which callback type to use based on what's provided
-    val intentConfigBundle = arguments?.getBundle("intentConfiguration")
-    val useConfirmationTokenCallback = intentConfigBundle?.containsKey("confirmationTokenConfirmHandler") == true
+    val intentConfigMap = arguments.getMap("intentConfiguration")
+    val useConfirmationTokenCallback = intentConfigMap?.hasKey("confirmationTokenConfirmHandler") == true
     val appearance =
       try {
-        buildPaymentSheetAppearance(arguments?.getBundle("appearance"), context)
+        buildPaymentSheetAppearance(arguments.getMap("appearance"), context)
       } catch (error: PaymentSheetAppearanceException) {
         initPromise.resolve(createError(ErrorType.Failed.toString(), error))
         return
@@ -128,7 +134,7 @@ class PaymentSheetFragment :
       }
 
     val shippingDetails =
-      arguments?.getBundle("defaultShippingDetails")?.let {
+      arguments.getMap("defaultShippingDetails")?.let {
         AddressSheetView.buildAddressDetails(it)
       }
 
@@ -136,9 +142,9 @@ class PaymentSheetFragment :
       PaymentOptionResultCallback { paymentOptionResult ->
         val result =
           paymentOptionResult.paymentOption?.let {
-            val bitmap = getBitmapFromVectorDrawable(context, it.drawableResourceId)
+            val bitmap = getBitmapFromDrawable(it.icon())
             val imageString = getBase64FromBitmap(bitmap)
-            val option: WritableMap = WritableNativeMap()
+            val option: WritableMap = Arguments.createMap()
             option.putString("label", it.label)
             option.putString("image", imageString)
             val additionalFields: Map<String, Any> = mapOf("didCancel" to paymentOptionResult.didCancel)
@@ -183,10 +189,7 @@ class PaymentSheetFragment :
             }
 
             is PaymentSheetResult.Completed -> {
-              resolvePaymentResult(WritableNativeMap())
-              // Remove the fragment now, we can be sure it won't be needed again if an intent is
-              // successful
-              removeFragment(context)
+              resolvePaymentResult(Arguments.createMap())
               paymentSheet = null
               flowController = null
             }
@@ -247,40 +250,13 @@ class PaymentSheetFragment :
           }
       }
 
-    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?.getBoolean("attachDefaultsToPaymentMethod", false) ?: false,
-      )
+    val billingDetailsConfig = buildBillingDetailsCollectionConfiguration(billingConfigParams)
 
-    var defaultBillingDetails: PaymentSheet.BillingDetails? = null
-    if (billingDetailsBundle != null) {
-      val addressBundle = billingDetailsBundle.getBundle("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,
-          billingDetailsBundle.getString("email"),
-          billingDetailsBundle.getString("name"),
-          billingDetailsBundle.getString("phone"),
-        )
-    }
+    val defaultBillingDetails = buildBillingDetails(billingDetailsMap)
     val configurationBuilder =
       PaymentSheet.Configuration
         .Builder(merchantDisplayName)
-        .allowsDelayedPaymentMethods(allowsDelayedPaymentMethods ?: false)
+        .allowsDelayedPaymentMethods(allowsDelayedPaymentMethods)
         .defaultBillingDetails(defaultBillingDetails)
         .customer(customerConfiguration)
         .googlePay(googlePayConfig)
@@ -289,21 +265,21 @@ class PaymentSheetFragment :
         .link(linkConfig)
         .billingDetailsCollectionConfiguration(billingDetailsConfig)
         .preferredNetworks(
-          mapToPreferredNetworks(arguments?.getIntegerArrayList("preferredNetworks")),
+          mapToPreferredNetworks(arguments.getIntegerList("preferredNetworks")),
         ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
         .cardBrandAcceptance(mapToCardBrandAcceptance(arguments))
-        .customPaymentMethods(parseCustomPaymentMethods(arguments))
+        .customPaymentMethods(parseCustomPaymentMethods(arguments.getMap("customPaymentMethodConfiguration")))
 
     primaryButtonLabel?.let { configurationBuilder.primaryButtonLabel(it) }
     paymentMethodOrder?.let { configurationBuilder.paymentMethodOrder(it) }
 
     configurationBuilder.paymentMethodLayout(
-      mapToPaymentMethodLayout(arguments?.getString("paymentMethodLayout")),
+      mapToPaymentMethodLayout(arguments.getString("paymentMethodLayout")),
     )
 
     paymentSheetConfiguration = configurationBuilder.build()
 
-    if (arguments?.getBoolean("customFlow") == true) {
+    if (arguments.getBooleanOr("customFlow", false)) {
       flowController =
         if (intentConfiguration != null) {
           val builder =
@@ -319,14 +295,14 @@ class PaymentSheetFragment :
           }
           builder
             .confirmCustomPaymentMethodCallback(this)
-            .build(this)
+            .build(activity)
         } else {
           PaymentSheet.FlowController
             .Builder(
               resultCallback = paymentResultCallback,
               paymentOptionResultCallback = paymentOptionCallback,
             ).confirmCustomPaymentMethodCallback(this)
-            .build(this)
+            .build(activity)
         }
       configureFlowController()
     } else {
@@ -338,22 +314,23 @@ class PaymentSheetFragment :
           } else {
             builder.createIntentCallback(createIntentCallback)
           }
+          @SuppressLint("RestrictedApi")
           builder
             .confirmCustomPaymentMethodCallback(this)
-            .build(this)
+            .build(activity, signal)
         } else {
+          @SuppressLint("RestrictedApi")
           PaymentSheet
             .Builder(paymentResultCallback)
             .confirmCustomPaymentMethodCallback(this)
-            .build(this)
+            .build(activity, signal)
         }
-      initPromise.resolve(WritableNativeMap())
+      initPromise.resolve(Arguments.createMap())
     }
   }
 
-  fun present(promise: Promise) {
+  override fun onPresent() {
     keepJsAwake = KeepJsAwakeTask(context).apply { start() }
-    presentPromise = promise
     if (paymentSheet != null) {
       if (!paymentIntentClientSecret.isNullOrEmpty()) {
         paymentSheet?.presentWithPaymentIntent(
@@ -371,7 +348,7 @@ class PaymentSheetFragment :
     } else if (flowController != null) {
       flowController?.presentPaymentOptions()
     } else {
-      promise.resolve(createMissingInitError())
+      promise?.resolve(createMissingInitError())
     }
   }
 
@@ -438,13 +415,13 @@ class PaymentSheetFragment :
       PaymentSheet.FlowController.ConfigCallback { _, _ ->
         val result =
           flowController?.getPaymentOption()?.let {
-            val bitmap = getBitmapFromVectorDrawable(context, it.drawableResourceId)
+            val bitmap = getBitmapFromDrawable(it.icon())
             val imageString = getBase64FromBitmap(bitmap)
-            val option: WritableMap = WritableNativeMap()
+            val option: WritableMap = Arguments.createMap()
             option.putString("label", it.label)
             option.putString("image", imageString)
             createResult("paymentOption", option)
-          } ?: run { WritableNativeMap() }
+          } ?: run { Arguments.createMap() }
         initPromise.resolve(result)
       }
 
@@ -479,7 +456,7 @@ class PaymentSheetFragment :
 
   private fun resolvePresentPromise(value: Any?) {
     keepJsAwake?.stop()
-    presentPromise?.resolve(value)
+    promise?.resolve(value)
   }
 
   private fun resolvePaymentResult(map: WritableMap) {
@@ -565,180 +542,21 @@ class PaymentSheetFragment :
   }
 
   companion object {
-    internal const val TAG = "payment_sheet_launch_fragment"
-
-    internal fun create(
-      context: ReactApplicationContext,
-      arguments: Bundle,
-      initPromise: Promise,
-    ): PaymentSheetFragment {
-      val instance = PaymentSheetFragment()
-      instance.context = context
-      instance.initPromise = initPromise
-      instance.arguments = arguments
-      return instance
-    }
-
-    private val mapIntToButtonType =
-      mapOf(
-        1 to PaymentSheet.GooglePayConfiguration.ButtonType.Buy,
-        6 to PaymentSheet.GooglePayConfiguration.ButtonType.Book,
-        5 to PaymentSheet.GooglePayConfiguration.ButtonType.Checkout,
-        4 to PaymentSheet.GooglePayConfiguration.ButtonType.Donate,
-        11 to PaymentSheet.GooglePayConfiguration.ButtonType.Order,
-        1000 to PaymentSheet.GooglePayConfiguration.ButtonType.Pay,
-        7 to PaymentSheet.GooglePayConfiguration.ButtonType.Subscribe,
-        1001 to PaymentSheet.GooglePayConfiguration.ButtonType.Plain,
-      )
-
     internal fun createMissingInitError(): WritableMap =
       createError(
         PaymentSheetErrorType.Failed.toString(),
         "No payment sheet has been initialized yet. You must call `initPaymentSheet` before `presentPaymentSheet`.",
       )
-
-    internal fun buildGooglePayConfig(params: Bundle?): PaymentSheet.GooglePayConfiguration? {
-      if (params == null || params.isEmpty) {
-        return null
-      }
-
-      val countryCode = params.getString("merchantCountryCode").orEmpty()
-      val currencyCode = params.getString("currencyCode").orEmpty()
-      val testEnv = params.getBoolean("testEnv")
-      val amount = params.getString("amount")?.toLongOrNull()
-      val label = params.getString("label")
-      val buttonType =
-        mapIntToButtonType.get(params.getInt("buttonType"))
-          ?: PaymentSheet.GooglePayConfiguration.ButtonType.Pay
-
-      return PaymentSheet.GooglePayConfiguration(
-        environment =
-          if (testEnv) {
-            PaymentSheet.GooglePayConfiguration.Environment.Test
-          } else {
-            PaymentSheet.GooglePayConfiguration.Environment.Production
-          },
-        countryCode = countryCode,
-        currencyCode = currencyCode,
-        amount = amount,
-        label = label,
-        buttonType = buttonType,
-      )
-    }
-
-    internal fun buildLinkConfig(params: Bundle?): PaymentSheet.LinkConfiguration {
-      if (params == null) {
-        return PaymentSheet.LinkConfiguration()
-      }
-
-      val display = mapStringToLinkDisplay(params.getString("display"))
-
-      return PaymentSheet.LinkConfiguration(
-        display = display,
-      )
-    }
-
-    private fun mapStringToLinkDisplay(value: String?): PaymentSheet.LinkConfiguration.Display =
-      when (value) {
-        "automatic" -> PaymentSheet.LinkConfiguration.Display.Automatic
-        "never" -> PaymentSheet.LinkConfiguration.Display.Never
-        else -> PaymentSheet.LinkConfiguration.Display.Automatic
-      }
-
-    @Throws(PaymentSheetException::class)
-    internal fun buildIntentConfiguration(intentConfigurationParams: Bundle?): PaymentSheet.IntentConfiguration? {
-      if (intentConfigurationParams == null) {
-        return null
-      }
-      val modeParams =
-        intentConfigurationParams.getBundle("mode")
-          ?: throw PaymentSheetException(
-            "If `intentConfiguration` is provided, `intentConfiguration.mode` is required",
-          )
-
-      return PaymentSheet.IntentConfiguration(
-        mode = buildIntentConfigurationMode(modeParams),
-        paymentMethodTypes =
-          intentConfigurationParams.getStringArrayList("paymentMethodTypes")?.toList()
-            ?: emptyList(),
-      )
-    }
-
-    @OptIn(PaymentMethodOptionsSetupFutureUsagePreview::class)
-    private fun buildIntentConfigurationMode(modeParams: Bundle): PaymentSheet.IntentConfiguration.Mode =
-      if (modeParams.containsKey("amount")) {
-        val currencyCode =
-          modeParams.getString("currencyCode")
-            ?: throw PaymentSheetException(
-              "You must provide a value to intentConfiguration.mode.currencyCode",
-            )
-        PaymentSheet.IntentConfiguration.Mode.Payment(
-          amount = modeParams.getInt("amount").toLong(),
-          currency = currencyCode,
-          setupFutureUse = mapToSetupFutureUse(modeParams.getString("setupFutureUsage")),
-          captureMethod = mapToCaptureMethod(modeParams.getString("captureMethod")),
-          paymentMethodOptions = mapToPaymentMethodOptions(modeParams.getBundle("paymentMethodOptions")),
-        )
-      } else {
-        val setupFutureUsage =
-          mapToSetupFutureUse(modeParams.getString("setupFutureUsage"))
-            ?: throw PaymentSheetException(
-              "You must provide a value to intentConfiguration.mode.setupFutureUsage",
-            )
-        PaymentSheet.IntentConfiguration.Mode.Setup(
-          currency = modeParams.getString("currencyCode"),
-          setupFutureUse = setupFutureUsage,
-        )
-      }
-
-    @OptIn(ExperimentalCustomerSessionApi::class)
-    @Throws(PaymentSheetException::class)
-    internal fun buildCustomerConfiguration(bundle: Bundle?): PaymentSheet.CustomerConfiguration? {
-      val customerId = bundle?.getString("customerId").orEmpty()
-      val customerEphemeralKeySecret = bundle?.getString("customerEphemeralKeySecret").orEmpty()
-      val customerSessionClientSecret = bundle?.getString("customerSessionClientSecret").orEmpty()
-      return if (customerSessionClientSecret.isNotEmpty() &&
-        customerEphemeralKeySecret.isNotEmpty()
-      ) {
-        throw PaymentSheetException(
-          "`customerEphemeralKeySecret` and `customerSessionClientSecret` cannot both be set",
-        )
-      } else if (customerId.isNotEmpty() && customerSessionClientSecret.isNotEmpty()) {
-        PaymentSheet.CustomerConfiguration.createWithCustomerSession(
-          id = customerId,
-          clientSecret = customerSessionClientSecret,
-        )
-      } else if (customerId.isNotEmpty() && customerEphemeralKeySecret.isNotEmpty()) {
-        PaymentSheet.CustomerConfiguration(
-          id = customerId,
-          ephemeralKeySecret = customerEphemeralKeySecret,
-        )
-      } else {
-        null
-      }
-    }
   }
 }
 
-fun getBitmapFromVectorDrawable(
-  context: Context?,
-  drawableId: Int,
-): Bitmap? {
-  val drawable = AppCompatResources.getDrawable(context!!, drawableId) ?: return null
-  return getBitmapFromDrawable(drawable)
-}
-
 fun getBitmapFromDrawable(drawable: Drawable): Bitmap? {
   val drawableCompat = DrawableCompat.wrap(drawable).mutate()
   if (drawableCompat.intrinsicWidth <= 0 || drawableCompat.intrinsicHeight <= 0) {
     return null
   }
   val bitmap =
-    Bitmap.createBitmap(
-      drawableCompat.intrinsicWidth,
-      drawableCompat.intrinsicHeight,
-      Bitmap.Config.ARGB_8888,
-    )
+    createBitmap(drawableCompat.intrinsicWidth, drawableCompat.intrinsicHeight)
   bitmap.eraseColor(Color.TRANSPARENT)
   val canvas = Canvas(bitmap)
   drawable.setBounds(0, 0, canvas.width, canvas.height)
@@ -756,14 +574,6 @@ fun getBase64FromBitmap(bitmap: Bitmap?): String? {
   return Base64.encodeToString(imageBytes, Base64.DEFAULT)
 }
 
-fun mapToCollectionMode(str: String?): PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode =
-  when (str) {
-    "automatic" -> PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode.Automatic
-    "never" -> PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode.Never
-    "always" -> PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode.Always
-    else -> PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode.Automatic
-  }
-
 fun mapToPaymentMethodLayout(str: String?): PaymentSheet.PaymentMethodLayout =
   when (str) {
     "Horizontal" -> PaymentSheet.PaymentMethodLayout.Horizontal
@@ -771,17 +581,7 @@ fun mapToPaymentMethodLayout(str: String?): PaymentSheet.PaymentMethodLayout =
     else -> PaymentSheet.PaymentMethodLayout.Automatic
   }
 
-fun mapToAddressCollectionMode(str: String?): PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode =
-  when (str) {
-    "automatic" ->
-      PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode.Automatic
-
-    "never" -> PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode.Never
-    "full" -> PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode.Full
-    else -> PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode.Automatic
-  }
-
-fun mapToSetupFutureUse(type: String?): PaymentSheet.IntentConfiguration.SetupFutureUse? =
+internal fun mapToSetupFutureUse(type: String?): PaymentSheet.IntentConfiguration.SetupFutureUse? =
   when (type) {
     "OffSession" -> PaymentSheet.IntentConfiguration.SetupFutureUse.OffSession
     "OnSession" -> PaymentSheet.IntentConfiguration.SetupFutureUse.OnSession
@@ -789,7 +589,7 @@ fun mapToSetupFutureUse(type: String?): PaymentSheet.IntentConfiguration.SetupFu
     else -> null
   }
 
-fun mapToCaptureMethod(type: String?): PaymentSheet.IntentConfiguration.CaptureMethod =
+internal fun mapToCaptureMethod(type: String?): PaymentSheet.IntentConfiguration.CaptureMethod =
   when (type) {
     "Automatic" -> PaymentSheet.IntentConfiguration.CaptureMethod.Automatic
     "Manual" -> PaymentSheet.IntentConfiguration.CaptureMethod.Manual
@@ -798,11 +598,11 @@ fun mapToCaptureMethod(type: String?): PaymentSheet.IntentConfiguration.CaptureM
   }
 
 @OptIn(PaymentMethodOptionsSetupFutureUsagePreview::class)
-fun mapToPaymentMethodOptions(options: Bundle?): PaymentSheet.IntentConfiguration.Mode.Payment.PaymentMethodOptions? {
-  val sfuBundle = options?.getBundle("setupFutureUsageValues")
+internal fun mapToPaymentMethodOptions(options: ReadableMap?): PaymentSheet.IntentConfiguration.Mode.Payment.PaymentMethodOptions? {
+  val sfuMap = options?.getMap("setupFutureUsageValues")
   val paymentMethodToSfuMap = mutableMapOf<PaymentMethod.Type, PaymentSheet.IntentConfiguration.SetupFutureUse>()
-  sfuBundle?.keySet()?.forEach { code ->
-    val sfuValue = mapToSetupFutureUse(sfuBundle?.getString(code))
+  sfuMap?.forEachKey { code ->
+    val sfuValue = mapToSetupFutureUse(sfuMap.getString(code))
     val paymentMethodType = PaymentMethod.Type.fromCode(code)
     if (paymentMethodType != null && sfuValue != null) {
       paymentMethodToSfuMap[paymentMethodType] = sfuValue
@@ -816,38 +616,3 @@ fun mapToPaymentMethodOptions(options: Bundle?): PaymentSheet.IntentConfiguratio
     null
   }
 }
-
-fun mapToCardBrandAcceptance(params: Bundle?): PaymentSheet.CardBrandAcceptance {
-  val cardBrandAcceptanceParams = params?.getBundle("cardBrandAcceptance") ?: return PaymentSheet.CardBrandAcceptance.all()
-  val filter = cardBrandAcceptanceParams.getString("filter") ?: return PaymentSheet.CardBrandAcceptance.all()
-
-  return when (filter) {
-    "all" -> PaymentSheet.CardBrandAcceptance.all()
-    "allowed" -> {
-      val brands = cardBrandAcceptanceParams.getStringArrayList("brands") ?: return PaymentSheet.CardBrandAcceptance.all()
-      val brandCategories = brands.mapNotNull { mapToCardBrandCategory(it) }
-      if (brandCategories.isEmpty()) {
-        return PaymentSheet.CardBrandAcceptance.all()
-      }
-      PaymentSheet.CardBrandAcceptance.allowed(brandCategories)
-    }
-    "disallowed" -> {
-      val brands = cardBrandAcceptanceParams.getStringArrayList("brands") ?: return PaymentSheet.CardBrandAcceptance.all()
-      val brandCategories = brands.mapNotNull { mapToCardBrandCategory(it) }
-      if (brandCategories.isEmpty()) {
-        return PaymentSheet.CardBrandAcceptance.all()
-      }
-      PaymentSheet.CardBrandAcceptance.disallowed(brandCategories)
-    }
-    else -> PaymentSheet.CardBrandAcceptance.all()
-  }
-}
-
-fun mapToCardBrandCategory(brand: String): PaymentSheet.CardBrandAcceptance.BrandCategory? =
-  when (brand) {
-    "visa" -> PaymentSheet.CardBrandAcceptance.BrandCategory.Visa
-    "mastercard" -> PaymentSheet.CardBrandAcceptance.BrandCategory.Mastercard
-    "amex" -> PaymentSheet.CardBrandAcceptance.BrandCategory.Amex
-    "discover" -> PaymentSheet.CardBrandAcceptance.BrandCategory.Discover
-    else -> null
-  }