Merge remote-tracking branch 'origin/MC-35989' into 2.4-develop-pr34

Author: serhii-balko

app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js

@@ -6,7 +6,7 @@
 /**
  * @api
  */
-define([], function () {
+define(['underscore'], function (_) {
     'use strict';
 
     /**
@@ -44,7 +44,7 @@ define([], function () {
             vatId: addressData['vat_id'],
             sameAsBilling: addressData['same_as_billing'],
             saveInAddressBook: addressData['save_in_address_book'],
-            customAttributes: addressData['custom_attributes'],
+            customAttributes: _.toArray(addressData['custom_attributes']).reverse(),
 
             /**
              * @return {*}

dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/model/customer/address.test.js

@@ -22,9 +22,12 @@ define([
         it('Check on empty object.', function () {
             var addressData = {
                 region: {}
+            },
+            expected = {
+                customAttributes: []
             };
 
-            expect(JSON.stringify(customerAddress(addressData))).toEqual(JSON.stringify({}));
+            expect(JSON.stringify(customerAddress(addressData))).toEqual(JSON.stringify(expected));
         });
 
         it('Check on function call with empty address data.', function () {
@@ -49,7 +52,8 @@ define([
                     }
                 }),
                 expected = {
-                    regionId: '1'
+                    regionId: '1',
+                    customAttributes: []
                 };
 
             expect(JSON.stringify(result)).toEqual(JSON.stringify(expected));