Improve configuration + add tests

Author: markmur

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

@@ -34,7 +34,7 @@ import PassKit
 class AcceleratedCheckoutConfiguration {
 	static let shared = AcceleratedCheckoutConfiguration()
 	var configuration: ShopifyAcceleratedCheckouts.Configuration?
-	var wallets: [String] = ["shopPay", "applePay"]
+	var wallets: [Wallet] = [Wallet.shopPay, Wallet.applePay]
 
 	private init() {
 		setupApplePay()
@@ -238,9 +238,8 @@ class RCTAcceleratedCheckoutButtonsView: UIView {
 			return
 		}
 
-		// Use wallets from props, or fall back to shared configuration, or default to both
-		let walletsToUse = wallets ?? AcceleratedCheckoutConfiguration.shared.wallets
-		let shopifyWallets = convertToShopifyWallets(walletsToUse)
+		// Use wallets from props, or fallback to default
+		let shopifyWallets = wallets.map(convertToShopifyWallets) ?? AcceleratedCheckoutConfiguration.shared.wallets
 
 		// Create Apple Pay configuration
 		let applePayConfig = ShopifyAcceleratedCheckouts.ApplePayConfiguration(
@@ -321,17 +320,15 @@ class RCTAcceleratedCheckoutButtonsView: UIView {
 	}
 
 	private func handleRenderStateChange(_ state: RenderState) {
-		onRenderStateChange?(["state": ShopifyEventSerialization.serialize(renderState: state)])
+		onRenderStateChange?(ShopifyEventSerialization.serialize(renderState: state))
 	}
 
 	private func handleWebPixelEvent(_ event: PixelEvent) {
 		onWebPixelEvent?(ShopifyEventSerialization.serialize(pixelEvent: event))
 	}
 
 	private func handleClickLink(_ url: URL) {
-		onClickLink?([
-			"url": url.absoluteString
-		])
+		onClickLink?(ShopifyEventSerialization.serialize(clickEvent: url))
 	}
 
 	override func layoutSubviews() {

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

@@ -95,6 +95,10 @@ class ShopifyEventSerialization {
 		}
 	}
 
+  static func serialize(clickEvent url: URL) -> [String: URL] {
+    return ["url": url]
+  }
+
 	/**
 	 * Converts a CheckoutError to a React Native compatible dictionary.
 	 * Handles all specific error types with proper type information.
@@ -157,16 +161,16 @@ class ShopifyEventSerialization {
 	/**
 	 * Converts a RenderState enum to a string for React Native.
 	 */
-	static func serialize(renderState state: RenderState) -> String {
+	static func serialize(renderState state: RenderState) -> [String: String] {
 		switch state {
 		case .loading:
-			return "loading"
+			return ["state": "loading"]
 		case .rendered:
-			return "rendered"
+			return ["state": "rendered"]
 		case .error:
-			return "error"
+			return ["state": "error"]
 		@unknown default:
-			return "unknown"
+			return ["state": "unknown"]
 		}
 	}
 }

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

@@ -47,18 +47,17 @@ @interface RCT_EXTERN_MODULE (RCTShopifyCheckoutSheetKit, NSObject)
                       resolve reject : (RCTPromiseRejectBlock)reject)
 
 /// Configure AcceleratedCheckouts
-RCT_EXTERN_METHOD(configureAcceleratedCheckouts : (NSString *)
-                      storefrontDomain storefrontAccessToken : (NSString *)
-                          storefrontAccessToken customerEmail : (NSString *)
-                              customerEmail customerPhoneNumber : (NSString *)
-                                  customerPhoneNumber);
+RCT_EXTERN_METHOD(
+    configureAcceleratedCheckouts : (NSString *)
+        storefrontDomain storefrontAccessToken : (NSString *)
+            storefrontAccessToken customerEmail : (NSString *)
+                customerEmail customerPhoneNumber : (NSString *)
+                    customerPhoneNumber resolve : (RCTPromiseResolveBlock)
+                        resolve reject : (RCTPromiseRejectBlock)reject);
 
 /// Check if accelerated checkout is available
-RCT_EXTERN_METHOD(
-    isAcceleratedCheckoutAvailable : (NSString *)cartId variantId : (NSString *)
-        variantId quantity : (nonnull NSNumber *)
-            quantity resolve : (RCTPromiseResolveBlock)
-                resolve reject : (RCTPromiseRejectBlock)reject);
+RCT_EXTERN_METHOD(isAcceleratedCheckoutAvailable : (RCTPromiseResolveBlock)
+                      resolve reject : (RCTPromiseRejectBlock)reject);
 
 @end
 

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

@@ -205,61 +205,48 @@ class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
 		resolve(config)
 	}
 
-	@objc func configureAcceleratedCheckouts(
-		_ storefrontDomain: String,
-		storefrontAccessToken: String,
-		customerEmail: String?,
-		customerPhoneNumber: String?,
-	) {
-		if #available(iOS 17.0, *) {
-			let customer = ShopifyAcceleratedCheckouts.Customer(
-				email: customerEmail,
-				phoneNumber: customerPhoneNumber
-			)
-
-			acceleratedCheckoutsConfiguration = ShopifyAcceleratedCheckouts.Configuration(
-				storefrontDomain: storefrontDomain,
-				storefrontAccessToken: storefrontAccessToken,
-				customer: customer
-			)
-
-			// Update the shared configuration for the UI components
-			AcceleratedCheckoutConfiguration.shared.configuration = acceleratedCheckoutsConfiguration as? ShopifyAcceleratedCheckouts.Configuration
-
-			// Notify all button views to update with the new configuration
-			NotificationCenter.default.post(name: Notification.Name("AcceleratedCheckoutConfigurationUpdated"), object: nil)
-		}
-	}
-
-	@objc func isAcceleratedCheckoutAvailable(
-		_ cartId: String?,
-		variantId: String?,
-		quantity: NSNumber,
-		resolve: @escaping RCTPromiseResolveBlock,
-		reject: @escaping RCTPromiseRejectBlock
-	) {
-		guard #available(iOS 17.0, *) else {
-			reject("UNAVAILABLE", "AcceleratedCheckouts requires iOS 17.0+", nil)
-			return
-		}
-
-		guard let config = acceleratedCheckoutsConfiguration as? ShopifyAcceleratedCheckouts.Configuration else {
-			reject("CONFIG_ERROR", "AcceleratedCheckouts configuration not set", nil)
-			return
-		}
-
-		Task {
-			do {
-				// For now, assume accelerated checkouts are available if configuration is set
-				// Future enhancement: implement actual availability checking based on shop settings
-				let available = true
+    @objc func configureAcceleratedCheckouts(
+        _ storefrontDomain: String,
+        storefrontAccessToken: String,
+        customerEmail: String?,
+        customerPhoneNumber: String?,
+        resolve: @escaping RCTPromiseResolveBlock,
+        reject: @escaping RCTPromiseRejectBlock
+    ) {
+        if #available(iOS 17.0, *) {
+            let customer = ShopifyAcceleratedCheckouts.Customer(
+                email: customerEmail,
+                phoneNumber: customerPhoneNumber
+            )
+
+            acceleratedCheckoutsConfiguration = ShopifyAcceleratedCheckouts.Configuration(
+                storefrontDomain: storefrontDomain,
+                storefrontAccessToken: storefrontAccessToken,
+                customer: customer
+            )
+
+            AcceleratedCheckoutConfiguration.shared.configuration = acceleratedCheckoutsConfiguration as? ShopifyAcceleratedCheckouts.Configuration
+
+            NotificationCenter.default.post(name: Notification.Name("AcceleratedCheckoutConfigurationUpdated"), object: nil)
+
+            resolve(true)
+        } else {
+            resolve(false)
+        }
+    }
 
-				resolve(available)
-			} catch {
-				reject("AVAILABILITY_ERROR", error.localizedDescription, error)
-			}
-		}
-	}
+    @objc func isAcceleratedCheckoutAvailable(
+        _ resolve: @escaping RCTPromiseResolveBlock,
+        reject: @escaping RCTPromiseRejectBlock
+    ) {
+        guard #available(iOS 17.0, *) else {
+            resolve(false)
+            return
+        }
+
+        let isConfigured = (acceleratedCheckoutsConfiguration as? ShopifyAcceleratedCheckouts.Configuration) != nil
+        resolve(isConfigured)
+    }
 
 	// MARK: - Private
 }

modules/@shopify/checkout-sheet-kit/src/context.tsx

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-import React, {useCallback, useMemo, useRef} from 'react';
+import React, {useCallback, useMemo, useRef, useEffect, useState} from 'react';
 import type {PropsWithChildren} from 'react';
 import {type EmitterSubscription} from 'react-native';
 import {ShopifyCheckoutSheet} from './index';
@@ -31,12 +31,12 @@ import type {
   RemoveEventListeners,
   CheckoutEvent,
   Configuration,
-  AcceleratedCheckoutConfiguration,
 } from './index.d';
 
 type Maybe<T> = T | undefined;
 
 interface Context {
+  acceleratedCheckoutsAvailable: boolean;
   addEventListener: AddEventListener;
   getConfig: () => Promise<Configuration | undefined>;
   setConfig: (config: Configuration) => void;
@@ -46,19 +46,12 @@ interface Context {
   dismiss: () => void;
   invalidate: () => void;
   version: Maybe<string>;
-  configureAcceleratedCheckouts: (
-    config: AcceleratedCheckoutConfiguration,
-  ) => void;
-  isAcceleratedCheckoutAvailable: (options: {
-    cartId?: string;
-    variantId?: string;
-    quantity?: number;
-  }) => Promise<boolean>;
 }
 
 const noop = () => undefined;
 
 const ShopifyCheckoutSheetContext = React.createContext<Context>({
+  acceleratedCheckoutsAvailable: false,
   addEventListener: noop,
   removeEventListeners: noop,
   setConfig: noop,
@@ -68,8 +61,6 @@ const ShopifyCheckoutSheetContext = React.createContext<Context>({
   invalidate: noop,
   dismiss: noop,
   version: undefined,
-  configureAcceleratedCheckouts: noop,
-  isAcceleratedCheckoutAvailable: async () => false,
 });
 
 interface Props {
@@ -82,12 +73,32 @@ export function ShopifyCheckoutSheetProvider({
   configuration,
   children,
 }: PropsWithChildren<Props>) {
+  const [acceleratedCheckoutsAvailable, setAcceleratedCheckoutsAvailable] =
+    useState(false);
   const instance = useRef<ShopifyCheckoutSheet | null>(null);
 
   if (!instance.current) {
     instance.current = new ShopifyCheckoutSheet(configuration, features);
   }
 
+  useEffect(() => {
+    async function configureAcceleratedCheckouts() {
+      if (!instance.current || !configuration) {
+        return;
+      }
+
+      if (configuration.acceleratedCheckouts) {
+        setAcceleratedCheckoutsAvailable(
+          await instance.current?.configureAcceleratedCheckouts(
+            configuration.acceleratedCheckouts,
+          ),
+        );
+      }
+    }
+
+    configureAcceleratedCheckouts();
+  }, [configuration]);
+
   const addEventListener: AddEventListener = useCallback(
     (eventName, callback): EmitterSubscription | undefined => {
       return instance.current?.addEventListener(eventName, callback);
@@ -127,29 +138,9 @@ export function ShopifyCheckoutSheetProvider({
     return instance.current?.getConfig();
   }, []);
 
-  const configureAcceleratedCheckouts = useCallback(
-    (config: AcceleratedCheckoutConfiguration) => {
-      instance.current?.configureAcceleratedCheckouts(config);
-    },
-    [],
-  );
-
-  const isAcceleratedCheckoutAvailable = useCallback(
-    async (options: {
-      cartId?: string;
-      variantId?: string;
-      quantity?: number;
-    }) => {
-      return (
-        (await instance.current?.isAcceleratedCheckoutAvailable(options)) ??
-        false
-      );
-    },
-    [],
-  );
-
   const context = useMemo((): Context => {
     return {
+      acceleratedCheckoutsAvailable,
       addEventListener,
       dismiss,
       setConfig,
@@ -159,10 +150,9 @@ export function ShopifyCheckoutSheetProvider({
       invalidate,
       removeEventListeners,
       version: instance.current?.version,
-      configureAcceleratedCheckouts,
-      isAcceleratedCheckoutAvailable,
     };
   }, [
+    acceleratedCheckoutsAvailable,
     addEventListener,
     dismiss,
     removeEventListeners,
@@ -171,8 +161,6 @@ export function ShopifyCheckoutSheetProvider({
     preload,
     present,
     invalidate,
-    configureAcceleratedCheckouts,
-    isAcceleratedCheckoutAvailable,
   ]);
 
   return (