@stripe/stripe-react-native 0.68.0 → 0.69.0

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.11.0
+StripeSdk_stripeVersion=23.12.0

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

@@ -0,0 +1,175 @@
+package com.reactnativestripesdk
+
+import androidx.activity.ComponentActivity
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.lifecycleScope
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+import com.reactnativestripesdk.utils.ErrorType
+import com.reactnativestripesdk.utils.createError
+import com.reactnativestripesdk.utils.mapFromPaymentMethod
+import com.stripe.android.link.LinkController
+import com.stripe.android.link.LinkControllerPreview
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+internal const val LINK_CONTROLLER_NOT_INITIALIZED_ERROR =
+    "LinkController has not been initialized. Call initLinkController first."
+
+/**
+ * Manages [LinkController] initialization and presentation for the React Native bridge.
+ *
+ * @PrivatePreview
+ */
+@OptIn(LinkControllerPreview::class)
+internal class LinkControllerManager(
+    private val context: ReactApplicationContext,
+    private val publishableKey: String,
+    private val stripeAccountId: String?,
+) {
+    private var linkController: LinkController? = null
+    private var linkPresenter: LinkController.Presenter? = null
+    private var presentPromise: Promise? = null
+
+    fun configure(params: ReadableMap, promise: Promise) {
+        val email = params.getString("email")
+        val merchantDisplayName = params.getString("merchantDisplayName")
+        if (merchantDisplayName == null) {
+            promise.resolve(createError(ErrorType.Failed.toString(), "merchantDisplayName is required."))
+            return
+        }
+
+        val activity = context.currentActivity as? ComponentActivity
+        if (activity == null) {
+            promise.resolve(createError(ErrorType.Failed.toString(), "Activity is not available. Retry this method."))
+            return
+        }
+
+        val phoneNumber = params.getString("phoneNumber")
+        val allowLogout = if (params.hasKey("allowLogout")) params.getBoolean("allowLogout") else true
+        val setupIntentClientSecret = params.getString("setupIntentClientSecret")
+
+        val supportedTypes = parseSupportedPaymentMethodTypes(params)
+
+        val config = LinkController.Configuration(
+            merchantDisplayName = merchantDisplayName,
+            publishableKey = publishableKey,
+            stripeAccountId = stripeAccountId
+        )
+            .also { if (email != null) it.email(email) }
+            .phoneNumber(phoneNumber)
+            .supportedPaymentMethodTypes(supportedTypes)
+            .allowLogout(allowLogout)
+            .setupIntentClientSecret(setupIntentClientSecret)
+
+        // Build a new controller if this is the first call or after a reset.
+        // SavedStateHandle() is empty — state will not survive process death, which is
+        // the same trade-off made by other Stripe RN SDK APIs.
+        if (linkController == null) {
+            linkController = LinkController.Builder(
+                application = activity.application,
+                savedStateHandle = SavedStateHandle()
+            ).build()
+        }
+
+        val controller = linkController!!
+
+        activity.lifecycleScope.launch {
+            val result = controller.configure(config)
+            if (result.isSuccess) {
+                // Create once: presenter may register ActivityResultLaunchers, which must happen before onStart().
+                if (linkPresenter == null) {
+                    linkPresenter = controller.createPresenter(
+                        activity = activity,
+                        presentCallback = { presentResult -> handlePresentResult(presentResult) }
+                    )
+                }
+                promise.resolve(Arguments.createMap())
+            } else {
+                promise.resolve(
+                    createError(
+                        ErrorType.Failed.toString(),
+                        result.exceptionOrNull()?.message ?: "LinkController configuration failed."
+                    )
+                )
+            }
+        }
+    }
+
+    fun present(promise: Promise) {
+        val presenter = linkPresenter
+        if (presenter == null) {
+            promise.resolve(createError(ErrorType.Failed.toString(), LINK_CONTROLLER_NOT_INITIALIZED_ERROR))
+            return
+        }
+
+        presentPromise = promise
+        presenter.present()
+    }
+
+    fun destroy() {
+        linkController = null
+        linkPresenter = null
+        presentPromise = null
+    }
+
+    private fun parseSupportedPaymentMethodTypes(params: ReadableMap): List<LinkController.PaymentMethodType>? =
+        params.getArray("supportedPaymentMethodTypes")?.let { arr ->
+            (0 until arr.size()).mapNotNull { i ->
+                when (arr.getString(i)) {
+                    "card" -> LinkController.PaymentMethodType.Card
+                    "bankAccount" -> LinkController.PaymentMethodType.BankAccount
+                    else -> null
+                }
+            }.ifEmpty { null }
+        }
+
+    private fun handlePresentResult(result: LinkController.PresentResult) {
+        val promise = presentPromise ?: return
+        val controller = linkController ?: return
+        when (result) {
+            is LinkController.PresentResult.Completed -> {
+                val response = Arguments.createMap()
+                response.putMap("paymentMethod", mapFromPaymentMethod(result.paymentMethod))
+
+                val preview = controller.paymentMethodPreview.value
+                val currentScope = (context.currentActivity as? ComponentActivity)?.lifecycleScope
+                if (preview != null && currentScope != null) {
+                    currentScope.launch {
+                        val iconBase64 = withContext(Dispatchers.IO) {
+                            try {
+                                convertDrawableToBase64(preview.icon)
+                            } catch (_: Exception) {
+                                null
+                            }
+                        }
+                        val previewMap = Arguments.createMap()
+                        previewMap.putString("label", preview.label)
+                        preview.sublabel?.let { previewMap.putString("sublabel", it) }
+                        if (iconBase64 != null) {
+                            previewMap.putString("icon", "data:image/png;base64,$iconBase64")
+                        }
+                        response.putMap("paymentMethodPreview", previewMap)
+                        promise.resolve(response)
+                    }
+                } else {
+                    promise.resolve(response)
+                }
+            }
+            is LinkController.PresentResult.Canceled -> {
+                promise.resolve(
+                    createError(
+                        ErrorType.Canceled.toString(),
+                        "The customer canceled the Link flow."
+                    )
+                )
+            }
+            is LinkController.PresentResult.Failed -> {
+                promise.resolve(createError(ErrorType.Failed.toString(), result.error))
+            }
+        }
+    }
+}

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

