@stripe/stripe-react-native 0.56.0 → 0.57.0

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

@@ -20,21 +20,21 @@ import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.module.annotations.ReactModule
-import com.reactnativestripesdk.addresssheet.AddressLauncherFragment
-import com.reactnativestripesdk.customersheet.CustomerSheetFragment
+import com.reactnativestripesdk.addresssheet.AddressLauncherManager
+import com.reactnativestripesdk.customersheet.CustomerSheetManager
 import com.reactnativestripesdk.pushprovisioning.PushProvisioningProxy
 import com.reactnativestripesdk.utils.ConfirmPaymentErrorType
 import com.reactnativestripesdk.utils.CreateTokenErrorType
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.GooglePayErrorType
+import com.reactnativestripesdk.utils.StripeUIManager
 import com.reactnativestripesdk.utils.createCanAddCardResult
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createMissingActivityError
 import com.reactnativestripesdk.utils.createMissingInitError
 import com.reactnativestripesdk.utils.createResult
 import com.reactnativestripesdk.utils.getBooleanOr
-import com.reactnativestripesdk.utils.getBooleanOrFalse
-import com.reactnativestripesdk.utils.getMapOrNull
+import com.reactnativestripesdk.utils.getIntOrNull
 import com.reactnativestripesdk.utils.getValOr
 import com.reactnativestripesdk.utils.mapFromPaymentIntentResult
 import com.reactnativestripesdk.utils.mapFromPaymentMethod
@@ -46,8 +46,6 @@ import com.reactnativestripesdk.utils.mapToPaymentMethodType
 import com.reactnativestripesdk.utils.mapToReturnURL
 import com.reactnativestripesdk.utils.mapToShippingDetails
 import com.reactnativestripesdk.utils.mapToUICustomization
-import com.reactnativestripesdk.utils.removeFragment
-import com.reactnativestripesdk.utils.toBundleObject
 import com.stripe.android.ApiResultCallback
 import com.stripe.android.GooglePayJsonFactory
 import com.stripe.android.PaymentAuthConfig
@@ -55,6 +53,7 @@ import com.stripe.android.PaymentConfiguration
 import com.stripe.android.Stripe
 import com.stripe.android.core.ApiVersion
 import com.stripe.android.core.AppInfo
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
 import com.stripe.android.customersheet.CustomerSheet
 import com.stripe.android.googlepaylauncher.GooglePayLauncher
 import com.stripe.android.model.BankAccountTokenParams
@@ -66,7 +65,6 @@ import com.stripe.android.model.PaymentMethod
 import com.stripe.android.model.SetupIntent
 import com.stripe.android.model.Token
 import com.stripe.android.payments.bankaccount.CollectBankAccountConfiguration
-import com.stripe.android.paymentsheet.ExperimentalCustomerSessionApi
 import com.stripe.android.paymentsheet.PaymentSheet
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
@@ -75,6 +73,7 @@ import kotlinx.coroutines.launch
 import org.json.JSONObject
 
 @ReactModule(name = StripeSdkModule.NAME)
+@OptIn(ReactNativeSdkInternal::class)
 class StripeSdkModule(
   reactContext: ReactApplicationContext,
 ) : NativeStripeSdkModuleSpec(reactContext) {
@@ -89,11 +88,15 @@ class StripeSdkModule(
   private var createPlatformPayPaymentMethodPromise: Promise? = null
   private var platformPayUsesDeprecatedTokenFlow = false
 
-  private var paymentSheetFragment: PaymentSheetFragment? = null
-  private var paymentLauncherFragment: PaymentLauncherFragment? = null
-  private var collectBankAccountLauncherFragment: CollectBankAccountLauncherFragment? = null
+  private val stripeUIManagers = mutableListOf<StripeUIManager>()
+  private var paymentSheetManager: PaymentSheetManager? = null
+  private var paymentLauncherManager: PaymentLauncherManager? = null
+  private var collectBankAccountLauncherManager: CollectBankAccountLauncherManager? = null
+  private var financialConnectionsSheetManager: FinancialConnectionsSheetManager? = null
+  private var googlePayLauncherManager: GooglePayLauncherManager? = null
+  private var googlePayPaymentMethodLauncherManager: GooglePayPaymentMethodLauncherManager? = null
 
-  private var customerSheetFragment: CustomerSheetFragment? = null
+  private var customerSheetManager: CustomerSheetManager? = null
 
   internal var embeddedIntentCreationCallback = CompletableDeferred<ReadableMap>()
   internal var embeddedConfirmationTokenCreationCallback = CompletableDeferred<ReadableMap>()
@@ -104,20 +107,6 @@ class StripeSdkModule(
 
   val eventEmitter: EventEmitterCompat by lazy { EventEmitterCompat(reactApplicationContext) }
 
-  // If you create a new Fragment, you must put the tag here, otherwise result callbacks for that
-  // Fragment will not work on RN < 0.65
-  private val allStripeFragmentTags: List<String>
-    get() =
-      listOf(
-        PaymentSheetFragment.TAG,
-        PaymentLauncherFragment.TAG,
-        CollectBankAccountLauncherFragment.TAG,
-        FinancialConnectionsSheetFragment.TAG,
-        AddressLauncherFragment.TAG,
-        GooglePayLauncherFragment.TAG,
-        CustomerSheetFragment.TAG,
-      )
-
   private val mActivityEventListener =
     object : BaseActivityEventListener() {
       override fun onActivityResult(
@@ -145,10 +134,6 @@ class StripeSdkModule(
                 )
               }
             }
-
-            else -> {
-              dispatchActivityResultsToFragments(requestCode, resultCode, data)
-            }
           }
         }
       }
