Merge branch 'master' into master

2026-09-09 11:38:08 +08:00 · 2018-10-23 20:53:52 +03:00
parent 41610ccf57 9344c1bc80
commit 5f62083c2f
4 changed files with 99 additions and 73 deletions
@@ -178,10 +178,12 @@ class Profile extends React.Component {
        },
      },
      notify,
+      success: hasChangedUsername,
    } = this.props;
    const { editing, formData, showDialog } = this.state;

-    const usernameCanBeUpdated = canUsernameBeUpdated(status);
+    const usernameCanBeUpdated =
+      canUsernameBeUpdated(status) && !hasChangedUsername;

    return (
      <section
@@ -308,6 +310,7 @@ Profile.propTypes = {
  notify: PropTypes.func.isRequired,
  username: PropTypes.string,
  emailAddress: PropTypes.string,
+  success: PropTypes.bool.isRequired,
 };

 export default Profile;