@stripe/stripe-react-native 0.48.0 → 0.50.0

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

@@ -3,6 +3,7 @@ package com.reactnativestripesdk
 import android.app.Activity
 import android.app.Application
 import android.content.Context
+import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
@@ -11,6 +12,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Base64
+import android.util.Log
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.graphics.drawable.DrawableCompat
 import com.facebook.react.bridge.Arguments
@@ -28,10 +30,18 @@ import com.reactnativestripesdk.utils.PaymentSheetException
 import com.reactnativestripesdk.utils.StripeFragment
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createResult
+import com.reactnativestripesdk.utils.mapFromCustomPaymentMethod
 import com.reactnativestripesdk.utils.mapFromPaymentMethod
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
+import com.reactnativestripesdk.utils.parseCustomPaymentMethods
 import com.reactnativestripesdk.utils.removeFragment
 import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
+import com.stripe.android.model.PaymentMethod
+import com.stripe.android.paymentelement.ConfirmCustomPaymentMethodCallback
+import com.stripe.android.paymentelement.CustomPaymentMethodResult
+import com.stripe.android.paymentelement.CustomPaymentMethodResultHandler
+import com.stripe.android.paymentelement.ExperimentalCustomPaymentMethodsApi
+import com.stripe.android.paymentelement.PaymentMethodOptionsSetupFutureUsagePreview
 import com.stripe.android.paymentsheet.CreateIntentCallback
 import com.stripe.android.paymentsheet.CreateIntentResult
 import com.stripe.android.paymentsheet.ExperimentalCustomerSessionApi
@@ -40,11 +50,17 @@ import com.stripe.android.paymentsheet.PaymentSheet
 import com.stripe.android.paymentsheet.PaymentSheetResult
 import com.stripe.android.paymentsheet.PaymentSheetResultCallback
 import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import java.io.ByteArrayOutputStream
 import kotlin.Exception
 
