feat(payment): PAYPAL-5717 Added AppSwitch to PPCP button strategy

Author: andriiVitvitskyi1990

packages/paypal-commerce-integration/src/paypal-commerce/paypal-commerce-button-strategy.spec.ts

@@ -397,24 +397,37 @@ describe('PayPalCommerceButtonStrategy', () => {
         });
 
         it('calls PayPal button resume', async () => {
+            const paymentMethodWithShippingOptionsFeature = {
+                ...paymentMethod,
+                initializationData: {
+                    ...paymentMethod.initializationData,
+                    isAppSwitchEnabled: true,
+                },
+            };
+
             jest.spyOn(
                 paymentIntegrationService.getState(),
-                'getStoreConfigOrThrow',
-            ).mockReturnValue({
-                ...storeConfig,
-                checkoutSettings: {
-                    ...storeConfig.checkoutSettings,
-                    features: {
-                        'PAYPAL-5716.app_switch_functionality': true,
-                    },
-                },
-            });
+                'getPaymentMethodOrThrow',
+            ).mockReturnValue(paymentMethodWithShippingOptionsFeature);
             await strategy.initialize(initializationOptions);
 
             expect(resumeMock).toHaveBeenCalled();
         });
 
         it('initializes PayPal button to render (buy now flow)', async () => {
+            const paymentMethodWithShippingOptionsFeature = {
+                ...paymentMethod,
+                initializationData: {
+                    ...paymentMethod.initializationData,
+                    isAppSwitchEnabled: true,
+                },
+            };
+
+            jest.spyOn(
+                paymentIntegrationService.getState(),
+                'getPaymentMethodOrThrow',
+            ).mockReturnValue(paymentMethodWithShippingOptionsFeature);
+            await strategy.initialize(initializationOptions);
             await strategy.initialize(buyNowInitializationOptions);
 
             expect(paypalSdk.Buttons).toHaveBeenCalledWith({
@@ -485,10 +498,11 @@ describe('PayPalCommerceButtonStrategy', () => {
             await strategy.initialize(initializationOptions);
 
             expect(paypalSdk.Buttons).toHaveBeenCalledWith({
-                fundingSource: paypalSdk.FUNDING.PAYPAL,
-                style: paypalCommerceOptions.style,
+                appSwitchWhenAvailable: true,
                 createOrder: expect.any(Function),
+                fundingSource: paypalSdk.FUNDING.PAYPAL,
                 onApprove: expect.any(Function),
+                style: paypalCommerceOptions.style,
             });
         });
 
@@ -557,26 +571,27 @@ describe('PayPalCommerceButtonStrategy', () => {
         });
 
         it('initializes PayPal button to render with appSwitch flag', async () => {
+            const paymentMethodWithShippingOptionsFeature = {
+                ...paymentMethod,
+                initializationData: {
+                    ...paymentMethod.initializationData,
+                    isAppSwitchEnabled: true,
+                },
+            };
+
             jest.spyOn(
                 paymentIntegrationService.getState(),
-                'getStoreConfigOrThrow',
-            ).mockReturnValue({
-                ...storeConfig,
-                checkoutSettings: {
-                    ...storeConfig.checkoutSettings,
-                    features: {
-                        'PAYPAL-5716.app_switch_functionality': true,
-                    },
-                },
-            });
+                'getPaymentMethodOrThrow',
+            ).mockReturnValue(paymentMethodWithShippingOptionsFeature);
+            await strategy.initialize(initializationOptions);
             await strategy.initialize(initializationOptions);
 
             expect(paypalSdk.Buttons).toHaveBeenCalledWith({
                 appSwitchWhenAvailable: true,
-                fundingSource: paypalSdk.FUNDING.PAYPAL,
-                style: paypalCommerceOptions.style,
                 createOrder: expect.any(Function),
+                fundingSource: paypalSdk.FUNDING.PAYPAL,
                 onApprove: expect.any(Function),
+                style: paypalCommerceOptions.style,
             });
         });
     });

packages/paypal-commerce-integration/src/paypal-commerce/paypal-commerce-button-strategy.ts

@@ -21,11 +21,8 @@ import {
 import PayPalCommerceButtonInitializeOptions, {
     WithPayPalCommerceButtonInitializeOptions,
 } from './paypal-commerce-button-initialize-options';
-import { isExperimentEnabled } from '@bigcommerce/checkout-sdk/utility';
 
 export default class PayPalCommerceButtonStrategy implements CheckoutButtonStrategy {
-    private methodId?: string;
-
     constructor(
         private paymentIntegrationService: PaymentIntegrationService,
         private paypalCommerceIntegrationService: PayPalCommerceIntegrationService,
@@ -71,8 +68,6 @@ export default class PayPalCommerceButtonStrategy implements CheckoutButtonStrat
             );
         }
 
-        this.methodId = methodId;
-
         if (!isBuyNowFlow) {
             // Info: default checkout should not be loaded for BuyNow flow,
             // since there is no checkout session available for that.
@@ -110,9 +105,10 @@ export default class PayPalCommerceButtonStrategy implements CheckoutButtonStrat
             paymentMethod.initializationData || {};
 
         const defaultCallbacks = {
-            ...(this.isPaypalCommerceAppSwitchEnabled() && { appSwitchWhenAvailable: true }),
-            createOrder: () =>
-                this.paypalCommerceIntegrationService.createOrder('paypalcommerce'),
+            // ...(this.isPaypalCommerceAppSwitchEnabled(methodId) && {
+            //     appSwitchWhenAvailable: true,
+            // }),
+            createOrder: () => this.paypalCommerceIntegrationService.createOrder('paypalcommerce'),
             onApprove: ({ orderID }: ApproveCallbackPayload) =>
                 this.paypalCommerceIntegrationService.tokenizePayment(methodId, orderID),
         };
@@ -144,7 +140,7 @@ export default class PayPalCommerceButtonStrategy implements CheckoutButtonStrat
         const paypalButton = paypalSdk.Buttons(buttonRenderOptions);
 
         if (paypalButton.isEligible()) {
-            if (paypalButton.hasReturned?.() && this.isPaypalCommerceAppSwitchEnabled()) {
+            if (paypalButton.hasReturned?.() && this.isPaypalCommerceAppSwitchEnabled(methodId)) {
                 paypalButton.resume?.();
             } else {
                 paypalButton.render(`#${containerId}`);
@@ -270,17 +266,11 @@ export default class PayPalCommerceButtonStrategy implements CheckoutButtonStrat
      * PayPal AppSwitch enabling handling
      *
      */
-    private isPaypalCommerceAppSwitchEnabled(): boolean {
+    private isPaypalCommerceAppSwitchEnabled(methodId: string): boolean {
         const state = this.paymentIntegrationService.getState();
-        const features = state.getStoreConfigOrThrow().checkoutSettings.features;
-        const paymentMethod = state.getPaymentMethodOrThrow<PayPalCommerceInitializationData>(
-            this.methodId || '',
-        );
-        const { isHostedCheckoutEnabled } = paymentMethod.initializationData || {};
+        const paymentMethod =
+            state.getPaymentMethodOrThrow<PayPalCommerceInitializationData>(methodId);
 
-        return (
-            !isHostedCheckoutEnabled &&
-            isExperimentEnabled(features, 'PAYPAL-5716.app_switch_functionality')
-        );
+        return paymentMethod.initializationData?.isAppSwitchEnabled || false;
     }
 }