From c6b765e934d3fd3b0f82947ec3e3a7c3456afea4 Mon Sep 17 00:00:00 2001
From: uzairr <uzairr@yahoo.com>
Date: Mon, 1 Feb 2021 14:29:41 +0500
Subject: [PATCH] fix error message sequence

---
 src/login/LoginPage.jsx                       |  2 +-
 src/login/messages.jsx                        |  7 ++++++-
 .../__snapshots__/LoginPage.test.jsx.snap     | 20 +++++++++----------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/login/LoginPage.jsx b/src/login/LoginPage.jsx
index 2c4af315..c5bd6b20 100644
--- a/src/login/LoginPage.jsx
+++ b/src/login/LoginPage.jsx
@@ -209,7 +209,7 @@ class LoginPage extends React.Component {
                 <ValidationFormGroup
                   for="email"
                   invalid={this.state.errors.email !== ''}
-                  invalidMessage={intl.formatMessage(messages['email.format.validation.message'])}
+                  invalidMessage={this.state.email === '' ? intl.formatMessage(messages['email.validation.message']) : intl.formatMessage(messages['email.format.validation.message'])}
                   className="mb-0 w-100"
                   helpText={intl.formatMessage(messages['email.help.message'])}
                 >
diff --git a/src/login/messages.jsx b/src/login/messages.jsx
index 35370297..23b6b08f 100644
--- a/src/login/messages.jsx
+++ b/src/login/messages.jsx
@@ -91,9 +91,14 @@ const messages = defineMessages({
     defaultMessage: 'The email address you\'ve provided isn\'t formatted correctly.',
     description: 'Validation message that appears when email address format is incorrect',
   },
+  'email.validation.message': {
+    id: 'email.validation.message',
+    defaultMessage: 'Please enter your Email.',
+    description: 'Validation message that appears when email is empty',
+  },
   'password.validation.message': {
     id: 'password.validation.message',
-    defaultMessage: 'Please enter your password.',
+    defaultMessage: 'Please enter your Password.',
     description: 'Validation message that appears when password is empty',
   },
   'password.label': {
diff --git a/src/login/tests/__snapshots__/LoginPage.test.jsx.snap b/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
index bb1ef81e..23b7e220 100644
--- a/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
+++ b/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
@@ -66,7 +66,7 @@ exports[`LoginPage should match TPA provider snapshot 1`] = `
             className="invalid-feedback"
             id="email-invalid-feedback"
           >
-            The email address you've provided isn't formatted correctly.
+            Please enter your Email.
           </strong>
         </div>
         <div
@@ -91,7 +91,7 @@ exports[`LoginPage should match TPA provider snapshot 1`] = `
             className="invalid-feedback"
             id="password-invalid-feedback"
           >
-            Please enter your password.
+            Please enter your Password.
           </strong>
         </div>
         <button
@@ -264,7 +264,7 @@ exports[`LoginPage should match default section snapshot 1`] = `
             className="invalid-feedback"
             id="email-invalid-feedback"
           >
-            The email address you've provided isn't formatted correctly.
+            Please enter your Email.
           </strong>
         </div>
         <div
@@ -289,7 +289,7 @@ exports[`LoginPage should match default section snapshot 1`] = `
             className="invalid-feedback"
             id="password-invalid-feedback"
           >
-            Please enter your password.
+            Please enter your Password.
           </strong>
         </div>
         <button
@@ -464,7 +464,7 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = `
             className="invalid-feedback"
             id="email-invalid-feedback"
           >
-            The email address you've provided isn't formatted correctly.
+            Please enter your Email.
           </strong>
         </div>
         <div
@@ -489,7 +489,7 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = `
             className="invalid-feedback"
             id="password-invalid-feedback"
           >
-            Please enter your password.
+            Please enter your Password.
           </strong>
         </div>
         <button
@@ -626,7 +626,7 @@ exports[`LoginPage should match pending button state snapshot 1`] = `
             className="invalid-feedback"
             id="email-invalid-feedback"
           >
-            The email address you've provided isn't formatted correctly.
+            Please enter your Email.
           </strong>
         </div>
         <div
@@ -651,7 +651,7 @@ exports[`LoginPage should match pending button state snapshot 1`] = `
             className="invalid-feedback"
             id="password-invalid-feedback"
           >
-            Please enter your password.
+            Please enter your Password.
           </strong>
         </div>
         <button
@@ -825,7 +825,7 @@ exports[`LoginPage should show error message 1`] = `
             className="invalid-feedback"
             id="email-invalid-feedback"
           >
-            The email address you've provided isn't formatted correctly.
+            Please enter your Email.
           </strong>
         </div>
         <div
@@ -850,7 +850,7 @@ exports[`LoginPage should show error message 1`] = `
             className="invalid-feedback"
             id="password-invalid-feedback"
           >
-            Please enter your password.
+            Please enter your Password.
           </strong>
         </div>
         <button