arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-24 09:18:09 +00:00
Code Issues Releases Wiki Activity

fixed getSelecedDevice in WalletService

Browse Source
This commit is contained in:
Szymon Lesisz 2018-05-22 20:40:04 +02:00
parent 053b12d3ff
commit 751a96ccc1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/js/services/WalletService.js
View File

@ -24,7 +24,16 @@ const getSelectedDevice = (state: State): ?TrezorDevice => {
if (!locationState.device) return null; if (!locationState.device) return null;
const instance: ?number = locationState.deviceInstance ? parseInt(locationState.deviceInstance) : undefined; 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;
});
} }
/** /**