Merge branch 'partial-account-token-in-redux'

1 files changed, 4 insertions, 11 deletions

diff --git a/app/components/Login.js b/app/components/Login.js
index 1e1d7dbb5f..784d92daa8 100644
--- a/app/components/Login.js
+++ b/app/components/Login.js
@@ -13,6 +13,7 @@ export type LoginPropTypes = {
   onSettings: ?(() => void),
   onFirstChangeAfterFailure: () => void,
   onExternalLink: (type: string) => void,
+  onAccountTokenChange: (string) => void,
 };
 
 export default class Login extends Component {
@@ -20,19 +21,15 @@ export default class Login extends Component {
   state = {
     notifyOnFirstChangeAfterFailure: false,
     isActive: false,
-    unsubmittedAccountToken: '',
   };
 
   onCreateAccount = () => this.props.onExternalLink('createAccount');
   onFocus = () => this.setState({ isActive: true });
   onBlur = () => this.setState({ isActive: false });
   onLogin = () => {
-    const accountToken = this.state.unsubmittedAccountToken;
+    const accountToken = this.props.account.accountToken;
     if(accountToken && accountToken.length > 0) {
       this.props.onLogin(accountToken);
-      this.setState({
-        unsubmittedAccountToken: '',
-      });
     }
   }
 
@@ -42,9 +39,7 @@ export default class Login extends Component {
       this.setState({ notifyOnFirstChangeAfterFailure: false });
       this.props.onFirstChangeAfterFailure();
     }
-    this.setState({
-      unsubmittedAccountToken: val,
-    });
+    this.props.onAccountTokenChange(val);
   }
 
   formTitle(s: LoginState): string {
@@ -168,9 +163,7 @@ export default class Login extends Component {
 
   _createLoginForm(): React.Element<*> {
     const { status, error } = this.props.account;
-    const accountToken = status === 'logging in'
-      ? this.props.account.accountToken
-      : this.state.unsubmittedAccountToken;
+    const accountToken = this.props.account.accountToken;
 
     const inputDisabled = status === 'logging in';