feat(payment): PAYPAL-4051 refactoring

bigcommerce · Apr 19, 2024 · 7956856 · 7956856
1 parent fc4026f
commit 7956856
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 36 deletions.
diff --git a/packages/apple-pay-integration/src/apple-pay-customer-strategy.ts b/packages/apple-pay-integration/src/apple-pay-customer-strategy.ts
@@ -543,11 +543,11 @@ export default class ApplePayCustomerStrategy implements CustomerStrategy {
     }
 
     private async _getBraintreeDeviceData() {
-        const braintreePaymentMethod: PaymentMethod = this._paymentIntegrationService
+        const braintreePaymentMethod = this._paymentIntegrationService
             .getState()
-            .getPaymentMethodOrThrow(ApplePayGatewayType.BRAINTREE);
+            .getPaymentMethod(ApplePayGatewayType.BRAINTREE);
 
-        if (braintreePaymentMethod.clientToken) {
+        if (braintreePaymentMethod?.clientToken) {
             const data = await this._braintreeIntegrationService.getDataCollector();
 
             return data.deviceData;
@@ -557,25 +557,25 @@ export default class ApplePayCustomerStrategy implements CustomerStrategy {
     private async _initializeBraintreeIntegrationService() {
         try {
             await this._paymentIntegrationService.loadPaymentMethod(ApplePayGatewayType.BRAINTREE);
-        } catch (_) {
-            return;
-        }
 
-        const state = this._paymentIntegrationService.getState();
+            const state = this._paymentIntegrationService.getState();
 
-        const storeConfig = state.getStoreConfigOrThrow();
+            const storeConfig = state.getStoreConfigOrThrow();
 
-        const braintreePaymentMethod: PaymentMethod = state.getPaymentMethodOrThrow(
-            ApplePayGatewayType.BRAINTREE,
-        );
+            const braintreePaymentMethod: PaymentMethod = state.getPaymentMethodOrThrow(
+                ApplePayGatewayType.BRAINTREE,
+            );
 
-        if (!braintreePaymentMethod.clientToken || !braintreePaymentMethod.initializationData) {
-            throw new MissingDataError(MissingDataErrorType.MissingPaymentMethod);
-        }
+            if (!braintreePaymentMethod.clientToken || !braintreePaymentMethod.initializationData) {
+                throw new MissingDataError(MissingDataErrorType.MissingPaymentMethod);
+            }
 
-        this._braintreeIntegrationService.initialize(
-            braintreePaymentMethod.clientToken,
-            storeConfig,
-        );
+            this._braintreeIntegrationService.initialize(
+                braintreePaymentMethod.clientToken,
+                storeConfig,
+            );
+        } catch (_) {
+            return noop();
+        }
     }
 }
diff --git a/packages/apple-pay-integration/src/apple-pay-payment-strategy.ts b/packages/apple-pay-integration/src/apple-pay-payment-strategy.ts
@@ -1,4 +1,5 @@
 import { RequestSender } from '@bigcommerce/request-sender';
+import { noop } from 'lodash';
 
 import { BraintreeIntegrationService } from '@bigcommerce/checkout-sdk/braintree-utils';
 import {
@@ -267,11 +268,11 @@ export default class ApplePayPaymentStrategy implements PaymentStrategy {
     }
 
     private async _getBraintreeDeviceData() {
-        const braintreePaymentMethod: PaymentMethod = this._paymentIntegrationService
+        const braintreePaymentMethod = this._paymentIntegrationService
             .getState()
-            .getPaymentMethodOrThrow(ApplePayGatewayType.BRAINTREE);
+            .getPaymentMethod(ApplePayGatewayType.BRAINTREE);
 
-        if (braintreePaymentMethod.clientToken) {
+        if (braintreePaymentMethod?.clientToken) {
             const data = await this._braintreeIntegrationService.getDataCollector();
 
             return data.deviceData;
@@ -281,25 +282,25 @@ export default class ApplePayPaymentStrategy implements PaymentStrategy {
     private async _initializeBraintreeIntegrationService() {
         try {
             await this._paymentIntegrationService.loadPaymentMethod(ApplePayGatewayType.BRAINTREE);
-        } catch (_) {
-            return;
-        }
 
-        const state = this._paymentIntegrationService.getState();
+            const state = this._paymentIntegrationService.getState();
 
-        const storeConfig = state.getStoreConfigOrThrow();
+            const storeConfig = state.getStoreConfigOrThrow();
 
-        const braintreePaymentMethod: PaymentMethod = state.getPaymentMethodOrThrow(
-            ApplePayGatewayType.BRAINTREE,
-        );
+            const braintreePaymentMethod: PaymentMethod = state.getPaymentMethodOrThrow(
+                ApplePayGatewayType.BRAINTREE,
+            );
 
-        if (!braintreePaymentMethod.clientToken || !braintreePaymentMethod.initializationData) {
-            return;
-        }
+            if (!braintreePaymentMethod.clientToken || !braintreePaymentMethod.initializationData) {
+                return;
+            }
 
-        this._braintreeIntegrationService.initialize(
-            braintreePaymentMethod.clientToken,
-            storeConfig,
-        );
+            this._braintreeIntegrationService.initialize(
+                braintreePaymentMethod.clientToken,
+                storeConfig,
+            );
+        } catch (_) {
+            return noop();
+        }
     }
 }