@stripe/stripe-react-native 0.21.0 → 0.22.1

package/ios/PushProvisioning/PushProvisioningUtils.swift

@@ -12,25 +12,33 @@ internal class PushProvisioningUtils {
     class func canAddCardToWallet(
         last4: String,
         primaryAccountIdentifier: String,
-        testEnv: Bool
-    ) -> (canAddCard: Bool, status: AddCardToWalletStatus?) {
+        testEnv: Bool,
+        hasPairedAppleWatch: Bool,
+        completion: @escaping (_ canAddCard: Bool, _ status: AddCardToWalletStatus?) -> Void
+    ) {
         if (!PKAddPassesViewController.canAddPasses()) {
-            return (false, AddCardToWalletStatus.UNSUPPORTED_DEVICE)
+            completion(false, AddCardToWalletStatus.UNSUPPORTED_DEVICE)
         }
         
-        var status : AddCardToWalletStatus? = nil
-        var canAddCard = PushProvisioningUtils.canAddPaymentPass(
+        let canAddCard = canAddPaymentPass(
             primaryAccountIdentifier: primaryAccountIdentifier,
             isTestMode: testEnv)
         
         if (!canAddCard) {
-            status = AddCardToWalletStatus.MISSING_CONFIGURATION
-        } else if (PushProvisioningUtils.passExistsWith(last4: last4)) {
-            canAddCard = false
-            status = AddCardToWalletStatus.CARD_ALREADY_EXISTS
+            completion(canAddCard, AddCardToWalletStatus.MISSING_CONFIGURATION)
+        } else {
+            PaymentPassFinder.findPassWithLast4(last4: last4, hasPairedAppleWatch: hasPairedAppleWatch) { canAddCardToADevice, passLocations in
+                var status: AddCardToWalletStatus? = nil
+                if (!canAddCardToADevice) {
+                    status = AddCardToWalletStatus.CARD_ALREADY_EXISTS
+                } else if (passLocations.contains(.PAIRED_DEVICE)) {
+                    status = AddCardToWalletStatus.CARD_EXISTS_ON_PAIRED_DEVICE
+                } else if (passLocations.contains(.CURRENT_DEVICE)) {
+                    status = AddCardToWalletStatus.CARD_EXISTS_ON_CURRENT_DEVICE
+                }
+                completion(canAddCardToADevice, status)
+            }
         }
-
-        return (canAddCard, status)
     }
     
     class func canAddPaymentPass(primaryAccountIdentifier: String, isTestMode: Bool) -> Bool {
@@ -45,20 +53,35 @@ internal class PushProvisioningUtils {
         }
     }
     
-    class func passExistsWith(last4: String) -> Bool {
-        let existingPass: PKPass? = {
+    class func getPassLocation(last4: String) -> PaymentPassFinder.PassLocation? {
+        let existingPassOnDevice: PKPass? = {
             if #available(iOS 13.4, *) {
-                return PKPassLibrary().passes(of: PKPassType.secureElement).first(where: {$0.secureElementPass?.primaryAccountNumberSuffix == last4})
+                return PKPassLibrary().passes(of: PKPassType.secureElement)
+                    .first(where: { $0.secureElementPass?.primaryAccountNumberSuffix == last4 && $0.secureElementPass?.passActivationState != .suspended && !$0.isRemotePass })
             } else {
-                return PKPassLibrary().passes(of: PKPassType.payment).first(where: {$0.paymentPass?.primaryAccountNumberSuffix == last4})
+                return PKPassLibrary().passes(of: PKPassType.payment)
+                    .first(where: { $0.paymentPass?.primaryAccountNumberSuffix == last4 && $0.paymentPass?.passActivationState != .suspended && !$0.isRemotePass })
             }
         }()
-        return existingPass != nil
+        
+        let existingPassOnPairedDevices: PKPass? = {
+            if #available(iOS 13.4, *) {
+                return PKPassLibrary().remoteSecureElementPasses
+                    .first(where: { $0.secureElementPass?.primaryAccountNumberSuffix == last4 && $0.secureElementPass?.passActivationState != .suspended })
+            } else {
+                return PKPassLibrary().remotePaymentPasses()
+                    .first(where: { $0.paymentPass?.primaryAccountNumberSuffix == last4 && $0.paymentPass?.passActivationState != .suspended })
+            }
+        }()
+        
+        return existingPassOnDevice != nil ? PaymentPassFinder.PassLocation.CURRENT_DEVICE : (existingPassOnPairedDevices != nil ? PaymentPassFinder.PassLocation.PAIRED_DEVICE : nil)
     }
     
     enum AddCardToWalletStatus: String {
         case UNSUPPORTED_DEVICE
         case MISSING_CONFIGURATION
         case CARD_ALREADY_EXISTS
+        case CARD_EXISTS_ON_CURRENT_DEVICE
+        case CARD_EXISTS_ON_PAIRED_DEVICE
     }
 }

package/ios/StripeSdk.m

@@ -19,6 +19,35 @@ RCT_EXTERN_METHOD(
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(
+                  isPlatformPaySupported:(NSDictionary *)params
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(
+                  createPlatformPayPaymentMethod:(NSDictionary *)params
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(
+                  confirmPlatformPay:(NSString *)clientSecret
+                  params:(NSDictionary *)params
+                  isPaymentIntent:(BOOL)isPaymentIntent
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject
+                  )
+
+RCT_EXTERN_METHOD(
+                  dismissPlatformPay: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(
+                  updatePlatformPaySheet:(NSArray *)summaryItems
+                  shippingMethods:(NSArray *)summaryItems
+                  errors: (NSArray *)errors
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter: (RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(
                   presentApplePay:(NSDictionary *)params
                   resolver: (RCTPromiseResolveBlock)resolve

package/ios/StripeSdk.swift

@@ -4,7 +4,7 @@ import StripePaymentSheet
 import StripeFinancialConnections
 
 @objc(StripeSdk)
-class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionViewControllerDelegate, UIAdaptivePresentationControllerDelegate {
+class StripeSdk: RCTEventEmitter, STPBankSelectionViewControllerDelegate, UIAdaptivePresentationControllerDelegate {
     public var cardFieldView: CardFieldView? = nil
     public var cardFormView: CardFormView? = nil
 
@@ -14,19 +14,49 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
     private var paymentSheetFlowController: PaymentSheet.FlowController?
 
     var urlScheme: String? = nil
-
-    var applePayCompletionCallback: STPIntentClientSecretCompletionBlock? = nil
-    var applePayRequestResolver: RCTPromiseResolveBlock? = nil
-    var applePayRequestRejecter: RCTPromiseRejectBlock? = nil
-    var applePayCompletionRejecter: RCTPromiseRejectBlock? = nil
-    var confirmApplePayPaymentResolver: RCTPromiseResolveBlock? = nil
+    
     var confirmPaymentResolver: RCTPromiseResolveBlock? = nil
 
+    var applePayCompletionCallback: STPIntentClientSecretCompletionBlock? = nil
+    var deprecatedApplePayRequestResolver: RCTPromiseResolveBlock? = nil
+    var deprecatedApplePayRequestRejecter: RCTPromiseRejectBlock? = nil
+    var deprecatedApplePayCompletionRejecter: RCTPromiseRejectBlock? = nil
+    var deprecatedConfirmApplePayPaymentResolver: RCTPromiseResolveBlock? = nil
+    
+    var confirmApplePayResolver: RCTPromiseResolveBlock? = nil
+    var confirmApplePayPaymentClientSecret: String? = nil
+    var confirmApplePaySetupClientSecret: String? = nil
+    
+    var applePaymentAuthorizationController: PKPaymentAuthorizationViewController? = nil
+    var createPlatformPayPaymentMethodResolver: RCTPromiseResolveBlock? = nil
+    var applePaymentMethodFlowCanBeCanceled = false
+    
     var confirmPaymentClientSecret: String? = nil
 
-    var shippingMethodUpdateHandler: ((PKPaymentRequestShippingMethodUpdate) -> Void)? = nil
-    var shippingContactUpdateHandler: ((PKPaymentRequestShippingContactUpdate) -> Void)? = nil
-
+    var shippingMethodUpdateCompletion: ((PKPaymentRequestShippingMethodUpdate) -> Void)? = nil
+    var shippingContactUpdateCompletion: ((PKPaymentRequestShippingContactUpdate) -> Void)? = nil
+    @available(iOS 15.0, *)
+    var couponCodeUpdateCompletion: ((PKPaymentRequestCouponCodeUpdate) -> Void)? {
+        get { _couponCodeUpdateCompletion as? ((PKPaymentRequestCouponCodeUpdate) -> Void) }
+        set { _couponCodeUpdateCompletion = newValue }
+    }
+    private var _couponCodeUpdateCompletion: Any? = nil
+    var shippingMethodUpdateJSCallback: RCTDirectEventBlock? = nil
+    var shippingContactUpdateJSCallback: RCTDirectEventBlock? = nil
+    var couponCodeEnteredJSCallback: RCTDirectEventBlock? = nil
+    var applePaySummaryItems: [PKPaymentSummaryItem] = []
+    var applePayShippingMethods: [PKShippingMethod] = []
+    var applePayShippingAddressErrors: [Error]? = nil
+    var applePayCouponCodeErrors: [Error]? = nil
+    
+    var hasLegacyApplePayListeners = false
+    override func startObserving() {
+        hasLegacyApplePayListeners = true
+    }
+    override func stopObserving() {
+        hasLegacyApplePayListeners = false
+    }
+    
     override func supportedEvents() -> [String]! {
         return ["onDidSetShippingMethod", "onDidSetShippingContact"]
     }
@@ -364,9 +394,56 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
         }
     }
 
+    @objc(updatePlatformPaySheet:shippingMethods:errors:resolver:rejecter:)
+    func updatePlatformPaySheet(summaryItems: NSArray,
+                             shippingMethods: NSArray,
+                             errors: [NSDictionary],
+                             resolver resolve: @escaping RCTPromiseResolveBlock,
+                             rejecter reject: @escaping RCTPromiseRejectBlock)
+    {
+        let couponUpdateHandlerIsNil: Bool = {
+            if #available(iOS 15.0, *), self.couponCodeUpdateCompletion == nil {
+                return true
+            }
+            return false
+        }()
+        
+        if (shippingMethodUpdateCompletion == nil && shippingContactUpdateCompletion == nil && couponUpdateHandlerIsNil) {
+            resolve(Errors.createError(ErrorType.Failed, "You can use this method only after either onShippingContactSelected, onShippingMethodSelected, or onCouponCodeEntered callbacks are triggered"))
+            return
+        }
+        
+        do {
+            applePaySummaryItems = try ApplePayUtils.buildPaymentSummaryItems(items: summaryItems as? [[String : Any]])
+        } catch {
+            resolve(Errors.createError(ErrorType.Failed, error.localizedDescription))
+            return
+        }
+        
+        applePayShippingMethods = ApplePayUtils.buildShippingMethods(items: shippingMethods as? [[String : Any]])
+        
+        do {
+            (applePayShippingAddressErrors, applePayCouponCodeErrors) = try ApplePayUtils.buildApplePayErrors(errorItems: errors)
+        } catch {
+            resolve(Errors.createError(ErrorType.Failed, error.localizedDescription))
+            return
+        }
+        
+
+        shippingMethodUpdateCompletion?(PKPaymentRequestShippingMethodUpdate.init(paymentSummaryItems: applePaySummaryItems))
+        shippingContactUpdateCompletion?(PKPaymentRequestShippingContactUpdate.init(errors: applePayShippingAddressErrors, paymentSummaryItems: applePaySummaryItems, shippingMethods: applePayShippingMethods))
+        if #available(iOS 15.0, *) {
+            couponCodeUpdateCompletion?(PKPaymentRequestCouponCodeUpdate.init(errors: applePayCouponCodeErrors, paymentSummaryItems: applePaySummaryItems, shippingMethods: applePayShippingMethods))
+            self.couponCodeUpdateCompletion = nil
+        }
+        self.shippingMethodUpdateCompletion = nil
+        self.shippingContactUpdateCompletion = nil
+        resolve([])
+    }
+    
     @objc(updateApplePaySummaryItems:errorAddressFields:resolver:rejecter:)
     func updateApplePaySummaryItems(summaryItems: NSArray, errorAddressFields: [NSDictionary], resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-        if (shippingMethodUpdateHandler == nil && shippingContactUpdateHandler == nil) {
+        if (shippingMethodUpdateCompletion == nil && shippingContactUpdateCompletion == nil) {
             resolve(Errors.createError(ErrorType.Failed, "You can use this method only after either onDidSetShippingMethod or onDidSetShippingContact events emitted"))
             return
         }
@@ -386,88 +463,26 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
             shippingAddressErrors.append(PKPaymentRequest.paymentShippingAddressInvalidError(withKey: field, localizedDescription: message))
         }
 
-        shippingMethodUpdateHandler?(PKPaymentRequestShippingMethodUpdate.init(paymentSummaryItems: paymentSummaryItems))
-        shippingContactUpdateHandler?(PKPaymentRequestShippingContactUpdate.init(errors: shippingAddressErrors, paymentSummaryItems: paymentSummaryItems, shippingMethods: []))
-        self.shippingMethodUpdateHandler = nil
-        self.shippingContactUpdateHandler = nil
+        shippingMethodUpdateCompletion?(PKPaymentRequestShippingMethodUpdate.init(paymentSummaryItems: paymentSummaryItems))
+        shippingContactUpdateCompletion?(PKPaymentRequestShippingContactUpdate.init(errors: shippingAddressErrors, paymentSummaryItems: paymentSummaryItems, shippingMethods: []))
+        self.shippingMethodUpdateCompletion = nil
+        self.shippingContactUpdateCompletion = nil
         resolve([])
     }
 
     @objc(openApplePaySetup:rejecter:)
     func openApplePaySetup(resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void {
-        let library = PKPassLibrary.init()
-        if (library.responds(to: #selector(PKPassLibrary.openPaymentSetup))) {
-            library.openPaymentSetup()
-            resolve([])
-        } else {
-            resolve(Errors.createError(ErrorType.Failed, "Cannot open payment setup"))
-        }
-    }
-
-
-    func applePayContext(_ context: STPApplePayContext, didSelect shippingMethod: PKShippingMethod, handler: @escaping (PKPaymentRequestShippingMethodUpdate) -> Void) {
-        self.shippingMethodUpdateHandler = handler
-        sendEvent(withName: "onDidSetShippingMethod", body: ["shippingMethod": Mappers.mapFromShippingMethod(shippingMethod: shippingMethod)])
-    }
-
-    func applePayContext(_ context: STPApplePayContext, didSelectShippingContact contact: PKContact, handler: @escaping (PKPaymentRequestShippingContactUpdate) -> Void) {
-        self.shippingContactUpdateHandler = handler
-        sendEvent(withName: "onDidSetShippingContact", body: ["shippingContact": Mappers.mapFromShippingContact(shippingContact: contact)])
-    }
-
-    func applePayContext(_ context: STPApplePayContext, didCreatePaymentMethod paymentMethod: STPPaymentMethod, paymentInformation: PKPayment, completion: @escaping STPIntentClientSecretCompletionBlock) {
-        self.applePayCompletionCallback = completion
-
-        let address = paymentMethod.billingDetails?.address?.line1?.split(whereSeparator: \.isNewline)
-        if (address?.indices.contains(0) == true) {
-            paymentMethod.billingDetails?.address?.line1 = String(address?[0] ?? "")
-        }
-        if (address?.indices.contains(1) == true) {
-            paymentMethod.billingDetails?.address?.line2 = String(address?[1] ?? "")
-        }
-
-        let method = Mappers.mapFromPaymentMethod(paymentMethod)
-        self.applePayRequestResolver?(Mappers.createResult("paymentMethod", method))
-        self.applePayRequestRejecter = nil
+        PKPassLibrary.init().openPaymentSetup()
+        resolve([])
     }
 
     @objc(confirmApplePayPayment:resolver:rejecter:)
     func confirmApplePayPayment(clientSecret: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-        self.applePayCompletionRejecter = reject
-        self.confirmApplePayPaymentResolver = resolve
+        self.deprecatedApplePayCompletionRejecter = reject
+        self.deprecatedConfirmApplePayPaymentResolver = resolve
         self.applePayCompletionCallback?(clientSecret, nil)
     }
 
-    func applePayContext(_ context: STPApplePayContext, didCompleteWith status: STPPaymentStatus, error: Error?) {
-        switch status {
-        case .success:
-            applePayCompletionRejecter = nil
-            applePayRequestRejecter = nil
-            confirmApplePayPaymentResolver?([])
-            break
-        case .error:
-            let message = "Payment not completed"
-            applePayCompletionRejecter?(ErrorType.Failed, message, nil)
-            applePayRequestRejecter?(ErrorType.Failed, message, nil)
-            applePayCompletionRejecter = nil
-            applePayRequestRejecter = nil
-            break
-        case .userCancellation:
-            let message = "The payment has been canceled"
-            applePayCompletionRejecter?(ErrorType.Canceled, message, nil)
-            applePayRequestRejecter?(ErrorType.Canceled, message, nil)
-            applePayCompletionRejecter = nil
-            applePayRequestRejecter = nil
-            break
-        @unknown default:
-            let message = "Payment not completed"
-            applePayCompletionRejecter?(ErrorType.Unknown, message, nil)
-            applePayRequestRejecter?(ErrorType.Unknown, message, nil)
-            applePayCompletionRejecter = nil
-            applePayRequestRejecter = nil
-        }
-    }
-
     @objc(isApplePaySupported:rejecter:)
     func isApplePaySupported(resolver resolve: @escaping RCTPromiseResolveBlock,
                              rejecter reject: @escaping RCTPromiseRejectBlock) {
@@ -496,65 +511,110 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
     func presentApplePay(params: NSDictionary,
                          resolver resolve: @escaping RCTPromiseResolveBlock,
                          rejecter reject: @escaping RCTPromiseRejectBlock) {
-        if (merchantIdentifier == nil) {
-            reject(ErrorType.Failed, "You must provide merchantIdentifier", nil)
+        self.deprecatedApplePayRequestResolver = resolve
+        self.deprecatedApplePayRequestRejecter = reject
+        
+        let (error, paymentRequest) = ApplePayUtils.createPaymentRequest(merchantIdentifier: merchantIdentifier, params: params)
+        guard let paymentRequest = paymentRequest else {
+            resolve(error)
             return
         }
-
-        if (params["jcbEnabled"] as? Bool == true) {
-            StripeAPI.additionalEnabledApplePayNetworks = [.JCB]
+        
+        if let applePayContext = STPApplePayContext(paymentRequest: paymentRequest, delegate: self) {
+            DispatchQueue.main.async {
+                applePayContext.presentApplePay(completion: nil)
+            }
+        } else {
+            resolve(Errors.createError(ErrorType.Failed, "Payment not completed"))
         }
-
-        guard let summaryItems = params["cartItems"] as? NSArray else {
-            reject(ErrorType.Failed, "You must provide the items for purchase", nil)
+    }
+    
+    @objc(isPlatformPaySupported:resolver:rejecter:)
+    func isPlatformPaySupported(params: NSDictionary,
+                                          resolver resolve: @escaping RCTPromiseResolveBlock,
+                                          rejecter reject: @escaping RCTPromiseRejectBlock) {
+        resolve(StripeAPI.deviceSupportsApplePay())
+    }
+    
+    @objc(createPlatformPayPaymentMethod:resolver:rejecter:)
+    func createPlatformPayPaymentMethod(params: NSDictionary,
+                                          resolver resolve: @escaping RCTPromiseResolveBlock,
+                                          rejecter reject: @escaping RCTPromiseRejectBlock) {
+        guard let applePayPatams = params["applePay"] as? NSDictionary else {
+            resolve(Errors.createError(ErrorType.Failed, "You must provide the `applePay` parameter."))
             return
         }
-        guard let country = params["country"] as? String else {
-            reject(ErrorType.Failed, "You must provide the country", nil)
+        let (error, paymentRequest) = ApplePayUtils.createPaymentRequest(merchantIdentifier: merchantIdentifier, params: applePayPatams)
+        guard let paymentRequest = paymentRequest else {
+            resolve(error)
             return
         }
-        guard let currency = params["currency"] as? String else {
-            reject(ErrorType.Failed, "You must provide the payment currency", nil)
+        
+        self.applePaySummaryItems = paymentRequest.paymentSummaryItems
+        self.applePayShippingMethods = paymentRequest.shippingMethods ?? []
+        self.applePayShippingAddressErrors = nil
+        self.applePayCouponCodeErrors = nil
+        applePaymentMethodFlowCanBeCanceled = true
+        createPlatformPayPaymentMethodResolver = resolve
+        self.applePaymentAuthorizationController = PKPaymentAuthorizationViewController(paymentRequest: paymentRequest)
+        if let applePaymentAuthorizationController = self.applePaymentAuthorizationController {
+            applePaymentAuthorizationController.delegate = self
+            DispatchQueue.main.async {
+                let vc = findViewControllerPresenter(from: UIApplication.shared.delegate?.window??.rootViewController ?? UIViewController())
+                vc.present(
+                    applePaymentAuthorizationController,
+                    animated: true,
+                    completion: nil
+                )
+            }
+        } else {
+            resolve(Errors.createError(ErrorType.Failed, "Invalid in-app payment request. Search the iOS logs for `NSUnderlyingError` to get more information."))
+        }
+    }
+    
+    @objc(dismissPlatformPay:rejecter:)
+    func dismissPlatformPay(resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void {
+        let didDismiss = maybeDismissApplePay()
+        resolve(didDismiss)
+    }
+    
+    @objc(confirmPlatformPay:params:isPaymentIntent:resolver:rejecter:)
+    func confirmPlatformPay(
+        clientSecret: String?,
+        params: NSDictionary,
+        isPaymentIntent: Bool,
+        resolver resolve: @escaping RCTPromiseResolveBlock,
+        rejecter reject: @escaping RCTPromiseRejectBlock
+    ) -> Void {
+        guard let applePayPatams = params["applePay"] as? NSDictionary else {
+            resolve(Errors.createError(ErrorType.Failed, "You must provide the `applePay` parameter."))
             return
         }
-
-        self.applePayRequestResolver = resolve
-        self.applePayRequestRejecter = reject
-
-        let merchantIdentifier = self.merchantIdentifier ?? ""
-        let paymentRequest = StripeAPI.paymentRequest(withMerchantIdentifier: merchantIdentifier, country: country, currency: currency)
-
-        let requiredShippingAddressFields = params["requiredShippingAddressFields"] as? NSArray ?? NSArray()
-        let requiredBillingContactFields = params["requiredBillingContactFields"] as? NSArray ?? NSArray()
-        let shippingMethods = params["shippingMethods"] as? NSArray ?? NSArray()
-
-        paymentRequest.requiredShippingContactFields = Set(requiredShippingAddressFields.map {
-            Mappers.mapToPKContactField(field: $0 as! String)
-        })
-
-        paymentRequest.requiredBillingContactFields = Set(requiredBillingContactFields.map {
-            Mappers.mapToPKContactField(field: $0 as! String)
-        })
-
-        paymentRequest.shippingMethods = Mappers.mapToShippingMethods(shippingMethods: shippingMethods)
-
-        do {
-            paymentRequest.paymentSummaryItems = try ApplePayUtils
-                .buildPaymentSummaryItems(items: summaryItems as? [[String : Any]])
-        } catch  {
-            resolve(Errors.createError(ErrorType.Failed, error.localizedDescription))
+        let (error, paymentRequest) = ApplePayUtils.createPaymentRequest(merchantIdentifier: merchantIdentifier, params: applePayPatams)
+        guard let paymentRequest = paymentRequest else {
+            resolve(error)
             return
         }
 
+        self.applePaySummaryItems = paymentRequest.paymentSummaryItems
+        self.applePayShippingMethods = paymentRequest.shippingMethods ?? []
+        self.applePayShippingAddressErrors = nil
+        self.applePayCouponCodeErrors = nil
+        self.confirmApplePayResolver = resolve
+        if (isPaymentIntent) {
+            self.confirmApplePayPaymentClientSecret = clientSecret
+        } else {
+            self.confirmApplePaySetupClientSecret = clientSecret
+        }
         if let applePayContext = STPApplePayContext(paymentRequest: paymentRequest, delegate: self) {
             DispatchQueue.main.async {
                 applePayContext.presentApplePay(completion: nil)
             }
         } else {
-            reject(ErrorType.Failed, "Payment not completed", nil)
+            resolve(Errors.createError(ErrorType.Failed, "Payment not completed"))
         }
     }
-
+    
     func configure3dSecure(_ params: NSDictionary) {
         let threeDSCustomizationSettings = STPPaymentHandler.shared().threeDSCustomizationSettings
         let uiCustomization = Mappers.mapUICustomization(params)
@@ -1056,13 +1116,17 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
             resolve(Errors.createError(ErrorType.Failed, "You must provide `cardLastFour`"))
             return
         }
-        let (canAddCard, status) = PushProvisioningUtils.canAddCardToWallet(last4: last4,
-                                                 primaryAccountIdentifier: params["primaryAccountIdentifier"] as? String ?? "",
-                                                 testEnv: params["testEnv"] as? Bool ?? false)
-        resolve([
-            "canAddCard": canAddCard,
-            "details": ["status": status?.rawValue],
-        ])
+        PushProvisioningUtils.canAddCardToWallet(
+            last4: last4,
+            primaryAccountIdentifier: params["primaryAccountIdentifier"] as? String ?? "",
+            testEnv: params["testEnv"] as? Bool ?? false,
+            hasPairedAppleWatch: params["hasPairedAppleWatch"]  as? Bool ?? false)
+        { canAddCard, status in
+            resolve([
+                "canAddCard": canAddCard,
+                "details": ["status": status?.rawValue],
+            ])
+        }
     }
 
     @objc(isCardInWallet:resolver:rejecter:)
@@ -1075,7 +1139,7 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
             resolve(Errors.createError(ErrorType.Failed, "You must provide `cardLastFour`"))
             return
         }
-        resolve(["isInWallet": PushProvisioningUtils.passExistsWith(last4: last4)])
+        resolve(["isInWallet": PushProvisioningUtils.getPassLocation(last4: last4) != nil])
     }
 
     @objc(collectBankAccountToken:resolver:rejecter:)

package/ios/Tests/AddressSheetUtilsTests.swift

@@ -7,7 +7,7 @@
 
 import XCTest
 @testable import stripe_react_native
-import Stripe
+import StripePaymentSheet
 
 class AddressSheetUtilsTests: XCTestCase {
     let testCity = "testCity"
@@ -202,9 +202,6 @@ class AddressSheetUtilsTests: XCTestCase {
         XCTAssertEqual(
             result.phone, .hidden
         )
-        XCTAssertEqual(
-            result.name, .required
-        )
         XCTAssertEqual(
             result.checkboxLabel, nil
         )
@@ -219,9 +216,6 @@ class AddressSheetUtilsTests: XCTestCase {
         XCTAssertEqual(
             result.phone, .optional
         )
-        XCTAssertEqual(
-            result.name, .hidden
-        )
         XCTAssertEqual(
             result.checkboxLabel, testCheckboxLabel
         )

package/ios/Tests/PushProvisioningTests.swift

@@ -11,19 +11,22 @@ import XCTest
 
 class PushProvisioningTests: XCTestCase {
     func testCanAddCardToWalletInTestMode() throws {
-        let (canAddCard, status) = PushProvisioningUtils.canAddCardToWallet(last4: "4242",
+        PushProvisioningUtils.canAddCardToWallet(last4: "4242",
                                                  primaryAccountIdentifier: "",
-                                                 testEnv: true)
-        XCTAssertEqual(canAddCard, true)
-        XCTAssertEqual(status, nil)
+                                                 testEnv: true, hasPairedAppleWatch: false) { canAddCard, status in
+            XCTAssertEqual(canAddCard, true)
+            XCTAssertEqual(status, nil)
+        }
     }
-
+    
     func testCanAddCardToWalletInLiveMode() throws {
-        let (canAddCard, status) = PushProvisioningUtils.canAddCardToWallet(last4: "4242",
+        PushProvisioningUtils.canAddCardToWallet(last4: "4242",
                                                  primaryAccountIdentifier: "",
-                                                 testEnv: false)
-        XCTAssertEqual(canAddCard, false)
-        XCTAssertEqual(status, PushProvisioningUtils.AddCardToWalletStatus.MISSING_CONFIGURATION)
+                                                 testEnv: false,
+                                                 hasPairedAppleWatch: false) { canAddCard, status in
+            XCTAssertEqual(canAddCard, false)
+            XCTAssertEqual(status, PushProvisioningUtils.AddCardToWalletStatus.MISSING_CONFIGURATION)
+        }
     }
     
     func testCanAddPaymentPassInTestMode() throws {
@@ -42,8 +45,8 @@ class PushProvisioningTests: XCTestCase {
     
     func testCheckIfPassExists() throws {
         XCTAssertEqual(
-            PushProvisioningUtils.passExistsWith(last4: "4242"),
-            false
+            PushProvisioningUtils.getPassLocation(last4: "4242"),
+            nil
         )
     }
 }

package/jest/mock.js

@@ -22,6 +22,27 @@ const mockFunctions = {
     paymentMethod: {},
     error: null,
   })),
+  isPlatformPaySupported: jest.fn(async () => true),
+  confirmPlatformPaySetupIntent: jest.fn(async () => ({
+    setupIntent: {},
+    error: null,
+  })),
+  confirmPlatformPayPayment: jest.fn(async () => ({
+    paymentIntent: {},
+    error: null,
+  })),
+  dismissPlatformPay: jest.fn(async () => true),
+  createPlatformPayPaymentMethod: jest.fn(async () => ({
+    paymentMethod: {},
+    token: {},
+    error: null,
+  })),
+  updatePlatformPaySheet: jest.fn(async () => ({
+    error: null,
+  })),
+  openPlatformPaySetup: jest.fn(async () => {
+    return;
+  }),
   isApplePaySupported: jest.fn(async () => true),
   presentApplePay: jest.fn(async () => ({
     error: null,
@@ -141,6 +162,28 @@ const mockHooks = {
       ...mockFunctions.openApplePaySetup(),
     })),
   })),
+  usePlatformPay: jest.fn(() => ({
+    loading: false,
+    isPlatformPaySupported: true,
+    confirmPlatformPaySetupIntent: jest.fn(async () => ({
+      ...mockFunctions.confirmPlatformPaySetupIntent(),
+    })),
+    confirmPlatformPayPayment: jest.fn(async () => ({
+      ...mockFunctions.confirmPlatformPayPayment(),
+    })),
+    dismissPlatformPay: jest.fn(async () => ({
+      ...mockFunctions.dismissPlatformPay(),
+    })),
+    createPlatformPayPaymentMethod: jest.fn(async () => ({
+      ...mockFunctions.createPlatformPayPaymentMethod(),
+    })),
+    updatePlatformPaySheet: jest.fn(async () => ({
+      ...mockFunctions.updatePlatformPaySheet(),
+    })),
+    openPlatformPaySetup: jest.fn(async () => ({
+      ...mockFunctions.openPlatformPaySetup(),
+    })),
+  })),
   usePaymentSheet: jest.fn(() => ({
     loading: false,
     initPaymentSheet: jest.fn(async () => ({
@@ -175,5 +218,6 @@ module.exports = {
   AuBECSDebitForm: () => 'AuBECSDebitForm',
   GooglePayButton: () => 'GooglePayButton',
   AddToWalletButton: () => 'AddToWalletButton',
+  PlatformPayButton: () => 'PlatformPayButton',
   useStripe: jest.fn(() => mockHooks),
 };