From 72355ba2bf566b538675d27a8611eb67d4f43bdd Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 24 Jul 2017 10:06:45 -0700 Subject: fix uncleared server errors in user settings (#6964) --- .../user_settings/user_settings_general/user_settings_general.jsx | 8 ++++---- 1 file 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; } -- cgit v1.2.3-1-g7c22