@@ -158,19 +143,22 @@ class StripeSdkModule(
     reactContext.addActivityEventListener(mActivityEventListener)
   }
 
-  // Necessary on older versions of React Native (~0.65 and below)
-  private fun dispatchActivityResultsToFragments(
-    requestCode: Int,
-    resultCode: Int,
-    data: Intent?,
-  ) {
-    getCurrentActivityOrResolveWithError(null)?.supportFragmentManager?.let { fragmentManager ->
-      for (tag in allStripeFragmentTags) {
-        fragmentManager.findFragmentByTag(tag)?.let {
-          it.activity?.activityResultRegistry?.dispatchResult(requestCode, resultCode, data)
-        }
-      }
-    }
+  override fun invalidate() {
+    super.invalidate()
+
+    stripeUIManagers.forEach { it.destroy() }
+    stripeUIManagers.clear()
+  }
+
+  private fun registerStripeUIManager(uiManager: StripeUIManager) {
+    uiManager.create()
+    stripeUIManagers.add(uiManager)
+  }
+
+  private fun unregisterStripeUIManager(uiManager: StripeUIManager?) {
+    val uiManager = uiManager ?: return
+    uiManager.destroy()
+    stripeUIManagers.remove(uiManager)
   }
 
   private fun configure3dSecure(params: ReadableMap) {
@@ -205,18 +193,18 @@ class StripeSdkModule(
     promise: Promise,
   ) {
     val publishableKey = getValOr(params, "publishableKey", null) as String
-    val appInfo = getMapOrNull(params, "appInfo") as ReadableMap
+    val appInfo = params.getMap("appInfo") as ReadableMap
     this.stripeAccountId = getValOr(params, "stripeAccountId", null)
     val urlScheme = getValOr(params, "urlScheme", null)
-    val setReturnUrlSchemeOnAndroid = getBooleanOrFalse(params, "setReturnUrlSchemeOnAndroid")
+    val setReturnUrlSchemeOnAndroid = params.getBooleanOr("setReturnUrlSchemeOnAndroid", false)
     this.urlScheme = if (setReturnUrlSchemeOnAndroid) urlScheme else null
 
-    getMapOrNull(params, "threeDSecureParams")?.let {
+    params.getMap("threeDSecureParams")?.let {
       configure3dSecure(it)
     }
 
     this.publishableKey = publishableKey
-    AddressLauncherFragment.publishableKey = publishableKey
+    AddressLauncherManager.publishableKey = publishableKey
 
     val name = getValOr(appInfo, "name", "") as String
     val partnerId = getValOr(appInfo, "partnerId", "")
@@ -239,28 +227,11 @@ class StripeSdkModule(
     params: ReadableMap,
     promise: Promise,
   ) {
-    getCurrentActivityOrResolveWithError(promise)?.let { activity ->
-      paymentSheetFragment?.removeFragment(reactApplicationContext)
-      val bundle = toBundleObject(params)
-
-      // Handle custom payment methods separately since toBundleObject cannot handle arrays of objects
-      val customPaymentMethodConfig = params.getMap("customPaymentMethodConfiguration")
-      if (customPaymentMethodConfig != null) {
-        // Store the original ReadableMap for custom payment methods
-        bundle.putSerializable("customPaymentMethodConfigurationReadableMap", customPaymentMethodConfig.toHashMap())
-      }
-
-      paymentSheetFragment =
-        PaymentSheetFragment.create(reactApplicationContext, bundle, promise)
-      try {
-        activity.supportFragmentManager
-          .beginTransaction()
-          .add(paymentSheetFragment!!, PaymentSheetFragment.TAG)
-          .commit()
-      } catch (error: IllegalStateException) {
-        promise.resolve(createError(ErrorType.Failed.toString(), error.message))
+    unregisterStripeUIManager(paymentSheetManager)
+    paymentSheetManager =
+      PaymentSheetManager(reactApplicationContext, params, promise).also {
+        registerStripeUIManager(it)
       }
-    }
   }
 
   @ReactMethod
@@ -268,30 +239,30 @@ class StripeSdkModule(
     options: ReadableMap,
     promise: Promise,
   ) {
-    if (paymentSheetFragment == null) {
-      promise.resolve(PaymentSheetFragment.createMissingInitError())
+    if (paymentSheetManager == null) {
+      promise.resolve(PaymentSheetManager.createMissingInitError())
       return
     }
 
     val timeoutKey = "timeout"
     if (options.hasKey(timeoutKey)) {
-      paymentSheetFragment?.presentWithTimeout(
+      paymentSheetManager?.presentWithTimeout(
         options.getInt(timeoutKey).toLong(),
         promise,
       )
     } else {
-      paymentSheetFragment?.present(promise)
+      paymentSheetManager?.present(promise)
     }
   }
 
   @ReactMethod
   override fun confirmPaymentSheetPayment(promise: Promise) {
-    if (paymentSheetFragment == null) {
-      promise.resolve(PaymentSheetFragment.createMissingInitError())
+    if (paymentSheetManager == null) {
+      promise.resolve(PaymentSheetManager.createMissingInitError())
       return
     }
 
-    paymentSheetFragment?.confirmPayment(promise)
+    paymentSheetManager?.confirmPayment(promise)
   }
 
   @ReactMethod
@@ -307,12 +278,12 @@ class StripeSdkModule(
   ) {
     embeddedIntentCreationCallback.complete(params)
 
-    if (paymentSheetFragment == null) {
-      promise.resolve(PaymentSheetFragment.createMissingInitError())
+    if (paymentSheetManager == null) {
+      promise.resolve(PaymentSheetManager.createMissingInitError())
       return
     }
 
-    paymentSheetFragment?.paymentSheetIntentCreationCallback?.complete(params)
+    paymentSheetManager?.paymentSheetIntentCreationCallback?.complete(params)
   }
 
   @ReactMethod
@@ -335,12 +306,12 @@ class StripeSdkModule(
     embeddedConfirmationTokenCreationCallback.complete(params)
     paymentSheetConfirmationTokenCreationCallback.complete(params)
 
-    if (paymentSheetFragment == null) {
-      promise.resolve(PaymentSheetFragment.createMissingInitError())
+    if (paymentSheetManager == null) {
+      promise.resolve(PaymentSheetManager.createMissingInitError())
       return
     }
 
-    paymentSheetFragment?.paymentSheetConfirmationTokenCreationCallback?.complete(params)
+    paymentSheetManager?.paymentSheetConfirmationTokenCreationCallback?.complete(params)
   }
 
   @ReactMethod
@@ -359,7 +330,7 @@ class StripeSdkModule(
         )
         return
       }
-    val paymentMethodData = getMapOrNull(data, "paymentMethodData")
+    val paymentMethodData = data.getMap("paymentMethodData")
     val factory =
       PaymentMethodCreateParamsFactory(paymentMethodData, options, cardFieldView, cardFormView)
     try {
@@ -494,7 +465,7 @@ class StripeSdkModule(
         }
 
     val cardAddress = cardFieldView?.cardAddress ?: cardFormView?.cardAddress
-    val address = getMapOrNull(params, "address")
+    val address = params.getMap("address")
     val cardParams =
       CardParams(
         number = cardParamsMap["number"] as String,
@@ -549,15 +520,19 @@ class StripeSdkModule(
     returnUrl: String?,
     promise: Promise,
   ) {
-    paymentLauncherFragment =
-      PaymentLauncherFragment.forNextActionPayment(
-        context = reactApplicationContext,
-        stripe,
-        publishableKey,
-        stripeAccountId,
-        promise,
-        paymentIntentClientSecret,
-      )
+    unregisterStripeUIManager(paymentSheetManager)
+    paymentLauncherManager =
+      PaymentLauncherManager
+        .forNextActionPayment(
+          context = reactApplicationContext,
+          stripe,
+          publishableKey,
+          stripeAccountId,
+          paymentIntentClientSecret,
+        ).also {
+          registerStripeUIManager(it)
+          it.present(promise)
+        }
   }
 
   @ReactMethod
@@ -566,15 +541,19 @@ class StripeSdkModule(
     returnUrl: String?,
     promise: Promise,
   ) {
-    paymentLauncherFragment =
-      PaymentLauncherFragment.forNextActionSetup(
-        context = reactApplicationContext,
-        stripe,
-        publishableKey,
-        stripeAccountId,
-        promise,
-        setupIntentClientSecret,
-      )
+    unregisterStripeUIManager(paymentLauncherManager)
+    paymentLauncherManager =
+      PaymentLauncherManager
+        .forNextActionSetup(
+          context = reactApplicationContext,
+          stripe,
+          publishableKey,
+          stripeAccountId,
+          setupIntentClientSecret,
+        ).also {
+          registerStripeUIManager(it)
+          it.present(promise)
+        }
   }
 
 // TODO: Uncomment when WeChat is re-enabled in stripe-ios
@@ -603,7 +582,7 @@ class StripeSdkModule(
     options: ReadableMap?,
     promise: Promise,
   ) {
-    val paymentMethodData = getMapOrNull(params, "paymentMethodData")
+    val paymentMethodData = params?.getMap("paymentMethodData")
     val paymentMethodType =
       if (params != null) {
         mapToPaymentMethodType(params.getString("paymentMethodType")) ?: run {
@@ -643,17 +622,21 @@ class StripeSdkModule(
         confirmParams.returnUrl = mapToReturnURL(urlScheme)
       }
       confirmParams.shipping =
-        mapToShippingDetails(getMapOrNull(paymentMethodData, "shippingDetails"))
-      paymentLauncherFragment =
-        PaymentLauncherFragment.forPayment(
-          context = reactApplicationContext,
-          stripe,
-          publishableKey,
-          stripeAccountId,
-          promise,
-          paymentIntentClientSecret,
-          confirmParams,
-        )
+        mapToShippingDetails(paymentMethodData?.getMap("shippingDetails"))
+      unregisterStripeUIManager(paymentLauncherManager)
+      paymentLauncherManager =
+        PaymentLauncherManager
+          .forPayment(
+            context = reactApplicationContext,
+            stripe,
+            publishableKey,
+            stripeAccountId,
+            paymentIntentClientSecret,
+            confirmParams,
+          ).also {
+            registerStripeUIManager(it)
+            it.present(promise)
+          }
     } catch (error: PaymentMethodCreateParamsException) {
       promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), error))
     }
@@ -701,7 +684,7 @@ class StripeSdkModule(
 
     val factory =
       PaymentMethodCreateParamsFactory(
-        getMapOrNull(params, "paymentMethodData"),
+        params.getMap("paymentMethodData"),
         options,
         cardFieldView,
         cardFormView,
@@ -717,16 +700,20 @@ class StripeSdkModule(
       urlScheme?.let {
         confirmParams.returnUrl = mapToReturnURL(urlScheme)
       }
-      paymentLauncherFragment =
-        PaymentLauncherFragment.forSetup(
-          context = reactApplicationContext,
-          stripe,
-          publishableKey,
-          stripeAccountId,
-          promise,
-          setupIntentClientSecret,
-          confirmParams,
-        )
+      unregisterStripeUIManager(paymentLauncherManager)
+      paymentLauncherManager =
+        PaymentLauncherManager
+          .forSetup(
+            context = reactApplicationContext,
+            stripe,
+            publishableKey,
+            stripeAccountId,
+            setupIntentClientSecret,
+            confirmParams,
+          ).also {
+            registerStripeUIManager(it)
+            it.present(promise)
+          }
     } catch (error: PaymentMethodCreateParamsException) {
       promise.resolve(createError(ConfirmPaymentErrorType.Failed.toString(), error))
     }
@@ -738,24 +725,16 @@ class StripeSdkModule(
     promise: Promise,
   ) {
     val googlePayParams = params?.getMap("googlePay")
-    val fragment =
-      GooglePayPaymentMethodLauncherFragment.create(
+    unregisterStripeUIManager(googlePayPaymentMethodLauncherManager)
+    googlePayPaymentMethodLauncherManager =
+      GooglePayPaymentMethodLauncherManager(
         reactApplicationContext,
-        getBooleanOrFalse(googlePayParams, "testEnv"),
-        getBooleanOrFalse(googlePayParams, "existingPaymentMethodRequired"),
-        promise,
-      )
-
-    getCurrentActivityOrResolveWithError(promise)?.let {
-      try {
-        it.supportFragmentManager
-          .beginTransaction()
-          .add(fragment, GooglePayPaymentMethodLauncherFragment.TAG)
-          .commit()
-      } catch (error: IllegalStateException) {
-        promise.resolve(createError(ErrorType.Failed.toString(), error.message))
+        googlePayParams?.getBooleanOr("testEnv", false) ?: false,
+        googlePayParams?.getBooleanOr("existingPaymentMethodRequired", false) ?: false,
+      ).also {
+        registerStripeUIManager(it)
+        it.present(promise)
       }
-    }
   }
 
   @ReactMethod
@@ -781,12 +760,12 @@ class StripeSdkModule(
         return
       }
 
-    GooglePayLauncherFragment().also {
-      it.presentGooglePaySheet(
+    googlePayLauncherManager =
+      GooglePayLauncherManager(
+        reactApplicationContext,
         clientSecret,
-        if (isPaymentIntent) GooglePayLauncherFragment.Mode.ForPayment else GooglePayLauncherFragment.Mode.ForSetup,
+        if (isPaymentIntent) GooglePayLauncherManager.Mode.ForPayment else GooglePayLauncherManager.Mode.ForSetup,
         googlePayParams,
-        reactApplicationContext,
       ) { launcherResult, errorMap ->
         if (errorMap != null) {
           promise.resolve(errorMap)
@@ -851,7 +830,6 @@ class StripeSdkModule(
           }
         }
       }
-    }
   }
 
   @ReactMethod
@@ -948,7 +926,7 @@ class StripeSdkModule(
     params: ReadableMap,
     promise: Promise,
   ) {
-    val paymentMethodData = getMapOrNull(params, "paymentMethodData")
+    val paymentMethodData = params.getMap("paymentMethodData")
     val paymentMethodType = mapToPaymentMethodType(getValOr(params, "paymentMethodType", null))
     if (paymentMethodType != PaymentMethod.Type.USBankAccount) {
       promise.resolve(
@@ -960,7 +938,7 @@ class StripeSdkModule(
       return
     }
 
-    val billingDetails = getMapOrNull(paymentMethodData, "billingDetails")
+    val billingDetails = paymentMethodData?.getMap("billingDetails")
 
     val name = billingDetails?.getString("name")
     if (name.isNullOrEmpty()) {
@@ -979,26 +957,19 @@ class StripeSdkModule(
         billingDetails.getString("email"),
       )
 
-    collectBankAccountLauncherFragment =
-      CollectBankAccountLauncherFragment.create(
+    unregisterStripeUIManager(collectBankAccountLauncherManager)
+    collectBankAccountLauncherManager =
+      CollectBankAccountLauncherManager(
         reactApplicationContext,
         publishableKey,
         stripeAccountId,
         clientSecret,
         isPaymentIntent,
         collectParams,
-        promise,
-      )
-    getCurrentActivityOrResolveWithError(promise)?.let {
-      try {
-        it.supportFragmentManager
-          .beginTransaction()
-          .add(collectBankAccountLauncherFragment!!, "collect_bank_account_launcher_fragment")
-          .commit()
-      } catch (error: IllegalStateException) {
-        promise.resolve(createError(ErrorType.Failed.toString(), error.message))
+      ).also {
+        registerStripeUIManager(it)
+        it.present(promise)
       }
-    }
   }
 
   @ReactMethod
@@ -1096,16 +1067,18 @@ class StripeSdkModule(
       promise.resolve(createMissingInitError())
       return
     }
-    FinancialConnectionsSheetFragment().also {
-      it.presentFinancialConnectionsSheet(
+    unregisterStripeUIManager(financialConnectionsSheetManager)
+    financialConnectionsSheetManager =
+      FinancialConnectionsSheetManager(
+        reactApplicationContext,
         clientSecret,
-        FinancialConnectionsSheetFragment.Mode.ForToken,
+        FinancialConnectionsSheetManager.Mode.ForToken,
         publishableKey,
         stripeAccountId,
-        promise,
-        reactApplicationContext,
-      )
-    }
+      ).also {
+        registerStripeUIManager(it)
+        it.present(promise)
+      }
   }
 
   @ReactMethod
@@ -1118,16 +1091,19 @@ class StripeSdkModule(
       promise.resolve(createMissingInitError())
       return
     }
-    FinancialConnectionsSheetFragment().also {
-      it.presentFinancialConnectionsSheet(
+
+    unregisterStripeUIManager(financialConnectionsSheetManager)
+    financialConnectionsSheetManager =
+      FinancialConnectionsSheetManager(
+        reactApplicationContext,
         clientSecret,
-        FinancialConnectionsSheetFragment.Mode.ForSession,
+        FinancialConnectionsSheetManager.Mode.ForSession,
         publishableKey,
         stripeAccountId,
-        promise,
-        reactApplicationContext,
-      )
-    }
+      ).also {
+        registerStripeUIManager(it)
+        it.present(promise)
+      }
   }
 
   @ReactMethod
@@ -1141,25 +1117,11 @@ class StripeSdkModule(
       return
     }
 
-    getCurrentActivityOrResolveWithError(promise)?.let { activity ->
-      customerSheetFragment?.removeFragment(reactApplicationContext)
-      customerSheetFragment =
-        CustomerSheetFragment().also {
-          it.context = reactApplicationContext
-          it.initPromise = promise
-          val bundle = toBundleObject(params)
-          bundle.putBundle("customerAdapter", toBundleObject(customerAdapterOverrides))
-          it.arguments = bundle
-        }
-      try {
-        activity.supportFragmentManager
-          .beginTransaction()
-          .add(customerSheetFragment!!, CustomerSheetFragment.TAG)
-          .commit()
-      } catch (error: IllegalStateException) {
-        promise.resolve(createError(ErrorType.Failed.toString(), error.message))
+    unregisterStripeUIManager(customerSheetManager)
+    customerSheetManager =
+      CustomerSheetManager(reactApplicationContext, params, customerAdapterOverrides, promise).also {
+        registerStripeUIManager(it)
       }
-    }
   }
 
   @ReactMethod
@@ -1167,19 +1129,16 @@ class StripeSdkModule(
     params: ReadableMap,
     promise: Promise,
   ) {
-    var timeout: Long? = null
-    if (params.hasKey("timeout")) {
-      timeout = params.getInt("timeout").toLong()
-    }
-    customerSheetFragment?.present(timeout, promise) ?: run {
-      promise.resolve(CustomerSheetFragment.createMissingInitError())
+    val timeout = params.getIntOrNull("timeout")?.toLong()
+    customerSheetManager?.present(promise, timeout) ?: run {
+      promise.resolve(CustomerSheetManager.createMissingInitError())
     }
   }
 
   @ReactMethod
   override fun retrieveCustomerSheetPaymentOptionSelection(promise: Promise) {
-    customerSheetFragment?.retrievePaymentOptionSelection(promise) ?: run {
-      promise.resolve(CustomerSheetFragment.createMissingInitError())
+    customerSheetManager?.retrievePaymentOptionSelection(promise) ?: run {
+      promise.resolve(CustomerSheetManager.createMissingInitError())
     }
   }
 
@@ -1188,7 +1147,7 @@ class StripeSdkModule(
     paymentMethodJsonObjects: ReadableArray,
     promise: Promise,
   ) {
-    customerSheetFragment?.let { fragment ->
+    customerSheetManager?.let { fragment ->
       val paymentMethods = mutableListOf<PaymentMethod>()
       for (paymentMethodJson in paymentMethodJsonObjects.toArrayList()) {
         PaymentMethod.fromJson(JSONObject((paymentMethodJson as HashMap<*, *>)))?.let {
@@ -1202,7 +1161,7 @@ class StripeSdkModule(
       }
       fragment.customerAdapter?.fetchPaymentMethodsCallback?.complete(paymentMethods)
     } ?: run {
-      promise.resolve(CustomerSheetFragment.createMissingInitError())
+      promise.resolve(CustomerSheetManager.createMissingInitError())
       return
     }
   }
@@ -1212,7 +1171,7 @@ class StripeSdkModule(
     paymentMethodJson: ReadableMap,
     promise: Promise,
   ) {
-    customerSheetFragment?.let {
+    customerSheetManager?.let {
       val paymentMethod =
         PaymentMethod.fromJson(JSONObject(paymentMethodJson.toHashMap() as HashMap<*, *>))
       if (paymentMethod == null) {
@@ -1224,7 +1183,7 @@ class StripeSdkModule(
       }
       it.customerAdapter?.attachPaymentMethodCallback?.complete(paymentMethod)
     } ?: run {
-      promise.resolve(CustomerSheetFragment.createMissingInitError())
+      promise.resolve(CustomerSheetManager.createMissingInitError())
       return
     }
   }
@@ -1234,7 +1193,7 @@ class StripeSdkModule(
     paymentMethodJson: ReadableMap,
     promise: Promise,
   ) {
-    customerSheetFragment?.let {
+    customerSheetManager?.let {
       val paymentMethod =
         PaymentMethod.fromJson(JSONObject(paymentMethodJson.toHashMap() as HashMap<*, *>))
       if (paymentMethod == null) {
@@ -1246,17 +1205,17 @@ class StripeSdkModule(
       }
       it.customerAdapter?.detachPaymentMethodCallback?.complete(paymentMethod)
     } ?: run {
-      promise.resolve(CustomerSheetFragment.createMissingInitError())
+      promise.resolve(CustomerSheetManager.createMissingInitError())
       return
     }
   }
 
   @ReactMethod
   override fun customerAdapterSetSelectedPaymentOptionCallback(promise: Promise) {
-    customerSheetFragment?.let {
+    customerSheetManager?.let {
       it.customerAdapter?.setSelectedPaymentOptionCallback?.complete(Unit)
     } ?: run {
-      promise.resolve(CustomerSheetFragment.createMissingInitError())
+      promise.resolve(CustomerSheetManager.createMissingInitError())
       return
     }
   }
@@ -1266,10 +1225,10 @@ class StripeSdkModule(
     paymentOption: String?,
     promise: Promise,
   ) {
-    customerSheetFragment?.let {
+    customerSheetManager?.let {
       it.customerAdapter?.fetchSelectedPaymentOptionCallback?.complete(paymentOption)
     } ?: run {
-      promise.resolve(CustomerSheetFragment.createMissingInitError())
+      promise.resolve(CustomerSheetManager.createMissingInitError())
       return
     }
   }
@@ -1279,29 +1238,27 @@ class StripeSdkModule(
     clientSecret: String,
     promise: Promise,
   ) {
-    customerSheetFragment?.let {
+    customerSheetManager?.let {
       it.customerAdapter?.setupIntentClientSecretForCustomerAttachCallback?.complete(clientSecret)
     } ?: run {
-      promise.resolve(CustomerSheetFragment.createMissingInitError())
+      promise.resolve(CustomerSheetManager.createMissingInitError())
       return
     }
   }
 
-  @OptIn(ExperimentalCustomerSessionApi::class)
   @ReactMethod
   override fun clientSecretProviderSetupIntentClientSecretCallback(
     setupIntentClientSecret: String,
     promise: Promise,
   ) {
-    customerSheetFragment?.let {
+    customerSheetManager?.let {
       it.customerSessionProvider?.provideSetupIntentClientSecretCallback?.complete(setupIntentClientSecret)
     } ?: run {
-      promise.resolve(CustomerSheetFragment.createMissingInitError())
+      promise.resolve(CustomerSheetManager.createMissingInitError())
       return
     }
   }
 
-  @OptIn(ExperimentalCustomerSessionApi::class)
   @ReactMethod
   override fun clientSecretProviderCustomerSessionClientSecretCallback(
     customerSessionClientSecretJson: ReadableMap,
@@ -1318,15 +1275,15 @@ class StripeSdkModule(
       return
     }
 
-    customerSheetFragment?.let {
+    customerSheetManager?.let {
       it.customerSessionProvider?.providesCustomerSessionClientSecretCallback?.complete(
         CustomerSheet.CustomerSessionClientSecret.create(
-          customerId = customerId!!,
-          clientSecret = clientSecret!!,
+          customerId = customerId,
+          clientSecret = clientSecret,
         ),
       )
     } ?: run {
-      promise.resolve(CustomerSheetFragment.createMissingInitError())
+      promise.resolve(CustomerSheetManager.createMissingInitError())
       return
     }
   }