@stripe/stripe-react-native 0.65.1 → 0.66.0

package/android/detekt/detekt-baseline.xml

@@ -11,16 +11,6 @@
     <ID>CyclomaticComplexMethod:Mappers.kt:internal fun mapToPaymentMethodType: PaymentMethod.Type?</ID>
     <ID>CyclomaticComplexMethod:PaymentMethodCreateParamsFactory.kt:PaymentMethodCreateParamsFactory$@Throws(PaymentMethodCreateParamsException::class) fun createPaymentMethodParams: PaymentMethodCreateParams</ID>
     <ID>CyclomaticComplexMethod:PaymentSheetAppearance.kt:@SuppressLint("RestrictedApi") @Throws(PaymentSheetAppearanceException::class) private fun buildEmbeddedAppearance: PaymentSheet.Appearance.Embedded</ID>
-    <ID>EmptyFunctionBlock:CardFieldView.kt:CardFieldView.&lt;no name provided>${ }</ID>
-    <ID>EmptyFunctionBlock:CardFieldView.kt:CardFieldView.&lt;no name provided>${}</ID>
-    <ID>EmptyFunctionBlock:CustomerSheetManager.kt:CustomerSheetManager.&lt;no name provided>${ }</ID>
-    <ID>EmptyFunctionBlock:CustomerSheetManager.kt:CustomerSheetManager.&lt;no name provided>${}</ID>
-    <ID>EmptyFunctionBlock:DrawableLoadingTest.kt:DrawableLoadingTest.MockAsyncDrawable${}</ID>
-    <ID>EmptyFunctionBlock:PaymentSheetManager.kt:&lt;no name provided>${}</ID>
-    <ID>EmptyFunctionBlock:PaymentSheetManager.kt:PaymentSheetManager.&lt;no name provided>${ }</ID>
-    <ID>EmptyFunctionBlock:PaymentSheetManager.kt:PaymentSheetManager.&lt;no name provided>${}</ID>
-    <ID>EmptyFunctionBlock:StripeAbstractComposeView.kt:StripeAbstractComposeView.CompatView${ }</ID>
-    <ID>EmptyFunctionBlock:StripeSdkModule.kt:StripeSdkModule.&lt;no name provided>${}</ID>
     <ID>ForbiddenComment:Mappers.kt:// TODO: Can't access, private</ID>
     <ID>ForbiddenComment:PaymentSheetAppearance.kt:// TODO: The theme is so crazy long, why does each Color thing has the same redundant Theme...</ID>
     <ID>ForbiddenComment:PaymentSheetAppearance.kt:// TODO: Why is background a string but successBackgroundColor a "dynamic" color?</ID>

package/android/gradle.properties

@@ -3,4 +3,4 @@ StripeSdk_compileSdkVersion=36
 StripeSdk_targetSdkVersion=36
 StripeSdk_minSdkVersion=23
 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties
-StripeSdk_stripeVersion=23.6.+
+StripeSdk_stripeVersion=23.9.+

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

@@ -367,32 +367,10 @@ class CardFieldView(
       }
     }
 
