diff options
| author | Chris <ccbrown112@gmail.com> | 2017-07-24 10:06:45 -0700 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-07-24 18:06:45 +0100 |
| commit | 72355ba2bf566b538675d27a8611eb67d4f43bdd (patch) | |
| tree | 338572b1213304cf32bf571c7b0aeea6322bfab6 | |
| parent | 87746227bfbc738bf79bda35cb8c06859f186c18 (diff) | |
| download | chat-72355ba2bf566b538675d27a8611eb67d4f43bdd.tar.gz chat-72355ba2bf566b538675d27a8611eb67d4f43bdd.tar.bz2 chat-72355ba2bf566b538675d27a8611eb67d4f43bdd.zip | |
fix uncleared server errors in user settings (#6964)
| -rw-r--r-- | webapp/components/user_settings/user_settings_general/user_settings_general.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/user_settings/user_settings_general/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general/user_settings_general.jsx index 613744b43..fc5f82f29 100644 --- a/webapp/components/user_settings/user_settings_general/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general/user_settings_general.jsx @@ -131,10 +131,10 @@ class UserSettingsGeneralTab extends React.Component { const {formatMessage} = this.props.intl; const usernameError = Utils.isValidUsername(username); if (usernameError === 'Cannot use a reserved word as a username.') { - this.setState({clientError: formatMessage(holders.usernameReserved)}); + this.setState({clientError: formatMessage(holders.usernameReserved), serverError: ''}); return; } else if (usernameError) { - this.setState({clientError: formatMessage(holders.usernameRestrictions, {min: Constants.MIN_USERNAME_LENGTH, max: Constants.MAX_USERNAME_LENGTH})}); + this.setState({clientError: formatMessage(holders.usernameRestrictions, {min: Constants.MIN_USERNAME_LENGTH, max: Constants.MAX_USERNAME_LENGTH}), serverError: ''}); return; } @@ -259,10 +259,10 @@ class UserSettingsGeneralTab extends React.Component { const file = this.state.pictureFile; if (file.type !== 'image/jpeg' && file.type !== 'image/png') { - this.setState({clientError: formatMessage(holders.validImage)}); + this.setState({clientError: formatMessage(holders.validImage), serverError: ''}); return; } else if (file.size > this.state.maxFileSize) { - this.setState({clientError: formatMessage(holders.imageTooLarge)}); + this.setState({clientError: formatMessage(holders.imageTooLarge), serverError: ''}); return; } |