@stripe/stripe-react-native 0.44.0 → 0.46.0

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

@@ -0,0 +1,238 @@
+package com.reactnativestripesdk
+
+import android.annotation.SuppressLint
+import android.content.Context
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.EmbeddedPaymentElementViewManagerDelegate
+import com.facebook.react.viewmanagers.EmbeddedPaymentElementViewManagerInterface
+import com.reactnativestripesdk.PaymentSheetFragment.Companion.buildCustomerConfiguration
+import com.reactnativestripesdk.PaymentSheetFragment.Companion.buildGooglePayConfig
+import com.reactnativestripesdk.addresssheet.AddressSheetView
+import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
+import com.reactnativestripesdk.utils.PaymentSheetException
+import com.reactnativestripesdk.utils.mapToPreferredNetworks
+import com.reactnativestripesdk.utils.toBundleObject
+import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
+import com.stripe.android.paymentelement.EmbeddedPaymentElement
+import com.stripe.android.paymentelement.ExperimentalEmbeddedPaymentElementApi
+import com.stripe.android.paymentsheet.PaymentSheet
+
+@OptIn(ExperimentalEmbeddedPaymentElementApi::class)
+@ReactModule(name = EmbeddedPaymentElementViewManager.NAME)
+class EmbeddedPaymentElementViewManager :
+  ViewGroupManager<EmbeddedPaymentElementView>(),
+  EmbeddedPaymentElementViewManagerInterface<EmbeddedPaymentElementView> {
+  companion object {
+    const val NAME = "EmbeddedPaymentElementView"
+  }
+
+  private val delegate = EmbeddedPaymentElementViewManagerDelegate(this)
+
+  override fun getName() = NAME
+
+  override fun getDelegate() = delegate
+
+  override fun createViewInstance(ctx: ThemedReactContext): EmbeddedPaymentElementView = EmbeddedPaymentElementView(ctx)
+
+  override fun onDropViewInstance(view: EmbeddedPaymentElementView) {
+    super.onDropViewInstance(view)
+
+    view.handleOnDropViewInstance()
+  }
+
+  override fun needsCustomLayoutForChildren(): Boolean = true
+
+  @ReactProp(name = "configuration")
+  override fun setConfiguration(
+    view: EmbeddedPaymentElementView,
+    cfg: Dynamic,
+  ) {
+    val elementConfig = parseElementConfiguration(cfg.asMap(), view.context)
+    view.latestElementConfig = elementConfig
+    // if intentConfig is already set, configure immediately:
+    view.latestIntentConfig?.let { intentCfg ->
+      view.configure(elementConfig, intentCfg)
+      view.post {
+        view.requestLayout()
+        view.invalidate()
+      }
+    }
+  }
+
+  @ReactProp(name = "intentConfiguration")
+  override fun setIntentConfiguration(
+    view: EmbeddedPaymentElementView,
+    cfg: Dynamic,
+  ) {
+    val intentConfig = parseIntentConfiguration(cfg.asMap())
+    view.latestIntentConfig = intentConfig
+    view.latestElementConfig?.let { elemCfg ->
+      view.configure(elemCfg, intentConfig)
+    }
+  }
+
+  @SuppressLint("RestrictedApi")
+  @OptIn(ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class)
+  private fun parseElementConfiguration(
+    map: ReadableMap,
+    context: Context,
+  ): EmbeddedPaymentElement.Configuration {
+    val merchantDisplayName = map.getString("merchantDisplayName").orEmpty()
+    val allowsDelayedPaymentMethods: Boolean =
+      if (map.hasKey("allowsDelayedPaymentMethods") &&
+        map.getType("allowsDelayedPaymentMethods") == ReadableType.Boolean
+      ) {
+        map.getBoolean("allowsDelayedPaymentMethods")
+      } else {
+        false // default
+      }
+    var defaultBillingDetails: PaymentSheet.BillingDetails? = null
+    val billingDetailsMap = map.getMap("defaultBillingDetails")
+    if (billingDetailsMap != null) {
+      val addressBundle = billingDetailsMap.getMap("address")
+      val address =
+        PaymentSheet.Address(
+          addressBundle?.getString("city"),
+          addressBundle?.getString("country"),
+          addressBundle?.getString("line1"),
+          addressBundle?.getString("line2"),
+          addressBundle?.getString("postalCode"),
+          addressBundle?.getString("state"),
+        )
+      defaultBillingDetails =
+        PaymentSheet.BillingDetails(
+          address,
+          billingDetailsMap.getString("email"),
+          billingDetailsMap.getString("name"),
+          billingDetailsMap.getString("phone"),
+        )
+    }
+
+    val customerConfiguration =
+      try {
+        buildCustomerConfiguration(toBundleObject(map))
+      } catch (error: PaymentSheetException) {
+        throw Error() // TODO handle error
+      }
+
+    val googlePayConfig = buildGooglePayConfig(toBundleObject(map.getMap("googlePay")))
+    val shippingDetails =
+      map.getMap("defaultShippingDetails")?.let {
+        AddressSheetView.buildAddressDetails(it)
+      }
+    val appearance =
+      try {
+        buildPaymentSheetAppearance(toBundleObject(map.getMap("appearance")), context)
+      } catch (error: 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?.getBoolean("attachDefaultsToPaymentMethod") ?: false,
+      )
+    val allowsRemovalOfLastSavedPaymentMethod =
+      if (map.hasKey("allowsRemovalOfLastSavedPaymentMethod")) {
+        map.getBoolean("allowsRemovalOfLastSavedPaymentMethod")
+      } else {
+        true
+      }
+    val primaryButtonLabel = map.getString("primaryButtonLabel")
+    val paymentMethodOrder = map.getStringArrayList("paymentMethodOrder")
+
+    val formSheetAction =
+      map
+        .getMap("formSheetAction")
+        ?.getString("type")
+        ?.let { type ->
+          when (type) {
+            "confirm" -> EmbeddedPaymentElement.FormSheetAction.Confirm
+            else -> EmbeddedPaymentElement.FormSheetAction.Continue
+          }
+        }
+        ?: EmbeddedPaymentElement.FormSheetAction.Continue
+
+    val configurationBuilder =
+      EmbeddedPaymentElement.Configuration
+        .Builder(merchantDisplayName)
+        .formSheetAction(formSheetAction)
+        .allowsDelayedPaymentMethods(allowsDelayedPaymentMethods ?: false)
+        .defaultBillingDetails(defaultBillingDetails)
+        .customer(customerConfiguration)
+        .googlePay(googlePayConfig)
+        .appearance(appearance)
+        .shippingDetails(shippingDetails)
+        .billingDetailsCollectionConfiguration(billingDetailsConfig)
+        .preferredNetworks(
+          mapToPreferredNetworks(
+            map
+              .getIntegerArrayList("preferredNetworks")
+              ?.let { ArrayList(it) },
+          ),
+        ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
+        .cardBrandAcceptance(mapToCardBrandAcceptance(toBundleObject(map)))
+
+    primaryButtonLabel?.let { configurationBuilder.primaryButtonLabel(it) }
+    paymentMethodOrder?.let { configurationBuilder.paymentMethodOrder(it) }
+
+    return configurationBuilder.build()
+  }
+
+  private fun parseIntentConfiguration(map: ReadableMap): PaymentSheet.IntentConfiguration {
+    val intentConfig = PaymentSheetFragment.buildIntentConfiguration(toBundleObject(map))
+    return intentConfig ?: throw IllegalArgumentException("IntentConfiguration is null")
+  }
+
+  override fun confirm(view: EmbeddedPaymentElementView) {
+    view.confirm()
+  }
+
+  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) }
+  }
+  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
+
+  val result = mutableListOf<Int>()
+  for (i in 0 until array.size()) {
+    // getType check to skip non-number entries
+    if (array.getType(i) == ReadableType.Number) {
+      // if it's actually a float/double, this will truncate; adjust as needed
+      result.add(array.getInt(i))
+    }
+  }
+  return result
+}

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

@@ -1,11 +1,5 @@
 package com.reactnativestripesdk
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
@@ -15,6 +9,7 @@ import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.reactnativestripesdk.utils.ErrorType
+import com.reactnativestripesdk.utils.StripeFragment
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createMissingActivityError
 import com.reactnativestripesdk.utils.mapFromFinancialConnectionsEvent
@@ -29,7 +24,7 @@ import com.stripe.android.financialconnections.model.FinancialConnectionsAccount
 import com.stripe.android.financialconnections.model.FinancialConnectionsAccountList
 import com.stripe.android.financialconnections.model.FinancialConnectionsSession
 
-class FinancialConnectionsSheetFragment : Fragment() {
+class FinancialConnectionsSheetFragment : StripeFragment() {
   enum class Mode {
     ForToken,
     ForSession,
@@ -40,28 +35,13 @@ class FinancialConnectionsSheetFragment : Fragment() {
   private lateinit var configuration: FinancialConnectionsSheet.Configuration
   private lateinit var mode: Mode
 
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-
+  override fun prepare() {
     val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
-    if (stripeSdkModule != null && stripeSdkModule.eventListenerCount > 0) {
-      FinancialConnections.setEventListener { event ->
-        val params = mapFromFinancialConnectionsEvent(event)
-        stripeSdkModule.sendEvent(context, "onFinancialConnectionsEvent", params)
-      }
+    FinancialConnections.setEventListener { event ->
+      val params = mapFromFinancialConnectionsEvent(event)
+      stripeSdkModule?.emitOnFinancialConnectionsEvent(params)
     }
-  }
 
-  override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup?,
-    savedInstanceState: Bundle?,
-  ): View = FrameLayout(requireActivity()).also { it.visibility = View.GONE }
-
-  override fun onViewCreated(
-    view: View,
-    savedInstanceState: Bundle?,
-  ) {
     when (mode) {
       Mode.ForToken -> {
         FinancialConnectionsSheet
@@ -70,6 +50,7 @@ class FinancialConnectionsSheetFragment : Fragment() {
             ::onFinancialConnectionsSheetForTokenResult,
           ).present(configuration = configuration)
       }
+
       Mode.ForSession -> {
         FinancialConnectionsSheet
           .create(this, ::onFinancialConnectionsSheetForDataResult)
@@ -90,9 +71,11 @@ class FinancialConnectionsSheetFragment : Fragment() {
       is FinancialConnectionsSheetForTokenResult.Canceled -> {
         promise.resolve(createError(ErrorType.Canceled.toString(), "The flow has been canceled"))
       }
+
       is FinancialConnectionsSheetForTokenResult.Failed -> {
         promise.resolve(createError(ErrorType.Failed.toString(), result.error))
       }
+
       is FinancialConnectionsSheetForTokenResult.Completed -> {
         promise.resolve(createTokenResult(result))
         (context.currentActivity as? FragmentActivity)
@@ -109,9 +92,11 @@ class FinancialConnectionsSheetFragment : Fragment() {
       is FinancialConnectionsSheetResult.Canceled -> {
         promise.resolve(createError(ErrorType.Canceled.toString(), "The flow has been canceled"))
       }
+
       is FinancialConnectionsSheetResult.Failed -> {
         promise.resolve(createError(ErrorType.Failed.toString(), result.error))
       }
+
       is FinancialConnectionsSheetResult.Completed -> {
         promise.resolve(
           WritableNativeMap().also {

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

@@ -4,11 +4,21 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.GooglePayButtonManagerDelegate
+import com.facebook.react.viewmanagers.GooglePayButtonManagerInterface
 
 @ReactModule(name = GooglePayButtonManager.REACT_CLASS)
-class GooglePayButtonManager : SimpleViewManager<GooglePayButtonView>() {
+class GooglePayButtonManager :
+  SimpleViewManager<GooglePayButtonView>(),
+  GooglePayButtonManagerInterface<GooglePayButtonView> {
+  private val delegate = GooglePayButtonManagerDelegate(this)
+
   override fun getName() = REACT_CLASS
 
+  override fun getDelegate() = delegate
+
+  override fun createViewInstance(reactContext: ThemedReactContext): GooglePayButtonView = GooglePayButtonView(reactContext)
+
   override fun onAfterUpdateTransaction(view: GooglePayButtonView) {
     super.onAfterUpdateTransaction(view)
 
@@ -16,7 +26,7 @@ class GooglePayButtonManager : SimpleViewManager<GooglePayButtonView>() {
   }
 
   @ReactProp(name = "type")
-  fun type(
+  override fun setType(
     view: GooglePayButtonView,
     buttonType: Int,
   ) {
@@ -24,7 +34,7 @@ class GooglePayButtonManager : SimpleViewManager<GooglePayButtonView>() {
   }
 
   @ReactProp(name = "appearance")
-  fun appearance(
+  override fun setAppearance(
     view: GooglePayButtonView,
     appearance: Int,
   ) {
@@ -32,15 +42,13 @@ class GooglePayButtonManager : SimpleViewManager<GooglePayButtonView>() {
   }
 
   @ReactProp(name = "borderRadius")
-  fun borderRadius(
+  override fun setBorderRadius(
     view: GooglePayButtonView,
     borderRadius: Int,
   ) {
     view.setBorderRadius(borderRadius)
   }
 
-  override fun createViewInstance(reactContext: ThemedReactContext): GooglePayButtonView = GooglePayButtonView(reactContext)
-
   companion object {
     const val REACT_CLASS = "GooglePayButton"
   }

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

@@ -1,17 +1,12 @@
 package com.reactnativestripesdk
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.GooglePayErrorType
+import com.reactnativestripesdk.utils.StripeFragment
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createMissingActivityError
 import com.reactnativestripesdk.utils.getBooleanOr
@@ -19,7 +14,7 @@ import com.reactnativestripesdk.utils.getIntOrNull
 import com.stripe.android.googlepaylauncher.GooglePayEnvironment
 import com.stripe.android.googlepaylauncher.GooglePayLauncher
 
-class GooglePayLauncherFragment : Fragment() {
+class GooglePayLauncherFragment : StripeFragment() {
   enum class Mode {
     ForSetup,
     ForPayment,
@@ -34,16 +29,7 @@ class GooglePayLauncherFragment : Fragment() {
   private var label: String? = null
   private lateinit var callback: (result: GooglePayLauncher.Result?, error: WritableMap?) -> Unit
 
-  override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup?,
-    savedInstanceState: Bundle?,
-  ): View = FrameLayout(requireActivity()).also { it.visibility = View.GONE }
-
-  override fun onViewCreated(
-    view: View,
-    savedInstanceState: Bundle?,
-  ) {
+  override fun prepare() {
     launcher =
       GooglePayLauncher(
         fragment = this,

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

@@ -12,12 +12,12 @@ import com.reactnativestripesdk.utils.removeFragment
 import com.stripe.android.googlepaylauncher.GooglePayEnvironment
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
 
-class GooglePayPaymentMethodLauncherFragment(
-  private val context: ReactApplicationContext,
-  private val isTestEnv: Boolean,
-  private val paymentMethodRequired: Boolean,
-  private val promise: Promise,
-) : Fragment() {
+class GooglePayPaymentMethodLauncherFragment : Fragment() {
+  private lateinit var context: ReactApplicationContext
+  private var isTestEnv = false
+  private var paymentMethodRequired = false
+  private lateinit var promise: Promise
+
   override fun onCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
@@ -50,5 +50,19 @@ class GooglePayPaymentMethodLauncherFragment(
 
   companion object {
     const val TAG = "google_pay_support_fragment"
+
+    fun create(
+      context: ReactApplicationContext,
+      isTestEnv: Boolean,
+      paymentMethodRequired: Boolean,
+      promise: Promise,
+    ): GooglePayPaymentMethodLauncherFragment {
+      val instance = GooglePayPaymentMethodLauncherFragment()
+      instance.context = context
+      instance.isTestEnv = isTestEnv
+      instance.paymentMethodRequired = paymentMethodRequired
+      instance.promise = promise
+      return instance
+    }
   }
 }

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

@@ -1,17 +1,12 @@
 package com.reactnativestripesdk
 
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.reactnativestripesdk.utils.ConfirmPaymentErrorType
 import com.reactnativestripesdk.utils.ConfirmSetupIntentErrorType
 import com.reactnativestripesdk.utils.ErrorType
+import com.reactnativestripesdk.utils.StripeFragment
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createMissingActivityError
 import com.reactnativestripesdk.utils.createResult
@@ -29,26 +24,57 @@ import com.stripe.android.payments.paymentlauncher.PaymentLauncher
 import com.stripe.android.payments.paymentlauncher.PaymentResult
 
 /** Instances of this class should only be initialized with the companion's helper methods. */
-class PaymentLauncherFragment(
-  private val context: ReactApplicationContext,
-  private val stripe: Stripe,
-  private val publishableKey: String,
-  private val stripeAccountId: String?,
-  private val promise: Promise,
+class PaymentLauncherFragment : StripeFragment() {
+  private lateinit var context: ReactApplicationContext
+  private lateinit var stripe: Stripe
+  private lateinit var publishableKey: String
+  private var stripeAccountId: String? = null
+  private lateinit var promise: Promise
+
   // Used when confirming a payment intent
-  private val paymentIntentClientSecret: String? = null,
-  private val confirmPaymentParams: ConfirmPaymentIntentParams? = null,
+  private var paymentIntentClientSecret: String? = null
+  private var confirmPaymentParams: ConfirmPaymentIntentParams? = null
+
   // Used when confirming a setup intent
-  private val setupIntentClientSecret: String? = null,
-  private val confirmSetupParams: ConfirmSetupIntentParams? = null,
+  private var setupIntentClientSecret: String? = null
+  private var confirmSetupParams: ConfirmSetupIntentParams? = null
+
   // Used when handling the next action on a payment intent
-  private val handleNextActionPaymentIntentClientSecret: String? = null,
+  private var handleNextActionPaymentIntentClientSecret: String? = null
+
   // Used when handling the next action on a setup intent
-  private val handleNextActionSetupIntentClientSecret: String? = null,
-) : Fragment() {
+  private var handleNextActionSetupIntentClientSecret: String? = null
   private lateinit var paymentLauncher: PaymentLauncher
 
   companion object {
+    private fun create(
+      context: ReactApplicationContext,
+      stripe: Stripe,
+      publishableKey: String,
+      stripeAccountId: String?,
+      promise: Promise,
+      paymentIntentClientSecret: String? = null,
+      confirmPaymentParams: ConfirmPaymentIntentParams? = null,
+      setupIntentClientSecret: String? = null,
+      confirmSetupParams: ConfirmSetupIntentParams? = null,
+      handleNextActionPaymentIntentClientSecret: String? = null,
+      handleNextActionSetupIntentClientSecret: String? = null,
+    ): PaymentLauncherFragment {
+      val instance = PaymentLauncherFragment()
+      instance.context = context
+      instance.stripe = stripe
+      instance.publishableKey = publishableKey
+      instance.stripeAccountId = stripeAccountId
+      instance.promise = promise
+      instance.paymentIntentClientSecret = paymentIntentClientSecret
+      instance.confirmPaymentParams = confirmPaymentParams
+      instance.setupIntentClientSecret = setupIntentClientSecret
+      instance.confirmSetupParams = confirmSetupParams
+      instance.handleNextActionPaymentIntentClientSecret = handleNextActionPaymentIntentClientSecret
+      instance.handleNextActionSetupIntentClientSecret = handleNextActionSetupIntentClientSecret
+      return instance
+    }
+
     /** Helper-constructor used for confirming payment intents */
     fun forPayment(
       context: ReactApplicationContext,
@@ -60,7 +86,7 @@ class PaymentLauncherFragment(
       confirmPaymentParams: ConfirmPaymentIntentParams,
     ): PaymentLauncherFragment {
       val paymentLauncherFragment =
-        PaymentLauncherFragment(
+        create(
           context,
           stripe,
           publishableKey,
@@ -84,7 +110,7 @@ class PaymentLauncherFragment(
       confirmSetupParams: ConfirmSetupIntentParams,
     ): PaymentLauncherFragment {
       val paymentLauncherFragment =
-        PaymentLauncherFragment(
+        create(
           context,
           stripe,
           publishableKey,
@@ -107,7 +133,7 @@ class PaymentLauncherFragment(
       handleNextActionPaymentIntentClientSecret: String,
     ): PaymentLauncherFragment {
       val paymentLauncherFragment =
-        PaymentLauncherFragment(
+        create(
           context,
           stripe,
           publishableKey,
@@ -129,7 +155,7 @@ class PaymentLauncherFragment(
       handleNextActionSetupIntentClientSecret: String,
     ): PaymentLauncherFragment {
       val paymentLauncherFragment =
-        PaymentLauncherFragment(
+        create(
           context,
           stripe,
           publishableKey,
@@ -161,43 +187,36 @@ class PaymentLauncherFragment(
     internal const val TAG = "payment_launcher_fragment"
   }
 
-  override fun onCreateView(
-    inflater: LayoutInflater,
-    container: ViewGroup?,
-    savedInstanceState: Bundle?,
-  ): View {
+  override fun prepare() {
     paymentLauncher = createPaymentLauncher()
     if (paymentIntentClientSecret != null && confirmPaymentParams != null) {
-      paymentLauncher.confirm(confirmPaymentParams)
+      paymentLauncher.confirm(confirmPaymentParams!!)
     } else if (setupIntentClientSecret != null && confirmSetupParams != null) {
-      paymentLauncher.confirm(confirmSetupParams)
+      paymentLauncher.confirm(confirmSetupParams!!)
     } else if (handleNextActionPaymentIntentClientSecret != null) {
-      paymentLauncher.handleNextActionForPaymentIntent(handleNextActionPaymentIntentClientSecret)
+      paymentLauncher.handleNextActionForPaymentIntent(handleNextActionPaymentIntentClientSecret!!)
     } else if (handleNextActionSetupIntentClientSecret != null) {
-      paymentLauncher.handleNextActionForSetupIntent(handleNextActionSetupIntentClientSecret)
+      paymentLauncher.handleNextActionForSetupIntent(handleNextActionSetupIntentClientSecret!!)
     } else {
       throw Exception(
         "Invalid parameters provided to PaymentLauncher. Ensure that you are providing the correct client secret and setup params (if necessary).",
       )
     }
-    return FrameLayout(requireActivity()).also { it.visibility = View.GONE }
   }
 
   private fun createPaymentLauncher(): PaymentLauncher =
     PaymentLauncher.create(this, publishableKey, stripeAccountId) { paymentResult ->
       when (paymentResult) {
         is PaymentResult.Completed -> {
-          if (paymentIntentClientSecret != null) {
-            retrievePaymentIntent(paymentIntentClientSecret, stripeAccountId)
-          } else if (handleNextActionPaymentIntentClientSecret != null) {
-            retrievePaymentIntent(handleNextActionPaymentIntentClientSecret, stripeAccountId)
-          } else if (setupIntentClientSecret != null) {
-            retrieveSetupIntent(setupIntentClientSecret, stripeAccountId)
-          } else if (handleNextActionSetupIntentClientSecret != null) {
-            retrieveSetupIntent(handleNextActionSetupIntentClientSecret, stripeAccountId)
-          } else {
-            throw Exception("Failed to create Payment Launcher. No client secret provided.")
-          }
+          paymentIntentClientSecret?.let {
+            retrievePaymentIntent(it, stripeAccountId)
+          } ?: handleNextActionPaymentIntentClientSecret?.let {
+            retrievePaymentIntent(it, stripeAccountId)
+          } ?: setupIntentClientSecret?.let {
+            retrieveSetupIntent(it, stripeAccountId)
+          } ?: handleNextActionSetupIntentClientSecret?.let {
+            retrieveSetupIntent(it, stripeAccountId)
+          } ?: throw Exception("Failed to create Payment Launcher. No client secret provided.")
         }
         is PaymentResult.Canceled -> {
           promise.resolve(createError(ConfirmPaymentErrorType.Canceled.toString(), message = null))

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

@@ -19,7 +19,7 @@ import com.stripe.android.model.PaymentMethodOptionsParams
 
 class PaymentMethodCreateParamsFactory(
   private val paymentMethodData: ReadableMap?,
-  private val options: ReadableMap,
+  private val options: ReadableMap?,
   private val cardFieldView: CardFieldView?,
   private val cardFormView: CardFormView?,
 ) {
@@ -267,6 +267,7 @@ class PaymentMethodCreateParamsFactory(
         PaymentMethod.Type.Card -> createCardStripeIntentParams(clientSecret, isPaymentIntent)
         PaymentMethod.Type.USBankAccount ->
           createUSBankAccountStripeIntentParams(clientSecret, isPaymentIntent)
+
         PaymentMethod.Type.Affirm -> createAffirmStripeIntentParams(clientSecret, isPaymentIntent)
         PaymentMethod.Type.Ideal,
         PaymentMethod.Type.Alipay,
@@ -304,6 +305,7 @@ class PaymentMethodCreateParamsFactory(
             )
           }
         }
+
         null -> ConfirmPaymentIntentParams.create(clientSecret)
         else -> {
           throw Exception("This paymentMethodType is not supported yet")