fix lint

src/actions/ImportAccountActions.js

@@ -21,12 +21,14 @@ export type ImportAccountAction =
           error: ?string,
       };
 
-
 const findIndex = (accounts: Array<Account>, network: Network, device: TrezorDevice): number => {
     return accounts.filter(
-        a => a.imported === true && a.network === network.shortcut && a.deviceID === (device.features|| {}).device_id
+        a =>
+            a.imported === true &&
+            a.network === network.shortcut &&
+            a.deviceID === (device.features || {}).device_id
     ).length;
-}
+};
 
 export const importAddress = (
     address: string,

src/reducers/utils/index.js

@@ -92,7 +92,8 @@ export const getSelectedAccount = (state: State): ?Account => {
     return state.accounts.find(
         a =>
             a.imported === isImported &&
-            (a.deviceState === device.state || a.imported) &&
+            (a.deviceState === device.state ||
+                (a.imported && a.deviceID === (device.features || {}).device_id)) &&
             a.index === index &&
             a.network === locationState.network
     );