@stripe/stripe-react-native 0.55.0 → 0.56.0

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

@@ -13,6 +13,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.reactnativestripesdk.ReactNativeCustomerAdapter
+import com.reactnativestripesdk.ReactNativeCustomerSessionProvider
 import com.reactnativestripesdk.buildPaymentSheetAppearance
 import com.reactnativestripesdk.getBase64FromBitmap
 import com.reactnativestripesdk.getBitmapFromDrawable
@@ -34,15 +35,17 @@ import com.stripe.android.customersheet.CustomerSheet
 import com.stripe.android.customersheet.CustomerSheetResult
 import com.stripe.android.customersheet.PaymentOptionSelection
 import com.stripe.android.model.PaymentMethod
+import com.stripe.android.paymentsheet.ExperimentalCustomerSessionApi
 import com.stripe.android.paymentsheet.PaymentSheet
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class)
+@OptIn(ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class, ExperimentalCustomerSessionApi::class)
 class CustomerSheetFragment : StripeFragment() {
   private var customerSheet: CustomerSheet? = null
   internal var customerAdapter: ReactNativeCustomerAdapter? = null
+  internal var customerSessionProvider: ReactNativeCustomerSessionProvider? = null
   internal var context: ReactApplicationContext? = null
   internal var initPromise: Promise? = null
   private var presentPromise: Promise? = null
@@ -73,28 +76,9 @@ class CustomerSheetFragment : StripeFragment() {
     val googlePayEnabled = arguments?.getBoolean("googlePayEnabled") ?: false
     val billingDetailsBundle = arguments?.getBundle("defaultBillingDetails")
     val billingConfigParams = arguments?.getBundle("billingDetailsCollectionConfiguration")
-    val setupIntentClientSecret = arguments?.getString("setupIntentClientSecret")
-    val customerId = arguments?.getString("customerId")
-    val customerEphemeralKeySecret = arguments?.getString("customerEphemeralKeySecret")
-    val customerAdapterOverrideParams = arguments?.getBundle("customerAdapter")
     val allowsRemovalOfLastSavedPaymentMethod =
       arguments?.getBoolean("allowsRemovalOfLastSavedPaymentMethod", true) ?: true
     val paymentMethodOrder = arguments?.getStringArrayList("paymentMethodOrder")
-    if (customerId == null) {
-      initPromise.resolve(
-        createError(ErrorType.Failed.toString(), "You must provide a value for `customerId`"),
-      )
-      return
-    }
-    if (customerEphemeralKeySecret == null) {
-      initPromise.resolve(
-        createError(
-          ErrorType.Failed.toString(),
-          "You must provide a value for `customerEphemeralKeySecret`",
-        ),
-      )
-      return
-    }
 
     val appearance =
       try {
@@ -125,21 +109,62 @@ class CustomerSheetFragment : StripeFragment() {
       )
     }
 
-    val customerAdapter =
-      createCustomerAdapter(
-        context,
-        customerId,
-        customerEphemeralKeySecret,
-        setupIntentClientSecret,
-        customerAdapterOverrideParams,
-      ).also { this.customerAdapter = it }
-
-    customerSheet =
-      CustomerSheet.create(
-        fragment = this,
-        customerAdapter = customerAdapter,
-        callback = ::handleResult,
+    val customerEphemeralKeySecret = arguments?.getString("customerEphemeralKeySecret")
+    val intentConfiguration = createIntentConfiguration(arguments?.getBundle("intentConfiguration"))
+    if (customerEphemeralKeySecret == null && intentConfiguration == null) {
+      initPromise.resolve(
+        createError(
+          ErrorType.Failed.toString(),
+          "You must provide either `customerEphemeralKeySecret` or `intentConfiguration`",
+        ),
       )
+      return
+    } else if (customerEphemeralKeySecret == null) {
+      val customerSessionProvider =
+        ReactNativeCustomerSessionProvider(
+          context = context,
+          intentConfiguration = intentConfiguration!!,
+        ).also { this.customerSessionProvider = it }
+
+      customerSheet =
+        CustomerSheet.create(
+          fragment = this,
+          customerSessionProvider = customerSessionProvider,
+          callback = ::handleResult,
+        )
+    } else if (intentConfiguration == null) {
+      val customerId = arguments?.getString("customerId")
+      if (customerId == null) {
+        initPromise.resolve(
+          createError(ErrorType.Failed.toString(), "When using `customerEphemeralKeySecret` you must provide a value for `customerId`"),
+        )
+        return
+      }
+      val setupIntentClientSecret = arguments?.getString("setupIntentClientSecret")
+      val customerAdapterOverrideParams = arguments?.getBundle("customerAdapter")
+      val customerAdapter =
+        createCustomerAdapter(
+          context,
+          customerId!!,
+          customerEphemeralKeySecret,
+          setupIntentClientSecret,
+          customerAdapterOverrideParams,
+        ).also { this.customerAdapter = it }
+
+      customerSheet =
+        CustomerSheet.create(
+          fragment = this,
+          customerAdapter = customerAdapter,
+          callback = ::handleResult,
+        )
+    } else {
+      initPromise.resolve(
+        createError(
+          ErrorType.Failed.toString(),
+          "You must provide either `customerEphemeralKeySecret` or `intentConfiguration`, but not both",
+        ),
+      )
+    }
 
     customerSheet?.configure(configuration.build())
 
@@ -389,6 +414,19 @@ class CustomerSheetFragment : StripeFragment() {
       return paymentOptionResult
     }
 
+    internal fun createIntentConfiguration(intentConfigurationBundle: Bundle?): CustomerSheet.IntentConfiguration? =
+      intentConfigurationBundle?.let { bundle ->
+        val onBehalfOf = bundle?.getString("onBehalfOf")
+        CustomerSheet.IntentConfiguration
+          .Builder()
+          .paymentMethodTypes(bundle?.getStringArrayList("paymentMethodTypes") ?: emptyList())
+          .apply {
+            if (onBehalfOf != null) {
+              this.onBehalfOf(onBehalfOf!!)
+            }
+          }.build()
+      }
+
     private fun buildResult(
       label: String,
       drawable: Drawable,

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

@@ -0,0 +1,37 @@
+package com.reactnativestripesdk
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.stripe.android.customersheet.CustomerSheet
+import com.stripe.android.paymentsheet.ExperimentalCustomerSessionApi
+import kotlinx.coroutines.CompletableDeferred
+
+@OptIn(ExperimentalCustomerSessionApi::class)
+class ReactNativeCustomerSessionProvider(
+  val context: ReactApplicationContext,
+  val intentConfiguration: CustomerSheet.IntentConfiguration,
+) : CustomerSheet.CustomerSessionProvider() {
+  private val stripeSdkModule = context.getNativeModule(StripeSdkModule::class.java)
+
+  internal var provideSetupIntentClientSecretCallback: CompletableDeferred<String>? = null
+  internal var providesCustomerSessionClientSecretCallback: CompletableDeferred<CustomerSheet.CustomerSessionClientSecret>? = null
+
+  override suspend fun intentConfiguration(): Result<CustomerSheet.IntentConfiguration> = Result.success(intentConfiguration)
+
+  override suspend fun provideSetupIntentClientSecret(customerId: String): Result<String> {
+    CompletableDeferred<String>().also {
+      provideSetupIntentClientSecretCallback = it
+      stripeSdkModule?.eventEmitter?.emitOnCustomerSessionProviderSetupIntentClientSecret()
+      val resultFromJavascript = it.await()
+      return Result.success(resultFromJavascript)
+    }
+  }
+
+  override suspend fun providesCustomerSessionClientSecret(): Result<CustomerSheet.CustomerSessionClientSecret> {
+    CompletableDeferred<CustomerSheet.CustomerSessionClientSecret>().also {
+      providesCustomerSessionClientSecretCallback = it
+      stripeSdkModule?.eventEmitter?.emitOnCustomerSessionProviderCustomerSessionClientSecret()
+      val resultFromJavascript = it.await()
+      return Result.success(resultFromJavascript)
+    }
+  }
+}

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

@@ -18,6 +18,7 @@ import com.stripe.android.model.BankAccountTokenParams
 import com.stripe.android.model.Card
 import com.stripe.android.model.CardBrand
 import com.stripe.android.model.ConfirmPaymentIntentParams
+import com.stripe.android.model.ConfirmationToken
 import com.stripe.android.model.GooglePayResult
 import com.stripe.android.model.MicrodepositType
 import com.stripe.android.model.PaymentIntent
@@ -152,6 +153,7 @@ internal fun mapPaymentMethodType(type: PaymentMethod.Type?): String =
     PaymentMethod.Type.Affirm -> "Affirm"
     PaymentMethod.Type.CashAppPay -> "CashApp"
     PaymentMethod.Type.RevolutPay -> "RevolutPay"
+    PaymentMethod.Type.Link -> "Link"
     else -> "Unknown"
   }
 
@@ -183,6 +185,7 @@ internal fun mapToPaymentMethodType(type: String?): PaymentMethod.Type? =
     "Affirm" -> PaymentMethod.Type.Affirm
     "CashApp" -> PaymentMethod.Type.CashAppPay
     "RevolutPay" -> PaymentMethod.Type.RevolutPay
+    "Link" -> PaymentMethod.Type.Link
     else -> null
   }
 
@@ -561,6 +564,7 @@ internal fun mapNextAction(
     NextActionType.UseStripeSdk,
     NextActionType.UpiAwaitNotification,
     NextActionType.DisplayPayNowDetails,
+    NextActionType.DisplayPromptPayDetails,
     null,
     -> {
       return null
@@ -1028,7 +1032,16 @@ internal fun mapToPreferredNetworks(networksAsInts: ArrayList<Int>?): List<CardB
 internal fun mapFromFinancialConnectionsEvent(event: FinancialConnectionsEvent): WritableMap =
   Arguments.createMap().apply {
     putString("name", event.name.value)
-    putMap("metadata", event.metadata.toMap().toReadableMap())
+
+    // We require keys to use pascal case, but the original map uses snake case.
+    val tweakedMap =
+      buildMap {
+        put("institutionName", event.metadata.institutionName)
+        put("manualEntry", event.metadata.manualEntry)
+        put("errorCode", event.metadata.errorCode)
+      }
+
+    putMap("metadata", tweakedMap.toReadableMap())
   }
 
 private fun List<Any?>.toWritableArray(): WritableArray {
@@ -1118,3 +1131,73 @@ internal fun mapFromCustomPaymentMethod(
     )
     putMap("billingDetails", mapFromBillingDetails(billingDetails))
   }
+
+@SuppressLint("RestrictedApi")
+internal fun mapFromConfirmationToken(confirmationToken: ConfirmationToken): WritableMap {
+  val token: WritableMap = WritableNativeMap()
+
+  token.putString("id", confirmationToken.id)
+  token.putDouble("created", confirmationToken.created.toDouble())
+  token.putDouble("expiresAt", confirmationToken.expiresAt?.toDouble() ?: 0.0)
+  token.putBoolean("liveMode", confirmationToken.liveMode)
+  token.putString("paymentIntentId", confirmationToken.paymentIntentId)
+  token.putString("setupIntentId", confirmationToken.setupIntentId)
+  token.putString("returnURL", confirmationToken.returnUrl)
+  token.putString("setupFutureUsage", mapFromSetupFutureUsage(confirmationToken.setupFutureUsage))
+
+  // PaymentMethodPreview
+  confirmationToken.paymentMethodPreview?.let { preview ->
+    val paymentMethodPreview = WritableNativeMap()
+    paymentMethodPreview.putString("type", mapPaymentMethodType(preview.type))
+    paymentMethodPreview.putMap("billingDetails", mapFromBillingDetails(preview.billingDetails))
+    paymentMethodPreview.putString("allowRedisplay", mapFromAllowRedisplay(preview.allowRedisplay))
+    paymentMethodPreview.putString("customerId", preview.customerId)
+    token.putMap("paymentMethodPreview", paymentMethodPreview)
+  } ?: run {
+    token.putNull("paymentMethodPreview")
+  }
+
+  // Shipping details
+  confirmationToken.shipping?.let { shippingDetails ->
+    val shipping = WritableNativeMap()
+    shipping.putString("name", shippingDetails.name)
+    shipping.putString("phone", shippingDetails.phone)
+
+    shippingDetails.address?.let { address ->
+      val addressMap = WritableNativeMap()
+      addressMap.putString("city", address.city)
+      addressMap.putString("country", address.country)
+      addressMap.putString("line1", address.line1)
+      addressMap.putString("line2", address.line2)
+      addressMap.putString("postalCode", address.postalCode)
+      addressMap.putString("state", address.state)
+      shipping.putMap("address", addressMap)
+    } ?: run {
+      shipping.putMap("address", WritableNativeMap())
+    }
+
+    token.putMap("shipping", shipping)
+  } ?: run {
+    token.putNull("shipping")
+  }
+
+  return token
+}
+
+@SuppressLint("RestrictedApi")
+private fun mapFromSetupFutureUsage(setupFutureUsage: ConfirmPaymentIntentParams.SetupFutureUsage?): String? =
+  when (setupFutureUsage) {
+    ConfirmPaymentIntentParams.SetupFutureUsage.OnSession -> "on_session"
+    ConfirmPaymentIntentParams.SetupFutureUsage.OffSession -> "off_session"
+    ConfirmPaymentIntentParams.SetupFutureUsage.Blank -> ""
+    ConfirmPaymentIntentParams.SetupFutureUsage.None -> "none"
+    null -> null
+  }
+
+private fun mapFromAllowRedisplay(allowRedisplay: PaymentMethod.AllowRedisplay?): String? =
+  when (allowRedisplay) {
+    PaymentMethod.AllowRedisplay.ALWAYS -> "always"
+    PaymentMethod.AllowRedisplay.LIMITED -> "limited"
+    PaymentMethod.AllowRedisplay.UNSPECIFIED -> "unspecified"
+    null -> null
+  }

package/android/src/oldarch/java/com/facebook/react/viewmanagers/ApplePayButtonManagerDelegate.java

@@ -34,6 +34,18 @@ public class ApplePayButtonManagerDelegate<T extends View, U extends BaseViewMan
       case "borderRadius":
         mViewManager.setBorderRadius(view, value == null ? 4 : ((Double) value).intValue());
         break;
+      case "hasShippingMethodCallback":
+        mViewManager.setHasShippingMethodCallback(view, value == null ? false : (boolean) value);
+        break;
+      case "hasShippingContactCallback":
+        mViewManager.setHasShippingContactCallback(view, value == null ? false : (boolean) value);
+        break;
+      case "hasCouponCodeCallback":
+        mViewManager.setHasCouponCodeCallback(view, value == null ? false : (boolean) value);
+        break;
+      case "hasOrderTrackingCallback":
+        mViewManager.setHasOrderTrackingCallback(view, value == null ? false : (boolean) value);
+        break;
       default:
         super.setProperty(view, propName, value);
     }

package/android/src/oldarch/java/com/facebook/react/viewmanagers/ApplePayButtonManagerInterface.java

@@ -16,4 +16,8 @@ public interface ApplePayButtonManagerInterface<T extends View>  {
   void setType(T view, int value);
   void setButtonStyle(T view, int value);
   void setBorderRadius(T view, int value);
+  void setHasShippingMethodCallback(T view, boolean value);
+  void setHasShippingContactCallback(T view, boolean value);
+  void setHasCouponCodeCallback(T view, boolean value);
+  void setHasOrderTrackingCallback(T view, boolean value);
 }

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

@@ -54,70 +54,6 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
     invoke(eventName, null);
   }
 
-  protected final void emitOnConfirmHandlerCallback(ReadableMap value) {
-    invoke("onConfirmHandlerCallback", value);
-  }
-
-  protected final void emitOnFinancialConnectionsEvent(ReadableMap value) {
-    invoke("onFinancialConnectionsEvent", value);
-  }
-
-  protected final void emitOnOrderTrackingCallback() {
-    invoke("onOrderTrackingCallback");
-  }
-
-  protected final void emitOnCustomerAdapterFetchPaymentMethodsCallback() {
-    invoke("onCustomerAdapterFetchPaymentMethodsCallback");
-  }
-
-  protected final void emitOnCustomerAdapterAttachPaymentMethodCallback(ReadableMap value) {
-    invoke("onCustomerAdapterAttachPaymentMethodCallback", value);
-  }
-
-  protected final void emitOnCustomerAdapterDetachPaymentMethodCallback(ReadableMap value) {
-    invoke("onCustomerAdapterDetachPaymentMethodCallback", value);
-  }
-
-  protected final void emitOnCustomerAdapterSetSelectedPaymentOptionCallback(ReadableMap value) {
-    invoke("onCustomerAdapterSetSelectedPaymentOptionCallback", value);
-  }
-
-  protected final void emitOnCustomerAdapterFetchSelectedPaymentOptionCallback() {
-    invoke("onCustomerAdapterFetchSelectedPaymentOptionCallback");
-  }
-
-  protected final void emitOnCustomerAdapterSetupIntentClientSecretForCustomerAttachCallback() {
-    invoke("onCustomerAdapterSetupIntentClientSecretForCustomerAttachCallback");
-  }
-
-  protected final void emitEmbeddedPaymentElementDidUpdateHeight(ReadableMap value) {
-    invoke("embeddedPaymentElementDidUpdateHeight", value);
-  }
-
-  protected final void emitEmbeddedPaymentElementWillPresent() {
-    invoke("embeddedPaymentElementWillPresent");
-  }
-
-  protected final void emitEmbeddedPaymentElementDidUpdatePaymentOption(ReadableMap value) {
-    invoke("embeddedPaymentElementDidUpdatePaymentOption", value);
-  }
-
-  protected final void emitEmbeddedPaymentElementFormSheetConfirmComplete(ReadableMap value) {
-    invoke("embeddedPaymentElementFormSheetConfirmComplete", value);
-  }
-
-  protected final void emitEmbeddedPaymentElementRowSelectionImmediateAction() {
-    invoke("embeddedPaymentElementRowSelectionImmediateAction");
-  }
-
-  protected final void emitEmbeddedPaymentElementLoadingFailed(ReadableMap value) {
-    invoke("embeddedPaymentElementLoadingFailed", value);
-  }
-
-  protected final void emitOnCustomPaymentMethodConfirmHandlerCallback(ReadableMap value) {
-    invoke("onCustomPaymentMethodConfirmHandlerCallback", value);
-  }
-
   @ReactMethod
   @DoNotStrip
   public abstract void initialise(ReadableMap params, Promise promise);
@@ -158,6 +94,10 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
   @DoNotStrip
   public abstract void intentCreationCallback(ReadableMap result, Promise promise);
 
+  @ReactMethod
+  @DoNotStrip
+  public abstract void confirmationTokenCreationCallback(ReadableMap result, Promise promise);
+
   @ReactMethod
   @DoNotStrip
   public abstract void customPaymentMethodResultCallback(ReadableMap result, Promise promise);
@@ -300,6 +240,14 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
   @DoNotStrip
   public abstract void customerAdapterSetupIntentClientSecretForCustomerAttachCallback(String clientSecret, Promise promise);
 
+  @ReactMethod
+  @DoNotStrip
+  public abstract void clientSecretProviderSetupIntentClientSecretCallback(String setupIntentClientSecret, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void clientSecretProviderCustomerSessionClientSecretCallback(ReadableMap customerSessionClientSecret, Promise promise);
+
   @ReactMethod
   @DoNotStrip
   public abstract void createEmbeddedPaymentElement(ReadableMap intentConfig, ReadableMap configuration, Promise promise);

package/ios/ApplePayButtonManager.m

@@ -5,7 +5,7 @@
 @interface RCT_EXTERN_MODULE(ApplePayButtonManager, RCTViewManager)
 RCT_EXPORT_VIEW_PROPERTY(type, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(buttonStyle, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(borderRadius, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(buttonBorderRadius, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(disabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(onShippingMethodSelectedAction, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onShippingContactSelectedAction, RCTDirectEventBlock)

package/ios/ApplePayButtonView.swift

@@ -18,7 +18,7 @@ public class ApplePayButtonView: UIView {
     
     @objc public var type: NSNumber?
     @objc public var buttonStyle: NSNumber?
-    @objc public var borderRadius: NSNumber?
+    @objc public var buttonBorderRadius: NSNumber?
     @objc public var disabled = false
     
     @objc func handleApplePayButtonTapped() {
@@ -37,7 +37,7 @@ public class ApplePayButtonView: UIView {
         let paymentButtonStyle = PKPaymentButtonStyle(rawValue: self.buttonStyle as? Int ?? 2) ?? .black
         self.applePayButton = PKPaymentButton(paymentButtonType: paymentButtonType, paymentButtonStyle: paymentButtonStyle)
         if #available(iOS 12.0, *) {
-            self.applePayButton?.cornerRadius = self.borderRadius as? CGFloat ?? 4.0
+            self.applePayButton?.cornerRadius = self.buttonBorderRadius as? CGFloat ?? 4.0
         }
         
         if let applePayButton = self.applePayButton {

package/ios/Mappers.swift

@@ -1,5 +1,7 @@
 import Stripe
 import StripePaymentSheet
+@_spi(ConfirmationTokensPublicPreview) import StripePayments
+import Contacts
 
 class Mappers {
     class func createResult(_ key: String, _ value: NSDictionary?, additionalFields: [String: Any]? = nil) -> NSDictionary {
@@ -298,6 +300,7 @@ class Mappers {
         case STPPaymentMethodType.affirm: return "Affirm"
         case STPPaymentMethodType.cashApp: return "CashApp"
         case STPPaymentMethodType.revolutPay: return "RevolutPay"
+        case STPPaymentMethodType.link: return "Link"
         case STPPaymentMethodType.unknown: return "Unknown"
         default: return "Unknown"
         }
@@ -331,6 +334,7 @@ class Mappers {
             case "Affirm": return STPPaymentMethodType.affirm
             case "CashApp": return STPPaymentMethodType.cashApp
             case "RevolutPay": return STPPaymentMethodType.revolutPay
+            case "Link": return STPPaymentMethodType.link
             default: return STPPaymentMethodType.unknown
             }
         }
@@ -557,18 +561,31 @@ class Mappers {
     }
 
     class func mapFromBillingDetails(billingDetails: STPPaymentMethodBillingDetails?) -> NSDictionary {
+        let email: Any = billingDetails?.email ?? NSNull()
+        let phone: Any = billingDetails?.phone ?? NSNull()
+        let name: Any = billingDetails?.name ?? NSNull()
+
+        let addressCity: Any = billingDetails?.address?.city ?? NSNull()
+        let addressPostalCode: Any = billingDetails?.address?.postalCode ?? NSNull()
+        let addressCountry: Any = billingDetails?.address?.country ?? NSNull()
+        let addressLine1: Any = billingDetails?.address?.line1 ?? NSNull()
+        let addressLine2: Any = billingDetails?.address?.line2 ?? NSNull()
+        let addressState: Any = billingDetails?.address?.state ?? NSNull()
+
+        let address: NSDictionary = [
+            "city": addressCity,
+            "postalCode": addressPostalCode,
+            "country": addressCountry,
+            "line1": addressLine1,
+            "line2": addressLine2,
+            "state": addressState,
+        ]
+
         let billing: NSDictionary = [
-            "email": billingDetails?.email ?? NSNull(),
-            "phone": billingDetails?.phone ?? NSNull(),
-            "name": billingDetails?.name ?? NSNull(),
-            "address": [
-                "city": billingDetails?.address?.city,
-                "postalCode": billingDetails?.address?.postalCode,
-                "country": billingDetails?.address?.country,
-                "line1": billingDetails?.address?.line1,
-                "line2": billingDetails?.address?.line2,
-                "state": billingDetails?.address?.state,
-            ],
+            "email": email,
+            "phone": phone,
+            "name": name,
+            "address": address,
         ]
 
         return billing
@@ -679,6 +696,89 @@ class Mappers {
         return method
     }
 
+    class func mapFromConfirmationToken(_ confirmationToken: STPConfirmationToken?) -> NSDictionary? {
+        guard let confirmationToken = confirmationToken else {
+            return nil
+        }
+
+        var paymentMethodPreview: NSDictionary? = nil
+        if let preview = confirmationToken.paymentMethodPreview {
+            paymentMethodPreview = [
+                "type": Mappers.mapPaymentMethodType(type: preview.type),
+                "billingDetails": Mappers.mapFromBillingDetails(billingDetails: preview.billingDetails),
+                "allowRedisplay": mapFromAllowRedisplay(allowRedisplay: preview.allowRedisplay) ?? NSNull(),
+                "customerId": preview.customerId ?? NSNull(),
+                "allResponseFields": preview.allResponseFields
+            ]
+        }
+
+        var shipping: NSDictionary? = nil
+        if let shippingDetails = confirmationToken.shipping {
+            var addressDetails: NSDictionary = [:]
+            if let address = shippingDetails.address {
+                addressDetails = [
+                    "city": address.city ?? NSNull(),
+                    "state": address.state ?? NSNull(),
+                    "country": address.country ?? NSNull(),
+                    "line1": address.line1 ?? NSNull(),
+                    "line2": address.line2 ?? NSNull(),
+                    "postalCode": address.postalCode ?? NSNull(),
+                ]
+            }
+            shipping = [
+                "address": addressDetails,
+                "name": shippingDetails.name ?? NSNull(),
+                "phone": shippingDetails.phone ?? NSNull()
+            ]
+        }
+
+        let token: NSDictionary = [
+            "id": confirmationToken.stripeId,
+            "created": convertDateToUnixTimestampSeconds(date: confirmationToken.created) ?? NSNull(),
+            "expiresAt": convertDateToUnixTimestampSeconds(date: confirmationToken.expiresAt) ?? NSNull(),
+            "liveMode": confirmationToken.liveMode,
+            "paymentIntentId": confirmationToken.paymentIntentId ?? NSNull(),
+            "setupIntentId": confirmationToken.setupIntentId ?? NSNull(),
+            "returnURL": confirmationToken.returnURL ?? NSNull(),
+            "setupFutureUsage": mapFromSetupFutureUsage(setupFutureUsage: confirmationToken.setupFutureUsage) ?? NSNull(),
+            "paymentMethodPreview": paymentMethodPreview ?? NSNull(),
+            "shipping": shipping ?? NSNull(),
+            "allResponseFields": confirmationToken.allResponseFields
+        ]
+        return token
+    }
+
+    class func mapFromAllowRedisplay(allowRedisplay: STPPaymentMethodAllowRedisplay?) -> String? {
+        guard let allowRedisplay = allowRedisplay else {
+            return nil
+        }
+        switch allowRedisplay {
+        case .always: return "always"
+        case .limited: return "limited"
+        case .unspecified: return "unspecified"
+        @unknown default: return "unspecified"
+        }
+    }
+
+    class func mapFromSetupFutureUsage(setupFutureUsage: STPPaymentIntentSetupFutureUsage?) -> String? {
+        guard let setupFutureUsage = setupFutureUsage else {
+            return nil
+        }
+        switch setupFutureUsage {
+        case .offSession: return "OffSession"
+        case .onSession: return "OnSession"
+        case .none: return "None"
+        default: return nil
+        }
+    }
+
+    class func convertDateToUnixTimestampSeconds(date: Date?) -> NSNumber? {
+        guard let date = date else {
+            return nil
+        }
+        return NSNumber(value: date.timeIntervalSince1970)
+    }
+
     class func mapIntentStatus(status: STPSetupIntentStatus?) -> String {
         if let status = status {
             switch status {
@@ -961,13 +1061,6 @@ class Mappers {
         return nil
     }
 
-    class func convertDateToUnixTimestampSeconds(date: Date?) -> String? {
-        if let date = date {
-            let value = date.timeIntervalSince1970
-            return String(format: "%.0f", value)
-        }
-        return nil
-    }
 
     class func mapFromCardValidationState(state: STPCardValidationState?) -> String {
         if let state = state {

package/ios/NewArch/ApplePayButtonComponentView.mm

@@ -96,7 +96,7 @@ using namespace facebook::react;
   _view.type = @(newViewProps.type);
   _view.buttonStyle = @(newViewProps.buttonStyle);
   _view.disabled = newViewProps.disabled;
-  _view.borderRadius = @(newViewProps.borderRadius);
+  _view.buttonBorderRadius = @(newViewProps.buttonBorderRadius);
 
   // Set the boolean flags from props
   _view.hasShippingMethodCallback = newViewProps.hasShippingMethodCallback;

package/ios/OldArch/StripeSdkEventEmitterCompat.h

@@ -5,6 +5,7 @@
 
 @interface StripeSdkEventEmitterCompat : RCTEventEmitter
 - (void)emitOnConfirmHandlerCallback:(NSDictionary *)value;
+- (void)emitOnConfirmationTokenHandlerCallback:(NSDictionary *)value;
 - (void)emitOnFinancialConnectionsEvent:(NSDictionary *)value;
 - (void)emitOnOrderTrackingCallback;
 - (void)emitOnCustomerAdapterFetchPaymentMethodsCallback;
@@ -13,6 +14,8 @@
 - (void)emitOnCustomerAdapterSetSelectedPaymentOptionCallback:(NSDictionary *)value;
 - (void)emitOnCustomerAdapterFetchSelectedPaymentOptionCallback;
 - (void)emitOnCustomerAdapterSetupIntentClientSecretForCustomerAttachCallback;
+- (void)emitOnCustomerSessionProviderSetupIntentClientSecret;
+- (void)emitOnCustomerSessionProviderCustomerSessionClientSecret;
 - (void)emitEmbeddedPaymentElementDidUpdateHeight:(NSDictionary *)value;
 - (void)emitEmbeddedPaymentElementWillPresent;
 - (void)emitEmbeddedPaymentElementDidUpdatePaymentOption:(NSDictionary *)value;