@stripe/stripe-react-native 0.55.1 → 0.57.0

package/android/gradle.properties

@@ -3,4 +3,4 @@ StripeSdk_compileSdkVersion=30
 StripeSdk_targetSdkVersion=28
 StripeSdk_minSdkVersion=21
 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties
-StripeSdk_stripeVersion=21.29.0
+StripeSdk_stripeVersion=22.1.+

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

@@ -10,6 +10,7 @@ import com.facebook.react.uimanager.UIManagerHelper
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
+import com.reactnativestripesdk.utils.getIntOr
 import com.reactnativestripesdk.utils.getIntOrNull
 import com.reactnativestripesdk.utils.getValOr
 import com.stripe.android.databinding.StripeBecsDebitWidgetBinding
@@ -41,11 +42,11 @@ class AuBECSDebitFormView(
     val textColor = getValOr(value, "textColor", null)
     val textErrorColor = getValOr(value, "textErrorColor", null)
     val placeholderColor = getValOr(value, "placeholderColor", null)
-    val fontSize = getIntOrNull(value, "fontSize")
-    val borderWidth = getIntOrNull(value, "borderWidth")
+    val fontSize = value.getIntOrNull("fontSize")
+    val borderWidth = value.getIntOrNull("borderWidth")
     val backgroundColor = getValOr(value, "backgroundColor", null)
     val borderColor = getValOr(value, "borderColor", null)
-    val borderRadius = getIntOrNull(value, "borderRadius") ?: 0
+    val borderRadius = value.getIntOr("borderRadius", 0)
 
     textColor?.let {
       (binding.accountNumberEditText as StripeEditText).setTextColor(Color.parseColor(it))

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

@@ -19,6 +19,7 @@ import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import com.reactnativestripesdk.utils.PostalCodeUtilities
+import com.reactnativestripesdk.utils.getIntOr
 import com.reactnativestripesdk.utils.getIntOrNull
 import com.reactnativestripesdk.utils.getValOr
 import com.reactnativestripesdk.utils.hideSoftKeyboard
@@ -103,12 +104,12 @@ class CardFieldView(
   }
 
   fun setCardStyle(value: ReadableMap?) {
-    val borderWidth = getIntOrNull(value, "borderWidth")
+    val borderWidth = value.getIntOrNull("borderWidth")
     val backgroundColor = getValOr(value, "backgroundColor", null)
     val borderColor = getValOr(value, "borderColor", null)
-    val borderRadius = getIntOrNull(value, "borderRadius") ?: 0
+    val borderRadius = value.getIntOr("borderRadius", 0)
     val textColor = getValOr(value, "textColor", null)
-    val fontSize = getIntOrNull(value, "fontSize")
+    val fontSize = value.getIntOrNull("fontSize")
     val fontFamily = getValOr(value, "fontFamily")
     val placeholderColor = getValOr(value, "placeholderColor", null)
     val textErrorColor = getValOr(value, "textErrorColor", null)
@@ -281,9 +282,9 @@ class CardFieldView(
       cardAddress = null
     }
 
-    mCardWidget.cardParams?.let {
-      cardDetails["brand"] = mapCardBrand(it.brand)
-      cardDetails["last4"] = it.last4
+    mCardWidget.paymentMethodCreateParams?.let {
+      cardDetails["brand"] = mapCardBrand(mCardWidget.brand)
+      cardDetails["last4"] = it.cardLast4()
     } ?: run {
       cardDetails["brand"] = null
       cardDetails["last4"] = null

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

@@ -6,7 +6,6 @@ import android.graphics.Color
 import android.os.Build
 import android.text.InputFilter
 import android.view.View
-import android.view.View.OnFocusChangeListener
 import android.widget.FrameLayout
 import androidx.core.view.setMargins
 import com.facebook.react.bridge.ReadableMap
@@ -18,6 +17,7 @@ import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import com.reactnativestripesdk.utils.PostalCodeUtilities
+import com.reactnativestripesdk.utils.getIntOr
 import com.reactnativestripesdk.utils.getIntOrNull
 import com.reactnativestripesdk.utils.getValOr
 import com.reactnativestripesdk.utils.hideSoftKeyboard
@@ -143,10 +143,10 @@ class CardFormView(
   fun setCardStyle(value: ReadableMap?) {
     val backgroundColor = getValOr(value, "backgroundColor", null)
     val textColor = getValOr(value, "textColor", null)
-    val borderWidth = getIntOrNull(value, "borderWidth")
+    val borderWidth = value.getIntOrNull("borderWidth")
     val borderColor = getValOr(value, "borderColor", null)
-    val borderRadius = getIntOrNull(value, "borderRadius") ?: 0
-    val fontSize = getIntOrNull(value, "fontSize")
+    val borderRadius = value.getIntOr("borderRadius", 0)
+    val fontSize = value.getIntOrNull("fontSize")
     val fontFamily = getValOr(value, "fontFamily")
     val placeholderColor = getValOr(value, "placeholderColor", null)
     val textErrorColor = getValOr(value, "textErrorColor", null)
@@ -245,16 +245,16 @@ class CardFormView(
   private fun setListeners() {
     cardForm.setCardValidCallback { isValid, _ ->
       if (isValid) {
-        cardForm.cardParams?.let {
+        cardForm.paymentMethodCreateParams?.let {
           val cardParamsMap = it.toParamMap()["card"] as HashMap<*, *>
           val cardDetails: MutableMap<String, Any> =
             mutableMapOf(
               "expiryMonth" to cardParamsMap["exp_month"] as Int,
               "expiryYear" to cardParamsMap["exp_year"] as Int,
-              "last4" to it.last4,
-              "brand" to mapCardBrand(it.brand),
-              "postalCode" to (it.address?.postalCode ?: ""),
-              "country" to (it.address?.country ?: ""),
+              "last4" to (it.cardLast4() ?: ""),
+              "brand" to mapCardBrand(cardForm.brand),
+              "postalCode" to (it.billingDetails?.address?.postalCode ?: ""),
+              "country" to (it.billingDetails?.address?.country ?: ""),
             )
 
           if (dangerouslyGetFullCardDetails) {
@@ -277,8 +277,8 @@ class CardFormView(
           cardAddress =
             Address
               .Builder()
-              .setPostalCode(it.address?.postalCode)
-              .setCountry(it.address?.country)
+              .setPostalCode(it.billingDetails?.address?.postalCode)
+              .setCountry(it.billingDetails?.address?.country)
               .build()
 
           cardFormViewBinding.cardMultilineWidget.paymentMethodCard?.let { params ->

package/android/src/main/java/com/reactnativestripesdk/{CollectBankAccountLauncherFragment.kt → CollectBankAccountLauncherManager.kt}

@@ -1,15 +1,15 @@
 package com.reactnativestripesdk
 
-import com.facebook.react.bridge.Promise
+import androidx.activity.ComponentActivity
 import com.facebook.react.bridge.ReactApplicationContext
 import com.reactnativestripesdk.utils.ErrorType
-import com.reactnativestripesdk.utils.StripeFragment
+import com.reactnativestripesdk.utils.StripeUIManager
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createResult
 import com.reactnativestripesdk.utils.mapFromFinancialConnectionsEvent
 import com.reactnativestripesdk.utils.mapFromPaymentIntentResult
 import com.reactnativestripesdk.utils.mapFromSetupIntentResult
-import com.reactnativestripesdk.utils.removeFragment
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
 import com.stripe.android.financialconnections.FinancialConnections
 import com.stripe.android.model.PaymentIntent
 import com.stripe.android.model.SetupIntent
@@ -18,18 +18,20 @@ import com.stripe.android.payments.bankaccount.CollectBankAccountConfiguration
 import com.stripe.android.payments.bankaccount.CollectBankAccountLauncher
 import com.stripe.android.payments.bankaccount.navigation.CollectBankAccountResult
 
-class CollectBankAccountLauncherFragment : StripeFragment() {
-  private lateinit var context: ReactApplicationContext
-  private lateinit var publishableKey: String
-  private var stripeAccountId: String? = null
-  private lateinit var clientSecret: String
-  private var isPaymentIntent: Boolean = false
-  private lateinit var collectParams: CollectBankAccountConfiguration.USBankAccount
-  private lateinit var promise: Promise
+@OptIn(ReactNativeSdkInternal::class)
+class CollectBankAccountLauncherManager(
+  context: ReactApplicationContext,
+  private val publishableKey: String,
+  private val stripeAccountId: String? = null,
+  private val clientSecret: String,
+  private val isPaymentIntent: Boolean,
+  private val collectParams: CollectBankAccountConfiguration.USBankAccount,
+) : StripeUIManager(context) {
   private lateinit var collectBankAccountLauncher: CollectBankAccountLauncher
 
-  override fun prepare() {
-    collectBankAccountLauncher = createBankAccountLauncher()
+  override fun onPresent() {
+    val activity = getCurrentActivityOrResolveWithError(promise) ?: return
+    collectBankAccountLauncher = createBankAccountLauncher(activity)
 
     val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
     if (stripeSdkModule != null) {
@@ -63,17 +65,17 @@ class CollectBankAccountLauncherFragment : StripeFragment() {
     FinancialConnections.clearEventListener()
   }
 
-  private fun createBankAccountLauncher(): CollectBankAccountLauncher =
-    CollectBankAccountLauncher.create(this) { result ->
+  private fun createBankAccountLauncher(activity: ComponentActivity): CollectBankAccountLauncher =
+    CollectBankAccountLauncher.create(activity, signal) { result ->
       when (result) {
         is CollectBankAccountResult.Completed -> {
           val intent = result.response.intent
           if (intent.status === StripeIntent.Status.RequiresPaymentMethod) {
-            promise.resolve(
+            promise?.resolve(
               createError(ErrorType.Canceled.toString(), "Bank account collection was canceled."),
             )
           } else if (intent.status === StripeIntent.Status.RequiresConfirmation) {
-            promise.resolve(
+            promise?.resolve(
               if (isPaymentIntent) {
                 createResult(
                   "paymentIntent",
@@ -87,39 +89,14 @@ class CollectBankAccountLauncherFragment : StripeFragment() {
         }
 
         is CollectBankAccountResult.Cancelled -> {
-          promise.resolve(
+          promise?.resolve(
             createError(ErrorType.Canceled.toString(), "Bank account collection was canceled."),
           )
         }
 
         is CollectBankAccountResult.Failed -> {
-          promise.resolve(createError(ErrorType.Failed.toString(), result.error))
+          promise?.resolve(createError(ErrorType.Failed.toString(), result.error))
         }
       }
-      removeFragment(context)
     }
-
-  companion object {
-    internal const val TAG = "collect_bank_account_launcher_fragment"
-
-    fun create(
-      context: ReactApplicationContext,
-      publishableKey: String,
-      stripeAccountId: String? = null,
-      clientSecret: String,
-      isPaymentIntent: Boolean,
-      collectParams: CollectBankAccountConfiguration.USBankAccount,
-      promise: Promise,
-    ): CollectBankAccountLauncherFragment {
-      val instance = CollectBankAccountLauncherFragment()
-      instance.context = context
-      instance.publishableKey = publishableKey
-      instance.stripeAccountId = stripeAccountId
-      instance.clientSecret = clientSecret
-      instance.isPaymentIntent = isPaymentIntent
-      instance.collectParams = collectParams
-      instance.promise = promise
-      return instance
-    }
-  }
 }

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

@@ -12,15 +12,14 @@ 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.PaymentSheetManager.Companion.buildCustomerConfiguration
+import com.reactnativestripesdk.PaymentSheetManager.Companion.buildGooglePayConfig
 import com.reactnativestripesdk.addresssheet.AddressSheetView
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
 import com.reactnativestripesdk.utils.PaymentSheetException
 import com.reactnativestripesdk.utils.getBooleanOr
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
 import com.reactnativestripesdk.utils.parseCustomPaymentMethods
-import com.reactnativestripesdk.utils.toBundleObject
 import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
 import com.stripe.android.paymentelement.EmbeddedPaymentElement
 import com.stripe.android.paymentelement.ExperimentalCustomPaymentMethodsApi
@@ -113,15 +112,15 @@ class EmbeddedPaymentElementViewManager :
     var defaultBillingDetails: PaymentSheet.BillingDetails? = null
     val billingDetailsMap = map.getMap("defaultBillingDetails")
     if (billingDetailsMap != null) {
-      val addressBundle = billingDetailsMap.getMap("address")
+      val addressMap = 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"),
+          addressMap?.getString("city"),
+          addressMap?.getString("country"),
+          addressMap?.getString("line1"),
+          addressMap?.getString("line2"),
+          addressMap?.getString("postalCode"),
+          addressMap?.getString("state"),
         )
       defaultBillingDetails =
         PaymentSheet.BillingDetails(
@@ -134,20 +133,20 @@ class EmbeddedPaymentElementViewManager :
 
     val customerConfiguration =
       try {
-        buildCustomerConfiguration(toBundleObject(map))
+        buildCustomerConfiguration(map)
       } catch (error: PaymentSheetException) {
         throw Error() // TODO handle error
       }
 
-    val googlePayConfig = buildGooglePayConfig(toBundleObject(map.getMap("googlePay")))
-    val linkConfig = PaymentSheetFragment.buildLinkConfig(toBundleObject(map.getMap("link")))
+    val googlePayConfig = buildGooglePayConfig(map.getMap("googlePay"))
+    val linkConfig = PaymentSheetManager.buildLinkConfig(map.getMap("link"))
     val shippingDetails =
       map.getMap("defaultShippingDetails")?.let {
         AddressSheetView.buildAddressDetails(it)
       }
     val appearance =
       try {
-        buildPaymentSheetAppearance(toBundleObject(map.getMap("appearance")), context)
+        buildPaymentSheetAppearance(map.getMap("appearance"), context)
       } catch (error: PaymentSheetAppearanceException) {
         throw Error() // TODO handle error
       }
@@ -201,7 +200,7 @@ class EmbeddedPaymentElementViewManager :
               ?.let { ArrayList(it) },
           ),
         ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
-        .cardBrandAcceptance(mapToCardBrandAcceptance(toBundleObject(map)))
+        .cardBrandAcceptance(mapToCardBrandAcceptance(map))
         .embeddedViewDisplaysMandateText(
           if (map.hasKey("embeddedViewDisplaysMandateText") &&
             map.getType("embeddedViewDisplaysMandateText") == ReadableType.Boolean
@@ -210,15 +209,9 @@ class EmbeddedPaymentElementViewManager :
           } else {
             true // default value
           },
-        )
-        // Serialize original ReadableMap because toBundleObject cannot keep arrays of objects
-        .customPaymentMethods(
+        ).customPaymentMethods(
           parseCustomPaymentMethods(
-            toBundleObject(map.getMap("customPaymentMethodConfiguration")).apply {
-              map.getMap("customPaymentMethodConfiguration")?.let { readable ->
-                putSerializable("customPaymentMethodConfigurationReadableMap", readable.toHashMap())
-              }
-            },
+            map.getMap("customPaymentMethodConfiguration"),
           ),
         )
 
@@ -244,7 +237,7 @@ class EmbeddedPaymentElementViewManager :
   }
 
   private fun parseIntentConfiguration(map: ReadableMap): PaymentSheet.IntentConfiguration {
-    val intentConfig = PaymentSheetFragment.buildIntentConfiguration(toBundleObject(map))
+    val intentConfig = PaymentSheetManager.buildIntentConfiguration(map)
     return intentConfig ?: throw IllegalArgumentException("IntentConfiguration is null")
   }
 

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

@@ -60,6 +60,14 @@ class EventEmitterCompat(
     invoke("onCustomerAdapterSetupIntentClientSecretForCustomerAttachCallback")
   }
 
+  fun emitOnCustomerSessionProviderSetupIntentClientSecret() {
+    invoke("onCustomerSessionProviderSetupIntentClientSecret")
+  }
+
+  fun emitOnCustomerSessionProviderCustomerSessionClientSecret() {
+    invoke("onCustomerSessionProviderCustomerSessionClientSecret")
+  }
+
   fun emitEmbeddedPaymentElementDidUpdateHeight(value: ReadableMap?) {
     invoke("embeddedPaymentElementDidUpdateHeight", value)
   }

package/android/src/main/java/com/reactnativestripesdk/{FinancialConnectionsSheetFragment.kt → FinancialConnectionsSheetManager.kt}

@@ -1,19 +1,18 @@
 package com.reactnativestripesdk
 
-import androidx.fragment.app.FragmentActivity
+import android.annotation.SuppressLint
 import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
 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.StripeUIManager
 import com.reactnativestripesdk.utils.createError
-import com.reactnativestripesdk.utils.createMissingActivityError
 import com.reactnativestripesdk.utils.mapFromFinancialConnectionsEvent
 import com.reactnativestripesdk.utils.mapFromToken
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
 import com.stripe.android.financialconnections.FinancialConnections
 import com.stripe.android.financialconnections.FinancialConnectionsSheet
 import com.stripe.android.financialconnections.FinancialConnectionsSheetForTokenResult
@@ -24,18 +23,28 @@ import com.stripe.android.financialconnections.model.FinancialConnectionsAccount
 import com.stripe.android.financialconnections.model.FinancialConnectionsAccountList
 import com.stripe.android.financialconnections.model.FinancialConnectionsSession
 
-class FinancialConnectionsSheetFragment : StripeFragment() {
+@OptIn(ReactNativeSdkInternal::class)
+class FinancialConnectionsSheetManager(
+  context: ReactApplicationContext,
+  clientSecret: String,
+  private var mode: Mode,
+  publishableKey: String,
+  stripeAccountId: String?,
+) : StripeUIManager(context) {
   enum class Mode {
     ForToken,
     ForSession,
   }
 
-  private lateinit var promise: Promise
-  private lateinit var context: ReactApplicationContext
-  private lateinit var configuration: FinancialConnectionsSheet.Configuration
-  private lateinit var mode: Mode
+  private var configuration =
+    FinancialConnectionsSheet.Configuration(
+      financialConnectionsSessionClientSecret = clientSecret,
+      publishableKey = publishableKey,
+      stripeAccountId = stripeAccountId,
+    )
 
-  override fun prepare() {
+  override fun onPresent() {
+    val activity = getCurrentActivityOrResolveWithError(promise) ?: return
     val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
     FinancialConnections.setEventListener { event ->
       val params = mapFromFinancialConnectionsEvent(event)
@@ -44,16 +53,19 @@ class FinancialConnectionsSheetFragment : StripeFragment() {
 
     when (mode) {
       Mode.ForToken -> {
+        @SuppressLint("RestrictedApi")
         FinancialConnectionsSheet
           .createForBankAccountToken(
-            this,
+            activity,
+            signal,
             ::onFinancialConnectionsSheetForTokenResult,
           ).present(configuration = configuration)
       }
 
       Mode.ForSession -> {
+        @SuppressLint("RestrictedApi")
         FinancialConnectionsSheet
-          .create(this, ::onFinancialConnectionsSheetForDataResult)
+          .create(activity, signal, ::onFinancialConnectionsSheetForDataResult)
           .present(configuration = configuration)
       }
     }
@@ -61,7 +73,6 @@ class FinancialConnectionsSheetFragment : StripeFragment() {
 
   override fun onDestroy() {
     super.onDestroy()
-
     // Remove any event listener that might be set
     FinancialConnections.clearEventListener()
   }
@@ -69,20 +80,15 @@ class FinancialConnectionsSheetFragment : StripeFragment() {
   private fun onFinancialConnectionsSheetForTokenResult(result: FinancialConnectionsSheetForTokenResult) {
     when (result) {
       is FinancialConnectionsSheetForTokenResult.Canceled -> {
-        promise.resolve(createError(ErrorType.Canceled.toString(), "The flow has been canceled"))
+        promise?.resolve(createError(ErrorType.Canceled.toString(), "The flow has been canceled"))
       }
 
       is FinancialConnectionsSheetForTokenResult.Failed -> {
-        promise.resolve(createError(ErrorType.Failed.toString(), result.error))
+        promise?.resolve(createError(ErrorType.Failed.toString(), result.error))
       }
 
       is FinancialConnectionsSheetForTokenResult.Completed -> {
-        promise.resolve(createTokenResult(result))
-        (context.currentActivity as? FragmentActivity)
-          ?.supportFragmentManager
-          ?.beginTransaction()
-          ?.remove(this)
-          ?.commitAllowingStateLoss()
+        promise?.resolve(createTokenResult(result))
       }
     }
   }
@@ -90,77 +96,24 @@ class FinancialConnectionsSheetFragment : StripeFragment() {
   private fun onFinancialConnectionsSheetForDataResult(result: FinancialConnectionsSheetResult) {
     when (result) {
       is FinancialConnectionsSheetResult.Canceled -> {
-        promise.resolve(createError(ErrorType.Canceled.toString(), "The flow has been canceled"))
+        promise?.resolve(createError(ErrorType.Canceled.toString(), "The flow has been canceled"))
       }
 
       is FinancialConnectionsSheetResult.Failed -> {
-        promise.resolve(createError(ErrorType.Failed.toString(), result.error))
+        promise?.resolve(createError(ErrorType.Failed.toString(), result.error))
       }
 
       is FinancialConnectionsSheetResult.Completed -> {
-        promise.resolve(
+        promise?.resolve(
           WritableNativeMap().also {
             it.putMap("session", mapFromSession(result.financialConnectionsSession))
           },
         )
-        (context.currentActivity as? FragmentActivity)
-          ?.supportFragmentManager
-          ?.beginTransaction()
-          ?.remove(this)
-          ?.commitAllowingStateLoss()
-      }
-    }
-  }
-
-  fun presentFinancialConnectionsSheet(
-    clientSecret: String,
-    mode: Mode,
-    publishableKey: String,
-    stripeAccountId: String?,
-    promise: Promise,
-    context: ReactApplicationContext,
-  ) {
-    this.promise = promise
-    this.context = context
-    this.mode = mode
-    this.configuration =
-      FinancialConnectionsSheet.Configuration(
-        financialConnectionsSessionClientSecret = clientSecret,
-        publishableKey = publishableKey,
-        stripeAccountId = stripeAccountId,
-      )
-
-    (context.currentActivity as? FragmentActivity)?.let {
-      attemptToCleanupPreviousFragment(it)
-      commitFragmentAndStartFlow(it)
-    }
-      ?: run {
-        promise.resolve(createMissingActivityError())
-        return
       }
-  }
-
-  private fun attemptToCleanupPreviousFragment(currentActivity: FragmentActivity) {
-    currentActivity.supportFragmentManager
-      .beginTransaction()
-      .remove(this)
-      .commitAllowingStateLoss()
-  }
-
-  private fun commitFragmentAndStartFlow(currentActivity: FragmentActivity) {
-    try {
-      currentActivity.supportFragmentManager
-        .beginTransaction()
-        .add(this, TAG)
-        .commit()
-    } catch (error: IllegalStateException) {
-      promise.resolve(createError(ErrorType.Failed.toString(), error.message))
     }
   }
 
   companion object {
-    internal const val TAG = "financial_connections_sheet_launch_fragment"
-
     private fun createTokenResult(result: FinancialConnectionsSheetForTokenResult.Completed): WritableMap =
       WritableNativeMap().also {
         it.putMap("session", mapFromSession(result.financialConnectionsSession))

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

@@ -0,0 +1,107 @@
+package com.reactnativestripesdk
+
+import android.annotation.SuppressLint
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
+import com.reactnativestripesdk.utils.GooglePayErrorType
+import com.reactnativestripesdk.utils.StripeUIManager
+import com.reactnativestripesdk.utils.createError
+import com.reactnativestripesdk.utils.getBooleanOr
+import com.reactnativestripesdk.utils.getIntOrNull
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
+import com.stripe.android.googlepaylauncher.GooglePayEnvironment
+import com.stripe.android.googlepaylauncher.GooglePayLauncher
+
+@OptIn(ReactNativeSdkInternal::class)
+class GooglePayLauncherManager(
+  context: ReactApplicationContext,
+  private val clientSecret: String,
+  private val mode: Mode,
+  googlePayParams: ReadableMap,
+  private val callback: (GooglePayLauncher.Result?, error: WritableMap?) -> Unit,
+) : StripeUIManager(context) {
+  enum class Mode {
+    ForSetup,
+    ForPayment,
+  }
+
+  private var launcher: GooglePayLauncher? = null
+  private var configuration =
+    GooglePayLauncher.Config(
+      environment =
+        if (googlePayParams.getBoolean("testEnv")) {
+          GooglePayEnvironment.Test
+        } else {
+          GooglePayEnvironment.Production
+        },
+      merchantCountryCode = googlePayParams.getString("merchantCountryCode").orEmpty(),
+      merchantName = googlePayParams.getString("merchantName").orEmpty(),
+      isEmailRequired = googlePayParams.getBooleanOr("isEmailRequired", false),
+      billingAddressConfig =
+        buildBillingAddressParameters(googlePayParams.getMap("billingAddressConfig")),
+      existingPaymentMethodRequired =
+        googlePayParams.getBooleanOr("existingPaymentMethodRequired", false),
+      allowCreditCards = googlePayParams.getBooleanOr("allowCreditCards", true),
+    )
+  private var currencyCode = googlePayParams.getString("currencyCode") ?: "USD"
+  private var amount = googlePayParams.getIntOrNull("amount")
+  private var label = googlePayParams.getString("label")
+
+  override fun onPresent() {
+    val activity = getCurrentActivityOrResolveWithError(promise) ?: return
+    @SuppressLint("RestrictedApi")
+    launcher =
+      GooglePayLauncher(
+        activity = activity,
+        signal = signal,
+        config = configuration,
+        readyCallback = ::onGooglePayReady,
+        resultCallback = ::onGooglePayResult,
+      )
+  }
+
+  private fun onGooglePayReady(isReady: Boolean) {
+    if (isReady) {
+      when (mode) {
+        Mode.ForSetup -> {
+          launcher?.presentForSetupIntent(clientSecret, currencyCode, amount?.toLong(), label)
+        }
+        Mode.ForPayment -> {
+          launcher?.presentForPaymentIntent(clientSecret, label)
+        }
+      }
+    } else {
+      callback(
+        null,
+        createError(
+          GooglePayErrorType.Failed.toString(),
+          "Google Pay is not available on this device. You can use isPlatformPaySupported to preemptively check for Google Pay support.",
+        ),
+      )
+    }
+  }
+
+  private fun onGooglePayResult(result: GooglePayLauncher.Result) {
+    callback(result, null)
+  }
+
+  companion object {
+    private fun buildBillingAddressParameters(params: ReadableMap?): GooglePayLauncher.BillingAddressConfig {
+      val isRequired = params?.getBooleanOr("isRequired", false)
+      val isPhoneNumberRequired = params?.getBooleanOr("isPhoneNumberRequired", false)
+      val format =
+        when (params?.getString("format").orEmpty()) {
+          "FULL" -> GooglePayLauncher.BillingAddressConfig.Format.Full
+          "MIN" -> GooglePayLauncher.BillingAddressConfig.Format.Min
+          else -> GooglePayLauncher.BillingAddressConfig.Format.Min
+        }
+
+      return GooglePayLauncher.BillingAddressConfig(
+        isRequired = isRequired ?: false,
+        format = format,
+        isPhoneNumberRequired = isPhoneNumberRequired ?: false,
+      )
+    }
+  }
+}