MAGETWO-91517: Cancel and Return link removes billing and shipping address

- Fix statics.

Author: AlexeyManenok

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

@@ -66,14 +66,15 @@ define([
          * Resolve shipping address. Used local storage
          */
         resolveShippingAddress: function () {
+            var newCustomerShippingAddress;
+
             if (!checkoutData.getShippingAddressFromData() &&
                 window.checkoutConfig.shippingAddressFromData
             ) {
                 checkoutData.setShippingAddressFromData(window.checkoutConfig.shippingAddressFromData);
             }
 
-            var newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
-
+            newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
             if (newCustomerShippingAddress) {
                 createShippingAddress(newCustomerShippingAddress);
             }
@@ -201,15 +202,17 @@ define([
          * Resolve billing address. Used local storage
          */
         resolveBillingAddress: function () {
+            var selectedBillingAddress,
+                newCustomerBillingAddressData;
+
             if (!checkoutData.getBillingAddressFromData() &&
                 window.checkoutConfig.billingAddressFromData
             ) {
                 checkoutData.setBillingAddressFromData(window.checkoutConfig.billingAddressFromData);
             }
 
-            var selectedBillingAddress = checkoutData.getSelectedBillingAddress(),
-                newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
-
+            selectedBillingAddress = checkoutData.getSelectedBillingAddress();
+            newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
             if (selectedBillingAddress) {
                 if (selectedBillingAddress == 'new-customer-address' && newCustomerBillingAddressData) { //eslint-disable-line
                     selectBillingAddress(createBillingAddress(newCustomerBillingAddressData));

app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js

@@ -17,15 +17,16 @@ define([
 ], function ($, Component, ko, customer, checkEmailAvailability, loginAction, quote, checkoutData, fullScreenLoader) {
     'use strict';
 
+    var validatedEmail;
+
     if (!checkoutData.getValidatedEmailValue() &&
         window.checkoutConfig.validatedEmailValue
     ) {
         checkoutData.setInputFieldEmailValue(window.checkoutConfig.validatedEmailValue);
         checkoutData.setValidatedEmailValue(window.checkoutConfig.validatedEmailValue);
     }
 
-    var validatedEmail = checkoutData.getValidatedEmailValue();
-
+    validatedEmail = checkoutData.getValidatedEmailValue();
     if (validatedEmail && !customer.isLoggedIn()) {
         quote.guestEmail = validatedEmail;
     }