From 13b49c32b5c6db53eea8647e2b7c8214fd5ed773 Mon Sep 17 00:00:00 2001
From: Szymon Lesisz <sz.lesisz@gmail.com>
Date: Fri, 12 Apr 2019 17:27:24 +0200
Subject: [PATCH] Update RouterActions.js

---
 src/actions/RouterActions.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/actions/RouterActions.js b/src/actions/RouterActions.js
index 603bbb01..f8f10877 100644
--- a/src/actions/RouterActions.js
+++ b/src/actions/RouterActions.js
@@ -429,19 +429,13 @@ export const setInitialUrl = (): PayloadAction<boolean> => (
     dispatch: Dispatch,
     getState: GetState
 ): boolean => {
-    const { initialPathname } = getState().wallet;
-    if (typeof initialPathname !== 'string') return false;
-
     // DEVICE.CONNECT race condition, "selectDevice" method was called but currently selectedDevice is in getState (auth) process
     // if so, consume this action (return true) to break "selectDevice" process
     const { selectedDevice } = getState().wallet;
-    if (
-        selectedDevice &&
-        selectedDevice.type === 'acquired' &&
-        !selectedDevice.features.passphrase_protection &&
-        !selectedDevice.state
-    )
-        return true;
+    if (selectedDevice && selectedDevice.type === 'acquired' && !selectedDevice.state) return true;
+
+    const { initialPathname } = getState().wallet;
+    if (typeof initialPathname !== 'string') return false;
 
     const valid = dispatch(
         getValidUrl({