fix(payment): PAYMENTS-8239 addresses feedback

Author: bc-amit

packages/apple-pay-integration/src/apple-pay-button-strategy.ts

@@ -267,27 +267,19 @@ export default class ApplePayButtonStrategy implements CheckoutButtonStrategy {
               ]
             : [];
 
-        unselectedOptions
-            ?.filter((option) => option.isRecommended)
-            ?.forEach((option) =>
-                shippingOptions.push({
-                    label: option.description,
-                    amount: `${option.cost.toFixed(decimalPlaces)}`,
-                    detail: option.additionalDescription,
-                    identifier: option.id,
-                }),
-            );
-
-        unselectedOptions
-            ?.filter((option) => !option.isRecommended)
-            ?.forEach((option) =>
+        if (unselectedOptions) {
+            [
+                ...unselectedOptions.filter((option) => option.isRecommended),
+                ...unselectedOptions.filter((option) => !option.isRecommended),
+            ].forEach((option) =>
                 shippingOptions.push({
                     label: option.description,
                     amount: `${option.cost.toFixed(decimalPlaces)}`,
                     detail: option.additionalDescription,
                     identifier: option.id,
                 }),
             );
+        }
 
         if (!isShippingOptions(availableOptions)) {
             throw new Error('Shipping options not available.');

packages/apple-pay-integration/src/apple-pay-customer-strategy.ts

@@ -297,27 +297,19 @@ export default class ApplePayCustomerStrategy implements CustomerStrategy {
               ]
             : [];
 
-        unselectedOptions
-            ?.filter((option) => option.isRecommended)
-            ?.forEach((option) =>
-                shippingOptions.push({
-                    label: option.description,
-                    amount: `${option.cost.toFixed(decimalPlaces)}`,
-                    detail: option.additionalDescription,
-                    identifier: option.id,
-                }),
-            );
-
-        unselectedOptions
-            ?.filter((option) => !option.isRecommended)
-            ?.forEach((option) =>
+        if (unselectedOptions) {
+            [
+                ...unselectedOptions.filter((option) => option.isRecommended),
+                ...unselectedOptions.filter((option) => !option.isRecommended),
+            ].forEach((option) =>
                 shippingOptions.push({
                     label: option.description,
                     amount: `${option.cost.toFixed(decimalPlaces)}`,
                     detail: option.additionalDescription,
                     identifier: option.id,
                 }),
             );
+        }
 
         if (!isShippingOptions(availableOptions)) {
             throw new Error('Shipping options not available.');

packages/core/src/checkout-buttons/strategies/apple-pay/apple-pay-button-strategy.ts

@@ -282,27 +282,19 @@ export default class ApplePayButtonStrategy implements CheckoutButtonStrategy {
               ]
             : [];
 
-        unselectedOptions
-            ?.filter((option) => option.isRecommended)
-            ?.forEach((option) =>
-                shippingOptions.push({
-                    label: option.description,
-                    amount: `${option.cost.toFixed(decimalPlaces)}`,
-                    detail: option.additionalDescription,
-                    identifier: option.id,
-                }),
-            );
-
-        unselectedOptions
-            ?.filter((option) => !option.isRecommended)
-            ?.forEach((option) =>
+        if (unselectedOptions) {
+            [
+                ...unselectedOptions.filter((option) => option.isRecommended),
+                ...unselectedOptions.filter((option) => !option.isRecommended),
+            ].forEach((option) =>
                 shippingOptions.push({
                     label: option.description,
                     amount: `${option.cost.toFixed(decimalPlaces)}`,
                     detail: option.additionalDescription,
                     identifier: option.id,
                 }),
             );
+        }
 
         if (!isShippingOptions(availableOptions)) {
             throw new Error('Shipping options not available.');

packages/core/src/customer/strategies/apple-pay/apple-pay-customer-strategy.ts

@@ -323,27 +323,19 @@ export default class ApplePayCustomerStrategy implements CustomerStrategy {
               ]
             : [];
 
-        unselectedOptions
-            ?.filter((option) => option.isRecommended)
-            ?.forEach((option) =>
-                shippingOptions.push({
-                    label: option.description,
-                    amount: `${option.cost.toFixed(decimalPlaces)}`,
-                    detail: option.additionalDescription,
-                    identifier: option.id,
-                }),
-            );
-
-        unselectedOptions
-            ?.filter((option) => !option.isRecommended)
-            ?.forEach((option) =>
+        if (unselectedOptions) {
+            [
+                ...unselectedOptions.filter((option) => option.isRecommended),
+                ...unselectedOptions.filter((option) => !option.isRecommended),
+            ].forEach((option) =>
                 shippingOptions.push({
                     label: option.description,
                     amount: `${option.cost.toFixed(decimalPlaces)}`,
                     detail: option.additionalDescription,
                     identifier: option.id,
                 }),
             );
+        }
 
         if (!isShippingOptions(availableOptions)) {
             throw new Error('Shipping options not available.');