Fixed failed loginChange action when resetting login error

3 files changed, 20 insertions, 4 deletions

diff --git a/app/containers/LoginPage.js b/app/containers/LoginPage.js
index abee712be4..ef4698fad1 100644
--- a/app/containers/LoginPage.js
+++ b/app/containers/LoginPage.js
@@ -8,12 +8,12 @@ import { links } from '../config';
 
 const mapStateToProps = (state) => state;
 const mapDispatchToProps = (dispatch, props) => {
-  const { loginChange, login } = bindActionCreators(accountActions, dispatch);
+  const { login } = bindActionCreators(accountActions, dispatch);
   const { backend } = props;
   return {
     onSettings: () => dispatch(push('/settings')),
     onLogin: (account) => login(backend, account),
-    onFirstChangeAfterFailure: () => loginChange({ status: 'none', error: null }),
+    onFirstChangeAfterFailure: () => dispatch(accountActions.resetLoginError()),
     onExternalLink: (type) => shell.openExternal(links[type])
   };
 };
diff --git a/app/redux/account/actions.js b/app/redux/account/actions.js
index cae9b22187..78f8c2d783 100644
--- a/app/redux/account/actions.js
+++ b/app/redux/account/actions.js
@@ -19,10 +19,15 @@ type LoggedOutAction = {
   type: 'LOGGED_OUT',
 };
 
+type ResetLoginErrorAction = {
+  type: 'RESET_LOGIN_ERROR',
+};
+
 export type AccountAction = StartLoginAction
                             | LoginSuccessfulAction
                             | LoginFailedAction
-                            | LoggedOutAction;
+                            | LoggedOutAction
+                            | ResetLoginErrorAction;
 
 function startLogin(accountNumber?: string): StartLoginAction {
   return {
@@ -55,7 +60,13 @@ function autoLoginFailed(): LoggedOutAction {
   return loggedOut();
 }
 
+function resetLoginError(): ResetLoginErrorAction {
+  return {
+    type: 'RESET_LOGIN_ERROR',
+  };
+}
+
 const login = (backend: Backend, account: string) => () => backend.login(account);
 const logout = (backend: Backend) => () => backend.logout();
 
-export default { login, logout, startLogin, loginSuccessful, loginFailed, loggedOut, autoLoginFailed };
+export default { login, logout, startLogin, loginSuccessful, loginFailed, loggedOut, autoLoginFailed, resetLoginError };
diff --git a/app/redux/account/reducers.js b/app/redux/account/reducers.js
index 504cbe4e15..094d90fa3a 100644
--- a/app/redux/account/reducers.js
+++ b/app/redux/account/reducers.js
@@ -48,6 +48,11 @@ export default function(state: AccountReduxState = initialState, action: ReduxAc
       expiry: null,
       error: null,
     }};
+  case 'RESET_LOGIN_ERROR':
+    return { ...state, ...{
+      status: 'none',
+      error: null,
+    }};
   }
 
   return state;