-    mCardWidget.setCardInputListener(
-      object : CardInputListener {
-        override fun onCardComplete() {}
-
-        override fun onExpirationComplete() {}
-
-        override fun onCvcComplete() {}
-
-        override fun onPostalCodeComplete() {}
-
-        override fun onFocusChange(focusField: CardInputListener.FocusField) {}
-      },
-    )
+    mCardWidget.setCardInputListener(DefaultCardInputListener())
 
     mCardWidget.setExpiryDateTextWatcher(
-      object : TextWatcher {
-        override fun beforeTextChanged(
-          p0: CharSequence?,
-          p1: Int,
-          p2: Int,
-          p3: Int,
-        ) {
-        }
-
-        override fun afterTextChanged(p0: Editable?) {}
-
+      object : DefaultTextWatcher() {
         override fun onTextChanged(
           var1: CharSequence?,
           var2: Int,
@@ -410,17 +388,7 @@ class CardFieldView(
     )
 
     mCardWidget.setPostalCodeTextWatcher(
-      object : TextWatcher {
-        override fun beforeTextChanged(
-          p0: CharSequence?,
-          p1: Int,
-          p2: Int,
-          p3: Int,
-        ) {
-        }
-
-        override fun afterTextChanged(p0: Editable?) {}
-
+      object : DefaultTextWatcher() {
         override fun onTextChanged(
           var1: CharSequence?,
           var2: Int,
@@ -433,17 +401,7 @@ class CardFieldView(
     )
 
     mCardWidget.setCardNumberTextWatcher(
-      object : TextWatcher {
-        override fun beforeTextChanged(
-          p0: CharSequence?,
-          p1: Int,
-          p2: Int,
-          p3: Int,
-        ) {
-        }
-
-        override fun afterTextChanged(p0: Editable?) {}
-
+      object : DefaultTextWatcher() {
         override fun onTextChanged(
           var1: CharSequence?,
           var2: Int,
@@ -458,17 +416,7 @@ class CardFieldView(
     )
 
     mCardWidget.setCvcNumberTextWatcher(
-      object : TextWatcher {
-        override fun beforeTextChanged(
-          p0: CharSequence?,
-          p1: Int,
-          p2: Int,
-          p3: Int,
-        ) {
-        }
-
-        override fun afterTextChanged(p0: Editable?) {}
-
+      object : DefaultTextWatcher() {
         override fun onTextChanged(
           var1: CharSequence?,
           var2: Int,
@@ -534,4 +482,50 @@ class CardFieldView(
   private companion object {
     const val CARD_WIDGET_HORIZONTAL_PADDING = 20
   }
+
+  private open class DefaultTextWatcher : TextWatcher {
+    override fun beforeTextChanged(
+      p0: CharSequence?,
+      p1: Int,
+      p2: Int,
+      p3: Int,
+    ) {
+      // NO-OP
+    }
+
+    override fun afterTextChanged(p0: Editable?) {
+      // NO-OP
+    }
+
+    override fun onTextChanged(
+      var1: CharSequence?,
+      var2: Int,
+      var3: Int,
+      var4: Int,
+    ) {
+      // NO-OP
+    }
+  }
+
+  private open class DefaultCardInputListener : CardInputListener {
+    override fun onCardComplete() {
+      // NO-OP
+    }
+
+    override fun onExpirationComplete() {
+      // NO-OP
+    }
+
+    override fun onCvcComplete() {
+      // NO-OP
+    }
+
+    override fun onPostalCodeComplete() {
+      // NO-OP
+    }
+
+    override fun onFocusChange(focusField: CardInputListener.FocusField) {
+      // NO-OP
+    }
+  }
 }

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

@@ -0,0 +1,26 @@
+package com.reactnativestripesdk
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+internal class CurrencySelectorElementEvent(
+  surfaceId: Int,
+  viewTag: Int,
+  private val eventType: EventType,
+  private val eventMap: WritableMap?,
+) : Event<CurrencySelectorElementEvent>(surfaceId, viewTag) {
+  enum class EventType {
+    OnHeightChange,
+  }
+
+  override fun getEventData() = eventMap
+
+  companion object {
+    const val ON_HEIGHT_CHANGE = "topHeightChange"
+  }
+
+  override fun getEventName(): String =
+    when (eventType) {
+      EventType.OnHeightChange -> ON_HEIGHT_CHANGE
+    }
+}

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

@@ -1,26 +1,139 @@
 package com.reactnativestripesdk
 
 import android.annotation.SuppressLint
-import android.widget.FrameLayout
-import com.facebook.react.uimanager.ThemedReactContext
-
-/**
- * Minimal stub so the JS-side `CurrencySelectorElement` codegen mapping
- * resolves at app launch. The full Compose-based implementation that hosts
- * `Checkout.CurrencySelectorContent()` lives on the feature branch and will
- * replace this once that lands.
- */
-@SuppressLint("ViewConstructor")
+import android.content.Context
+import androidx.compose.foundation.layout.Box
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.layout
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.dp
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.UIManagerHelper
+import com.stripe.android.paymentelement.CheckoutSessionPreview
+
+@OptIn(CheckoutSessionPreview::class)
 class CurrencySelectorElementView(
-  context: ThemedReactContext,
-) : FrameLayout(context) {
-  @Suppress("UnusedParameter")
+  context: Context,
+) : StripeAbstractComposeView(context) {
+  private val reactContext get() = context as ReactContext
+
+  // Backing state for props. mutableStateOf so Compose recomposes on changes.
+  private var sessionKeyState = mutableStateOf<String?>(null)
+  private var disabledState = mutableStateOf(false)
+
   fun setSessionKey(value: String?) {
-    // no-op stub
+    sessionKeyState.value = value?.takeIf { it.isNotEmpty() }
   }
 
-  @Suppress("UnusedParameter")
   fun setDisabled(value: Boolean) {
-    // no-op stub
+    disabledState.value = value
+  }
+
+  @SuppressLint("RestrictedApi")
+  @Composable
+  override fun Content() {
+    val sessionKey by remember { sessionKeyState }
+    val disabled by remember { disabledState }
+
+    val checkout = remember(sessionKey) {
+      sessionKey?.let { key ->
+        val module = reactContext.getNativeModule(StripeSdkModule::class.java)
+        module?.checkoutInstances?.get(key)
+      }
+    }
+
+    if (checkout != null) {
+      // We don't push state to JS from this view — `StripeSdkModule` already
+      // observes the same `Checkout` instance and emits a unified
+      // `checkoutSessionDidChangeState` event that `useCheckout` mirrors into
+      // its `state`. Keeping the bridge in one place avoids redundant
+      // round-trips and inconsistencies.
+      MeasuredCurrencySelector(
+        reportHeightChange = { reportHeightChange(it) },
+      ) {
+        Box {
+          checkout.CurrencySelectorContent()
+          if (disabled) {
+            // The Stripe Android composable doesn't yet expose an `isEnabled`
+            // parameter, so swallow taps with a transparent pointer-input
+            // overlay while `disabled` is true. The toggle stays visible but
+            // can't be interacted with.
+            Box(
+              Modifier
+                .matchParentSize()
+                .pointerInput(Unit) { /* consume all gestures */ },
+            )
+          }
+        }
+      }
+    } else {
+      // No checkout yet: take up zero height so the element collapses.
+      LaunchedEffect(Unit) {
+        reportHeightChange(0f)
+      }
+    }
+  }
+
+  @Composable
+  private fun MeasuredCurrencySelector(
+    reportHeightChange: (Float) -> Unit,
+    content: @Composable () -> Unit,
+  ) {
+    val density = LocalDensity.current
+    var heightDp by remember { mutableStateOf(1.dp) } // non-zero sentinel
+
+    Box(
+      Modifier
+        .onSizeChanged { size ->
+          val h = with(density) { size.height.toDp() }
+          if (h != heightDp) {
+            heightDp = h
+            reportHeightChange(h.value)
+          }
+        }
+        .layout { measurable, constraints ->
+          val widthPx = constraints.maxWidth
+          val minHpx = measurable.minIntrinsicHeight(widthPx).coerceAtLeast(0)
+
+          val placeable = measurable.measure(
+            constraints.copy(minHeight = minHpx, maxHeight = minHpx),
+          )
+
+          layout(constraints.maxWidth, placeable.height) {
+            placeable.placeRelative(IntOffset.Zero)
+          }
+        },
+    ) {
+      content()
+    }
+  }
+
+  private fun reportHeightChange(height: Float) {
+    val params = Arguments.createMap().apply {
+      putDouble("height", height.toDouble())
+    }
+    dispatchEvent(CurrencySelectorElementEvent.EventType.OnHeightChange, params)
+  }
+
+  private fun dispatchEvent(
+    eventType: CurrencySelectorElementEvent.EventType,
+    params: WritableMap,
+  ) {
+    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, id)
+    val surfaceId = UIManagerHelper.getSurfaceId(reactContext)
+    dispatcher?.dispatchEvent(
+      CurrencySelectorElementEvent(surfaceId, id, eventType, params),
+    )
   }
 }

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

@@ -6,7 +6,9 @@ import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.StripeCurrencySelectorElementManagerDelegate
 import com.facebook.react.viewmanagers.StripeCurrencySelectorElementManagerInterface
+import com.stripe.android.paymentelement.CheckoutSessionPreview
 
+@OptIn(CheckoutSessionPreview::class)
 @ReactModule(name = CurrencySelectorElementViewManager.NAME)
 class CurrencySelectorElementViewManager :
   ViewGroupManager<CurrencySelectorElementView>(),
@@ -24,11 +26,26 @@ class CurrencySelectorElementViewManager :
   override fun createViewInstance(ctx: ThemedReactContext): CurrencySelectorElementView =
     CurrencySelectorElementView(ctx)
 
+  override fun onDropViewInstance(view: CurrencySelectorElementView) {
+    super.onDropViewInstance(view)
+    view.handleOnDropViewInstance()
+  }
+
+  override fun needsCustomLayoutForChildren(): Boolean = true
+
+  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
+    mutableMapOf(
+      CurrencySelectorElementEvent.ON_HEIGHT_CHANGE to
+        mutableMapOf("registrationName" to "onHeightChange"),
+    )
+
   @ReactProp(name = "sessionKey")
   override fun setSessionKey(
     view: CurrencySelectorElementView,
     value: String?,
   ) {
+    // Codegen marks `sessionKey` as required, but it can briefly arrive as
+    // null when the view is recycled. Treat empty/null the same.
     view.setSessionKey(value)
   }
 

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

@@ -103,4 +103,8 @@ class EventEmitterCompat(
   fun emitOnCheckoutClientSecretRequested(value: ReadableMap?) {
     invoke("onCheckoutClientSecretRequested", value)
   }
+
+  fun emitCheckoutSessionDidChangeState(value: ReadableMap?) {
+    invoke("checkoutSessionDidChangeState", value)
+  }
 }

package/android/src/main/java/com/reactnativestripesdk/PaymentSheetManager.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.graphics.Bitmap
 import android.graphics.Canvas
@@ -21,6 +20,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.reactnativestripesdk.addresssheet.AddressSheetView
+import com.reactnativestripesdk.utils.DefaultActivityLifecycleCallbacks
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.KeepJsAwakeTask
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
@@ -63,7 +63,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeoutOrNull
 import java.io.ByteArrayOutputStream
-import kotlin.Exception
 import kotlin.coroutines.resume
 
 @OptIn(
@@ -468,7 +467,7 @@ class PaymentSheetManager(
     var paymentSheetActivity: Activity? = null
 
     val activityLifecycleCallbacks =
-      object : Application.ActivityLifecycleCallbacks {
+      object : DefaultActivityLifecycleCallbacks() {
         override fun onActivityCreated(
           activity: Activity,
           savedInstanceState: Bundle?,
@@ -480,20 +479,6 @@ class PaymentSheetManager(
           }
         }
 
-        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) {
           if (activity.javaClass.name == PAYMENT_SHEET_ACTIVITY ||
             activity.javaClass.name == PAYMENT_OPTIONS_ACTIVITY
@@ -702,12 +687,16 @@ suspend fun waitForDrawableToLoad(
             who: Drawable,
             what: Runnable,
             `when`: Long,
-          ) {}
+          ) {
+            // NO-OP
+          }
 
           override fun unscheduleDrawable(
             who: Drawable,
             what: Runnable,
-          ) {}
+          ) {
+            // NO-OP
+          }
         }
 
       drawable.callback = callback

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

@@ -64,6 +64,7 @@ abstract class StripeAbstractComposeView(
 
     @Composable
     override fun Content() {
+      // NO-OP
     }
   }
 

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 {
@@ -1866,13 +1880,48 @@ class StripeSdkModule(
     }
   }
 
-  override fun checkoutRefresh(
+  override fun checkoutRunServerUpdateStart(
     sessionKey: String,
     promise: Promise,
   ) {
-    performCheckoutMutation(sessionKey, promise) { checkout ->
-      checkout.refresh()
+    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 checkoutRunServerUpdateComplete(
+    sessionKey: String,
+    error: String?,
+    promise: Promise,
+  ) {
+    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 +1933,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 +2009,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 +2035,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 +2075,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