handle apple pay errors

ios/Mappers.swift

@@ -173,7 +173,7 @@ class Mappers {
         let method: NSDictionary = [
             "detail": shippingMethod.detail ?? "",
             "identifier": shippingMethod.identifier ?? "",
-			"amount": shippingMethod.amount.stringValue,
+            "amount": shippingMethod.amount.stringValue,
             "type": shippingMethod.type,
             "label": shippingMethod.label
         ]
@@ -183,12 +183,12 @@ class Mappers {
 
     class func mapFromShippingContact(shippingContact: PKContact) -> NSDictionary {
         let name: NSDictionary = [
-           "familyName": shippingContact.name?.familyName ?? "",
-           "namePrefix": shippingContact.name?.namePrefix ?? "",
-           "nameSuffix": shippingContact.name?.nameSuffix ?? "",
-           "givenName": shippingContact.name?.givenName ?? "",
-           "middleName": shippingContact.name?.middleName ?? "",
-           "nickname": shippingContact.name?.nickname ?? "",
+            "familyName": shippingContact.name?.familyName ?? "",
+            "namePrefix": shippingContact.name?.namePrefix ?? "",
+            "nameSuffix": shippingContact.name?.nameSuffix ?? "",
+            "givenName": shippingContact.name?.givenName ?? "",
+            "middleName": shippingContact.name?.middleName ?? "",
+            "nickname": shippingContact.name?.nickname ?? "",
         ]
         let contact: NSDictionary = [
             "emailAddress": shippingContact.emailAddress ?? "",
@@ -209,6 +209,28 @@ class Mappers {
         return contact
     }
 
+    class func mapAddressFields(_ addressFields: [String]) -> [String] {
+        return addressFields.map {
+            if ($0 == "street") {
+                return CNPostalAddressStreetKey
+            } else if ($0 == "city") {
+                return CNPostalAddressCityKey
+            } else if ($0 == "subAdministrativeArea") {
+                return CNPostalAddressSubAdministrativeAreaKey
+            } else if ($0 == "state") {
+                return CNPostalAddressStateKey
+            } else if ($0 == "postalCode") {
+                return CNPostalAddressPostalCodeKey
+            } else if ($0 == "country") {
+                return CNPostalAddressCountryKey
+            } else if ($0 == "countryCode") {
+                return CNPostalAddressISOCountryCodeKey
+            } else if ($0 == "subLocality") {
+                return CNPostalAddressSubLocalityKey
+            }
+            return ""
+        }
+    }
 
     class func mapIntentStatus(status: STPPaymentIntentStatus?) -> String {
         if let status = status {
@@ -414,12 +436,12 @@ class Mappers {
         shippingAddress.line1 = shippingDetails["addressLine1"] as? String ?? ""
         shippingAddress.line2 = shippingDetails["addressLine2"] as? String
         shippingAddress.state = shippingDetails["addressState"] as? String
-
+        
         let shipping = STPPaymentIntentShippingDetailsParams(address: shippingAddress, name: shippingDetails["name"] as? String ?? "")
-
+        
         return shipping
     }
-
+    
     class func mapFromBillingDetails(billingDetails: STPPaymentMethodBillingDetails?) -> NSDictionary {
         let billing: NSDictionary = [
             "email": billingDetails?.email ?? NSNull(),
@@ -561,7 +583,7 @@ class Mappers {
             "lastSetupError": NSNull()
         ]
 
-
+        
         let types = setupIntent.paymentMethodTypes.map {
             mapPaymentMethodType(type: STPPaymentMethodType.init(rawValue: Int(truncating: $0))!)
         }

ios/StripeSdk.m

@@ -26,6 +26,7 @@ @interface RCT_EXTERN_MODULE(StripeSdk, RCTEventEmitter)
 
 RCT_EXTERN_METHOD(
                   updateApplePaySummaryItems:(NSArray *)summaryItems
+                  errorAddressFields: (NSArray *)errorAddressFields
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject)
 

ios/StripeSdk.swift

@@ -241,8 +241,8 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
         }
     }
 
-    @objc(updateApplePaySummaryItems:resolver:rejecter:)
-    func updateApplePaySummaryItems(summaryItems: NSArray, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+    @objc(updateApplePaySummaryItems:errorAddressFields:resolver:rejecter:)
+    func updateApplePaySummaryItems(summaryItems: NSArray, errorAddressFields: [NSDictionary], resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         if (shippingMethodUpdateHandler == nil && shippingContactUpdateHandler == nil) {
             reject(ApplePayErrorType.Failed.rawValue, "You can use this method only after either onDidSetShippingMethod or onDidSetShippingContact events emitted", nil)
             return
@@ -256,8 +256,16 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
                 paymentSummaryItems.append(PKPaymentSummaryItem(label: label, amount: amount, type: type))
             }
         }
+        var shippingAddressErrors: [Error] = []
+
+        for item in errorAddressFields {
+            let field = item["field"] as! String
+            let message = item["message"] as? String ?? field + " error"
+            shippingAddressErrors.append(PKPaymentRequest.paymentShippingAddressInvalidError(withKey: field, localizedDescription: message))
+        }
+
         shippingMethodUpdateHandler?(PKPaymentRequestShippingMethodUpdate.init(paymentSummaryItems: paymentSummaryItems))
-        shippingContactUpdateHandler?(PKPaymentRequestShippingContactUpdate.init(paymentSummaryItems: paymentSummaryItems))
+        shippingContactUpdateHandler?(PKPaymentRequestShippingContactUpdate.init(errors: shippingAddressErrors, paymentSummaryItems: paymentSummaryItems, shippingMethods: []))
         self.shippingMethodUpdateHandler = nil
         self.shippingContactUpdateHandler = nil
         resolve(NSNull())
@@ -396,7 +404,7 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
         paymentRequest.paymentSummaryItems = paymentSummaryItems
         if let applePayContext = STPApplePayContext(paymentRequest: paymentRequest, delegate: self) {
             DispatchQueue.main.async {
-                applePayContext.presentApplePay(on: UIApplication.shared.delegate?.window??.rootViewController ?? UIViewController())
+                applePayContext.presentApplePay(completion: nil)
             }
         } else {
             reject(ApplePayErrorType.Failed.rawValue, "Apple pay request failed", nil)

src/NativeStripeSdk.tsx

@@ -29,7 +29,11 @@ type NativeStripeSdkType = {
   presentApplePay(params: ApplePay.PresentParams): Promise<void>;
   confirmApplePayPayment(clientSecret: string): Promise<void>;
   updateApplePaySummaryItems(
-    summaryItems: ApplePay.CartSummaryItem[]
+    summaryItems: ApplePay.CartSummaryItem[],
+    errorAddressFields: Array<{
+      field: ApplePay.AddressFields;
+      message?: string;
+    }>
   ): Promise<void>;
   confirmSetupIntent(
     paymentIntentClientSecret: string,

src/functions.ts

@@ -123,7 +123,11 @@ export const presentApplePay = async (
 };
 
 export const updateApplePaySummaryItems = async (
-  summaryItems: ApplePay.CartSummaryItem[]
+  summaryItems: ApplePay.CartSummaryItem[],
+  errorAddressFields: Array<{
+    field: ApplePay.AddressFields;
+    message?: string;
+  }> = []
 ): Promise<ApplePayResult> => {
   if (!(await NativeStripeSdk.isApplePaySupported())) {
     return {
@@ -135,7 +139,10 @@ export const updateApplePaySummaryItems = async (
   }
 
   try {
-    await NativeStripeSdk.updateApplePaySummaryItems(summaryItems);
+    await NativeStripeSdk.updateApplePaySummaryItems(
+      summaryItems,
+      errorAddressFields
+    );
 
     return {};
   } catch (error) {

src/hooks/useApplePay.tsx

@@ -37,15 +37,21 @@ export interface Props {
    *    handler([
    *      { label: 'Example item name 1', amount: '11.00' },
    *      { label: 'Example item name 2', amount: '25.00' },
-   *   ]);
+   *    ], [
+   *      { field: 'city', message: 'city error' },
+   *    ]);
    *  }
    * })
    * ```
    */
   onShippingContactSelected?: (
     shippingContact: ApplePay.ShippingContact,
     handler: (
-      summaryItems: ApplePay.CartSummaryItem[]
+      summaryItems: ApplePay.CartSummaryItem[],
+      errorAddressFields?: Array<{
+        field: ApplePay.AddressFields;
+        message?: string;
+      }>
     ) => Promise<{
       error?: StripeError<ApplePayError>;
     }>

src/hooks/useStripe.tsx

@@ -96,9 +96,13 @@ export function useStripe() {
 
   const _updateApplePaySummaryItems = useCallback(
     async (
-      summaryItems: ApplePay.CartSummaryItem[]
+      summaryItems: ApplePay.CartSummaryItem[],
+      errorAddressFields: Array<{
+        field: ApplePay.AddressFields;
+        message?: string;
+      }> = []
     ): Promise<ApplePayResult> => {
-      return updateApplePaySummaryItems(summaryItems);
+      return updateApplePaySummaryItems(summaryItems, errorAddressFields);
     },
     []
   );

src/types/ApplePay.ts

@@ -8,6 +8,16 @@ export namespace ApplePay {
     | 'phoneticName'
     | 'postalAddress';
 
+  export type AddressFields =
+    | 'street'
+    | 'city'
+    | 'subAdministrativeArea'
+    | 'state'
+    | 'postalCode'
+    | 'country'
+    | 'countryCode'
+    | 'subLocality';
+
   export interface ShippingMethod {
     label: string;
     amount: string;