fix(payment): PI-4290 google pay shipping address required fix

Author: bc-dronov

packages/google-pay-integration/src/gateways/google-pay-gateway.spec.ts

@@ -33,6 +33,8 @@ describe('GooglePayGateway', () => {
             features: {
                 ...storeConfig.checkoutSettings.features,
                 'PI-2875.googlepay_coupons_handling': true,
+                // experiment name will be added after code freeze
+                'experiment_shouldRequestShipping': true,
             },
         },
     };

packages/google-pay-integration/src/gateways/google-pay-gateway.ts

@@ -110,10 +110,10 @@ export default class GooglePayGateway {
         });
     }
 
-    async getRequiredData(): Promise<GooglePayRequiredPaymentData> {
+    async getRequiredData(shouldRequestShipping = true): Promise<GooglePayRequiredPaymentData> {
         const data: GooglePayRequiredPaymentData = { emailRequired: true };
 
-        if (!this._isShippingAddressRequired()) {
+        if (!this._isShippingAddressRequired(shouldRequestShipping)) {
             return data;
         }
 
@@ -131,8 +131,8 @@ export default class GooglePayGateway {
         };
     }
 
-    getCallbackIntents(): CallbackIntentsType[] {
-        if (this._isShippingAddressRequired()) {
+    getCallbackIntents(shouldRequestShipping = true): CallbackIntentsType[] {
+        if (this._isShippingAddressRequired(shouldRequestShipping)) {
             return [
                 CallbackIntentsType.OFFER,
                 CallbackIntentsType.SHIPPING_ADDRESS,
@@ -445,13 +445,24 @@ export default class GooglePayGateway {
         this._gatewayIdentifier = gateway || this.getGatewayIdentifier();
     }
 
-    private _isShippingAddressRequired(): boolean {
+    private _isShippingAddressRequired(shouldRequestShipping = true): boolean {
         const { getCartOrThrow, getStoreConfig, getShippingAddress } =
             this._paymentIntegrationService.getState();
 
+        // experiment name will be added after code freeze
+        const useNewLogic = getStoreConfig()?.checkoutSettings.features['experiment_shouldRequestShipping'] || false;
+
+        console.log('useNewLogic', useNewLogic);
+        let shippingContextRequiresCheck: boolean;
+
+        if (useNewLogic) {
+            shippingContextRequiresCheck = shouldRequestShipping;
+        } else {
+            shippingContextRequiresCheck = getShippingAddress() === undefined;
+        }
+
         return (
-            getShippingAddress() === undefined &&
-            itemsRequireShipping(getCartOrThrow(), getStoreConfig())
+            shippingContextRequiresCheck && itemsRequireShipping(getCartOrThrow(), getStoreConfig())
         );
     }
 

packages/google-pay-integration/src/google-pay-payment-processor.ts

@@ -64,8 +64,8 @@ export default class GooglePayPaymentProcessor {
         this._buildButtonPayloads();
     }
 
-    async initializeWidget() {
-        await this._buildWidgetPayloads();
+    async initializeWidget(shouldRequestShipping = true) {
+        await this._buildWidgetPayloads(shouldRequestShipping);
 
         await this._determineReadinessToPay();
 
@@ -236,7 +236,7 @@ export default class GooglePayPaymentProcessor {
         };
     }
 
-    private async _buildWidgetPayloads(): Promise<void> {
+    private async _buildWidgetPayloads(shouldRequestShipping = true): Promise<void> {
         const baseCardPaymentMethod = this._getBaseCardPaymentMethod();
 
         this._cardPaymentMethod = {
@@ -251,8 +251,8 @@ export default class GooglePayPaymentProcessor {
             allowedPaymentMethods: [this._cardPaymentMethod],
             transactionInfo: this._gateway.getTransactionInfo(),
             merchantInfo: this._gateway.getMerchantInfo(),
-            ...(await this._gateway.getRequiredData()),
-            callbackIntents: this._gateway.getCallbackIntents(),
+            ...(await this._gateway.getRequiredData(shouldRequestShipping)),
+            callbackIntents: this._gateway.getCallbackIntents(shouldRequestShipping),
             offerInfo: this._gateway.getAppliedCoupons(),
         };
         this._isReadyToPayRequest = {

packages/google-pay-integration/src/google-pay-payment-strategy.ts

@@ -152,7 +152,7 @@ export default class GooglePayPaymentStrategy implements PaymentStrategy {
 
             // TODO: Dispatch Widget Actions
             try {
-                await this._googlePayPaymentProcessor.initializeWidget();
+                await this._googlePayPaymentProcessor.initializeWidget(false);
                 await this._interactWithPaymentSheet();
             } catch (error) {
                 let err: unknown = error;