From 751a96ccc1660ea9413705bc917f09f340cbe8a0 Mon Sep 17 00:00:00 2001 From: Szymon Lesisz Date: Tue, 22 May 2018 20:40:04 +0200 Subject: [PATCH] fixed getSelecedDevice in WalletService --- src/js/services/WalletService.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/js/services/WalletService.js b/src/js/services/WalletService.js index 041db13a..59218e2c 100644 --- a/src/js/services/WalletService.js +++ b/src/js/services/WalletService.js @@ -24,7 +24,16 @@ const getSelectedDevice = (state: State): ?TrezorDevice => { if (!locationState.device) return null; const instance: ?number = locationState.deviceInstance ? parseInt(locationState.deviceInstance) : undefined; - return state.connect.devices.find(d => d.features && d.features.device_id === locationState.device && d.instance === instance); + return state.connect.devices.find(d => { + if (d.unacquired && d.path === locationState.device) { + return true; + } else if (d.features && d.features.bootloader_mode && d.path === locationState.device) { + return true; + } else if (d.features && d.features.device_id === locationState.device && d.instance === instance) { + return true; + } + return false; + }); } /**