Skip to content

Commit 747d85c

Browse files
committed
Added Toast for EmptyCurrentPass & IncorrectCurrentPass
1 parent 91e5b79 commit 747d85c

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

client/modules/User/actions.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,16 +275,26 @@ export function submitSettings(formValues) {
275275

276276
export function updateSettings(formValues) {
277277
return (dispatch) =>
278-
new Promise((resolve) =>
278+
new Promise((resolve) => {
279+
if (!formValues.currentPassword && formValues.newPassword) {
280+
dispatch(showToast(5500));
281+
dispatch(setToastText('Toast.EmptyCurrentPass'));
282+
resolve();
283+
return;
284+
}
285+
279286
submitSettings(formValues)
280287
.then((response) => {
281288
dispatch(updateSettingsSuccess(response.data));
282289
dispatch(showToast(5500));
283290
dispatch(setToastText('Toast.SettingsSaved'));
284291
resolve();
285292
})
286-
.catch((error) => resolve({ error }))
287-
);
293+
.catch((error) => {
294+
dispatch(showToast(5500));
295+
dispatch(setToastText('Toast.IncorrectCurrentPass'));
296+
});
297+
});
288298
}
289299

290300
export function createApiKeySuccess(user) {

translations/locales/en-US/translations.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@
112112
"SketchFailedSave": "Failed to save sketch.",
113113
"AutosaveEnabled": "Autosave enabled.",
114114
"LangChange": "Language changed",
115-
"SettingsSaved": "Settings saved."
115+
"SettingsSaved": "Settings saved.",
116+
"EmptyCurrentPass": "Current Password field is empty",
117+
"IncorrectCurrentPass": "Current Password is incorrect"
116118
},
117119
"Toolbar": {
118120
"Preview": "Preview",

translations/locales/hi/translations.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@
112112
"SketchFailedSave": "स्केच सेव करने में असमर्थ",
113113
"AutosaveEnabled": "ऑटोसेव चालू",
114114
"LangChange": "भाषा बदली",
115-
"SettingsSaved": "सेटिंग्स सेव की"
115+
"SettingsSaved": "सेटिंग्स सेव की",
116+
"EmptyCurrentPass": "वर्तमान पासवर्ड फ़ील्ड खाली है",
117+
"IncorrectCurrentPass": "वर्तमान पासवर्ड गलत है "
116118
},
117119
"Toolbar": {
118120
"Preview": "पूर्वावलोकन",

0 commit comments

Comments
 (0)