summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
authorDavid Lu <david.lu@hotmail.com>2016-06-27 07:45:24 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-06-27 07:45:24 -0400
commit3cfc369ce9266cb755edb6936e0526a6d9417629 (patch)
tree5c0545f43cf406479aab54e056bcde0842200743 /webapp/components/user_settings
parentdbd60b3f16eb83bc4db9e91169783290b3c3a056 (diff)
downloadchat-3cfc369ce9266cb755edb6936e0526a6d9417629.tar.gz
chat-3cfc369ce9266cb755edb6936e0526a6d9417629.tar.bz2
chat-3cfc369ce9266cb755edb6936e0526a6d9417629.zip
Added error message for unchanged email (#3420)
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/user_settings_general.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index e586c9290..9702185c2 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -160,12 +160,12 @@ class UserSettingsGeneralTab extends React.Component {
const email = this.state.email.trim().toLowerCase();
const confirmEmail = this.state.confirmEmail.trim().toLowerCase();
+ const {formatMessage} = this.props.intl;
if (user.email === email) {
- this.updateSection('');
+ this.setState({emailError: Utils.localizeMessage('user.settings.general.emailUnchanged', 'Your new email address is the same as your old email address.'), clientError: '', serverError: ''});
return;
}
- const {formatMessage} = this.props.intl;
if (email === '' || !Utils.isEmail(email)) {
this.setState({emailError: formatMessage(holders.validEmail), clientError: '', serverError: ''});
return;