Upgrade cocoapod, update error codes

Author: markmur

modules/@shopify/checkout-sheet-kit/ios/ShopifyCheckoutSheetKit+EventSerialization.swift

@@ -112,15 +112,15 @@ internal enum ShopifyEventSerialization {
      */
     static func serialize(checkoutError error: CheckoutError) -> [String: Any] {
         switch error {
-        case let .checkoutExpired(message, code, recoverable):
+        case let .expired(message, code, recoverable):
             return [
                 "__typename": "CheckoutExpiredError",
                 "message": message,
                 "code": code.rawValue,
                 "recoverable": recoverable
             ]
 
-        case let .checkoutUnavailable(message, code, recoverable):
+        case let .unavailable(message, code, recoverable):
             switch code {
             case let .clientError(clientErrorCode):
                 return [
@@ -139,15 +139,15 @@ internal enum ShopifyEventSerialization {
                 ]
             }
 
-        case let .configurationError(message, code, recoverable):
+        case let .misconfiguration(message, code, recoverable):
             return [
                 "__typename": "ConfigurationError",
                 "message": message,
                 "code": code.rawValue,
                 "recoverable": recoverable
             ]
 
-        case let .sdkError(underlying, recoverable):
+        case let .internal(underlying, recoverable):
             return [
                 "__typename": "InternalError",
                 "code": "unknown",

modules/@shopify/checkout-sheet-kit/ios/ShopifyCheckoutSheetKit.swift

@@ -53,7 +53,7 @@ class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
     }
 
     override func supportedEvents() -> [String]! {
-        return ["close", "complete", "start", "error", "addressChangeStart", "submitStart"]
+        return ["close", "complete", "start", "error", "addressChangeStart", "submitStart", "paymentMethodChangeStart"]
     }
 
     override func startObserving() {
@@ -110,7 +110,7 @@ class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
                 self.sendEvent(withName: "close", body: nil)
             }
 
-            self.checkoutSheet?.dismiss(animated: true)
+            // self.checkoutSheet?.dismiss(animated: true)
         }
     }
 

modules/@shopify/checkout-sheet-kit/src/errors.d.ts

@@ -43,6 +43,10 @@ export enum CheckoutNativeErrorType {
   UnknownError = 'UnknownError',
 }
 
+/**
+ * @important TODO: Fix mapping here.
+ * Currently "unknown" is returned for every code
+ */
 function getCheckoutErrorCode(code: string | undefined): CheckoutErrorCode {
   const codeKey = Object.keys(CheckoutErrorCode).find(
     key => CheckoutErrorCode[key as keyof typeof CheckoutErrorCode] === code,

modules/@shopify/checkout-sheet-kit/src/index.ts

@@ -186,7 +186,10 @@ class ShopifyCheckoutSheet implements ShopifyCheckoutSheetKit {
         eventCallback = this.interceptEventEmission('start', callback);
         break;
       case 'addressChangeStart':
-        eventCallback = this.interceptEventEmission('addressChangeStart', callback);
+        eventCallback = this.interceptEventEmission(
+          'addressChangeStart',
+          callback,
+        );
         break;
       case 'submitStart':
         eventCallback = this.interceptEventEmission('submitStart', callback);
@@ -524,7 +527,10 @@ export type {
   AcceleratedCheckoutButtonsProps,
   RenderStateChangeEvent,
 } from './components/AcceleratedCheckoutButtons';
-export type {ShopifyCheckoutProps, ShopifyCheckoutRef} from './components/Checkout';
+export type {
+  ShopifyCheckoutProps,
+  ShopifyCheckoutRef,
+} from './components/Checkout';
 export type {ShopifyCheckoutEventProviderProps} from './ShopifyCheckoutEventProvider';
 
 // Components

sample/Gemfile.lock

@@ -1,11 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
-    activesupport (7.2.2.2)
+    CFPropertyList (3.0.8)
+    activesupport (7.2.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -17,15 +14,15 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.3)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     claide (1.1.0)
     cocoapods (1.15.2)
       addressable (~> 2.8)
@@ -68,7 +65,7 @@ GEM
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
     concurrent-ruby (1.3.3)
-    connection_pool (2.5.4)
+    connection_pool (3.0.2)
     drb (2.2.3)
     escape (0.0.4)
     ethon (0.15.0)
@@ -81,15 +78,16 @@ GEM
       mutex_m
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.15.0)
+    json (2.18.0)
     logger (1.7.0)
-    minitest (5.25.5)
+    minitest (6.0.0)
+      prism (~> 1.5)
     molinillo (0.8.0)
     mutex_m (0.3.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    nkf (0.2.0)
+    prism (1.7.0)
     public_suffix (4.0.7)
     rexml (3.4.4)
     ruby-macho (2.5.1)

sample/ios/Podfile.lock

@@ -2544,11 +2544,11 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - ShopifyCheckoutSheetKit (3.4.0-rc.8):
-    - ShopifyCheckoutSheetKit/Core (= 3.4.0-rc.8)
-  - ShopifyCheckoutSheetKit/AcceleratedCheckouts (3.4.0-rc.8):
+  - ShopifyCheckoutSheetKit (3.4.0-rc.9):
+    - ShopifyCheckoutSheetKit/Core (= 3.4.0-rc.9)
+  - ShopifyCheckoutSheetKit/AcceleratedCheckouts (3.4.0-rc.9):
     - ShopifyCheckoutSheetKit/Core
-  - ShopifyCheckoutSheetKit/Core (3.4.0-rc.8)
+  - ShopifyCheckoutSheetKit/Core (3.4.0-rc.9)
   - SocketRocket (0.7.1)
   - Yoga (0.0.0)
 
@@ -2595,7 +2595,7 @@ DEPENDENCIES:
   - React-Mapbuffer (from `../../node_modules/react-native/ReactCommon`)
   - React-microtasksnativemodule (from `../../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
   - react-native-config (from `../node_modules/react-native-config`)
-  - react-native-safe-area-context (from `../../node_modules/react-native-safe-area-context`)
+  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - React-NativeModulesApple (from `../../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
   - React-oscompat (from `../../node_modules/react-native/ReactCommon/oscompat`)
   - React-perflogger (from `../../node_modules/react-native/ReactCommon/reactperflogger`)
@@ -2630,7 +2630,7 @@ DEPENDENCIES:
   - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
   - RNGestureHandler (from `../../node_modules/react-native-gesture-handler`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
-  - RNScreens (from `../../node_modules/react-native-screens`)
+  - RNScreens (from `../node_modules/react-native-screens`)
   - "RNShopifyCheckoutSheetKit (from `../../modules/@shopify/checkout-sheet-kit`)"
   - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
   - ShopifyCheckoutSheetKit (from `~/src/github.com/Shopify/checkout-sheet-kit-swift`)
@@ -2727,7 +2727,7 @@ EXTERNAL SOURCES:
   react-native-config:
     :path: "../node_modules/react-native-config"
   react-native-safe-area-context:
-    :path: "../../node_modules/react-native-safe-area-context"
+    :path: "../node_modules/react-native-safe-area-context"
   React-NativeModulesApple:
     :path: "../../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios"
   React-oscompat:
@@ -2797,7 +2797,7 @@ EXTERNAL SOURCES:
   RNReanimated:
     :path: "../node_modules/react-native-reanimated"
   RNScreens:
-    :path: "../../node_modules/react-native-screens"
+    :path: "../node_modules/react-native-screens"
   RNShopifyCheckoutSheetKit:
     :path: "../../modules/@shopify/checkout-sheet-kit"
   RNVectorIcons:
@@ -2887,7 +2887,7 @@ SPEC CHECKSUMS:
   RNScreens: 26bb60cdb2ef2ca06fd87feefc495072f25982a7
   RNShopifyCheckoutSheetKit: 26063fe3dfaed4a2f8ba0c6a5c92b8dfef15c1fb
   RNVectorIcons: be4d047a76ad307ffe54732208fb0498fcb8477f
-  ShopifyCheckoutSheetKit: 8e1574805ee7b3043608c92f3cdbea3adf7079fa
+  ShopifyCheckoutSheetKit: 4941c60418f1da7637a73a3f1aa33f68304ce1d3
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: a742cc68e8366fcfc681808162492bc0aa7a9498
 

sample/src/App.tsx

@@ -228,8 +228,11 @@ function AppWithContext({children}: PropsWithChildren) {
 
     const addressChangeStart = shopify.addEventListener(
       'addressChangeStart',
-      (event) => {
-        console.log('[App] onAddressChangeStart event received from imperative API:', event);
+      event => {
+        console.log(
+          '[App] onAddressChangeStart event received from imperative API:',
+          event,
+        );
       },
     );