@stripe/stripe-react-native 0.65.1 → 0.67.0

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

@@ -2,7 +2,6 @@ package com.reactnativestripesdk
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.app.Application
 import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
@@ -10,7 +9,6 @@ import android.os.Looper
 import android.util.Log
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.net.toUri
 import androidx.fragment.app.FragmentActivity
 import com.facebook.react.ReactActivity
@@ -31,6 +29,7 @@ import com.reactnativestripesdk.customersheet.CustomerSheetManager
 import com.reactnativestripesdk.pushprovisioning.PushProvisioningProxy
 import com.reactnativestripesdk.utils.ConfirmPaymentErrorType
 import com.reactnativestripesdk.utils.CreateTokenErrorType
+import com.reactnativestripesdk.utils.DefaultActivityLifecycleCallbacks
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.GooglePayErrorType
 import com.reactnativestripesdk.utils.RetrievePaymentIntentErrorType
@@ -82,10 +81,15 @@ import com.stripe.android.model.Token
 import com.stripe.android.paymentelement.CheckoutSessionPreview
 import com.stripe.android.payments.bankaccount.CollectBankAccountConfiguration
 import com.stripe.android.paymentsheet.PaymentSheet
+import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
 import org.json.JSONObject
 import java.util.UUID
 
@@ -113,6 +117,13 @@ class StripeSdkModule(
   private var googlePayLauncherManager: GooglePayLauncherManager? = null
   private var googlePayPaymentMethodLauncherManager: GooglePayPaymentMethodLauncherManager? = null
   internal val checkoutInstances = mutableMapOf<String, Checkout>()
+  private val serverUpdateContinuations =
+    mutableMapOf<String, CancellableContinuation<Result<Unit>>>()
+
+  // / Tracks the long-running coroutine that observes each Checkout's
+  // / `checkoutSession` + `isLoading` flows and forwards transitions to JS as
+  // / `checkoutSessionDidChangeState` events.
+  private val checkoutStateObservers = mutableMapOf<String, Job>()
 
   private var customerSheetManager: CustomerSheetManager? = null
 
@@ -165,6 +176,8 @@ class StripeSdkModule(
 
     stripeUIManagers.forEach { it.destroy() }
     stripeUIManagers.clear()
+    checkoutStateObservers.values.forEach { it.cancel() }
+    checkoutStateObservers.clear()
     checkoutInstances.clear()
   }
 
@@ -1743,6 +1756,7 @@ class StripeSdkModule(
         onSuccess = { checkout ->
           val sessionKey = UUID.randomUUID().toString()
           checkoutInstances[sessionKey] = checkout
+          observeCheckoutState(sessionKey, checkout)
 
           promise.resolve(
             Arguments.createMap().apply {
@@ -1855,24 +1869,48 @@ class StripeSdkModule(
     }
   }
 
-  override fun checkoutUpdateTaxId(
+  override fun checkoutRunServerUpdateStart(
     sessionKey: String,
-    type: String,
-    value: String,
     promise: Promise,
   ) {
-    performCheckoutMutation(sessionKey, promise) { checkout ->
-      checkout.updateTaxId(type = type, value = value)
+    val checkout = checkoutInstances[sessionKey] ?: run {
+      promise.reject(ErrorType.Failed.toString(), "Checkout session not found.")
+      return
+    }
+
+    if (serverUpdateContinuations.containsKey(sessionKey)) {
+      promise.reject(ErrorType.Failed.toString(), "A server update is already in progress for this session.")
+      return
+    }
+
+    CoroutineScope(Dispatchers.Main).launch {
+      checkout.runServerUpdate {
+        suspendCancellableCoroutine { continuation ->
+          serverUpdateContinuations[sessionKey] = continuation
+        }
+      }.fold(
+        onSuccess = { promise.resolve(mapFromCheckoutState(checkout)) },
+        onFailure = { promise.reject(ErrorType.Failed.toString(), it.message, it) },
+      )
     }
   }
 
-  override fun checkoutRefresh(
+  override fun checkoutRunServerUpdateComplete(
     sessionKey: String,
+    error: String?,
     promise: Promise,
   ) {
-    performCheckoutMutation(sessionKey, promise) { checkout ->
-      checkout.refresh()
+    val continuation = serverUpdateContinuations.remove(sessionKey) ?: run {
+      promise.reject(ErrorType.Failed.toString(), "No pending server update for this session.")
+      return
     }
+
+    if (error != null) {
+      continuation.resume(Result.failure(Exception(error))) {}
+    } else {
+      continuation.resume(Result.success(Unit)) {}
+    }
+    promise.resolve(null)
   }
 
   private fun buildCheckoutConfiguration(configuration: ReadableMap): Checkout.Configuration {
@@ -1884,6 +1922,41 @@ class StripeSdkModule(
     return checkoutConfiguration
   }
 
+  /**
+   * Forwards the checkout's `(checkoutSession, isLoading)` flow to JS as
+   * `checkoutSessionDidChangeState` events. Equivalent to the iOS
+   * `CheckoutDelegate` bridge — every native-side mutation (currency selection,
+   * promo code, refresh, etc.) goes through one canonical channel that
+   * `useCheckout` listens to.
+   */
+  private fun observeCheckoutState(
+    sessionKey: String,
+    checkout: Checkout,
+  ) {
+    checkoutStateObservers[sessionKey]?.cancel()
+
+    val job = CoroutineScope(Dispatchers.Main).launch {
+      // `combine` re-emits on every upstream tick. `distinctUntilChanged`
+      // collapses runs where neither field actually moved — both flows are
+      // StateFlows so we'd otherwise see a redundant initial replay when
+      // wiring up.
+      combine(
+        checkout.checkoutSession,
+        checkout.isLoading,
+      ) { session, isLoading -> session to isLoading }
+        .distinctUntilChanged()
+        .collect {
+          eventEmitter.emitCheckoutSessionDidChangeState(
+            Arguments.createMap().apply {
+              putString("sessionKey", sessionKey)
+              putMap("state", mapFromCheckoutState(checkout))
+            },
+          )
+        }
+    }
+    checkoutStateObservers[sessionKey] = job
+  }
+
   private fun performCheckoutMutation(
     sessionKey: String,
     promise: Promise,
@@ -1925,14 +1998,14 @@ class StripeSdkModule(
   private var isRecreatingReactActivity = false
   private var isAuthWebViewActive = false
   private val activityLifecycleCallbacks =
-    object : Application.ActivityLifecycleCallbacks {
+    object : DefaultActivityLifecycleCallbacks() {
       override fun onActivityCreated(
         activity: Activity,
-        bundle: Bundle?,
+        savedInstanceState: Bundle?,
       ) {
-        // Only set flag when ReactActivity is actually being recreated (bundle != null)
-        // bundle != null means this is a recreation, not first creation
-        if (activity is ReactActivity && bundle != null) {
+        // Only set flag when ReactActivity is actually being recreated (savedInstanceState != null)
+        // savedInstanceState != null means this is a recreation, not first creation
+        if (activity is ReactActivity && savedInstanceState != null) {
           isRecreatingReactActivity = true
         }
 
@@ -1951,21 +2024,6 @@ class StripeSdkModule(
           }
         }
       }
-
-      override fun onActivityStarted(activity: Activity) {}
-
-      override fun onActivityResumed(activity: Activity) {}
-
-      override fun onActivityPaused(activity: Activity) {}
-
-      override fun onActivityStopped(activity: Activity) {}
-
-      override fun onActivitySaveInstanceState(
-        activity: Activity,
-        bundle: Bundle,
-      ) {}
-
-      override fun onActivityDestroyed(activity: Activity) {}
     }
 
   /**
@@ -2006,7 +2064,7 @@ class StripeSdkModule(
     // Timeout for auth webview fallback (if JavaScript doesn't call authWebViewDeepLinkHandled)
     private const val AUTH_WEBVIEW_FALLBACK_TIMEOUT_MS = 60_000L
 
-    private const val FILE_CLEANUP_DELAY_MS = 3000L
+    private const val FILE_CLEANUP_DELAY_MS = 3_000L
 
     // SDK-managed storage for pending stripe-connect:// URLs
     // This is static because deep links can arrive before ReactContext is available

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

@@ -62,6 +62,7 @@ class StripeSdkPackage : BaseReactPackage() {
       EmbeddedPaymentElementViewManager(),
       NavigationBarManager(),
       PaymentMethodMessagingElementViewManager(),
+      CurrencySelectorElementViewManager(),
     )
 
   private fun getOnrampModuleClass(): Class<out NativeModule?>? {

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

@@ -1,7 +1,6 @@
 package com.reactnativestripesdk.customersheet
 
 import android.app.Activity
-import android.app.Application
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.os.Handler
@@ -20,6 +19,7 @@ import com.reactnativestripesdk.buildPaymentSheetAppearance
 import com.reactnativestripesdk.convertDrawableToBase64
 import com.reactnativestripesdk.mapToCardBrandAcceptance
 import com.reactnativestripesdk.utils.CreateTokenErrorType
+import com.reactnativestripesdk.utils.DefaultActivityLifecycleCallbacks
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.KeepJsAwakeTask
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
@@ -224,7 +224,7 @@ class CustomerSheetManager(
   private fun presentWithTimeout(timeout: Long) {
     var activities: MutableList<Activity> = mutableListOf()
     val activityLifecycleCallbacks =
-      object : Application.ActivityLifecycleCallbacks {
+      object : DefaultActivityLifecycleCallbacks() {
         override fun onActivityCreated(
           activity: Activity,
           savedInstanceState: Bundle?,
@@ -232,20 +232,6 @@ class CustomerSheetManager(
           activities.add(activity)
         }
 
-        override fun onActivityStarted(activity: Activity) {}
-
-        override fun onActivityResumed(activity: Activity) {}
-
-        override fun onActivityPaused(activity: Activity) {}
-
-        override fun onActivityStopped(activity: Activity) {}
-
-        override fun onActivitySaveInstanceState(
-          activity: Activity,
-          outState: Bundle,
-        ) {
-        }
-
         override fun onActivityDestroyed(activity: Activity) {
           activities = mutableListOf()
           context.currentActivity?.application?.unregisterActivityLifecycleCallbacks(this)

package/android/src/main/java/com/reactnativestripesdk/utils/CheckoutMappers.kt

@@ -25,51 +25,70 @@ internal fun mapFromCheckoutState(
   }
 
 @OptIn(CheckoutSessionPreview::class)
-private fun mapFromCheckoutSession(
-  session: CheckoutSession,
-): WritableMap =
+private fun mapFromCheckoutSession(session: CheckoutSession): WritableMap =
   Arguments.createMap().apply {
     putString("id", session.id)
-    // TODO(CheckoutSessionsPreview): Populate from public Android checkout fields once
-    // stripe-android exposes status, paymentStatus, and livemode on CheckoutSession.
-    putString("status", "unknown")
-    putString("paymentStatus", "unknown")
     putBoolean("livemode", false)
 
     if (session.currency.isNotBlank()) {
       putString("currency", session.currency)
     }
 
-    session.totalSummary?.let { putMap("totals", mapFromCheckoutTotals(it)) }
-    putArray("lineItems", mapFromCheckoutLineItems(session))
-    putArray("shippingOptions", mapFromCheckoutShippingOptions(session))
+    putMap("status", mapFromStatus(session.status))
+    putMap("tax", mapFromTax(session.tax))
+    session.totalSummary?.let { putMap("total", mapFromTotal(it)) }
+
+    putArray("lineItems", mapFromLineItems(session))
+    putArray("shippingOptions", mapFromShippingOptions(session))
+    putArray("discountAmounts", Arguments.createArray())
+    putArray("currencyOptions", Arguments.createArray())
+  }
 
-    // TODO(CheckoutSessionsPreview): Populate top-level discounts once stripe-android
-    // exposes them directly instead of only exposing TotalSummary.discountAmounts.
-    putArray("discounts", Arguments.createArray())
+@OptIn(CheckoutSessionPreview::class)
+private fun mapFromStatus(status: CheckoutSession.Status): WritableMap =
+  Arguments.createMap().apply {
+    putString(
+        "type",
+        when (status) {
+      CheckoutSession.Status.Open -> "open"
+      CheckoutSession.Status.Complete -> "complete"
+      CheckoutSession.Status.Expired -> "expired"
+      else -> "unknown"
+    }
+    )
+  }
 
-    // TODO(CheckoutSessionsPreview): Populate customerId, customerEmail, billingAddress,
-    // and shippingAddress once stripe-android exposes them on public checkout models.
+@OptIn(CheckoutSessionPreview::class)
+private fun mapFromTax(tax: CheckoutSession.Tax): WritableMap =
+  Arguments.createMap().apply {
+    putString(
+        "status",
+        when (tax.status) {
+      CheckoutSession.Tax.Status.Ready -> "ready"
+      CheckoutSession.Tax.Status.RequiresShippingAddress -> "requiresShippingAddress"
+      CheckoutSession.Tax.Status.RequiresBillingAddress -> "requiresBillingAddress"
+      else -> "unknown"
+    }
+    )
   }
 
 @OptIn(CheckoutSessionPreview::class)
-private fun mapFromCheckoutTotals(totals: CheckoutSession.TotalSummary): WritableMap {
-  val taxTotal = totals.taxAmounts.sumOf { it.amount }
+private fun mapFromTotal(totals: CheckoutSession.TotalSummary): WritableMap =
+  Arguments.createMap().apply {
+    val taxTotal = totals.taxAmounts.sumOf { it.amount }
 
-  return Arguments.createMap().apply {
-    putDouble("subtotal", totals.subtotal.toDouble())
-    putDouble("total", totals.totalAmountDue.toDouble())
-    putDouble("due", totals.totalDueToday.toDouble())
-    // TODO(CheckoutSessionsPreview): Populate the top-level discount total once the
-    // Android TotalSummary model exposes it directly.
-    putDouble("discount", 0.0)
-    putDouble("shipping", (totals.shippingRate?.amount ?: 0L).toDouble())
-    putDouble("tax", taxTotal.toDouble())
+    putMap("subtotal", makeAmount(totals.subtotal))
+    putMap("taxExclusive", makeAmount(taxTotal))
+    putMap("taxInclusive", makeAmount(0L))
+    putMap("shippingRate", makeAmount(totals.shippingRate?.amount ?: 0L))
+    putMap("discount", makeAmount(0L))
+    putMap("total", makeAmount(totals.totalAmountDue))
+    putMap("appliedBalance", makeAmount(0L))
+    putBoolean("balanceAppliedToNextInvoice", false)
   }
-}
 
 @OptIn(CheckoutSessionPreview::class)
-private fun mapFromCheckoutLineItems(session: CheckoutSession): WritableArray =
+private fun mapFromLineItems(session: CheckoutSession): WritableArray =
   Arguments.createArray().apply {
     session.lineItems.forEach { item ->
       pushMap(
@@ -77,25 +96,32 @@ private fun mapFromCheckoutLineItems(session: CheckoutSession): WritableArray =
           putString("id", item.id)
           putString("name", item.name)
           putInt("quantity", item.quantity)
-          putDouble("unitAmount", (item.unitAmount ?: 0L).toDouble())
-          putString("currency", session.currency)
+          putArray("images", Arguments.createArray())
+          putArray("discountAmounts", Arguments.createArray())
+          putArray("taxAmounts", Arguments.createArray())
+          item.unitAmount?.let { putMap("unitAmount", makeAmount(it)) }
         },
       )
     }
   }
 
 @OptIn(CheckoutSessionPreview::class)
-private fun mapFromCheckoutShippingOptions(session: CheckoutSession): WritableArray =
+private fun mapFromShippingOptions(session: CheckoutSession): WritableArray =
   Arguments.createArray().apply {
     session.shippingOptions.forEach { option ->
       pushMap(
         Arguments.createMap().apply {
           putString("id", option.id)
           putString("displayName", option.displayName)
-          putDouble("amount", option.amount.toDouble())
+          putMap("amount", makeAmount(option.amount))
           putString("currency", session.currency)
-          option.deliveryEstimate?.let { putString("deliveryEstimate", it) }
         },
       )
     }
   }
+
+private fun makeAmount(minorUnits: Long): WritableMap =
+  Arguments.createMap().apply {
+    putString("amount", "")
+    putDouble("minorUnitsAmount", minorUnits.toDouble())
+  }

package/android/src/main/java/com/reactnativestripesdk/utils/DefaultActivityLifecycleCallbacks.kt

@@ -0,0 +1,41 @@
+package com.reactnativestripesdk.utils
+
+import android.app.Activity
+import android.app.Application
+import android.os.Bundle
+
+internal open class DefaultActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
+  override fun onActivityCreated(
+    activity: Activity,
+    savedInstanceState: Bundle?,
+  ) {
+    // NO-OP
+  }
+
+  override fun onActivityStarted(activity: Activity) {
+    // NO-OP
+  }
+
+  override fun onActivityResumed(activity: Activity) {
+    // NO-OP
+  }
+
+  override fun onActivityPaused(activity: Activity) {
+    // NO-OP
+  }
+
+  override fun onActivityStopped(activity: Activity) {
+    // NO-OP
+  }
+
+  override fun onActivitySaveInstanceState(
+    activity: Activity,
+    outState: Bundle,
+  ) {
+    // NO-OP
+  }
+
+  override fun onActivityDestroyed(activity: Activity) {
+    // NO-OP
+  }
+}

package/android/src/main/java/com/reactnativestripesdk/utils/Errors.kt

@@ -5,6 +5,7 @@ import com.facebook.react.bridge.WritableMap
 import com.stripe.android.core.exception.APIException
 import com.stripe.android.core.exception.AuthenticationException
 import com.stripe.android.core.exception.InvalidRequestException
+import com.stripe.android.core.exception.StripeException
 import com.stripe.android.exception.CardException
 import com.stripe.android.model.PaymentIntent
 import com.stripe.android.model.SetupIntent
@@ -173,6 +174,16 @@ internal fun createError(
         error.stripeError?.code,
       )
     }
+    is StripeException -> {
+      mapError(
+        code,
+        error.message,
+        error.localizedMessage,
+        error.stripeError?.declineCode,
+        error.stripeError?.type,
+        error.stripeError?.code
+      )
+    }
     else -> mapError(code, error.message, error.localizedMessage.orEmpty(), null, null, null)
   }
 
@@ -197,9 +208,3 @@ internal fun createMissingInitError(): WritableMap =
     "Stripe has not been initialized. Initialize Stripe in your app with the StripeProvider component " +
       "or the initStripe method.",
   )
-
-internal fun createOnrampNotConfiguredError(): WritableMap =
-  createError(
-    ErrorType.Failed.toString(),
-    "Onramp is not configured.",
-  )

package/android/src/oldarch/java/com/reactnativestripesdk/NativeOnrampSdkModuleSpec.java

@@ -17,9 +17,11 @@ import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public abstract class NativeOnrampSdkModuleSpec extends ReactContextBaseJavaModule implements TurboModule {
   public static final String NAME = "OnrampSdk";
@@ -57,6 +59,18 @@ public abstract class NativeOnrampSdkModuleSpec extends ReactContextBaseJavaModu
   @DoNotStrip
   public abstract void attachKycInfo(ReadableMap kycInfo, Promise promise);
 
+  @ReactMethod
+  @DoNotStrip
+  public abstract void retrieveMissingIdentifiers(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void submitIdentifiers(ReadableArray identifiers, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void presentUserAttestation(Promise promise);
+
   @ReactMethod
   @DoNotStrip
   public abstract void updatePhoneNumber(String phone, Promise promise);
@@ -71,7 +85,7 @@ public abstract class NativeOnrampSdkModuleSpec extends ReactContextBaseJavaModu
 
   @ReactMethod
   @DoNotStrip
-  public abstract void provideCheckoutClientSecret(String clientSecret);
+  public abstract void provideCheckoutClientSecret(@Nullable String clientSecret);
 
   @ReactMethod
   @DoNotStrip
@@ -91,11 +105,11 @@ public abstract class NativeOnrampSdkModuleSpec extends ReactContextBaseJavaModu
 
   @ReactMethod
   @DoNotStrip
-  public abstract void authenticateUserWithToken(String token, Promise promise);
+  public abstract void authenticateUserWithToken(String linkAuthTokenClientSecret, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void presentKycInfoVerification(ReadableMap updatedAddress, Promise promise);
+  public abstract void presentKycInfoVerification(@Nullable ReadableMap updatedAddress, Promise promise);
 
   @ReactMethod
   @DoNotStrip

package/android/src/oldarch/java/com/reactnativestripesdk/NativeStripeSdkModuleSpec.java

@@ -331,11 +331,11 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
 
   @ReactMethod
   @DoNotStrip
-  public abstract void checkoutUpdateTaxId(String sessionKey, String type, String value, Promise promise);
+  public abstract void checkoutRunServerUpdateStart(String sessionKey, Promise promise);
 
   @ReactMethod
   @DoNotStrip
-  public abstract void checkoutRefresh(String sessionKey, Promise promise);
+  public abstract void checkoutRunServerUpdateComplete(String sessionKey, @Nullable String error, Promise promise);
 
   @ReactMethod
   @DoNotStrip