diff --git a/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/create-paypal-commerce-alternative-methods-payment-strategy.ts b/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/create-paypal-commerce-alternative-methods-payment-strategy.ts index 8ec3c52b80..e387441175 100644 --- a/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/create-paypal-commerce-alternative-methods-payment-strategy.ts +++ b/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/create-paypal-commerce-alternative-methods-payment-strategy.ts @@ -2,7 +2,7 @@ import { PaymentStrategyFactory, toResolvableModule, } from '@bigcommerce/checkout-sdk/payment-integration-api'; -import { createPayPalCommerceSdk } from '@bigcommerce/checkout-sdk/paypal-commerce-utils'; +import { createPayPalSdkScriptLoader } from '@bigcommerce/checkout-sdk/paypal-utils'; import { LoadingIndicator } from '@bigcommerce/checkout-sdk/ui'; import createPayPalCommerceIntegrationService from '../create-paypal-commerce-integration-service'; @@ -16,7 +16,7 @@ const createPayPalCommerceAlternativeMethodsPaymentStrategy: PaymentStrategyFact new PayPalCommerceAlternativeMethodsPaymentStrategy( paymentIntegrationService, createPayPalCommerceIntegrationService(paymentIntegrationService), - createPayPalCommerceSdk(), + createPayPalSdkScriptLoader(), new LoadingIndicator({ containerStyles: LOADING_INDICATOR_STYLES, }), diff --git a/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/paypal-commerce-alternative-methods-payment-strategy.spec.ts b/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/paypal-commerce-alternative-methods-payment-strategy.spec.ts index fb5837360f..f503fa1325 100644 --- a/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/paypal-commerce-alternative-methods-payment-strategy.spec.ts +++ b/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/paypal-commerce-alternative-methods-payment-strategy.spec.ts @@ -16,9 +16,9 @@ import { PaymentIntegrationServiceMock, } from '@bigcommerce/checkout-sdk/payment-integrations-test-utils'; import { - createPayPalCommerceSdk, - PayPalCommerceSdk, -} from '@bigcommerce/checkout-sdk/paypal-commerce-utils'; + createPayPalSdkScriptLoader, + PayPalSdkScriptLoader, +} from '@bigcommerce/checkout-sdk/paypal-utils'; import { LoadingIndicator } from '@bigcommerce/checkout-sdk/ui'; import { @@ -48,7 +48,7 @@ describe('PayPalCommerceAlternativeMethodsPaymentStrategy', () => { let paypalCommerceIntegrationService: PayPalCommerceIntegrationService; let paypalSdk: PayPalSDK; let strategy: PayPalCommerceAlternativeMethodsPaymentStrategy; - let paypalCommerceSdk: PayPalCommerceSdk; + let paypalSdkScriptLoader: PayPalSdkScriptLoader; const paypalOrderId = 'paypal123'; @@ -84,12 +84,12 @@ describe('PayPalCommerceAlternativeMethodsPaymentStrategy', () => { loadingIndicator = new LoadingIndicator(); paypalCommerceIntegrationService = getPayPalCommerceIntegrationServiceMock(); paymentIntegrationService = new PaymentIntegrationServiceMock(); - paypalCommerceSdk = createPayPalCommerceSdk(); + paypalSdkScriptLoader = createPayPalSdkScriptLoader(); strategy = new PayPalCommerceAlternativeMethodsPaymentStrategy( paymentIntegrationService, paypalCommerceIntegrationService, - paypalCommerceSdk, + paypalSdkScriptLoader, loadingIndicator, ); @@ -101,7 +101,7 @@ describe('PayPalCommerceAlternativeMethodsPaymentStrategy', () => { 'getBillingAddressOrThrow', ).mockReturnValue(billingAddress); - jest.spyOn(paypalCommerceSdk, 'getPayPalApmsSdk').mockResolvedValue(paypalSdk); + jest.spyOn(paypalSdkScriptLoader, 'getPayPalApmsSdk').mockResolvedValue(paypalSdk); jest.spyOn(paypalCommerceIntegrationService, 'createOrder').mockResolvedValue( paypalOrderId, ); @@ -230,13 +230,16 @@ describe('PayPalCommerceAlternativeMethodsPaymentStrategy', () => { await strategy.initialize(initializationOptions); - expect(paypalCommerceSdk.getPayPalApmsSdk).not.toHaveBeenCalled(); + expect(paypalSdkScriptLoader.getPayPalApmsSdk).not.toHaveBeenCalled(); }); it('loads paypal sdk', async () => { await strategy.initialize(initializationOptions); - expect(paypalCommerceSdk.getPayPalApmsSdk).toHaveBeenCalledWith(paymentMethod, 'USD'); + expect(paypalSdkScriptLoader.getPayPalApmsSdk).toHaveBeenCalledWith( + paymentMethod, + 'USD', + ); }); }); diff --git a/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/paypal-commerce-alternative-methods-payment-strategy.ts b/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/paypal-commerce-alternative-methods-payment-strategy.ts index 4665815e59..0d7de1b628 100644 --- a/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/paypal-commerce-alternative-methods-payment-strategy.ts +++ b/packages/paypal-commerce-integration/src/paypal-commerce-alternative-methods/paypal-commerce-alternative-methods-payment-strategy.ts @@ -13,7 +13,11 @@ import { PaymentStrategy, TimeoutError, } from '@bigcommerce/checkout-sdk/payment-integration-api'; -import { PayPalApmSdk, PayPalCommerceSdk } from '@bigcommerce/checkout-sdk/paypal-commerce-utils'; +import { + PayPalApmSdk, + PayPalInitializationData, + PayPalSdkScriptLoader, +} from '@bigcommerce/checkout-sdk/paypal-utils'; import { LoadingIndicator } from '@bigcommerce/checkout-sdk/ui'; import { isExperimentEnabled } from '@bigcommerce/checkout-sdk/utility'; @@ -47,7 +51,7 @@ export default class PayPalCommerceAlternativeMethodsPaymentStrategy implements constructor( private paymentIntegrationService: PaymentIntegrationService, private paypalCommerceIntegrationService: PayPalCommerceIntegrationService, - private paypalCommerceSdk: PayPalCommerceSdk, + private paypalSdkScriptLoader: PayPalSdkScriptLoader, private loadingIndicator: LoadingIndicator, private pollingInterval: number = POLLING_INTERVAL, private maxPollingIntervalTime: number = MAX_POLLING_TIME, @@ -86,7 +90,7 @@ export default class PayPalCommerceAlternativeMethodsPaymentStrategy implements } const state = this.paymentIntegrationService.getState(); - const paymentMethod = state.getPaymentMethodOrThrow( + const paymentMethod = state.getPaymentMethodOrThrow( methodId, gatewayId, ); @@ -108,7 +112,7 @@ export default class PayPalCommerceAlternativeMethodsPaymentStrategy implements return; } - this.paypalApms = await this.paypalCommerceSdk.getPayPalApmsSdk( + this.paypalApms = await this.paypalSdkScriptLoader.getPayPalApmsSdk( paymentMethod, state.getCartOrThrow().currency.code, );