@stripe/stripe-react-native 0.57.3 → 0.59.0

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

@@ -39,14 +39,15 @@ import com.reactnativestripesdk.utils.mapFromPaymentMethod
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
 import com.reactnativestripesdk.utils.parseCustomPaymentMethods
 import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
+import com.stripe.android.PaymentConfiguration
 import com.stripe.android.core.reactnative.ReactNativeSdkInternal
 import com.stripe.android.model.PaymentMethod
 import com.stripe.android.paymentelement.ConfirmCustomPaymentMethodCallback
 import com.stripe.android.paymentelement.CreateIntentWithConfirmationTokenCallback
 import com.stripe.android.paymentelement.CustomPaymentMethodResult
 import com.stripe.android.paymentelement.CustomPaymentMethodResultHandler
-import com.stripe.android.paymentelement.ExperimentalCustomPaymentMethodsApi
 import com.stripe.android.paymentelement.PaymentMethodOptionsSetupFutureUsagePreview
+import com.stripe.android.paymentsheet.CardFundingFilteringPrivatePreview
 import com.stripe.android.paymentsheet.CreateIntentCallback
 import com.stripe.android.paymentsheet.CreateIntentResult
 import com.stripe.android.paymentsheet.PaymentOptionResultCallback
@@ -67,7 +68,7 @@ import kotlin.coroutines.resume
 @OptIn(
   ReactNativeSdkInternal::class,
   ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class,
-  ExperimentalCustomPaymentMethodsApi::class,
+  CardFundingFilteringPrivatePreview::class,
 )
 class PaymentSheetManager(
   context: ReactApplicationContext,
@@ -88,7 +89,6 @@ class PaymentSheetManager(
   private var keepJsAwake: KeepJsAwakeTask? = null
 
   @SuppressLint("RestrictedApi")
-  @OptIn(ExperimentalCustomPaymentMethodsApi::class)
   override fun onCreate() {
     val activity = getCurrentActivityOrResolveWithError(initPromise) ?: return
     val merchantDisplayName = arguments.getString("merchantDisplayName").orEmpty()
@@ -107,6 +107,8 @@ class PaymentSheetManager(
     val paymentMethodOrder = arguments.getStringList("paymentMethodOrder")
     val allowsRemovalOfLastSavedPaymentMethod =
       arguments.getBooleanOr("allowsRemovalOfLastSavedPaymentMethod", true)
+    val opensCardScannerAutomatically =
+      arguments.getBooleanOr("opensCardScannerAutomatically", false)
     paymentIntentClientSecret = arguments.getString("paymentIntentClientSecret").orEmpty()
     setupIntentClientSecret = arguments.getString("setupIntentClientSecret").orEmpty()
     intentConfiguration =
@@ -284,8 +286,11 @@ class PaymentSheetManager(
         .preferredNetworks(
           mapToPreferredNetworks(arguments.getIntegerList("preferredNetworks")),
         ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
+        .opensCardScannerAutomatically(opensCardScannerAutomatically)
         .cardBrandAcceptance(mapToCardBrandAcceptance(arguments))
-        .customPaymentMethods(parseCustomPaymentMethods(arguments.getMap("customPaymentMethodConfiguration")))
+        .apply {
+          mapToAllowedCardFundingTypes(arguments)?.let { allowedCardFundingTypes(it) }
+        }.customPaymentMethods(parseCustomPaymentMethods(arguments.getMap("customPaymentMethodConfiguration")))
 
     primaryButtonLabel?.let { configurationBuilder.primaryButtonLabel(it) }
     paymentMethodOrder?.let { configurationBuilder.paymentMethodOrder(it) }
@@ -294,6 +299,14 @@ class PaymentSheetManager(
       mapToPaymentMethodLayout(arguments.getString("paymentMethodLayout")),
     )
 
+    val userKeyTermsDisplay =
+      computeTermsDisplayForUserKey(
+        PaymentConfiguration.getInstance(context).publishableKey,
+      )
+    if (userKeyTermsDisplay.isNotEmpty()) {
+      configurationBuilder.termsDisplay(userKeyTermsDisplay)
+    }
+
     paymentSheetConfiguration = configurationBuilder.build()
 
     if (arguments.getBooleanOr("customFlow", false)) {
@@ -429,32 +442,8 @@ class PaymentSheetManager(
 
   private fun configureFlowController() {
     val onFlowControllerConfigure =
-      PaymentSheet.FlowController.ConfigCallback { _, _ ->
-        flowController?.getPaymentOption()?.let { paymentOption ->
-          // Launch async job to convert drawable, but resolve promise synchronously
-          CoroutineScope(Dispatchers.Default).launch {
-            val imageString =
-              try {
-                convertDrawableToBase64(paymentOption.icon())
-              } catch (e: Exception) {
-                val result =
-                  createError(
-                    PaymentSheetErrorType.Failed.toString(),
-                    "Failed to process payment option image: ${e.message}",
-                  )
-                initPromise.resolve(result)
-                return@launch
-              }
-
-            val option: WritableMap = Arguments.createMap()
-            option.putString("label", paymentOption.label)
-            option.putString("image", imageString)
-            val result = createResult("paymentOption", option)
-            initPromise.resolve(result)
-          }
-        } ?: run {
-          initPromise.resolve(Arguments.createMap())
-        }
+      PaymentSheet.FlowController.ConfigCallback { success, error ->
+        handleFlowControllerConfigured(success, error, initPromise, flowController)
       }
 
     if (!paymentIntentClientSecret.isNullOrEmpty()) {
@@ -498,7 +487,6 @@ class PaymentSheetManager(
     } ?: run { resolvePresentPromise(map) }
   }
 
-  @OptIn(ExperimentalCustomPaymentMethodsApi::class)
   override fun onConfirmCustomPaymentMethod(
     customPaymentMethod: PaymentSheet.CustomPaymentMethod,
     billingDetails: PaymentMethod.BillingDetails,
@@ -717,3 +705,44 @@ internal fun mapToPaymentMethodOptions(options: ReadableMap?): PaymentSheet.Inte
     null
   }
 }
+
+internal fun handleFlowControllerConfigured(
+  success: Boolean,
+  error: Throwable?,
+  promise: Promise,
+  flowController: PaymentSheet.FlowController?,
+) {
+  if (!success) {
+    promise.resolve(
+      createError(
+        PaymentSheetErrorType.Failed.toString(),
+        error?.message ?: "Failed to configure payment sheet",
+      ),
+    )
+    return
+  }
+  flowController?.getPaymentOption()?.let { paymentOption ->
+    CoroutineScope(Dispatchers.Default).launch {
+      val imageString =
+        try {
+          convertDrawableToBase64(paymentOption.icon())
+        } catch (e: Exception) {
+          val result =
+            createError(
+              PaymentSheetErrorType.Failed.toString(),
+              "Failed to process payment option image: ${e.message}",
+            )
+          promise.resolve(result)
+          return@launch
+        }
+
+      val option: WritableMap = Arguments.createMap()
+      option.putString("label", paymentOption.label)
+      option.putString("image", imageString)
+      val result = createResult("paymentOption", option)
+      promise.resolve(result)
+    }
+  } ?: run {
+    promise.resolve(Arguments.createMap())
+  }
+}

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

@@ -69,6 +69,8 @@ abstract class StripeAbstractComposeView(
 
   private var innerComposeView: InnerComposeView? = null
   private var isLifecycleSetup = false
+  private var activityLifecycleOwner: LifecycleOwner? = null
+  private var activityLifecycleObserver: LifecycleEventObserver? = null
 
   // Create a lifecycle this is tied to the activity, but that we can manually
   // update to DESTROYED state when the view is dropped.
@@ -113,24 +115,34 @@ abstract class StripeAbstractComposeView(
       return
     }
 
-    ((context as? ReactContext)?.currentActivity as? LifecycleOwner?)?.let {
+    ((context as? ReactContext)?.currentActivity as? LifecycleOwner?)?.let { owner ->
       isLifecycleSetup = true
+      activityLifecycleOwner = owner
 
       // Setup the lifecycle to match the activity.
-      it.lifecycle.addObserver(
+      val observer =
         object : LifecycleEventObserver {
           override fun onStateChanged(
             source: LifecycleOwner,
             event: Lifecycle.Event,
           ) {
-            lifecycleRegistry.handleLifecycleEvent(event)
+            if (lifecycleRegistry.currentState != Lifecycle.State.DESTROYED) {
+              lifecycleRegistry.handleLifecycleEvent(event)
+            }
           }
-        },
-      )
+        }
+      activityLifecycleObserver = observer
+      owner.lifecycle.addObserver(observer)
     }
   }
 
   fun handleOnDropViewInstance() {
+    activityLifecycleObserver?.let { observer ->
+      activityLifecycleOwner?.lifecycle?.removeObserver(observer)
+    }
+    activityLifecycleObserver = null
+    activityLifecycleOwner = null
+
     if (lifecycleRegistry.currentState.isAtLeast(Lifecycle.State.CREATED)) {
       lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
     }

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

@@ -0,0 +1,77 @@
+package com.reactnativestripesdk
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+
+/**
+ * Transparent interceptor Activity that captures stripe-connect:// deep links
+ * before they reach React Native's Linking module.
+ *
+ * This prevents Expo Router from receiving the URL and dismissing the current screen.
+ * The URL is stored in StripeSdkModule's internal storage and retrieved via polling.
+ *
+ * HOW IT WORKS:
+ * 1. Android launches this Activity when a stripe-connect:// URL is opened
+ * 2. onCreate() extracts the URL and stores it via StripeSdkModule.storeStripeConnectDeepLink()
+ * 3. Launches an Intent to bring the main app to the foreground
+ * 4. The Activity immediately finishes without showing any UI
+ * 5. JavaScript polls for URLs via NativeStripeSdk.pollAndClearPendingStripeConnectUrls()
+ *
+ * MANIFEST CONFIGURATION:
+ * The AndroidManifest.xml declares this Activity with:
+ * - android:exported="true" - allows deep links from outside the app
+ * - android:launchMode="singleTask" - reuses existing instance if available
+ * - android:theme="@android:style/Theme.Translucent.NoTitleBar" - transparent UI
+ * - Intent filter for stripe-connect:// scheme
+ *
+ * USER IMPACT:
+ * - Zero configuration required by users
+ * - Works automatically for all package names
+ * - No MainActivity override needed
+ */
+class StripeConnectDeepLinkInterceptorActivity : Activity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    // Extract the deep link URL from the Intent
+    val url = intent?.data?.toString()
+
+    if (url != null && url.startsWith("stripe-connect://")) {
+      // Store in SDK's internal storage (thread-safe)
+      StripeSdkModule.storeStripeConnectDeepLink(url)
+    } else {
+      Log.w(TAG, "Unexpected URL scheme in StripeConnectDeepLinkInterceptor: $url")
+    }
+
+    // Bring the main app back to the foreground
+    // This is critical because when Custom Tabs opens a deep link,
+    // the interceptor Activity starts in a new task. When it finishes,
+    // Android doesn't automatically return to the main app - it just shows
+    // the Custom Tab again. We need to explicitly bring the app forward.
+    try {
+      val packageName = applicationContext.packageName
+      val launchIntent = packageManager.getLaunchIntentForPackage(packageName)
+
+      if (launchIntent != null) {
+        // Flags to bring existing task to front without recreating activities
+        launchIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
+        launchIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        startActivity(launchIntent)
+      } else {
+        Log.w(TAG, "Could not get launch intent for package: $packageName")
+      }
+    } catch (e: Exception) {
+      Log.e(TAG, "Error bringing app to foreground", e)
+    }
+
+    // Immediately finish - don't show any UI
+    // This makes the Activity transparent to the user
+    finish()
+  }
+
+  companion object {
+    private const val TAG = "StripeConnectInterceptor"
+  }
+}