Merge branch 'develop' of github.com:magento/magento2ce into develop-prs

Author: ishakhsuvarov

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

@@ -259,6 +259,29 @@ define([
 
             obj.inputFieldEmailValue = email;
             saveData(obj);
+        },
+
+        /**
+         * Pulling the checked email value from persistence storage
+         *
+         * @return {*}
+         */
+        getCheckedEmailValue: function () {
+            var obj = getData();
+
+            return obj.checkedEmailValue ? obj.checkedEmailValue : '';
+        },
+
+        /**
+         * Setting the checked email value pulled from persistence storage
+         *
+         * @param {String} email
+         */
+        setCheckedEmailValue: function (email) {
+            var obj = getData();
+
+            obj.checkedEmailValue = email;
+            saveData(obj);
         }
     };
 });

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

@@ -42,6 +42,19 @@ define([
         forgotPasswordUrl: window.checkoutConfig.forgotPasswordUrl,
         emailCheckTimeout: 0,
 
+        /**
+         * Initializes regular properties of instance.
+         *
+         * @returns {Object} Chainable.
+         */
+        initConfig: function () {
+            this._super();
+
+            this.isPasswordVisible = this.resolveInitialPasswordVisibility();
+
+            return this;
+        },
+
         /**
          * Initializes observable properties of instance
          *
@@ -81,20 +94,19 @@ define([
          * Check email existing.
          */
         checkEmailAvailability: function () {
-            var self = this;
-
             this.validateRequest();
             this.isEmailCheckComplete = $.Deferred();
             this.isLoading(true);
             this.checkRequest = checkEmailAvailability(this.isEmailCheckComplete, this.email());
 
             $.when(this.isEmailCheckComplete).done(function () {
-                self.isPasswordVisible(false);
-            }).fail(function () {
-                self.isPasswordVisible(true);
-            }).always(function () {
-                self.isLoading(false);
-            });
+                this.isPasswordVisible(false);
+            }.bind(this)).fail(function () {
+                this.isPasswordVisible(true);
+                checkoutData.setCheckedEmailValue(this.email());
+            }.bind(this)).always(function () {
+                this.isLoading(false);
+            }.bind(this));
         },
 
         /**
@@ -153,6 +165,19 @@ define([
                     fullScreenLoader.stopLoader();
                 });
             }
+        },
+
+        /**
+         * Resolves an initial sate of a login form.
+         *
+         * @returns {Boolean} - initial visibility state.
+         */
+        resolveInitialPasswordVisibility: function () {
+            if (checkoutData.getInputFieldEmailValue() !== '') {
+                return checkoutData.getInputFieldEmailValue() === checkoutData.getCheckedEmailValue();
+            }
+
+            return false;
         }
     });
 });