From d8b492e7b613c64caf8176ef9cb5c2c87fc096b6 Mon Sep 17 00:00:00 2001 From: Szymon Lesisz Date: Thu, 16 Aug 2018 23:00:06 +0200 Subject: [PATCH] device menu sorted by instance --- src/js/components/wallet/aside/DeviceSelection.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/js/components/wallet/aside/DeviceSelection.js b/src/js/components/wallet/aside/DeviceSelection.js index 40bd36e4..61ca752d 100644 --- a/src/js/components/wallet/aside/DeviceSelection.js +++ b/src/js/components/wallet/aside/DeviceSelection.js @@ -171,7 +171,11 @@ export class DeviceDropdown extends Component { ); } - const deviceList = devices.map((dev, index) => { + const sortByInstance = (a: TrezorDevice, b: TrezorDevice) => { + if (!a.instance || !b.instance) return -1; + return a.instance > b.instance ? 1 : -1; + } + const deviceList = devices.sort(sortByInstance).map((dev, index) => { if (dev === selected) return null; let deviceStatus: string = 'Connected'; @@ -197,7 +201,7 @@ export class DeviceDropdown extends Component { return (
this.props.onSelectDevice(dev)}>
- { dev.instanceLabel } + 111{ dev.instanceLabel } { deviceStatus }