Andal.LND/frontend-app-authn
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error message sequence

Browse Source
This commit is contained in:
uzairr
2021-02-01 14:29:41 +05:00
parent a54b61d7f9
commit c6b765e934
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/login/LoginPage.jsx
View File

@@ -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'])}
>

7
src/login/messages.jsx
View File

@@ -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': {

20
src/login/tests/__snapshots__/LoginPage.test.jsx.snap
View File

@@ -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