arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2025-08-03 12:28:13 +00:00
Code Issues Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Vladimir Volek 2019-02-06 19:34:09 +01:00
commit 7432a9e37a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/__tests__/device.test.js
View File

@ -40,9 +40,9 @@ describe('device utils', () => {
it('isWebUSB', () => { it('isWebUSB', () => {
const data = [ const data = [
{ transport: { type: 'ParallelTransport', version: 'webusb' } }, { transport: { type: 'webusb', version: '1.6.0' } },
{ transport: { type: null, version: 'aaaaaa' } }, { transport: { type: null, version: 'aaaaaa' } },
{ transport: { type: 'ParallelTransport', version: 'webusb' } }, { transport: { type: 'webusb' } },
]; ];
data.forEach((item) => { data.forEach((item) => {

2
src/utils/device.js
View File

@ -79,7 +79,7 @@ export const getStatusName = (deviceStatus: string): string => {
} }
}; };
export const isWebUSB = (transport: Transport) => !!((transport.type && transport.version.indexOf('webusb') >= 0)); export const isWebUSB = (transport: Transport) => !!((transport.type && transport.type === 'webusb'));
export const isDisabled = (selectedDevice: TrezorDevice, devices: Array<TrezorDevice>, transport: Transport) => { export const isDisabled = (selectedDevice: TrezorDevice, devices: Array<TrezorDevice>, transport: Transport) => {
if (isWebUSB(transport)) return false; // always enabled if webusb if (isWebUSB(transport)) return false; // always enabled if webusb