@stripe/stripe-react-native 0.56.0 → 0.57.1

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

@@ -19,11 +19,20 @@ class StripeSdkPackage : BaseReactPackage() {
   ): NativeModule? =
     when (name) {
       StripeSdkModule.NAME -> StripeSdkModule(reactContext)
+      NativeOnrampSdkModuleSpec.NAME -> {
+        val onrampModuleClass = getOnrampModuleClass()
+        val constructor = onrampModuleClass.getConstructor(ReactApplicationContext::class.java)
+        constructor.newInstance(reactContext) as NativeModule
+      }
       else -> null
     }
 
   override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
-    val moduleList: Array<Class<out NativeModule?>> = arrayOf(StripeSdkModule::class.java)
+    val moduleList: Array<Class<out NativeModule?>> =
+      arrayOf(
+        StripeSdkModule::class.java,
+        getOnrampModuleClass(),
+      )
     val reactModuleInfoMap: MutableMap<String, ReactModuleInfo> = HashMap()
     for (moduleClass in moduleList) {
       val reactModule = moduleClass.getAnnotation(ReactModule::class.java) ?: continue
@@ -47,8 +56,18 @@ class StripeSdkPackage : BaseReactPackage() {
       StripeContainerManager(),
       CardFormViewManager(),
       GooglePayButtonManager(),
-      AddToWalletButtonManager(reactContext),
+      AddToWalletButtonManager(),
       AddressSheetViewManager(),
       EmbeddedPaymentElementViewManager(),
+      NavigationBarManager(),
     )
+
+  private fun getOnrampModuleClass(): Class<out NativeModule?> {
+    if (BuildConfig.IS_ONRAMP_INCLUDED) {
+      @Suppress("UNCHECKED_CAST")
+      return Class.forName("com.reactnativestripesdk.OnrampSdkModule") as Class<out NativeModule?>
+    } else {
+      return FakeOnrampSdkModule::class.java
+    }
+  }
 }

package/android/src/main/java/com/reactnativestripesdk/addresssheet/AddressLauncherManager.kt

@@ -0,0 +1,78 @@
+package com.reactnativestripesdk.addresssheet
+
+import android.annotation.SuppressLint
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableMap
+import com.reactnativestripesdk.utils.ErrorType
+import com.reactnativestripesdk.utils.StripeUIManager
+import com.reactnativestripesdk.utils.createError
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
+import com.stripe.android.paymentsheet.PaymentSheet
+import com.stripe.android.paymentsheet.addresselement.AddressDetails
+import com.stripe.android.paymentsheet.addresselement.AddressLauncher
+import com.stripe.android.paymentsheet.addresselement.AddressLauncherResult
+
+@OptIn(ReactNativeSdkInternal::class)
+class AddressLauncherManager(
+  context: ReactApplicationContext,
+  appearance: PaymentSheet.Appearance,
+  defaultAddress: AddressDetails?,
+  allowedCountries: Set<String>,
+  buttonTitle: String?,
+  title: String?,
+  googlePlacesApiKey: String?,
+  autocompleteCountries: Set<String>,
+  additionalFields: AddressLauncher.AdditionalFieldsConfiguration?,
+  private var callback: ((error: WritableMap?, address: AddressDetails?) -> Unit),
+) : StripeUIManager(context) {
+  companion object {
+    internal var publishableKey: String? = null
+  }
+
+  private lateinit var addressLauncher: AddressLauncher
+  private var configuration =
+    AddressLauncher.Configuration(
+      appearance = appearance,
+      address = defaultAddress,
+      allowedCountries = allowedCountries,
+      buttonTitle = buttonTitle,
+      additionalFields = additionalFields,
+      title = title,
+      googlePlacesApiKey = googlePlacesApiKey,
+      autocompleteCountries = autocompleteCountries,
+    )
+
+  override fun onPresent() {
+    val activity = getCurrentActivityOrResolveWithError(promise) ?: return
+    publishableKey?.let { publishableKey ->
+      @SuppressLint("RestrictedApi")
+      addressLauncher =
+        AddressLauncher(activity, signal, ::onAddressLauncherResult).also {
+          it.present(publishableKey = publishableKey, configuration = configuration)
+        }
+    }
+      ?: run {
+        callback.invoke(
+          createError(
+            ErrorType.Failed.toString(),
+            "No publishable key set. Stripe has not been initialized. Initialize Stripe in your app with the StripeProvider component or the initStripe method.",
+          ),
+          null,
+        )
+      }
+  }
+
+  private fun onAddressLauncherResult(result: AddressLauncherResult) {
+    when (result) {
+      is AddressLauncherResult.Canceled -> {
+        callback.invoke(
+          createError(ErrorType.Canceled.toString(), "The flow has been canceled."),
+          null,
+        )
+      }
+      is AddressLauncherResult.Succeeded -> {
+        callback.invoke(null, result.address)
+      }
+    }
+  }
+}

