From b5bc6251cffdb996674d62c3ee7c5a917b6cd5cb Mon Sep 17 00:00:00 2001 From: Marek Matys <57749215+thermaq@users.noreply.github.com> Date: Thu, 25 Mar 2021 14:05:06 +0100 Subject: [PATCH] fix password change popup message Fixed bad error message when providing bad old password during password change. Signed-off-by: Marek Matys --- .../views/settings/tabs/user/GeneralUserSettingsTab.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js index b7dbfa4a3b..b1ad9f3d23 100644 --- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js @@ -206,10 +206,10 @@ export default class GeneralUserSettingsTab extends React.Component { _onPasswordChangeError = (err) => { // TODO: Figure out a design that doesn't involve replacing the current dialog - let errMsg = err.error || ""; + let errMsg = err.error || err.message || ""; if (err.httpStatus === 403) { errMsg = _t("Failed to change password. Is your password correct?"); - } else if (err.httpStatus) { + } else if (!errMsg) { errMsg += ` (HTTP status ${err.httpStatus})`; } const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");