Entirely decouple routing from translation of backend events into redux actions

2 files changed, 9 insertions, 12 deletions

diff --git a/app/app.js b/app/app.js
index 43ad0d959a..4555bddcdd 100644
--- a/app/app.js
+++ b/app/app.js
@@ -88,9 +88,15 @@ syncBackendWithReduxStore(backend, store);
 mapBackendEventsToReduxActions(backend, store);
 
 // redirect user to main screen after login
-backend.on(Backend.EventType.login, (addr, error) => {
-  if(error) { return; }
-  setTimeout(() => store.dispatch(replace('/connect')), 1000);
+backend.on(Backend.EventType.login, (account, error) => {
+  if(error) { return; } // no-op on error
+  
+  setTimeout(() => {
+    const { settings } = store.getState();
+    const server = backend.serverInfo(settings.preferredServer);
+    backend.connect(server.address);
+    store.dispatch(replace('/connect'));
+  }, 1000);
 });
 
 // redirect user to login page on logout
diff --git a/app/lib/backend-redux-actions.js b/app/lib/backend-redux-actions.js
index c14f3f0cf0..ddf788028f 100644
--- a/app/lib/backend-redux-actions.js
+++ b/app/lib/backend-redux-actions.js
@@ -41,15 +41,6 @@ export default function mapBackendEventsToReduxActions(backend, store) {
   const onLogin = (account, error) => {
     const status = error ? LoginState.failed : LoginState.ok;
     store.dispatch(userActions.loginChange({ status, error }));
-    
-    // redirect to main screen after delay
-    if(status === LoginState.ok) {
-      const preferredServer = store.getState().settings.preferredServer;
-      const server = backend.serverInfo(preferredServer);
-
-      // auto-connect
-      setTimeout(() => backend.connect(server.address), 1000);
-    }
   };
 
   const onLogout = () => {