-@OptIn(ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class)
-class PaymentSheetFragment : StripeFragment() {
+@OptIn(ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class, ExperimentalCustomPaymentMethodsApi::class)
+class PaymentSheetFragment :
+  StripeFragment(),
+  ConfirmCustomPaymentMethodCallback {
   private lateinit var context: ReactApplicationContext
   private lateinit var initPromise: Promise
   private var paymentSheet: PaymentSheet? = null
@@ -59,6 +75,7 @@ class PaymentSheetFragment : StripeFragment() {
   internal var paymentSheetIntentCreationCallback = CompletableDeferred<ReadableMap>()
   private var keepJsAwake: KeepJsAwakeTask? = null
 
+  @OptIn(ExperimentalCustomPaymentMethodsApi::class)
   override fun prepare() {
     val merchantDisplayName = arguments?.getString("merchantDisplayName").orEmpty()
     if (merchantDisplayName.isEmpty()) {
@@ -238,6 +255,7 @@ class PaymentSheetFragment : StripeFragment() {
           mapToPreferredNetworks(arguments?.getIntegerArrayList("preferredNetworks")),
         ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
         .cardBrandAcceptance(mapToCardBrandAcceptance(arguments))
+        .customPaymentMethods(parseCustomPaymentMethods(arguments))
 
     primaryButtonLabel?.let { configurationBuilder.primaryButtonLabel(it) }
     paymentMethodOrder?.let { configurationBuilder.paymentMethodOrder(it) }
@@ -251,30 +269,35 @@ class PaymentSheetFragment : StripeFragment() {
     if (arguments?.getBoolean("customFlow") == true) {
       flowController =
         if (intentConfiguration != null) {
-          PaymentSheet.FlowController.create(
-            this,
-            paymentOptionCallback = paymentOptionCallback,
-            createIntentCallback = createIntentCallback,
-            paymentResultCallback = paymentResultCallback,
-          )
+          PaymentSheet.FlowController
+            .Builder(
+              resultCallback = paymentResultCallback,
+              paymentOptionCallback = paymentOptionCallback,
+            ).createIntentCallback(createIntentCallback)
+            .confirmCustomPaymentMethodCallback(this)
+            .build(this)
         } else {
-          PaymentSheet.FlowController.create(
-            this,
-            paymentOptionCallback = paymentOptionCallback,
-            paymentResultCallback = paymentResultCallback,
-          )
+          PaymentSheet.FlowController
+            .Builder(
+              resultCallback = paymentResultCallback,
+              paymentOptionCallback = paymentOptionCallback,
+            ).confirmCustomPaymentMethodCallback(this)
+            .build(this)
         }
       configureFlowController()
     } else {
       paymentSheet =
         if (intentConfiguration != null) {
-          PaymentSheet(
-            this,
-            createIntentCallback = createIntentCallback,
-            paymentResultCallback = paymentResultCallback,
-          )
+          PaymentSheet
+            .Builder(paymentResultCallback)
+            .createIntentCallback(createIntentCallback)
+            .confirmCustomPaymentMethodCallback(this)
+            .build(this)
         } else {
-          PaymentSheet(this, callback = paymentResultCallback)
+          PaymentSheet
+            .Builder(paymentResultCallback)
+            .confirmCustomPaymentMethodCallback(this)
+            .build(this)
         }
       initPromise.resolve(WritableNativeMap())
     }
@@ -418,6 +441,81 @@ class PaymentSheetFragment : StripeFragment() {
     } ?: run { resolvePresentPromise(map) }
   }
 
+  @OptIn(ExperimentalCustomPaymentMethodsApi::class)
+  override fun onConfirmCustomPaymentMethod(
+    customPaymentMethod: PaymentSheet.CustomPaymentMethod,
+    billingDetails: PaymentMethod.BillingDetails,
+  ) {
+    // Launch a transparent Activity to ensure React Native UI can appear on top of the Stripe proxy activity.
+    try {
+      val intent =
+        Intent(context, CustomPaymentMethodActivity::class.java).apply {
+          addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+          addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
+        }
+      context.startActivity(intent)
+    } catch (e: Exception) {
+      Log.e("StripeReactNative", "Failed to start CustomPaymentMethodActivity", e)
+    }
+
+    val stripeSdkModule =
+      try {
+        context.getNativeModule(StripeSdkModule::class.java)
+          ?: throw IllegalArgumentException("StripeSdkModule not found")
+      } catch (ex: IllegalArgumentException) {
+        Log.e("StripeReactNative", "StripeSdkModule not found for CPM callback", ex)
+        CustomPaymentMethodActivity.finishCurrent()
+        return
+      }
+
+    // Keep JS awake while React Native is backgrounded by Stripe SDK.
+    val keepJsAwakeTask =
+      KeepJsAwakeTask(context).apply { start() }
+
+    // Run on main coroutine scope.
+    CoroutineScope(Dispatchers.Main).launch {
+      try {
+        // Give the CustomPaymentMethodActivity a moment to fully initialize
+        delay(100)
+
+        // Emit event so JS can show the Alert and eventually respond via `customPaymentMethodResultCallback`.
+        stripeSdkModule.emitOnCustomPaymentMethodConfirmHandlerCallback(
+          mapFromCustomPaymentMethod(customPaymentMethod, billingDetails),
+        )
+
+        // Await JS result.
+        val resultFromJs = stripeSdkModule.customPaymentMethodResultCallback.await()
+
+        keepJsAwakeTask.stop()
+
+        val status = resultFromJs.getString("status")
+
+        val nativeResult =
+          when (status) {
+            "completed" ->
+              CustomPaymentMethodResult.completed()
+            "canceled" ->
+              CustomPaymentMethodResult.canceled()
+            "failed" -> {
+              val errMsg = resultFromJs.getString("error") ?: "Custom payment failed"
+              CustomPaymentMethodResult.failed(displayMessage = errMsg)
+            }
+            else ->
+              CustomPaymentMethodResult.failed(displayMessage = "Unknown status")
+          }
+
+        // Return result to Stripe SDK.
+        CustomPaymentMethodResultHandler.handleCustomPaymentMethodResult(
+          context,
+          nativeResult,
+        )
+      } finally {
+        // Clean up the transparent activity
+        CustomPaymentMethodActivity.finishCurrent()
+      }
+    }
+  }
+
   companion object {
     internal const val TAG = "payment_sheet_launch_fragment"
 
@@ -518,6 +616,7 @@ class PaymentSheetFragment : StripeFragment() {
       )
     }
 
+    @OptIn(PaymentMethodOptionsSetupFutureUsagePreview::class)
     private fun buildIntentConfigurationMode(modeParams: Bundle): PaymentSheet.IntentConfiguration.Mode {
       val currencyCode =
         modeParams.getString("currencyCode")
@@ -531,6 +630,7 @@ class PaymentSheetFragment : StripeFragment() {
           currency = currencyCode,
           setupFutureUse = mapToSetupFutureUse(modeParams.getString("setupFutureUsage")),
           captureMethod = mapToCaptureMethod(modeParams.getString("captureMethod")),
+          paymentMethodOptions = mapToPaymentMethodOptions(modeParams.getBundle("paymentMethodOptions")),
         )
       } else {
         val setupFutureUsage =
@@ -639,6 +739,7 @@ fun mapToSetupFutureUse(type: String?): PaymentSheet.IntentConfiguration.SetupFu
   when (type) {
     "OffSession" -> PaymentSheet.IntentConfiguration.SetupFutureUse.OffSession
     "OnSession" -> PaymentSheet.IntentConfiguration.SetupFutureUse.OnSession
+    "None" -> PaymentSheet.IntentConfiguration.SetupFutureUse.None
     else -> null
   }
 
@@ -650,6 +751,26 @@ fun mapToCaptureMethod(type: String?): PaymentSheet.IntentConfiguration.CaptureM
     else -> PaymentSheet.IntentConfiguration.CaptureMethod.Automatic
   }
 
+@OptIn(PaymentMethodOptionsSetupFutureUsagePreview::class)
+fun mapToPaymentMethodOptions(options: Bundle?): PaymentSheet.IntentConfiguration.Mode.Payment.PaymentMethodOptions? {
+  val sfuBundle = options?.getBundle("setupFutureUsageValues")
+  val paymentMethodToSfuMap = mutableMapOf<PaymentMethod.Type, PaymentSheet.IntentConfiguration.SetupFutureUse>()
+  sfuBundle?.keySet()?.forEach { code ->
+    val sfuValue = mapToSetupFutureUse(sfuBundle?.getString(code))
+    val paymentMethodType = PaymentMethod.Type.fromCode(code)
+    if (paymentMethodType != null && sfuValue != null) {
+      paymentMethodToSfuMap[paymentMethodType] = sfuValue
+    }
+  }
+  return if (paymentMethodToSfuMap.isNotEmpty()) {
+    PaymentSheet.IntentConfiguration.Mode.Payment.PaymentMethodOptions(
+      setupFutureUsageValues = paymentMethodToSfuMap,
+    )
+  } else {
+    null
+  }
+}
+
 fun mapToCardBrandAcceptance(params: Bundle?): PaymentSheet.CardBrandAcceptance {
   val cardBrandAcceptanceParams = params?.getBundle("cardBrandAcceptance") ?: return PaymentSheet.CardBrandAcceptance.all()
   val filter = cardBrandAcceptanceParams.getString("filter") ?: return PaymentSheet.CardBrandAcceptance.all()

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

@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.util.Log
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.BaseActivityEventListener
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
@@ -92,6 +93,7 @@ class StripeSdkModule(
   private var customerSheetFragment: CustomerSheetFragment? = null
 
   internal var embeddedIntentCreationCallback = CompletableDeferred<ReadableMap>()
+  internal var customPaymentMethodResultCallback = CompletableDeferred<ReadableMap>()
 
   internal var composeCompatView: StripeAbstractComposeView.CompatView? = null
 
@@ -233,6 +235,14 @@ class StripeSdkModule(
     getCurrentActivityOrResolveWithError(promise)?.let { activity ->
       paymentSheetFragment?.removeFragment(reactApplicationContext)
       val bundle = toBundleObject(params)
+
+      // Handle custom payment methods separately since toBundleObject cannot handle arrays of objects
+      val customPaymentMethodConfig = params.getMap("customPaymentMethodConfiguration")
+      if (customPaymentMethodConfig != null) {
+        // Store the original ReadableMap for custom payment methods
+        bundle.putSerializable("customPaymentMethodConfigurationReadableMap", customPaymentMethodConfig.toHashMap())
+      }
+
       paymentSheetFragment =
         PaymentSheetFragment.create(reactApplicationContext, bundle, promise)
       try {
@@ -298,6 +308,18 @@ class StripeSdkModule(
     paymentSheetFragment?.paymentSheetIntentCreationCallback?.complete(params)
   }
 
+  @ReactMethod
+  override fun customPaymentMethodResultCallback(
+    result: ReadableMap?,
+    promise: Promise?,
+  ) {
+    // Complete the deferred with the result from JavaScript
+    customPaymentMethodResultCallback.complete(result ?: Arguments.createMap())
+    // Reset for next use
+    customPaymentMethodResultCallback = CompletableDeferred()
+    promise?.resolve(null)
+  }
+
   @ReactMethod
   override fun createPaymentMethod(
     data: ReadableMap,

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

@@ -27,6 +27,8 @@ import com.stripe.android.model.StripeIntent
 import com.stripe.android.model.StripeIntent.NextActionData
 import com.stripe.android.model.StripeIntent.NextActionType
 import com.stripe.android.model.Token
+import com.stripe.android.paymentelement.ExperimentalCustomPaymentMethodsApi
+import com.stripe.android.paymentsheet.PaymentSheet
 
 internal fun createResult(
   key: String,
@@ -138,7 +140,6 @@ internal fun mapPaymentMethodType(type: PaymentMethod.Type?): String =
     PaymentMethod.Type.Oxxo -> "Oxxo"
     PaymentMethod.Type.P24 -> "P24"
     PaymentMethod.Type.SepaDebit -> "SepaDebit"
-    PaymentMethod.Type.Sofort -> "Sofort"
     PaymentMethod.Type.Upi -> "Upi"
     PaymentMethod.Type.WeChatPay -> "WeChatPay"
     PaymentMethod.Type.Klarna -> "Klarna"
@@ -168,7 +169,6 @@ internal fun mapToPaymentMethodType(type: String?): PaymentMethod.Type? =
     "Oxxo" -> PaymentMethod.Type.Oxxo
     "P24" -> PaymentMethod.Type.P24
     "SepaDebit" -> PaymentMethod.Type.SepaDebit
-    "Sofort" -> PaymentMethod.Type.Sofort
     "Upi" -> PaymentMethod.Type.Upi
     "WeChatPay" -> PaymentMethod.Type.WeChatPay
     "Klarna" -> PaymentMethod.Type.Klarna
@@ -415,10 +415,6 @@ internal fun mapFromPaymentMethod(paymentMethod: PaymentMethod): WritableMap {
       it.putString("last4", paymentMethod.bacsDebit?.last4)
     },
   )
-  pm.putMap(
-    "Sofort",
-    WritableNativeMap().also { it.putString("country", paymentMethod.sofort?.country) },
-  )
   pm.putMap(
     "Ideal",
     WritableNativeMap().also {
@@ -1065,3 +1061,53 @@ private fun Map<String, Any?>.toReadableMap(): ReadableMap {
 
   return writableMap
 }
+
+@OptIn(ExperimentalCustomPaymentMethodsApi::class)
+@SuppressLint("RestrictedApi")
+internal fun parseCustomPaymentMethods(customPaymentMethodConfig: Bundle?): List<PaymentSheet.CustomPaymentMethod> {
+  if (customPaymentMethodConfig == null) {
+    return emptyList()
+  }
+
+  val configHashMap = customPaymentMethodConfig.getSerializable("customPaymentMethodConfigurationReadableMap") as? HashMap<String, Any>
+  if (configHashMap != null) {
+    val customPaymentMethods = configHashMap["customPaymentMethods"] as? List<HashMap<String, Any>>
+    if (customPaymentMethods != null) {
+      val result = mutableListOf<PaymentSheet.CustomPaymentMethod>()
+
+      for (customPaymentMethodMap in customPaymentMethods) {
+        val id = customPaymentMethodMap["id"] as? String
+        if (id != null) {
+          val subtitle = customPaymentMethodMap["subtitle"] as? String
+          val disableBillingDetailCollection = customPaymentMethodMap["disableBillingDetailCollection"] as? Boolean ?: false
+          result.add(
+            PaymentSheet.CustomPaymentMethod(
+              id = id,
+              subtitle = subtitle,
+              disableBillingDetailCollection = disableBillingDetailCollection,
+            ),
+          )
+        }
+      }
+
+      return result
+    }
+  }
+
+  return emptyList()
+}
+
+@SuppressLint("RestrictedApi")
+internal fun mapFromCustomPaymentMethod(
+  customPaymentMethod: PaymentSheet.CustomPaymentMethod,
+  billingDetails: PaymentMethod.BillingDetails,
+): WritableMap =
+  WritableNativeMap().apply {
+    putMap(
+      "customPaymentMethod",
+      WritableNativeMap().apply {
+        putString("id", customPaymentMethod.id)
+      },
+    )
+    putMap("billingDetails", mapFromBillingDetails(billingDetails))
+  }

package/android/src/main/res/values/styles.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.StripeReactNative.Transparent" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Core transparency settings -->
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        
+        <!-- Enhanced transparency and touch handling -->
+        <item name="android:windowCloseOnTouchOutside">false</item>
+        <item name="android:windowEnableSplitTouch">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        
+        <!-- Performance optimizations -->
+        <item name="android:windowDisablePreview">true</item>
+        
+        <!-- Prevent visual artifacts -->
+        <item name="android:windowShowWallpaper">false</item>
+        <item name="android:windowFullscreen">false</item>
+    </style>
+</resources> 

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

@@ -114,6 +114,10 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
     invoke("embeddedPaymentElementLoadingFailed", value);
   }
 
+  protected final void emitOnCustomPaymentMethodConfirmHandlerCallback(ReadableMap value) {
+    invoke("onCustomPaymentMethodConfirmHandlerCallback", value);
+  }
+
   @ReactMethod
   @DoNotStrip
   public abstract void initialise(ReadableMap params, Promise promise);
@@ -154,6 +158,10 @@ public abstract class NativeStripeSdkModuleSpec extends ReactContextBaseJavaModu
   @DoNotStrip
   public abstract void intentCreationCallback(ReadableMap result, Promise promise);
 
+  @ReactMethod
+  @DoNotStrip
+  public abstract void customPaymentMethodResultCallback(ReadableMap result, Promise promise);
+
   @ReactMethod
   @DoNotStrip
   public abstract void presentPaymentSheet(ReadableMap options, Promise promise);

package/ios/ApplePayButtonManager.m

@@ -11,5 +11,9 @@ RCT_EXPORT_VIEW_PROPERTY(onShippingMethodSelectedAction, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onShippingContactSelectedAction, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onCouponCodeEnteredAction, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onOrderTrackingAction, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(hasShippingMethodCallback, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(hasShippingContactCallback, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(hasCouponCodeCallback, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(hasOrderTrackingCallback, BOOL)
 
 @end

package/ios/ApplePayButtonView.swift

@@ -10,16 +10,23 @@ public class ApplePayButtonView: UIView {
     @objc public var onCouponCodeEnteredAction: RCTDirectEventBlock?
     @objc public var onOrderTrackingAction: RCTDirectEventBlock?
     
+    // Boolean flags to track which callbacks were provided as props
+    @objc public var hasShippingMethodCallback = false
+    @objc public var hasShippingContactCallback = false
+    @objc public var hasCouponCodeCallback = false
+    @objc public var hasOrderTrackingCallback = false
+    
     @objc public var type: NSNumber?
     @objc public var buttonStyle: NSNumber?
     @objc public var borderRadius: NSNumber?
     @objc public var disabled = false
     
     @objc func handleApplePayButtonTapped() {
-        StripeSdkImpl.shared.shippingMethodUpdateJSCallback = onShippingMethodSelectedAction
-        StripeSdkImpl.shared.shippingContactUpdateJSCallback = onShippingContactSelectedAction
-        StripeSdkImpl.shared.couponCodeEnteredJSCallback = onCouponCodeEnteredAction
-        StripeSdkImpl.shared.platformPayOrderTrackingJSCallback = onOrderTrackingAction
+        // Only set callbacks that were actually provided as props
+        StripeSdkImpl.shared.shippingMethodUpdateJSCallback = hasShippingMethodCallback ? onShippingMethodSelectedAction : nil
+        StripeSdkImpl.shared.shippingContactUpdateJSCallback = hasShippingContactCallback ? onShippingContactSelectedAction : nil
+        StripeSdkImpl.shared.couponCodeEnteredJSCallback = hasCouponCodeCallback ? onCouponCodeEnteredAction : nil
+        StripeSdkImpl.shared.platformPayOrderTrackingJSCallback = hasOrderTrackingCallback ? onOrderTrackingAction : nil
     }
   
     @objc public func didSetProps() {

package/ios/Mappers.swift

@@ -285,7 +285,6 @@ class Mappers {
         case STPPaymentMethodType.EPS: return "Eps"
         case STPPaymentMethodType.bancontact: return "Bancontact"
         case STPPaymentMethodType.OXXO: return "Oxxo"
-        case STPPaymentMethodType.sofort: return "Sofort"
         case STPPaymentMethodType.UPI: return "Upi"
         case STPPaymentMethodType.afterpayClearpay: return "AfterpayClearpay"
         case STPPaymentMethodType.klarna: return "Klarna"
@@ -316,7 +315,6 @@ class Mappers {
             case "Eps": return STPPaymentMethodType.EPS
             case "Bancontact": return STPPaymentMethodType.bancontact
             case "Oxxo": return STPPaymentMethodType.OXXO
-            case "Sofort": return STPPaymentMethodType.sofort
             case "Upi": return STPPaymentMethodType.UPI
             case "AfterpayClearpay": return STPPaymentMethodType.afterpayClearpay
             case "Klarna": return STPPaymentMethodType.klarna
@@ -666,9 +664,6 @@ class Mappers {
             "SepaDebit": sepaDebit,
             "BacsDebit": bacsDebit,
             "AuBecsDebit": auBECSDebit,
-            "Sofort": [
-                "country": paymentMethod.sofort?.country
-            ],
             "Upi": [
                 "vpa": paymentMethod.upi?.vpa
             ],

package/ios/NewArch/ApplePayButtonComponentView.mm

@@ -98,6 +98,12 @@ using namespace facebook::react;
   _view.disabled = newViewProps.disabled;
   _view.borderRadius = @(newViewProps.borderRadius);
 
+  // Set the boolean flags from props
+  _view.hasShippingMethodCallback = newViewProps.hasShippingMethodCallback;
+  _view.hasShippingContactCallback = newViewProps.hasShippingContactCallback;
+  _view.hasCouponCodeCallback = newViewProps.hasCouponCodeCallback;
+  _view.hasOrderTrackingCallback = newViewProps.hasOrderTrackingCallback;
+
   [super updateProps:props oldProps:oldProps];
 
   [_view didSetProps];

package/ios/OldArch/StripeSdkEventEmitterCompat.h

@@ -21,7 +21,7 @@
 - (void)emitEmbeddedPaymentElementFormSheetConfirmComplete:(NSDictionary *)value;
 - (void)emitEmbeddedPaymentElementRowSelectionImmediateAction;
 - (void)emitEmbeddedPaymentElementLoadingFailed:(NSDictionary *)value;
-
+- (void)emitOnCustomPaymentMethodConfirmHandlerCallback:(NSDictionary *)value;
 @end
 
 #endif

package/ios/OldArch/StripeSdkEventEmitterCompat.m

@@ -21,7 +21,8 @@
     @"embeddedPaymentElementDidUpdatePaymentOption",
     @"embeddedPaymentElementFormSheetConfirmComplete",
     @"embeddedPaymentElementRowSelectionImmediateAction",
-    @"embeddedPaymentElementLoadingFailed"
+    @"embeddedPaymentElementLoadingFailed",
+    @"onCustomPaymentMethodConfirmHandlerCallback"
   ];
 }
 
@@ -100,6 +101,11 @@
   [self sendEventWithName:@"embeddedPaymentElementLoadingFailed"  body:value];
 }
 
+- (void)emitOnCustomPaymentMethodConfirmHandlerCallback:(NSDictionary *)value
+{
+  [self sendEventWithName:@"onCustomPaymentMethodConfirmHandlerCallback" body:value];
+}
+
 @end
 
 #endif

package/ios/PaymentMethodFactory.swift

@@ -31,8 +31,6 @@ class PaymentMethodFactory {
                 return try createFPXPaymentMethodParams()
             case STPPaymentMethodType.alipay:
                 return try createAlipayPaymentMethodParams()
-            case STPPaymentMethodType.sofort:
-                return try createSofortPaymentMethodParams()
             case STPPaymentMethodType.bancontact:
                 return try createBancontactPaymentMethodParams()
             case STPPaymentMethodType.SEPADebit:
@@ -82,8 +80,6 @@ class PaymentMethodFactory {
                 return createCardPaymentMethodOptions()
             case STPPaymentMethodType.FPX:
                 return nil
-            case STPPaymentMethodType.sofort:
-                return nil
             case STPPaymentMethodType.alipay:
                 return try createAlipayPaymentMethodOptions()
             case STPPaymentMethodType.bancontact:
@@ -250,16 +246,6 @@ class PaymentMethodFactory {
         return options
     }
 
-    private func createSofortPaymentMethodParams() throws -> STPPaymentMethodParams {
-        guard let country = self.paymentMethodData?["country"] as? String else {
-            throw PaymentMethodError.sofortPaymentMissingParams
-        }
-        let params = STPPaymentMethodSofortParams()
-        params.country = country
-
-        return STPPaymentMethodParams(sofort: params, billingDetails: billingDetailsParams, metadata: metadata)
-    }
-
     private func createBancontactPaymentMethodParams() throws -> STPPaymentMethodParams {
         let params = STPPaymentMethodBancontactParams()
 
@@ -411,7 +397,6 @@ enum PaymentMethodError: Error {
     case epsPaymentMissingParams
     case idealPaymentMissingParams
     case paymentNotSupported
-    case sofortPaymentMissingParams
     case cardPaymentOptionsMissingParams
     case bancontactPaymentMissingParams
     case sepaPaymentMissingParams
@@ -434,8 +419,6 @@ extension PaymentMethodError: LocalizedError {
             return NSLocalizedString("You must provide billing details", comment: "Create payment error")
         case .idealPaymentMissingParams:
             return NSLocalizedString("You must provide bank name", comment: "Create payment error")
-        case .sofortPaymentMissingParams:
-            return NSLocalizedString("You must provide bank account country", comment: "Create payment error")
         case .p24PaymentMissingParams:
             return NSLocalizedString("You must provide billing details", comment: "Create payment error")
         case .bancontactPaymentMissingParams:

package/ios/PaymentSheetAppearance.swift

@@ -185,6 +185,8 @@ internal class PaymentSheetAppearance {
                   row.style = .floatingButton
               case PaymentSheetAppearanceKeys.ROW_STYLE_FLAT_WITH_CHECKMARK:
                   row.style = .flatWithCheckmark
+              case PaymentSheetAppearanceKeys.ROW_STYLE_FLAT_WITH_CHEVRON:
+                  row.style = .flatWithChevron
               default:
                   throw PaymentSheetAppearanceError.invalidRowStyle(styleString)
               }
@@ -239,6 +241,10 @@ internal class PaymentSheetAppearance {
               flat.checkmark = try buildEmbeddedCheckmark(params: checkmarkParams)
           }
 
+          if let chevronParams = params[PaymentSheetAppearanceKeys.CHEVRON] as? NSDictionary {
+              flat.chevron = try buildEmbeddedChevron(params: chevronParams)
+          }
+
           return flat
       }
 
@@ -277,6 +283,19 @@ internal class PaymentSheetAppearance {
           return checkmark
       }
 
+      private class func buildEmbeddedChevron(params: NSDictionary) throws -> PaymentSheet.Appearance.EmbeddedPaymentElement.Row.Flat.Chevron {
+        var chevron = PaymentSheet.Appearance.default.embeddedPaymentElement.row.flat.chevron
+
+        if let colorHexes = params[PaymentSheetAppearanceKeys.COLOR] as? [String: String] {
+          chevron.color = dynamicColor(
+            from: colorHexes,
+            default: UIColor.systemGray // Default iOS system gray color
+          )
+        }
+
+          return chevron
+      }
+
       private class func buildEmbeddedFloating(params: NSDictionary) throws -> PaymentSheet.Appearance.EmbeddedPaymentElement.Row.Floating {
           var floating = PaymentSheet.Appearance.default.embeddedPaymentElement.row.floating
 
@@ -354,7 +373,7 @@ extension PaymentSheetAppearanceError: LocalizedError {
         case .unexpectedHexStringLength(let hexString):
             return NSLocalizedString("Failed to set Payment Sheet appearance. Expected hex string of length 6 or 8, but received: \(hexString)", comment: "Failed to set color")
         case .invalidRowStyle(let styleString):
-            return NSLocalizedString("Failed to set Embedded Payment Element appearance. Invalid row style '\(styleString)'. Expected one of: 'flatWithRadio', 'floatingButton', 'flatWithCheckmark'.", comment: "Invalid row style string")
+            return NSLocalizedString("Failed to set Embedded Payment Element appearance. Invalid row style '\(styleString)'. Expected one of: 'flatWithRadio', 'floatingButton', 'flatWithCheckmark', 'flatWithChevron'.", comment: "Invalid row style string")
         }
     }
 }
@@ -411,6 +430,7 @@ private struct PaymentSheetAppearanceKeys {
     static let SELECTED_COLOR = "selectedColor"
     static let UNSELECTED_COLOR = "unselectedColor"
     static let CHECKMARK = "checkmark"
+    static let CHEVRON = "chevron"
     static let SPACING = "spacing"
     static let TOP = "top"
     static let LEFT = "left"
@@ -422,6 +442,7 @@ private struct PaymentSheetAppearanceKeys {
     static let ROW_STYLE_FLAT_WITH_RADIO = "flatWithRadio"
     static let ROW_STYLE_FLOATING_BUTTON = "floatingButton"
     static let ROW_STYLE_FLAT_WITH_CHECKMARK = "flatWithCheckmark"
+    static let ROW_STYLE_FLAT_WITH_CHEVRON = "flatWithChevron"
     
     static let FORM_INSETS = "formInsetValues"
 }