diff options
| author | David Lu <david.lu@hotmail.com> | 2016-07-05 07:17:50 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-05 07:17:50 -0400 |
| commit | bc726b0840083142399e243ebaca721f2e03f287 (patch) | |
| tree | 868b57b2c258b1fea190b77f02a37d0e7b59d33c | |
| parent | c90a34c2a306824dc6836cada0fa29028d44d145 (diff) | |
| download | chat-bc726b0840083142399e243ebaca721f2e03f287.tar.gz chat-bc726b0840083142399e243ebaca721f2e03f287.tar.bz2 chat-bc726b0840083142399e243ebaca721f2e03f287.zip | |
Revert PLT-3233 (#3477)
| -rw-r--r-- | webapp/components/user_settings/user_settings_general.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index 9702185c2..37264fb7e 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -161,8 +161,9 @@ class UserSettingsGeneralTab extends React.Component { const confirmEmail = this.state.confirmEmail.trim().toLowerCase(); const {formatMessage} = this.props.intl; - if (user.email === email) { - this.setState({emailError: Utils.localizeMessage('user.settings.general.emailUnchanged', 'Your new email address is the same as your old email address.'), clientError: '', serverError: ''}); + + if (user.email === email && confirmEmail === '') { + this.updateSection(''); return; } |