Merge branch 'master' into losowsky-patch-2

This commit is contained in:
Kim Gardner
2018-05-10 10:41:01 -04:00
committed by GitHub
@@ -114,11 +114,11 @@ class Profile extends React.Component {
isSaveEnabled = () => {
const { formData } = this.state;
const { emailAddress, username } = this.props;
const { root: { me: { username, email } } } = this.props;
const formHasErrors = !!Object.keys(this.state.errors).length;
const validUsername =
formData.newUsername && formData.newUsername !== username;
const validEmail = formData.newEmail && formData.newEmail !== emailAddress;
const validEmail = formData.newEmail && formData.newEmail !== email;
return !formHasErrors && (validUsername || validEmail);
};