MAGETWO-64544: When logged in customer edits a new shipping address during checkout they are unable to place the order #6488

Author: omiroshnichenko

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

@@ -153,11 +153,7 @@ define([
                         class: buttons.cancel.class ? buttons.cancel.class : 'action secondary action-hide-popup',
 
                         /** @inheritdoc */
-                        click: function () {
-                            // Revert address.
-                            checkoutData.setShippingAddressFromData(self.tempData);
-                            this.closeModal();
-                        }
+                        click: this.onClosePopUp.bind(this)
                     }
                 ];
 
@@ -166,6 +162,11 @@ define([
                     self.isFormPopUpVisible(false);
                 };
 
+                this.popUpForm.options.modalCloseBtnHandler = this.onClosePopUp.bind(this);
+                this.popUpForm.options.keyEventHandlers = {
+                    escapeKey: this.onClosePopUp.bind(this)
+                };
+
                 /** @inheritdoc */
                 this.popUpForm.options.opened = function () {
                     // Store temporary address for revert action in case when user click cancel action
@@ -177,6 +178,14 @@ define([
             return popUp;
         },
 
+        /**
+         * Revert address and close modal.
+         */
+        onClosePopUp: function () {
+            checkoutData.setShippingAddressFromData($.extend(true, {}, this.temporaryAddress));
+            this.getPopUp().closeModal();
+        },
+
         /**
          * Show address form popup
          */
@@ -203,7 +212,7 @@ define([
                 newShippingAddress = createShippingAddress(addressData);
                 selectShippingAddress(newShippingAddress);
                 checkoutData.setSelectedShippingAddress(newShippingAddress.getKey());
-                checkoutData.setNewCustomerShippingAddress(addressData);
+                checkoutData.setNewCustomerShippingAddress($.extend(true, {}, addressData));
                 this.getPopUp().closeModal();
                 this.isNewAddressAdded(true);
             }