@stripe/stripe-react-native 0.56.0 → 0.57.0

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

@@ -1,12 +1,9 @@
 package com.reactnativestripesdk.utils
 
 import android.annotation.SuppressLint
-import android.os.Bundle
-import android.util.Log
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.ReadableType
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
@@ -30,6 +27,7 @@ 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
+import java.lang.IllegalArgumentException
 
 internal fun createResult(
   key: String,
@@ -138,7 +136,6 @@ internal fun mapPaymentMethodType(type: PaymentMethod.Type?): String =
     PaymentMethod.Type.CardPresent -> "CardPresent"
     PaymentMethod.Type.Eps -> "Eps"
     PaymentMethod.Type.Fpx -> "Fpx"
-    PaymentMethod.Type.Giropay -> "Giropay"
     PaymentMethod.Type.GrabPay -> "GrabPay"
     PaymentMethod.Type.Ideal -> "Ideal"
     PaymentMethod.Type.Netbanking -> "Netbanking"
@@ -171,7 +168,6 @@ internal fun mapToPaymentMethodType(type: String?): PaymentMethod.Type? =
     "CardPresent" -> PaymentMethod.Type.CardPresent
     "Eps" -> PaymentMethod.Type.Eps
     "Fpx" -> PaymentMethod.Type.Fpx
-    "Giropay" -> PaymentMethod.Type.Giropay
     "GrabPay" -> PaymentMethod.Type.GrabPay
     "Netbanking" -> PaymentMethod.Type.Netbanking
     "Oxxo" -> PaymentMethod.Type.Oxxo
@@ -665,7 +661,7 @@ internal fun mapToBillingDetails(
   if (billingDetails == null && cardAddress == null) {
     return null
   }
-  val address = mapToAddress(getMapOrNull(billingDetails, "address"), cardAddress)
+  val address = mapToAddress(billingDetails?.getMap("address"), cardAddress)
   val paymentMethodBillingDetailsBuilder = PaymentMethod.BillingDetails.Builder()
 
   if (billingDetails != null) {
@@ -686,7 +682,7 @@ internal fun mapToShippingDetails(shippingDetails: ReadableMap?): ConfirmPayment
     return null
   }
 
-  val address = mapToAddress(getMapOrNull(shippingDetails, "address"), null)
+  val address = mapToAddress(shippingDetails?.getMap("address"), null)
 
   return ConfirmPaymentIntentParams.Shipping(
     name = getValOr(shippingDetails, "name") ?: "",
@@ -694,37 +690,17 @@ internal fun mapToShippingDetails(shippingDetails: ReadableMap?): ConfirmPayment
   )
 }
 
-private fun getStringOrNull(
-  map: ReadableMap?,
-  key: String,
-): String? = if (map?.hasKey(key) == true) map.getString(key) else null
-
-fun getIntOrNull(
-  map: ReadableMap?,
-  key: String,
-): Int? = if (map?.hasKey(key) == true) map.getInt(key) else null
-
-fun getMapOrNull(
-  map: ReadableMap?,
-  key: String,
-): ReadableMap? = if (map?.hasKey(key) == true) map.getMap(key) else null
-
-fun getBooleanOrFalse(
-  map: ReadableMap?,
-  key: String,
-): Boolean = if (map?.hasKey(key) == true) map.getBoolean(key) else false
-
 private fun convertToUnixTimestamp(timestamp: Long): String = (timestamp * 1000).toString()
 
 fun mapToUICustomization(params: ReadableMap): PaymentAuthConfig.Stripe3ds2UiCustomization {
-  val labelCustomization = getMapOrNull(params, "label")
+  val labelCustomization = params.getMap("label")
   val navigationBarCustomization = params.getMap("navigationBar")
-  val textBoxCustomization = getMapOrNull(params, "textField")
-  val submitButtonCustomization = getMapOrNull(params, "submitButton")
-  val cancelButtonCustomization = getMapOrNull(params, "cancelButton")
-  val nextButtonCustomization = getMapOrNull(params, "nextButton")
-  val continueButtonCustomization = getMapOrNull(params, "continueButton")
-  val resendButtonCustomization = getMapOrNull(params, "resendButton")
+  val textBoxCustomization = params.getMap("textField")
+  val submitButtonCustomization = params.getMap("submitButton")
+  val cancelButtonCustomization = params.getMap("cancelButton")
+  val nextButtonCustomization = params.getMap("nextButton")
+  val continueButtonCustomization = params.getMap("continueButton")
+  val resendButtonCustomization = params.getMap("resendButton")
 
   val labelCustomizationBuilder = PaymentAuthConfig.Stripe3ds2LabelCustomization.Builder()
   val toolbarCustomizationBuilder = PaymentAuthConfig.Stripe3ds2ToolbarCustomization.Builder()
@@ -736,121 +712,121 @@ fun mapToUICustomization(params: ReadableMap): PaymentAuthConfig.Stripe3ds2UiCus
   val continueButtonCustomizationBuilder = PaymentAuthConfig.Stripe3ds2ButtonCustomization.Builder()
   val resendButtonCustomizationBuilder = PaymentAuthConfig.Stripe3ds2ButtonCustomization.Builder()
 
-  getStringOrNull(labelCustomization, "headingTextColor")?.let {
+  labelCustomization?.getString("headingTextColor")?.let {
     labelCustomizationBuilder.setHeadingTextColor(it)
   }
-  getStringOrNull(labelCustomization, "textColor")?.let {
+  labelCustomization?.getString("textColor")?.let {
     labelCustomizationBuilder.setTextColor(it)
   }
-  getIntOrNull(labelCustomization, "headingFontSize")?.let {
+  labelCustomization.getIntOrNull("headingFontSize")?.let {
     labelCustomizationBuilder.setHeadingTextFontSize(it)
   }
-  getIntOrNull(labelCustomization, "textFontSize")?.let {
+  labelCustomization.getIntOrNull("textFontSize")?.let {
     labelCustomizationBuilder.setTextFontSize(it)
   }
 
-  getStringOrNull(navigationBarCustomization, "headerText")?.let {
+  navigationBarCustomization?.getString("headerText")?.let {
     toolbarCustomizationBuilder.setHeaderText(it)
   }
-  getStringOrNull(navigationBarCustomization, "buttonText")?.let {
+  navigationBarCustomization?.getString("buttonText")?.let {
     toolbarCustomizationBuilder.setButtonText(it)
   }
-  getStringOrNull(navigationBarCustomization, "textColor")?.let {
+  navigationBarCustomization?.getString("textColor")?.let {
     toolbarCustomizationBuilder.setTextColor(it)
   }
-  getStringOrNull(navigationBarCustomization, "statusBarColor")?.let {
+  navigationBarCustomization?.getString("statusBarColor")?.let {
     toolbarCustomizationBuilder.setStatusBarColor(it)
   }
-  getStringOrNull(navigationBarCustomization, "backgroundColor")?.let {
+  navigationBarCustomization?.getString("backgroundColor")?.let {
     toolbarCustomizationBuilder.setBackgroundColor(it)
   }
-  getIntOrNull(navigationBarCustomization, "textFontSize")?.let {
+  navigationBarCustomization.getIntOrNull("textFontSize")?.let {
     toolbarCustomizationBuilder.setTextFontSize(it)
   }
 
-  getStringOrNull(textBoxCustomization, "borderColor")?.let {
+  textBoxCustomization?.getString("borderColor")?.let {
     textBoxCustomizationBuilder.setBorderColor(it)
   }
-  getStringOrNull(textBoxCustomization, "textColor")?.let {
+  textBoxCustomization?.getString("textColor")?.let {
     textBoxCustomizationBuilder.setTextColor(it)
   }
-  getIntOrNull(textBoxCustomization, "borderWidth")?.let {
+  textBoxCustomization.getIntOrNull("borderWidth")?.let {
     textBoxCustomizationBuilder.setBorderWidth(it)
   }
-  getIntOrNull(textBoxCustomization, "borderRadius")?.let {
+  textBoxCustomization.getIntOrNull("borderRadius")?.let {
     textBoxCustomizationBuilder.setCornerRadius(it)
   }
-  getIntOrNull(textBoxCustomization, "textFontSize")?.let {
+  textBoxCustomization.getIntOrNull("textFontSize")?.let {
     textBoxCustomizationBuilder.setTextFontSize(it)
   }
 
   // Submit button
-  getStringOrNull(submitButtonCustomization, "backgroundColor")?.let {
+  submitButtonCustomization?.getString("backgroundColor")?.let {
     submitButtonCustomizationBuilder.setBackgroundColor(it)
   }
-  getIntOrNull(submitButtonCustomization, "borderRadius")?.let {
+  submitButtonCustomization.getIntOrNull("borderRadius")?.let {
     submitButtonCustomizationBuilder.setCornerRadius(it)
   }
-  getStringOrNull(submitButtonCustomization, "textColor")?.let {
+  submitButtonCustomization?.getString("textColor")?.let {
     submitButtonCustomizationBuilder.setTextColor(it)
   }
-  getIntOrNull(submitButtonCustomization, "textFontSize")?.let {
+  submitButtonCustomization.getIntOrNull("textFontSize")?.let {
     submitButtonCustomizationBuilder.setTextFontSize(it)
   }
 
   // Cancel button
-  getStringOrNull(cancelButtonCustomization, "backgroundColor")?.let {
+  cancelButtonCustomization?.getString("backgroundColor")?.let {
     cancelButtonCustomizationBuilder.setBackgroundColor(it)
   }
-  getIntOrNull(cancelButtonCustomization, "borderRadius")?.let {
+  cancelButtonCustomization.getIntOrNull("borderRadius")?.let {
     cancelButtonCustomizationBuilder.setCornerRadius(it)
   }
-  getStringOrNull(cancelButtonCustomization, "textColor")?.let {
+  cancelButtonCustomization?.getString("textColor")?.let {
     cancelButtonCustomizationBuilder.setTextColor(it)
   }
-  getIntOrNull(cancelButtonCustomization, "textFontSize")?.let {
+  cancelButtonCustomization.getIntOrNull("textFontSize")?.let {
     cancelButtonCustomizationBuilder.setTextFontSize(it)
   }
 
   // Continue button
-  getStringOrNull(continueButtonCustomization, "backgroundColor")?.let {
+  continueButtonCustomization?.getString("backgroundColor")?.let {
     continueButtonCustomizationBuilder.setBackgroundColor(it)
   }
-  getIntOrNull(continueButtonCustomization, "borderRadius")?.let {
+  continueButtonCustomization.getIntOrNull("borderRadius")?.let {
     continueButtonCustomizationBuilder.setCornerRadius(it)
   }
-  getStringOrNull(continueButtonCustomization, "textColor")?.let {
+  continueButtonCustomization?.getString("textColor")?.let {
     continueButtonCustomizationBuilder.setTextColor(it)
   }
-  getIntOrNull(continueButtonCustomization, "textFontSize")?.let {
+  continueButtonCustomization.getIntOrNull("textFontSize")?.let {
     continueButtonCustomizationBuilder.setTextFontSize(it)
   }
 
   // Next button
-  getStringOrNull(nextButtonCustomization, "backgroundColor")?.let {
+  nextButtonCustomization?.getString("backgroundColor")?.let {
     nextButtonCustomizationBuilder.setBackgroundColor(it)
   }
-  getIntOrNull(nextButtonCustomization, "borderRadius")?.let {
+  nextButtonCustomization.getIntOrNull("borderRadius")?.let {
     nextButtonCustomizationBuilder.setCornerRadius(it)
   }
-  getStringOrNull(nextButtonCustomization, "textColor")?.let {
+  nextButtonCustomization?.getString("textColor")?.let {
     nextButtonCustomizationBuilder.setTextColor(it)
   }
-  getIntOrNull(nextButtonCustomization, "textFontSize")?.let {
+  nextButtonCustomization.getIntOrNull("textFontSize")?.let {
     nextButtonCustomizationBuilder.setTextFontSize(it)
   }
 
   // Resend button
-  getStringOrNull(resendButtonCustomization, "backgroundColor")?.let {
+  resendButtonCustomization?.getString("backgroundColor")?.let {
     resendButtonCustomizationBuilder.setBackgroundColor(it)
   }
-  getIntOrNull(resendButtonCustomization, "borderRadius")?.let {
+  resendButtonCustomization.getIntOrNull("borderRadius")?.let {
     resendButtonCustomizationBuilder.setCornerRadius(it)
   }
-  getStringOrNull(resendButtonCustomization, "textColor")?.let {
+  resendButtonCustomization?.getString("textColor")?.let {
     resendButtonCustomizationBuilder.setTextColor(it)
   }
-  getIntOrNull(resendButtonCustomization, "textFontSize")?.let {
+  resendButtonCustomization.getIntOrNull("textFontSize")?.let {
     resendButtonCustomizationBuilder.setTextFontSize(it)
   }
 
@@ -876,7 +852,7 @@ fun mapToUICustomization(params: ReadableMap): PaymentAuthConfig.Stripe3ds2UiCus
         PaymentAuthConfig.Stripe3ds2UiCustomization.ButtonType.RESEND,
       )
 
-  getStringOrNull(params, "accentColor")?.let { uiCustomization.setAccentColor(it) }
+  params.getString("accentColor")?.let { uiCustomization.setAccentColor(it) }
 
   return uiCustomization.build()
 }
@@ -936,55 +912,6 @@ fun mapToPaymentIntentFutureUsage(type: String?): ConfirmPaymentIntentParams.Set
     else -> null
   }
 
-fun toBundleObject(readableMap: ReadableMap?): Bundle {
-  val result = Bundle()
-  if (readableMap == null) {
-    return result
-  }
-  val iterator = readableMap.keySetIterator()
-  while (iterator.hasNextKey()) {
-    val key = iterator.nextKey()
-    when (readableMap.getType(key)) {
-      ReadableType.Null -> result.putString(key, null)
-      ReadableType.Boolean -> result.putBoolean(key, readableMap.getBoolean(key))
-      ReadableType.Number ->
-        try {
-          val numAsInt = readableMap.getInt(key)
-          val numAsDouble = readableMap.getDouble(key)
-          if (numAsDouble - numAsInt != 0.0) {
-            result.putDouble(key, numAsDouble)
-          } else {
-            result.putInt(key, numAsInt)
-          }
-        } catch (e: Exception) {
-          Log.e("toBundleException", "Failed to add number to bundle. Failed on: $key.")
-        }
-      ReadableType.String -> result.putString(key, readableMap.getString(key))
-      ReadableType.Map -> result.putBundle(key, toBundleObject(readableMap.getMap(key)))
-      ReadableType.Array -> {
-        val list = readableMap.getArray(key)?.toArrayList()
-        if (list == null) {
-          result.putString(key, null)
-        } else if (list.isEmpty()) {
-          result.putStringArrayList(key, ArrayList())
-        } else {
-          when (list.first()) {
-            is String -> result.putStringArrayList(key, list as java.util.ArrayList<String>)
-            is Int -> result.putIntegerArrayList(key, list as java.util.ArrayList<Int>)
-            else ->
-              Log.e(
-                "toBundleException",
-                "Cannot put arrays of objects into bundles. Failed on: $key.",
-              )
-          }
-        }
-      }
-      else -> Log.e("toBundleException", "Could not convert object with key: $key.")
-    }
-  }
-  return result
-}
-
 internal fun mapFromShippingContact(googlePayResult: GooglePayResult): WritableMap {
   val map = WritableNativeMap()
   map.putString("emailAddress", googlePayResult.email)
@@ -1008,7 +935,7 @@ internal fun mapFromShippingContact(googlePayResult: GooglePayResult): WritableM
   return map
 }
 
-internal fun mapToPreferredNetworks(networksAsInts: ArrayList<Int>?): List<CardBrand> {
+internal fun mapToPreferredNetworks(networksAsInts: List<Int>?): List<CardBrand> {
   if (networksAsInts == null) {
     return emptyList()
   }
@@ -1084,34 +1011,31 @@ private fun Map<String, Any?>.toReadableMap(): ReadableMap {
 
 @OptIn(ExperimentalCustomPaymentMethodsApi::class)
 @SuppressLint("RestrictedApi")
-internal fun parseCustomPaymentMethods(customPaymentMethodConfig: Bundle?): List<PaymentSheet.CustomPaymentMethod> {
+internal fun parseCustomPaymentMethods(customPaymentMethodConfig: ReadableMap?): 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,
-            ),
-          )
-        }
+  val customPaymentMethods = customPaymentMethodConfig.getArray("customPaymentMethods")
+  if (customPaymentMethods != null) {
+    val result = mutableListOf<PaymentSheet.CustomPaymentMethod>()
+
+    customPaymentMethods.forEachMap { customPaymentMethodMap ->
+      val id = customPaymentMethodMap.getString("id")
+      if (id != null) {
+        val subtitle = customPaymentMethodMap.getString("subtitle")
+        val disableBillingDetailCollection = customPaymentMethodMap.getBooleanOr("disableBillingDetailCollection", false)
+        result.add(
+          PaymentSheet.CustomPaymentMethod(
+            id = id,
+            subtitle = subtitle,
+            disableBillingDetailCollection = disableBillingDetailCollection,
+          ),
+        )
       }
-
-      return result
     }
+
+    return result
   }
 
   return emptyList()
@@ -1201,3 +1125,24 @@ private fun mapFromAllowRedisplay(allowRedisplay: PaymentMethod.AllowRedisplay?)
     PaymentMethod.AllowRedisplay.UNSPECIFIED -> "unspecified"
     null -> null
   }
+
+fun readableMapOf(vararg pairs: Pair<String, Any?>): ReadableMap =
+  Arguments.createMap().apply {
+    for ((key, value) in pairs) {
+      when (value) {
+        null -> putNull(key)
+        is String -> putString(key, value)
+        is Boolean -> putBoolean(key, value)
+        is Double -> putDouble(key, value)
+        is Float -> putDouble(key, value.toDouble())
+        is Int -> putInt(key, value)
+        is Long -> putLong(key, value)
+        is ReadableMap -> putMap(key, value)
+        is ReadableArray -> putArray(key, value)
+        else -> {
+          val valueType = value.javaClass.canonicalName
+          throw IllegalArgumentException("Illegal value type $valueType for key \"$key\"")
+        }
+      }
+    }
+  }

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

@@ -0,0 +1,62 @@
+package com.reactnativestripesdk.utils
+
+import android.annotation.SuppressLint
+import androidx.fragment.app.FragmentActivity
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.UiThreadUtil
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
+import com.stripe.android.core.reactnative.UnregisterSignal
+
+@ReactNativeSdkInternal
+@SuppressLint("RestrictedApi")
+abstract class StripeUIManager(
+  protected val context: ReactApplicationContext,
+) {
+  protected val signal = UnregisterSignal()
+  protected var promise: Promise? = null
+  protected var timeout: Long? = null
+
+  protected open fun onCreate() {}
+
+  protected abstract fun onPresent()
+
+  protected open fun onDestroy() {
+    signal.unregister()
+  }
+
+  fun create() {
+    UiThreadUtil.runOnUiThread {
+      onCreate()
+    }
+  }
+
+  fun present(
+    promise: Promise? = null,
+    timeout: Long? = null,
+  ) {
+    UiThreadUtil.runOnUiThread {
+      this.promise = promise
+      this.timeout = timeout
+      onPresent()
+    }
+  }
+
+  fun destroy() {
+    UiThreadUtil.runOnUiThread {
+      onDestroy()
+    }
+  }
+
+  /**
+   * Safely get and cast the current activity as an AppCompatActivity. If that fails, the promise
+   * provided will be resolved with an error message instructing the user to retry the method.
+   */
+  protected fun getCurrentActivityOrResolveWithError(promise: Promise?): FragmentActivity? {
+    (context.currentActivity as? FragmentActivity)?.let {
+      return it
+    }
+    promise?.resolve(createMissingActivityError())
+    return null
+  }
+}

package/ios/AddressSheet/AddressSheetView.swift

@@ -76,7 +76,7 @@ public class AddressSheetView: UIView {
         let navigationController = UINavigationController(rootViewController: addressViewController!)
         navigationController.modalPresentationStyle = getModalPresentationStyle()
         navigationController.modalTransitionStyle = getModalTransitionStyle()
-        let vc = findViewControllerPresenter(from: UIApplication.shared.delegate?.window??.rootViewController ?? UIViewController())
+        let vc = findViewControllerPresenter(from: RCTKeyWindow()?.rootViewController ?? UIViewController())
         vc.present(navigationController, animated: true)
     }
     

package/ios/FinancialConnections.swift

@@ -26,7 +26,7 @@ class FinancialConnections {
             )
             financialConnectionsSheet.onEvent = onEvent
             financialConnectionsSheet.present(
-              from: findViewControllerPresenter(from: UIApplication.shared.delegate?.window??.rootViewController ?? UIViewController()),
+              from: findViewControllerPresenter(from: RCTKeyWindow()?.rootViewController ?? UIViewController()),
               completion: { result in
                   switch result {
                   case .completed(session: let session):
@@ -55,7 +55,7 @@ class FinancialConnections {
             )
             financialConnectionsSheet.onEvent = onEvent
             financialConnectionsSheet.presentForToken(
-              from: findViewControllerPresenter(from: UIApplication.shared.delegate?.window??.rootViewController ?? UIViewController()),
+              from: findViewControllerPresenter(from: RCTKeyWindow()?.rootViewController ?? UIViewController()),
               completion: { result in
                   switch result {
                   case .completed(result: let result):

package/ios/Mappers.swift

@@ -286,7 +286,6 @@ class Mappers {
         case STPPaymentMethodType.SEPADebit: return "SepaDebit"
         case STPPaymentMethodType.AUBECSDebit: return "AuBecsDebit"
         case STPPaymentMethodType.bacsDebit: return "BacsDebit"
-        case STPPaymentMethodType.giropay: return "Giropay"
         case STPPaymentMethodType.przelewy24: return "P24"
         case STPPaymentMethodType.EPS: return "Eps"
         case STPPaymentMethodType.bancontact: return "Bancontact"
@@ -319,7 +318,6 @@ class Mappers {
             case "SepaDebit": return STPPaymentMethodType.SEPADebit
             case "AuBecsDebit": return STPPaymentMethodType.AUBECSDebit
             case "BacsDebit": return STPPaymentMethodType.bacsDebit
-            case "Giropay": return STPPaymentMethodType.giropay
             case "P24": return STPPaymentMethodType.przelewy24
             case "Eps": return STPPaymentMethodType.EPS
             case "Bancontact": return STPPaymentMethodType.bancontact
@@ -666,7 +664,7 @@ class Mappers {
             "accountType": mapFromUSBankAccountType(type: paymentMethod.usBankAccount?.accountType),
             "last4": paymentMethod.usBankAccount?.last4 ?? NSNull(),
             "bankName": paymentMethod.usBankAccount?.bankName ?? NSNull(),
-            "linkedAccount": paymentMethod.usBankAccount?.linkedAccount ?? NSNull(),
+            "linkedAccount": paymentMethod.usBankAccount?.financialConnectionsAccount ?? NSNull(),
             "fingerprint": paymentMethod.usBankAccount?.fingerprint ?? NSNull(),
             "preferredNetworks": paymentMethod.usBankAccount?.networks?.preferred ?? NSNull(),
             "supportedNetworks": paymentMethod.usBankAccount?.networks?.supported ?? NSNull(),
@@ -839,7 +837,7 @@ class Mappers {
 
 
         let types = setupIntent.paymentMethodTypes.map {
-            mapPaymentMethodType(type: STPPaymentMethodType.init(rawValue: Int(truncating: $0))!)
+            mapPaymentMethodType(type: $0)
         }
 
         intent.setValue(types, forKey: "paymentMethodTypes")

package/ios/PaymentMethodFactory.swift

@@ -39,8 +39,6 @@ class PaymentMethodFactory {
                 return try createBilliePaymentMethodParams()
             case STPPaymentMethodType.SEPADebit:
                 return try createSepaPaymentMethodParams()
-            case STPPaymentMethodType.giropay:
-                return try createGiropayPaymentMethodParams()
             case STPPaymentMethodType.EPS:
                 return try createEPSPaymentMethodParams()
             case STPPaymentMethodType.grabPay:
@@ -96,8 +94,6 @@ class PaymentMethodFactory {
                 return nil
             case STPPaymentMethodType.OXXO:
                 return nil
-            case STPPaymentMethodType.giropay:
-                return nil
             case STPPaymentMethodType.grabPay:
                 return nil
             case STPPaymentMethodType.przelewy24:
@@ -303,16 +299,6 @@ class PaymentMethodFactory {
         return STPPaymentMethodParams(oxxo: params, billingDetails: billingDetails, metadata: metadata)
     }
 
-    private func createGiropayPaymentMethodParams() throws -> STPPaymentMethodParams {
-        let params = STPPaymentMethodGiropayParams()
-
-        guard let billingDetails = billingDetailsParams else {
-            throw PaymentMethodError.giropayPaymentMissingParams
-        }
-
-        return STPPaymentMethodParams(giropay: params, billingDetails: billingDetails, metadata: metadata)
-    }
-
     private func createEPSPaymentMethodParams() throws -> STPPaymentMethodParams {
         let params = STPPaymentMethodEPSParams()
 
@@ -419,7 +405,6 @@ enum PaymentMethodError: Error {
     case bancontactPaymentMissingParams
     case billiePaymentMissingParams
     case sepaPaymentMissingParams
-    case giropayPaymentMissingParams
     case p24PaymentMissingParams
     case afterpayClearpayPaymentMissingParams
     // Klarna no longer requires email and country in billing details
@@ -434,8 +419,6 @@ extension PaymentMethodError: LocalizedError {
         switch self {
         case .cardPaymentMissingParams:
             return NSLocalizedString("Card details not complete", comment: "Create payment error")
-        case .giropayPaymentMissingParams:
-            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 .p24PaymentMissingParams:

package/ios/PushProvisioning/AddToWalletButtonView.swift

@@ -89,7 +89,7 @@ public class AddToWalletButtonView: UIView {
             return self.testEnv ? STPFakeAddPaymentPassViewController(requestConfiguration: config, delegate: self) : PKAddPaymentPassViewController(requestConfiguration: config, delegate: self)
         }()
 
-        let vc = findViewControllerPresenter(from: UIApplication.shared.delegate?.window??.rootViewController ?? UIViewController())
+        let vc = findViewControllerPresenter(from: RCTKeyWindow()?.rootViewController ?? UIViewController())
         vc.present(controller!, animated: true, completion: nil)
     }
     

package/ios/StripeSdkImpl+CustomerSheet.swift

@@ -107,7 +107,7 @@ extension StripeSdkImpl {
         }
 
         DispatchQueue.main.async {
-            self.customerSheetViewController = findViewControllerPresenter(from: UIApplication.shared.delegate?.window??.rootViewController ?? UIViewController())
+            self.customerSheetViewController = findViewControllerPresenter(from: RCTKeyWindow()?.rootViewController ?? UIViewController())
             if let customerSheetViewController = self.customerSheetViewController {
                 customerSheetViewController.modalPresentationStyle = CustomerSheetUtils.getModalPresentationStyle(params["presentationStyle"] as? String)
                 customerSheetViewController.modalTransitionStyle = CustomerSheetUtils.getModalTransitionStyle(params["animationStyle"] as? String)

package/ios/StripeSdkImpl+PaymentSheet.swift

@@ -396,6 +396,20 @@ extension StripeSdkImpl {
         if (applePayParams["request"] == nil) {
             return nil
         }
+        let authorizationResultHandler: PaymentSheet.ApplePayConfiguration.Handlers.AuthorizationResultHandler? = {
+            guard applePayParams.object(forKey: "setOrderTracking") != nil else {
+                return nil
+            }
+            return { result in
+                await withCheckedContinuation { continuation in
+                    // Set the handler first: this will be called from JS land after we `emitOnOrderTrackingCallback()`.
+                    self.orderTrackingHandler = (result, { result in
+                        continuation.resume(returning: result)
+                    })
+                    self.emitter?.emitOnOrderTrackingCallback()
+                }
+            }
+        }()
         return PaymentSheet.ApplePayConfiguration.Handlers(paymentRequestHandler: { request in
             do {
                 try request.configureRequestType(requestParams: applePayParams)
@@ -404,14 +418,7 @@ extension StripeSdkImpl {
                 RCTMakeAndLogError(error.localizedDescription, nil, nil)
             }
             return request
-        }, authorizationResultHandler: { result, completion in
-            if applePayParams.object(forKey: "setOrderTracking") != nil {
-                self.orderTrackingHandler = (result, completion)
-                self.emitter?.emitOnOrderTrackingCallback()
-            } else {
-                completion(result)
-            }
-        })
+        }, authorizationResultHandler: authorizationResultHandler)
     }
 
     internal static func mapToCollectionMode(str: String?) -> PaymentSheet.BillingDetailsCollectionConfiguration.CollectionMode {