Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3171' into Tier4-Kings-PR-07-24-2024

Author: glo23503

app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js

@@ -141,8 +141,9 @@ function (
          * Update address action
          */
         updateAddress: function () {
-            var addressData, newBillingAddress;
+            var addressData, newBillingAddress, needsToUpdateAddress;
 
+            needsToUpdateAddress = true;
             addressUpdated = true;
 
             if (this.selectedAddress() && !this.isAddressFormVisible()) {
@@ -156,7 +157,9 @@ function (
                     this.source.trigger(this.dataScopePrefix + '.custom_attributes.data.validate');
                 }
 
-                if (!this.source.get('params.invalid')) {
+                if (this.source.get('params.invalid')) {
+                    needsToUpdateAddress = false;
+                } else {
                     addressData = this.source.get(this.dataScopePrefix);
 
                     if (customer.isLoggedIn() && !this.customerHasAddresses) { //eslint-disable-line max-depth
@@ -168,9 +171,9 @@ function (
                     selectBillingAddress(newBillingAddress);
                     checkoutData.setSelectedBillingAddress(newBillingAddress.getKey());
                     checkoutData.setNewCustomerBillingAddress(addressData);
-                    this.updateAddresses(true);
                 }
             }
+            this.updateAddresses(needsToUpdateAddress);
         },
 
         /**

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/billing-address-validate.test.js

@@ -107,7 +107,7 @@ define([
 
     describe('Magento_Checkout/js/view/billing-address', function () {
         describe('"updateAddress" method', function () {
-            it('should not call updateAddresses when form is invalid', function () {
+            it('should call updateAddresses when form is invalid with false', function () {
                 billingAddress.source.set.and.callFake(function (key, value) {
                     if (key === 'params.invalid' && value === true) {
                         billingAddress.source.get.and.callFake(function () {
@@ -120,9 +120,25 @@ define([
                 });
                 spyOn(billingAddress, 'updateAddresses');
                 billingAddress.updateAddress();
-                expect(billingAddress.updateAddresses).not.toHaveBeenCalled();
+                expect(billingAddress.updateAddresses).toHaveBeenCalledWith(false);
                 expect(selectBillingAddress).not.toHaveBeenCalled();
             });
+
+            it('should call updateAddresses when form is valid with true', function () {
+                billingAddress.source.get.and.callFake(function (key) {
+                    if (key === 'params.invalid') {
+                        return false; // Simulate valid form data
+                    } else if (key === billingAddress.dataScopePrefix) {
+                        return lastSelectedBillingAddress; // Return mock address data
+                    }
+                    return null;
+                });
+
+                spyOn(billingAddress, 'updateAddresses');
+                billingAddress.updateAddress();
+                expect(billingAddress.updateAddresses).toHaveBeenCalledWith(true);
+                expect(selectBillingAddress).toHaveBeenCalled();
+            });
         });
     });
 });