From 2d4f3e823262f43ab69d15644079401395e27df3 Mon Sep 17 00:00:00 2001
From: Szymon Lesisz <sz.lesisz@gmail.com>
Date: Mon, 1 Oct 2018 13:21:58 +0200
Subject: [PATCH] fixed edgecase: handle disconnect device in BL/initialized
 mode OR without features

---
 src/actions/TrezorConnectActions.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/actions/TrezorConnectActions.js b/src/actions/TrezorConnectActions.js
index 7d718906..9ecc92c8 100644
--- a/src/actions/TrezorConnectActions.js
+++ b/src/actions/TrezorConnectActions.js
@@ -206,7 +206,7 @@ export const getSelectedDeviceState = (): AsyncAction => async (dispatch: Dispat
 export const deviceDisconnect = (device: Device): AsyncAction => async (dispatch: Dispatch, getState: GetState): Promise<void> => {
     const selected: ?TrezorDevice = getState().wallet.selectedDevice;
 
-    if (device && device.features) {
+    if (device.features) {
         if (selected && selected.features && selected.features.device_id === device.features.device_id) {
             dispatch(DiscoveryActions.stop(selected));
         }
@@ -218,7 +218,11 @@ export const deviceDisconnect = (device: Device): AsyncAction => async (dispatch
                 device: instances[0],
                 instances,
             });
+        } else {
+            dispatch(RouterActions.selectFirstAvailableDevice());
         }
+    } else {
+        dispatch(RouterActions.selectFirstAvailableDevice());
     }
 };