package/android/src/main/java/com/reactnativestripesdk/addresssheet/AddressSheetView.kt

@@ -1,19 +1,18 @@
 package com.reactnativestripesdk.addresssheet
 
 import android.annotation.SuppressLint
-import android.os.Bundle
 import android.util.Log
 import android.widget.FrameLayout
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.reactnativestripesdk.buildPaymentSheetAppearance
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
 import com.reactnativestripesdk.utils.createError
-import com.reactnativestripesdk.utils.toBundleObject
+import com.reactnativestripesdk.utils.getBooleanOr
 import com.stripe.android.paymentsheet.PaymentSheet
 import com.stripe.android.paymentsheet.addresselement.AddressDetails
 import com.stripe.android.paymentsheet.addresselement.AddressLauncher
@@ -31,6 +30,14 @@ class AddressSheetView(
   private var googlePlacesApiKey: String? = null
   private var autocompleteCountries: Set<String> = emptySet()
   private var additionalFields: AddressLauncher.AdditionalFieldsConfiguration? = null
+  private var addressSheetManager: AddressLauncherManager? = null
+
+  override fun onDetachedFromWindow() {
+    super.onDetachedFromWindow()
+
+    addressSheetManager?.destroy()
+    addressSheetManager = null
+  }
 
   private fun onSubmit(params: WritableMap) {
     UIManagerHelper.getEventDispatcherForReactTag(context, id)?.dispatchEvent(
@@ -59,29 +66,37 @@ class AddressSheetView(
   private fun launchAddressSheet() {
     val appearance =
       try {
-        buildPaymentSheetAppearance(toBundleObject(appearanceParams), context)
+        buildPaymentSheetAppearance(appearanceParams, context)
       } catch (error: PaymentSheetAppearanceException) {
         onError(createError(ErrorType.Failed.toString(), error))
         return
       }
-    AddressLauncherFragment().presentAddressSheet(
-      context,
-      appearance,
-      defaultAddress,
-      allowedCountries,
-      buttonTitle,
-      sheetTitle,
-      googlePlacesApiKey,
-      autocompleteCountries,
-      additionalFields,
-    ) { error, address ->
-      if (address != null) {
-        onSubmit(buildResult(address))
-      } else {
-        onError(error)
+    addressSheetManager?.destroy()
+    addressSheetManager =
+      AddressLauncherManager(
+        context.reactApplicationContext,
+        appearance,
+        defaultAddress,
+        allowedCountries,
+        buttonTitle,
+        sheetTitle,
+        googlePlacesApiKey,
+        autocompleteCountries,
+        additionalFields,
+      ) { error, address ->
+        addressSheetManager?.destroy()
+        addressSheetManager = null
+
+        if (address != null) {
+          onSubmit(buildResult(address))
+        } else {
+          onError(error)
+        }
+        isVisible = false
+      }.also {
+        it.create()
+        it.present()
       }
-      isVisible = false
-    }
   }
 
   fun setAppearance(appearanceParams: ReadableMap?) {
@@ -117,27 +132,25 @@ class AddressSheetView(
   }
 
   companion object {
-    internal fun buildAddressDetails(bundle: Bundle): AddressDetails =
+    internal fun buildAddressDetails(map: ReadableMap): AddressDetails =
       AddressDetails(
-        name = bundle.getString("name"),
-        address = buildAddress(bundle.getBundle("address")),
-        phoneNumber = bundle.getString("phone"),
-        isCheckboxSelected = bundle.getBoolean("isCheckboxSelected"),
+        name = map.getString("name"),
+        address = buildAddress(map.getMap("address")),
+        phoneNumber = map.getString("phone"),
+        isCheckboxSelected = map.getBooleanOr("isCheckboxSelected", false),
       )
 
-    internal fun buildAddressDetails(map: ReadableMap): AddressDetails = buildAddressDetails(toBundleObject(map))
-
-    internal fun buildAddress(bundle: Bundle?): PaymentSheet.Address? {
-      if (bundle == null) {
+    internal fun buildAddress(map: ReadableMap?): PaymentSheet.Address? {
+      if (map == null) {
         return null
       }
       return PaymentSheet.Address(
-        city = bundle.getString("city"),
-        country = bundle.getString("country"),
-        line1 = bundle.getString("line1"),
-        line2 = bundle.getString("line2"),
-        state = bundle.getString("state"),
-        postalCode = bundle.getString("postalCode"),
+        city = map.getString("city"),
+        country = map.getString("country"),
+        line1 = map.getString("line1"),
+        line2 = map.getString("line2"),
+        state = map.getString("state"),
+        postalCode = map.getString("postalCode"),
       )
     }
 
@@ -159,14 +172,14 @@ class AddressSheetView(
     }
 
     internal fun buildResult(addressDetails: AddressDetails): WritableMap =
-      WritableNativeMap().apply {
+      Arguments.createMap().apply {
         putMap(
           "result",
-          WritableNativeMap().apply {
+          Arguments.createMap().apply {
             putString("name", addressDetails.name)
             putMap(
               "address",
-              WritableNativeMap().apply {
+              Arguments.createMap().apply {
                 putString("city", addressDetails.address?.city)
                 putString("country", addressDetails.address?.country)
                 putString("line1", addressDetails.address?.line1)

package/android/src/main/java/com/reactnativestripesdk/addresssheet/AddressSheetViewManager.kt

@@ -41,7 +41,7 @@ class AddressSheetViewManager :
     view: AddressSheetView,
     appearance: Dynamic,
   ) {
-    view.setAppearance(appearance.asMap())
+    view.setAppearance(appearance.asMapOrNull())
   }
 
   @ReactProp(name = "defaultValues")
@@ -49,7 +49,7 @@ class AddressSheetViewManager :
     view: AddressSheetView,
     defaults: Dynamic,
   ) {
-    view.setDefaultValues(defaults.asMap())
+    view.setDefaultValues(defaults.asMapOrNull())
   }
 
   @ReactProp(name = "additionalFields")

package/android/src/main/java/com/reactnativestripesdk/customersheet/{CustomerSheetFragment.kt → CustomerSheetManager.kt}

@@ -10,79 +10,66 @@ import android.util.Log
 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.ReactNativeCustomerAdapter
 import com.reactnativestripesdk.ReactNativeCustomerSessionProvider
+import com.reactnativestripesdk.buildBillingDetails
+import com.reactnativestripesdk.buildBillingDetailsCollectionConfiguration
 import com.reactnativestripesdk.buildPaymentSheetAppearance
 import com.reactnativestripesdk.getBase64FromBitmap
 import com.reactnativestripesdk.getBitmapFromDrawable
-import com.reactnativestripesdk.mapToAddressCollectionMode
 import com.reactnativestripesdk.mapToCardBrandAcceptance
-import com.reactnativestripesdk.mapToCollectionMode
 import com.reactnativestripesdk.utils.CreateTokenErrorType
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.KeepJsAwakeTask
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
-import com.reactnativestripesdk.utils.StripeFragment
+import com.reactnativestripesdk.utils.StripeUIManager
 import com.reactnativestripesdk.utils.createError
+import com.reactnativestripesdk.utils.getBooleanOr
+import com.reactnativestripesdk.utils.getIntegerList
+import com.reactnativestripesdk.utils.getStringList
 import com.reactnativestripesdk.utils.mapFromPaymentMethod
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
 import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
 import com.stripe.android.customersheet.CustomerAdapter
 import com.stripe.android.customersheet.CustomerEphemeralKey
 import com.stripe.android.customersheet.CustomerSheet
 import com.stripe.android.customersheet.CustomerSheetResult
 import com.stripe.android.customersheet.PaymentOptionSelection
 import com.stripe.android.model.PaymentMethod
-import com.stripe.android.paymentsheet.ExperimentalCustomerSessionApi
 import com.stripe.android.paymentsheet.PaymentSheet
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class, ExperimentalCustomerSessionApi::class)
-class CustomerSheetFragment : StripeFragment() {
+@OptIn(ReactNativeSdkInternal::class, ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class)
+class CustomerSheetManager(
+  context: ReactApplicationContext,
+  private var arguments: ReadableMap,
+  private var customerAdapterOverrides: ReadableMap,
+  private var initPromise: Promise,
+) : StripeUIManager(context) {
   private var customerSheet: CustomerSheet? = null
   internal var customerAdapter: ReactNativeCustomerAdapter? = null
   internal var customerSessionProvider: ReactNativeCustomerSessionProvider? = null
-  internal var context: ReactApplicationContext? = null
-  internal var initPromise: Promise? = null
   private var presentPromise: Promise? = null
   private var keepJsAwake: KeepJsAwakeTask? = null
 
-  override fun prepare() {
-    val context =
-      context
-        ?: run {
-          Log.e(
-            "StripeReactNative",
-            "No context found during CustomerSheet.initialize. Please file an issue: https://github.com/stripe/stripe-react-native/issues",
-          )
-          return
-        }
-    val initPromise =
-      initPromise
-        ?: run {
-          Log.e(
-            "StripeReactNative",
-            "No promise found for CustomerSheet.initialize. Please file an issue: https://github.com/stripe/stripe-react-native/issues",
-          )
-          return
-        }
-
-    val headerTextForSelectionScreen = arguments?.getString("headerTextForSelectionScreen")
-    val merchantDisplayName = arguments?.getString("merchantDisplayName")
-    val googlePayEnabled = arguments?.getBoolean("googlePayEnabled") ?: false
-    val billingDetailsBundle = arguments?.getBundle("defaultBillingDetails")
-    val billingConfigParams = arguments?.getBundle("billingDetailsCollectionConfiguration")
+  override fun onCreate() {
+    val headerTextForSelectionScreen = arguments.getString("headerTextForSelectionScreen")
+    val merchantDisplayName = arguments.getString("merchantDisplayName")
+    val googlePayEnabled = arguments.getBooleanOr("googlePayEnabled", false)
+    val billingDetailsMap = arguments.getMap("defaultBillingDetails")
+    val billingConfigParams = arguments.getMap("billingDetailsCollectionConfiguration")
     val allowsRemovalOfLastSavedPaymentMethod =
-      arguments?.getBoolean("allowsRemovalOfLastSavedPaymentMethod", true) ?: true
-    val paymentMethodOrder = arguments?.getStringArrayList("paymentMethodOrder")
+      arguments.getBooleanOr("allowsRemovalOfLastSavedPaymentMethod", true)
+    val paymentMethodOrder = arguments.getStringList("paymentMethodOrder")
 
     val appearance =
       try {
-        buildPaymentSheetAppearance(arguments?.getBundle("appearance"), context)
+        buildPaymentSheetAppearance(arguments.getMap("appearance"), context)
       } catch (error: PaymentSheetAppearanceException) {
         initPromise.resolve(createError(ErrorType.Failed.toString(), error))
         return
@@ -95,13 +82,13 @@ class CustomerSheetFragment : StripeFragment() {
         .googlePayEnabled(googlePayEnabled)
         .headerTextForSelectionScreen(headerTextForSelectionScreen)
         .preferredNetworks(
-          mapToPreferredNetworks(arguments?.getIntegerArrayList("preferredNetworks")),
+          mapToPreferredNetworks(arguments.getIntegerList("preferredNetworks")),
         ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
         .cardBrandAcceptance(mapToCardBrandAcceptance(arguments))
 
     paymentMethodOrder?.let { configuration.paymentMethodOrder(it) }
-    billingDetailsBundle?.let {
-      configuration.defaultBillingDetails(createDefaultBillingDetails(billingDetailsBundle))
+    billingDetailsMap?.let {
+      configuration.defaultBillingDetails(createDefaultBillingDetails(billingDetailsMap))
     }
     billingConfigParams?.let {
       configuration.billingDetailsCollectionConfiguration(
@@ -109,8 +96,10 @@ class CustomerSheetFragment : StripeFragment() {
       )
     }
 
-    val customerEphemeralKeySecret = arguments?.getString("customerEphemeralKeySecret")
-    val intentConfiguration = createIntentConfiguration(arguments?.getBundle("intentConfiguration"))
+    val activity = getCurrentActivityOrResolveWithError(initPromise) ?: return
+
+    val customerEphemeralKeySecret = arguments.getString("customerEphemeralKeySecret")
+    val intentConfiguration = createIntentConfiguration(arguments.getMap("intentConfiguration"))
     if (customerEphemeralKeySecret == null && intentConfiguration == null) {
       initPromise.resolve(
         createError(
@@ -128,32 +117,34 @@ class CustomerSheetFragment : StripeFragment() {
 
       customerSheet =
         CustomerSheet.create(
-          fragment = this,
+          activity = activity,
           customerSessionProvider = customerSessionProvider,
           callback = ::handleResult,
         )
     } else if (intentConfiguration == null) {
-      val customerId = arguments?.getString("customerId")
+      val customerId = arguments.getString("customerId")
       if (customerId == null) {
         initPromise.resolve(
-          createError(ErrorType.Failed.toString(), "When using `customerEphemeralKeySecret` you must provide a value for `customerId`"),
+          createError(
+            ErrorType.Failed.toString(),
+            "When using `customerEphemeralKeySecret` you must provide a value for `customerId`",
+          ),
         )
         return
       }
-      val setupIntentClientSecret = arguments?.getString("setupIntentClientSecret")
-      val customerAdapterOverrideParams = arguments?.getBundle("customerAdapter")
+      val setupIntentClientSecret = arguments.getString("setupIntentClientSecret")
       val customerAdapter =
         createCustomerAdapter(
           context,
-          customerId!!,
+          customerId,
           customerEphemeralKeySecret,
           setupIntentClientSecret,
-          customerAdapterOverrideParams,
+          customerAdapterOverrides,
         ).also { this.customerAdapter = it }
 
       customerSheet =
         CustomerSheet.create(
-          fragment = this,
+          activity = activity,
           customerAdapter = customerAdapter,
           callback = ::handleResult,
         )
@@ -168,7 +159,7 @@ class CustomerSheetFragment : StripeFragment() {
 
     customerSheet?.configure(configuration.build())
 
-    initPromise.resolve(WritableNativeMap())
+    initPromise.resolve(Arguments.createMap())
   }
 
   private fun handleResult(result: CustomerSheetResult) {
@@ -193,16 +184,15 @@ class CustomerSheetFragment : StripeFragment() {
     resolvePresentPromise(promiseResult)
   }
 
-  fun present(
-    timeout: Long?,
-    promise: Promise,
-  ) {
-    keepJsAwake = context?.let { KeepJsAwakeTask(it).apply { start() } }
+  override fun onPresent() {
+    keepJsAwake = context.let { KeepJsAwakeTask(it).apply { start() } }
     presentPromise = promise
+    val timeout = timeout
     if (timeout != null) {
       presentWithTimeout(timeout)
+    } else {
+      customerSheet?.present() ?: run { resolvePresentPromise(createMissingInitError()) }
     }
-    customerSheet?.present() ?: run { resolvePresentPromise(createMissingInitError()) }
   }
 
   private fun presentWithTimeout(timeout: Long) {
@@ -232,7 +222,7 @@ class CustomerSheetFragment : StripeFragment() {
 
         override fun onActivityDestroyed(activity: Activity) {
           activities = mutableListOf()
-          context?.currentActivity?.application?.unregisterActivityLifecycleCallbacks(this)
+          context.currentActivity?.application?.unregisterActivityLifecycleCallbacks(this)
         }
       }
 
@@ -248,7 +238,7 @@ class CustomerSheetFragment : StripeFragment() {
       )
 
     context
-      ?.currentActivity
+      .currentActivity
       ?.application
       ?.registerActivityLifecycleCallbacks(activityLifecycleCallbacks)
 
@@ -304,45 +294,21 @@ class CustomerSheetFragment : StripeFragment() {
   }
 
   companion object {
-    internal const val TAG = "customer_sheet_launch_fragment"
-
     internal fun createMissingInitError(): WritableMap =
       createError(ErrorType.Failed.toString(), "No customer sheet has been initialized yet.")
 
-    internal fun createDefaultBillingDetails(bundle: Bundle): PaymentSheet.BillingDetails {
-      val addressBundle = bundle.getBundle("address")
-      val address =
-        PaymentSheet.Address(
-          addressBundle?.getString("city"),
-          addressBundle?.getString("country"),
-          addressBundle?.getString("line1"),
-          addressBundle?.getString("line2"),
-          addressBundle?.getString("postalCode"),
-          addressBundle?.getString("state"),
-        )
-      return PaymentSheet.BillingDetails(
-        address,
-        bundle.getString("email"),
-        bundle.getString("name"),
-        bundle.getString("phone"),
-      )
-    }
+    internal fun createDefaultBillingDetails(map: ReadableMap): PaymentSheet.BillingDetails =
+      buildBillingDetails(map) ?: PaymentSheet.BillingDetails()
 
-    internal fun createBillingDetailsCollectionConfiguration(bundle: Bundle): PaymentSheet.BillingDetailsCollectionConfiguration =
-      PaymentSheet.BillingDetailsCollectionConfiguration(
-        name = mapToCollectionMode(bundle.getString("name")),
-        phone = mapToCollectionMode(bundle.getString("phone")),
-        email = mapToCollectionMode(bundle.getString("email")),
-        address = mapToAddressCollectionMode(bundle.getString("address")),
-        attachDefaultsToPaymentMethod = bundle.getBoolean("attachDefaultsToPaymentMethod", false),
-      )
+    internal fun createBillingDetailsCollectionConfiguration(map: ReadableMap): PaymentSheet.BillingDetailsCollectionConfiguration =
+      buildBillingDetailsCollectionConfiguration(map)
 
     internal fun createCustomerAdapter(
       context: ReactApplicationContext,
       customerId: String,
       customerEphemeralKeySecret: String,
       setupIntentClientSecret: String?,
-      customerAdapterOverrideParams: Bundle?,
+      customerAdapterOverrideParams: ReadableMap?,
     ): ReactNativeCustomerAdapter {
       val ephemeralKeyProvider = {
         CustomerAdapter.Result.success(
@@ -375,18 +341,17 @@ class CustomerSheetFragment : StripeFragment() {
         context = context,
         adapter = customerAdapter,
         overridesFetchPaymentMethods =
-          customerAdapterOverrideParams?.getBoolean("fetchPaymentMethods") ?: false,
+          customerAdapterOverrideParams.getBooleanOr("fetchPaymentMethods", false),
         overridesAttachPaymentMethod =
-          customerAdapterOverrideParams?.getBoolean("attachPaymentMethod") ?: false,
+          customerAdapterOverrideParams.getBooleanOr("attachPaymentMethod", false),
         overridesDetachPaymentMethod =
-          customerAdapterOverrideParams?.getBoolean("detachPaymentMethod") ?: false,
+          customerAdapterOverrideParams.getBooleanOr("detachPaymentMethod", false),
         overridesSetSelectedPaymentOption =
-          customerAdapterOverrideParams?.getBoolean("setSelectedPaymentOption") ?: false,
+          customerAdapterOverrideParams.getBooleanOr("setSelectedPaymentOption", false),
         overridesFetchSelectedPaymentOption =
-          customerAdapterOverrideParams?.getBoolean("fetchSelectedPaymentOption") ?: false,
+          customerAdapterOverrideParams.getBooleanOr("fetchSelectedPaymentOption", false),
         overridesSetupIntentClientSecretForCustomerAttach =
-          customerAdapterOverrideParams?.getBoolean("setupIntentClientSecretForCustomerAttach")
-            ?: false,
+          customerAdapterOverrideParams.getBooleanOr("setupIntentClientSecretForCustomerAttach", false),
       )
     }
 
@@ -414,15 +379,15 @@ class CustomerSheetFragment : StripeFragment() {
       return paymentOptionResult
     }
 
-    internal fun createIntentConfiguration(intentConfigurationBundle: Bundle?): CustomerSheet.IntentConfiguration? =
+    internal fun createIntentConfiguration(intentConfigurationBundle: ReadableMap?): CustomerSheet.IntentConfiguration? =
       intentConfigurationBundle?.let { bundle ->
-        val onBehalfOf = bundle?.getString("onBehalfOf")
+        val onBehalfOf = bundle.getString("onBehalfOf")
         CustomerSheet.IntentConfiguration
           .Builder()
-          .paymentMethodTypes(bundle?.getStringArrayList("paymentMethodTypes") ?: emptyList())
+          .paymentMethodTypes(bundle.getStringList("paymentMethodTypes") ?: emptyList())
           .apply {
             if (onBehalfOf != null) {
-              this.onBehalfOf(onBehalfOf!!)
+              this.onBehalfOf(onBehalfOf)
             }
           }.build()
       }

package/android/src/main/java/com/reactnativestripesdk/customersheet/ReactNativeCustomerSessionProvider.kt

@@ -2,10 +2,8 @@ package com.reactnativestripesdk
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.stripe.android.customersheet.CustomerSheet
-import com.stripe.android.paymentsheet.ExperimentalCustomerSessionApi
 import kotlinx.coroutines.CompletableDeferred
 
-@OptIn(ExperimentalCustomerSessionApi::class)
 class ReactNativeCustomerSessionProvider(
   val context: ReactApplicationContext,
   val intentConfiguration: CustomerSheet.IntentConfiguration,
@@ -13,7 +11,8 @@ class ReactNativeCustomerSessionProvider(
   private val stripeSdkModule = context.getNativeModule(StripeSdkModule::class.java)
 
   internal var provideSetupIntentClientSecretCallback: CompletableDeferred<String>? = null
-  internal var providesCustomerSessionClientSecretCallback: CompletableDeferred<CustomerSheet.CustomerSessionClientSecret>? = null
+  internal var providesCustomerSessionClientSecretCallback:
+    CompletableDeferred<CustomerSheet.CustomerSessionClientSecret>? = null
 
   override suspend fun intentConfiguration(): Result<CustomerSheet.IntentConfiguration> = Result.success(intentConfiguration)