From 0802d7d6543b9f9dc3ece9434914e7e6051a5f27 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Fri, 10 Aug 2018 15:02:54 +0200
Subject: [PATCH] Fixed loop redirect

---
 src/js/services/RouterService.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/js/services/RouterService.js b/src/js/services/RouterService.js
index 021aa46b..a92d4e14 100644
--- a/src/js/services/RouterService.js
+++ b/src/js/services/RouterService.js
@@ -85,7 +85,7 @@ const RouterService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispa
         __unloading = true;
     } else if (action.type === LOCATION_CHANGE && !__unloading) {
         const { location } = api.getState().router;
-        const web3 = api.getState().web3;
+        const { web3 } = api.getState();
         const { devices } = api.getState();
         const { error } = api.getState().connect;
 
@@ -123,9 +123,8 @@ const RouterService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispa
                 // PATH VALIDATION
                 // redirect from root view
                 if (action.payload.pathname === '/' || !validation(api, requestedParams)) {
-                    // TODO: switch to first device?
-                    // redirectPath = `/device/${ devices[0].path }`;
-                    redirectPath = location.pathname;
+                    // TODO redirect to first device
+                    redirectPath = '/device/x';
                 } else if (requestedParams.device) {
                     if (requestedParams.network !== currentParams.network) {
                         postActions.push({
@@ -146,7 +145,7 @@ const RouterService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispa
             action.payload.state = pathToParams(url);
             action.payload.pathname = url;
             // change url
-            api.dispatch(replace(url));
+            // api.dispatch(replace(url));
         } else {
             action.payload.state = requestedParams;
         }