From c3bcc5fe91a9fb93ad99955f4922a3af60913325 Mon Sep 17 00:00:00 2001 From: Szymon Lesisz Date: Sat, 5 May 2018 14:11:03 +0200 Subject: [PATCH] fixed baseUrl in coin selection --- src/js/components/wallet/aside/CoinSelection.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js index 6a0614ff..0c625f11 100644 --- a/src/js/components/wallet/aside/CoinSelection.js +++ b/src/js/components/wallet/aside/CoinSelection.js @@ -10,9 +10,15 @@ import type { TrezorDevice } from '../../../flowtype'; const CoinSelection = (props: Props): React$Element => { const { location } = props.router; const { config } = props.localStorage; + const selectedDevice = props.connect.selectedDevice; - const urlParams = location.state; - const baseUrl: string = urlParams.deviceInstance ? `/device/${urlParams.device}:${urlParams.deviceInstance}` : `/device/${urlParams.device}`; + let baseUrl: string = ''; + if (selectedDevice) { + baseUrl = `/device/${selectedDevice.id}`; + if (selectedDevice.instance) { + baseUrl += `:${selectedDevice.instance}`; + } + } const walletCoins = config.coins.map(item => { const url = `${ baseUrl }/network/${ item.network }/address/0`;