ACP2E-3402: Checkout shipping address form get update with wrong address

Author: abukatar

app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js

@@ -1,12 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * Checkout adapter for customer data storage
- *
- * @api
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 define([
     'jquery',
@@ -87,9 +81,13 @@ define([
          * @param {Object} data
          */
         setShippingAddressFromData: function (data) {
-            var obj = getData();
+            let obj = getData(),
+                websiteCode = window.checkoutConfig.websiteCode;
 
-            obj.shippingAddressFromData = utils.filterFormData(data);
+            if (!obj.shippingAddressFromData) {
+                obj.shippingAddressFromData = {};
+            }
+            obj.shippingAddressFromData[websiteCode] = utils.filterFormData(data);
             saveData(obj);
         },
 
@@ -99,7 +97,13 @@ define([
          * @return {*}
          */
         getShippingAddressFromData: function () {
-            return getData().shippingAddressFromData;
+            let websiteCode = window.checkoutConfig.websiteCode;
+
+            if (!getData().shippingAddressFromData) {
+                return null;
+            }
+
+            return getData().shippingAddressFromData[websiteCode];
         },
 
         /**

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/checkout-data.test.js

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+
+define([
+    'Magento_Checkout/js/checkout-data',
+    'Magento_Customer/js/customer-data'
+], function (checkoutData, storage) {
+    'use strict';
+
+    describe('Magento_Checkout/js/checkout-data', function () {
+        let cacheKey = 'checkout-data',
+            testData = {
+                shippingAddressFromData: {base: {address1: 'address1'}}
+            },
+
+            /** Stub */
+            getStorageData = function () {
+                return testData;
+            };
+
+        window.checkoutConfig = {
+            websiteCode: 'base'
+        };
+
+        beforeEach(function () {
+            spyOn(storage, 'set');
+        });
+
+        it('should save selected shipping address per website', function () {
+            checkoutData.setShippingAddressFromData({address1: 'address1'});
+            expect(storage.set).toHaveBeenCalledWith(cacheKey, jasmine.objectContaining(testData));
+        });
+
+        it('should return null if no shipping address data exists', function () {
+            expect(checkoutData.getShippingAddressFromData()).toBeNull();
+        });
+
+        it('should get shipping address from data per website', function () {
+            spyOn(storage, 'get').and.returnValue(getStorageData);
+            let address = checkoutData.getShippingAddressFromData();
+
+            expect(address).toEqual(testData.shippingAddressFromData.base);
+        });
+    });
+});