@@ -127,6 +127,7 @@ class StripeSdkModule(
   private val checkoutStateObservers = mutableMapOf<String, Job>()
 
   private var customerSheetManager: CustomerSheetManager? = null
+  private var linkControllerManager: LinkControllerManager? = null
 
   internal var embeddedIntentCreationCallback = CompletableDeferred<ReadableMap>()
   internal var embeddedConfirmationTokenCreationCallback = CompletableDeferred<ReadableMap>()
@@ -180,6 +181,8 @@ class StripeSdkModule(
     checkoutStateObservers.values.forEach { it.cancel() }
     checkoutStateObservers.clear()
     checkoutInstances.clear()
+    linkControllerManager?.destroy()
+    linkControllerManager = null
   }
 
   private fun registerStripeUIManager(uiManager: StripeUIManager) {
@@ -1798,30 +1801,6 @@ class StripeSdkModule(
     }
   }
 
-  override fun checkoutUpdateBillingAddress(
-    sessionKey: String,
-    address: ReadableMap,
-    name: String?,
-    phone: String?,
-    promise: Promise,
-  ) {
-    val addressUpdate = buildCheckoutAddressUpdate(name, phone, address) ?: run {
-      promise.reject(ErrorType.Failed.toString(), "A billing address country is required.")
-      return
-    }
-
-    performCheckoutMutation(
-      sessionKey = sessionKey,
-      promise = promise,
-    ) { checkout ->
-      checkout.updateBillingAddress(
-        name = addressUpdate.name,
-        phoneNumber = addressUpdate.phone,
-        address = addressUpdate.toCheckoutAddress(),
-      )
-    }
-  }
-
   override fun checkoutApplyPromotionCode(
     sessionKey: String,
     code: String,
@@ -2024,6 +2003,34 @@ class StripeSdkModule(
       }
     }
 
+  // LinkController - Private Preview
+
+  @ReactMethod
+  override fun initLinkController(
+    params: ReadableMap,
+    promise: Promise,
+  ) {
+    linkControllerManager?.destroy()
+    linkControllerManager = LinkControllerManager(
+      context = reactApplicationContext,
+      publishableKey = publishableKey,
+      stripeAccountId = stripeAccountId,
+    )
+    linkControllerManager?.configure(params, promise)
+  }
+
+  @ReactMethod
+  override fun presentLinkController(promise: Promise) {
+    val manager = linkControllerManager
+    if (manager == null) {
+      promise.resolve(createError(ErrorType.Failed.toString(), LINK_CONTROLLER_NOT_INITIALIZED_ERROR))
+      return
+    }
+    UiThreadUtil.runOnUiThread {
+      manager.present(promise)
+    }
+  }
+
   /**
    * React native apps do not properly handle activity re-creation so make
    * sure to dismiss any stripe ui when that happens to make sure apps stay

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

@@ -305,10 +305,6 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
   @DoNotStrip
   public abstract void checkoutUpdateShippingAddress(String sessionKey, ReadableMap address, @Nullable String name, @Nullable String phone, Promise promise);
 
-  @ReactMethod
-  @DoNotStrip
-  public abstract void checkoutUpdateBillingAddress(String sessionKey, ReadableMap address, @Nullable String name, @Nullable String phone, Promise promise);
-
   @ReactMethod
   @DoNotStrip
   public abstract void checkoutApplyPromotionCode(String sessionKey, String code, Promise promise);
@@ -333,6 +329,14 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
   @DoNotStrip
   public abstract void checkoutRunServerUpdateComplete(String sessionKey, @Nullable String error, Promise promise);
 
+  @ReactMethod
+  @DoNotStrip
+  public abstract void initLinkController(ReadableMap params, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void presentLinkController(Promise promise);
+
   @ReactMethod
   @DoNotStrip
   public abstract void addListener(String eventType);

package/android/src/onramp/java/com/reactnativestripesdk/OnrampErrors.kt

@@ -3,14 +3,12 @@
 package com.reactnativestripesdk
 
 import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.reactnativestripesdk.utils.ErrorType
 import com.stripe.android.core.exception.StripeException
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import com.stripe.android.crypto.onramp.exception.AppAttestationException
 import com.stripe.android.crypto.onramp.exception.CryptoOnrampApiException
-import com.stripe.android.crypto.onramp.exception.SDKVersion
 import com.stripe.android.crypto.onramp.exception.StripeCryptoOnrampError
 
 internal fun createOnrampFailedError(error: Throwable): WritableMap =
@@ -32,29 +30,26 @@ private fun createOnrampError(
 
   val stripeError = apiException.stripeError
   val onrampErrorType = apiException.toOnrampErrorType()
+  val apiErrorContext = apiException.apiErrorContext
 
   return createOnrampErrorMap(
     code = code,
     message = apiException.userMessage,
     localizedMessage = apiException.localizedMessage,
     declineCode = stripeError?.declineCode,
-    type = apiException.context.apiErrorType ?: stripeError?.type,
+    type = apiErrorContext.apiErrorType ?: stripeError?.type,
     stripeErrorCode = apiException.code,
   ) {
     putString("onrampErrorType", onrampErrorType)
     putString("developerMessage", apiException.developerMessage)
     putString("userMessage", apiException.userMessage)
-    putString("reason", apiException.context.reason)
-    putString("operation", apiException.context.operation)
-    putString("appPackageName", apiException.context.appPackageName)
-    putString("mode", apiException.context.mode)
-    putArray("sdkVersions", mapFromSdkVersions(apiException.sdkVersions))
-    putString("requestId", apiException.context.requestId)
-    putString("apiErrorCode", apiException.context.apiErrorCode)
-    putString("apiErrorType", apiException.context.apiErrorType)
-    putString("apiErrorMessage", apiException.context.apiErrorMessage)
-    putString("apiUserMessage", apiException.context.apiUserMessage)
-    putString("docUrl", apiException.context.docUrl)
+    putString("reason", apiErrorContext.reason)
+    putString("requestId", apiErrorContext.requestId)
+    putString("apiErrorCode", apiErrorContext.apiErrorCode)
+    putString("apiErrorType", apiErrorContext.apiErrorType)
+    putString("apiErrorMessage", apiErrorContext.apiErrorMessage)
+    putString("apiUserMessage", apiErrorContext.apiUserMessage)
+    putString("docUrl", apiErrorContext.docUrl)
   }
 }
 
@@ -129,17 +124,3 @@ private fun createOnrampErrorMap(
   map.putMap("error", details)
   return map
 }
-
-private fun mapFromSdkVersions(
-  sdkVersions: List<SDKVersion>,
-): WritableArray =
-  Arguments.createArray().apply {
-    sdkVersions.forEach { sdkVersion ->
-      pushMap(
-        Arguments.createMap().apply {
-          putString("name", sdkVersion.name)
-          putString("version", sdkVersion.version)
-        },
-      )
-    }
-  }

package/android/src/onramp/java/com/reactnativestripesdk/OnrampSdkModule.kt

@@ -1,4 +1,4 @@
-@file:OptIn(ExperimentalCryptoOnramp::class)
+@file:OptIn(ExperimentalCryptoOnramp::class, LinkControllerPreview::class)
 
 package com.reactnativestripesdk
 
@@ -52,6 +52,7 @@ import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodSelection
 import com.stripe.android.link.LinkController.PaymentMethodPreview
+import com.stripe.android.link.LinkControllerPreview
 import com.stripe.android.link.PaymentMethodPreviewDetails
 import com.stripe.android.model.CardBrand
 import com.stripe.android.model.DateOfBirth
@@ -65,7 +66,7 @@ import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 
 @SuppressLint("RestrictedApi")
-@OptIn(ExperimentalCryptoOnramp::class)
+@OptIn(ExperimentalCryptoOnramp::class, LinkControllerPreview::class)
 @ReactModule(name = NativeOnrampSdkModuleSpec.NAME)
 class OnrampSdkModule(
   reactContext: ReactApplicationContext,

package/android/src/test/java/com/reactnativestripesdk/OnrampErrorsTest.kt

@@ -52,17 +52,6 @@ class OnrampErrorsTest {
     assertEquals("api_error", details.getString("type"))
     assertEquals("api_error", details.getString("apiErrorType"))
     assertEquals("android_package_name_mismatch", details.getString("reason"))
-    assertEquals("configure", details.getString("operation"))
-    assertEquals("com.example.app", details.getString("appPackageName"))
-    assertEquals("test", details.getString("mode"))
-    val sdkVersions = details.getArray("sdkVersions")
-    assertNotNull(sdkVersions)
-    val stripeAndroidVersion = sdkVersions!!.getMap(0)
-    assertEquals("stripe-android", stripeAndroidVersion!!.getString("name"))
-    assertEquals("23.9.1", stripeAndroidVersion.getString("version"))
-    val reactNativeVersion = sdkVersions.getMap(1)
-    assertEquals("stripe-react-native", reactNativeVersion!!.getString("name"))
-    assertEquals("0.66.0", reactNativeVersion.getString("version"))
     assertEquals("req_attestation", details.getString("requestId"))
     assertEquals(
       "Attestation request could not be verified.",
@@ -81,7 +70,7 @@ class OnrampErrorsTest {
   fun createOnrampFailedError_withUncategorizedApiError_preservesStripeCodes() {
     val error =
       createOnrampException(
-        className = "com.stripe.android.crypto.onramp.exception.UncategorizedApiErrorException",
+        className = "com.stripe.android.crypto.onramp.exception.UncategorizedException",
         reason = "consumer_session_expired",
         operation = "authorize",
         appPackageName = "com.example.app",
@@ -104,7 +93,6 @@ class OnrampErrorsTest {
     assertEquals("authentication_error", details.getString("type"))
     assertEquals("Session expired. Please sign in again.", details.getString("message"))
     assertEquals("Session expired. Please sign in again.", details.getString("userMessage"))
-    assertEquals("authorize", details.getString("operation"))
     assertEquals("req_auth", details.getString("requestId"))
     assertTrue(details.getString("developerMessage")!!.contains("Code: consumer_session_expired"))
   }
@@ -135,9 +123,6 @@ class OnrampErrorsTest {
     val context =
       APIErrorContext(
         reason = reason,
-        operation = operation,
-        appPackageName = appPackageName,
-        mode = mode,
         apiErrorCode = apiErrorCode,
         apiErrorType = apiErrorType,
         apiErrorMessage = apiErrorMessage,
@@ -145,6 +130,23 @@ class OnrampErrorsTest {
         docUrl = docUrl,
         underlyingError = cause,
       )
+    val diagnosticContextClass =
+      Class.forName("com.stripe.android.crypto.onramp.exception.DiagnosticContext")
+    val diagnosticContext =
+      diagnosticContextClass
+        .getDeclaredConstructor(
+          List::class.java,
+          String::class.java,
+          String::class.java,
+          String::class.java,
+        ).apply {
+          isAccessible = true
+        }.newInstance(
+          sdkVersions,
+          operation,
+          appPackageName,
+          mode,
+        )
 
     // The exception classes in the `com.stripe.android.crypto.onramp.exception` package
     // don't have public constructors, so we use reflection to create instances for testing.
@@ -153,7 +155,7 @@ class OnrampErrorsTest {
         .forName(className)
         .getDeclaredConstructor(
           APIErrorContext::class.java,
-          List::class.java,
+          diagnosticContextClass,
           String::class.java,
         ).apply {
           isAccessible = true
@@ -161,7 +163,7 @@ class OnrampErrorsTest {
 
     return constructor.newInstance(
       context,
-      sdkVersions,
+      diagnosticContext,
       userMessage,
     ) as Exception
   }

package/ios/CurrencySelectorElementView.swift

@@ -110,7 +110,7 @@ public class StripeCurrencySelectorElementContainerView: UIView {
     /// so the caption-text changes after a currency selection are reflected
     /// in our reported height back to RN.
     private func subscribeForLayoutUpdates(on checkout: Checkout) {
-        sessionCancellable = checkout.$state
+        sessionCancellable = checkout.$session
             .dropFirst()
             .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in

package/ios/Mappers+Checkout.swift

@@ -12,10 +12,10 @@ extension Mappers {
 
     // MARK: - State & Session
 
-    class func mapFromCheckoutState(_ state: Checkout.State) -> NSDictionary {
+    class func mapFromCheckoutState(isLoading: Bool, session: Checkout.Session) -> NSDictionary {
         [
-            "status": state.isLoading ? "loading" : "loaded",
-            "session": mapFromCheckoutSession(state.session),
+            "status": isLoading ? "loading" : "loaded",
+            "session": mapFromCheckoutSession(session),
         ]
     }
 

package/ios/OnrampErrors.swift

@@ -61,10 +61,6 @@ enum OnrampErrors {
             stripeErrorCode: error.code,
             additionalFields: commonOnrampFields(error: error, onrampErrorType: onrampErrorType).merging([
                 "reason": error.reason,
-                "operation": error.operation,
-                "appPackageName": error.appIdentifier,
-                "mode": error.mode,
-                "sdkVersions": mapSDKVersions(error.sdkVersions),
                 "requestId": error.requestID,
                 "apiErrorCode": error.code,
                 "apiErrorType": error.type,
@@ -86,18 +82,9 @@ enum OnrampErrors {
         ]
     }
 
-    private static func mapSDKVersions(_ sdkVersions: [SDKVersion]) -> [[String: String]] {
-        return sdkVersions.map { sdkVersion in
-            [
-                "name": sdkVersion.name,
-                "version": sdkVersion.version,
-            ]
-        }
-    }
-
     private static func onrampErrorType(for error: StripeCryptoOnrampAPIError) -> String {
         switch error {
-        case is AppAttestationAPIError:
+        case is AppAttestationError:
             return "AppAttestationError"
         default:
             return "UncategorizedApiError"

package/ios/StripeSdk.mm

@@ -289,21 +289,6 @@ RCT_EXPORT_METHOD(checkoutUpdateShippingAddress:(nonnull NSString *)sessionKey
                                              rejecter:reject];
 }
 
-RCT_EXPORT_METHOD(checkoutUpdateBillingAddress:(nonnull NSString *)sessionKey
-                                       address:(nonnull NSDictionary *)address
-                                          name:(NSString *_Nullable)name
-                                         phone:(NSString *_Nullable)phone
-                                       resolve:(nonnull RCTPromiseResolveBlock)resolve
-                                        reject:(nonnull RCTPromiseRejectBlock)reject)
-{
-  [StripeSdkImpl.shared checkoutUpdateBillingAddress:sessionKey
-                                             address:address
-                                                name:name
-                                               phone:phone
-                                            resolver:resolve
-                                            rejecter:reject];
-}
-
 RCT_EXPORT_METHOD(checkoutApplyPromotionCode:(nonnull NSString *)sessionKey
                                         code:(nonnull NSString *)code
                                      resolve:(nonnull RCTPromiseResolveBlock)resolve
@@ -599,6 +584,21 @@ RCT_EXPORT_METHOD(createRadarSession:(nonnull RCTPromiseResolveBlock)resolve
   [StripeSdkImpl.shared createRadarSession:resolve rejecter:reject];
 }
 
+// LinkController - Private Preview
+
+RCT_EXPORT_METHOD(initLinkController:(nonnull NSDictionary *)params
+                            resolve:(nonnull RCTPromiseResolveBlock)resolve
+                             reject:(nonnull RCTPromiseRejectBlock)reject)
+{
+  [StripeSdkImpl.shared initLinkController:params resolver:resolve rejecter:reject];
+}
+
+RCT_EXPORT_METHOD(presentLinkController:(nonnull RCTPromiseResolveBlock)resolve
+                                 reject:(nonnull RCTPromiseRejectBlock)reject)
+{
+  [StripeSdkImpl.shared presentLinkController:resolve rejecter:reject];
+}
+
 /* clang-format on */
 
 #ifdef RCT_NEW_ARCH_ENABLED

package/ios/StripeSdkImpl+Checkout.swift

@@ -11,7 +11,7 @@ import Foundation
 
 extension StripeSdkImpl {
     internal func currentCheckoutStateResult(checkout: Checkout) -> NSDictionary {
-        Mappers.mapFromCheckoutState(checkout.state)
+        Mappers.mapFromCheckoutState(isLoading: checkout.isLoading, session: checkout.session)
     }
 
     @objc(initCheckoutSession:configuration:resolver:rejecter:)
@@ -21,7 +21,10 @@ extension StripeSdkImpl {
         resolver resolve: @escaping RCTPromiseResolveBlock,
         rejecter reject: @escaping RCTPromiseRejectBlock
     ) {
-        let checkoutConfiguration = buildCheckoutConfiguration(params: configuration)
+        let checkoutConfiguration = buildCheckoutConfiguration(
+            clientSecret: clientSecret,
+            params: configuration
+        )
 
         Task { @MainActor [weak self] in
             guard let self else {
@@ -30,18 +33,16 @@ extension StripeSdkImpl {
             }
 
             do {
-                let checkout = try await Checkout(
-                    clientSecret: clientSecret,
-                    configuration: checkoutConfiguration
-                )
+                let checkout = try await Checkout(configuration: checkoutConfiguration)
                 let sessionKey = UUID().uuidString
 
-                let cancellable = checkout.$state
+                let cancellable = checkout.$isLoading
+                    .combineLatest(checkout.$session)
                     .dropFirst()
-                    .sink { [weak self] state in
+                    .sink { [weak self] isLoading, session in
                         self?.emitter?.emitCheckoutSessionDidChangeState([
                             "sessionKey": sessionKey,
-                            "state": Mappers.mapFromCheckoutState(state),
+                            "state": Mappers.mapFromCheckoutState(isLoading: isLoading, session: session),
                         ])
                     }
 
@@ -84,32 +85,6 @@ extension StripeSdkImpl {
         }
     }
 
-    @objc(checkoutUpdateBillingAddress:address:name:phone:resolver:rejecter:)
-    public func checkoutUpdateBillingAddress(
-        sessionKey: String,
-        address: NSDictionary,
-        name: String?,
-        phone: String?,
-        resolver resolve: @escaping RCTPromiseResolveBlock,
-        rejecter reject: @escaping RCTPromiseRejectBlock
-    ) {
-        performCheckoutAddressMutation(
-            sessionKey: sessionKey,
-            address: address,
-            name: name,
-            phone: phone,
-            missingCountryMessage: "A billing address country is required.",
-            resolver: resolve,
-            rejecter: reject
-        ) { checkout, addressUpdate in
-            try await checkout.updateBillingAddress(
-                name: addressUpdate.name,
-                phone: addressUpdate.phone,
-                address: addressUpdate.address
-            )
-        }
-    }
-
     @objc(checkoutApplyPromotionCode:code:resolver:rejecter:)
     public func checkoutApplyPromotionCode(
         sessionKey: String,
@@ -234,8 +209,11 @@ extension StripeSdkImpl {
         resolve(nil)
     }
 
-    internal func buildCheckoutConfiguration(params: NSDictionary) -> Checkout.Configuration {
-        var configuration = Checkout.Configuration()
+    internal func buildCheckoutConfiguration(
+        clientSecret: String,
+        params: NSDictionary
+    ) -> Checkout.Configuration {
+        var configuration = Checkout.Configuration(clientSecret: clientSecret)
 
         if let adaptivePricing = params["adaptivePricing"] as? NSDictionary,
            let allowed = adaptivePricing["allowed"] as? Bool {
@@ -329,8 +307,6 @@ extension StripeSdkImpl {
             switch checkoutError {
             case .invalidClientSecret:
                 return "InvalidClientSecret"
-            case .sessionNotOpen:
-                return "SessionNotOpen"
             case .sheetCurrentlyPresented:
                 return "SheetCurrentlyPresented"
             default: