Merge branch 'main' into kieran-osgood/refactor/cart-manager-error-messaging

Author: kieran-osgood-shopify

Samples/MobileBuyIntegration/MobileBuyIntegration/ApplePay/ApplePayHandler.swift

@@ -151,13 +151,8 @@ extension ApplePayHandler: PKPaymentAuthorizationControllerDelegate {
                 partial: true
             )
 
-            guard let firstDeliveryGroup = CartManager.shared.cart?.deliveryGroups.nodes.first
-            else {
-                throw CartManager.Errors.invariant(message: "deliveryGroups empty")
-            }
-
             let shippingMethods = PassKitFactory.shared.createShippingMethods(
-                firstDeliveryGroup: firstDeliveryGroup
+                firstDeliveryGroup: CartManager.shared.cart?.deliveryGroups.nodes.first
             )
 
             _ = try await CartManager.shared.performCartPrepareForCompletion()

Samples/MobileBuyIntegration/MobileBuyIntegration/ApplePay/PassKitFactory.swift

@@ -108,8 +108,13 @@ class PassKitFactory {
     }
 
     public func createShippingMethods(
-        firstDeliveryGroup: Storefront.CartDeliveryGroup
+        /**
+         * Default to first delivery group when user changes their delivery contact
+         * `nil` for digital products
+         */
+        firstDeliveryGroup: Storefront.CartDeliveryGroup?
     ) -> [PKShippingMethod] {
+        guard let firstDeliveryGroup else { return [] }
         return firstDeliveryGroup.deliveryOptions.compactMap {
             guard let title = $0.title, let description = $0.description else {
                 print("Invalid deliveryOption to map shipping method")

Samples/MobileBuyIntegration/MobileBuyIntegration/CartManager.swift

@@ -178,7 +178,7 @@ class CartManager: ObservableObject {
 
         let buyerIdentityInput = StorefrontInputFactory.shared.createCartBuyerIdentityInput(
             // During ApplePay `contact.emailAddress` is nil until `didAuthorizePayment`
-            email: contact.emailAddress ?? "",
+            email: contact.emailAddress,
             deliveryAddressPreferencesInput: deliveryAddressPreferencesInput
         )
 

Samples/MobileBuyIntegration/MobileBuyIntegration/StorefrontClient.swift

@@ -192,7 +192,7 @@ class StorefrontInputFactory {
     }
 
     public func createCartBuyerIdentityInput(
-        email: String,
+        email: String?,
         deliveryAddressPreferencesInput: Input<[Storefront.DeliveryAddressInput]>
     ) -> Storefront.CartBuyerIdentityInput {
         if appConfiguration.useVaultedState {