Skip to content

Fixing Incorrect login error message #3466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 28, 2025
Merged

Fixing Incorrect login error message #3466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97b99c7
Fixing Incorrect login error message
Jatin24062005 Apr 28, 2025
d0fbc32
Merge branch 'develop' into Jatin-Issue#3465
raclim Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/utils/reduxFormUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ export function validateSettings(formProps) {

export function validateLogin(formProps) {
const errors = {};
if (!formProps.email) {
errors.email = i18n.t('ReduxFormUtils.errorEmptyEmail');
if (!formProps.email && !formProps.username) {
errors.email = i18n.t('ReduxFormUtils.errorEmptyEmailorUserName');
}
if (!formProps.password) {
errors.password = i18n.t('ReduxFormUtils.errorEmptyPassword');
Expand Down
1 change: 1 addition & 0 deletions translations/locales/en-US/translations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@
"ReduxFormUtils": {
"errorInvalidEmail": "Please enter a valid email address",
"errorEmptyEmail": "Please enter an email",
"errorEmptyEmailorUserName": "Please enter an email or username",
"errorPasswordMismatch": "Passwords must match",
"errorEmptyPassword": "Please enter a password",
"errorShortPassword": "Password must be at least 6 characters",
Expand Down