From b5cc5edc450f640f6800d03298abb5967f14982e Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 27 Aug 2018 12:29:13 +0200 Subject: [PATCH 01/10] Move wallet's "Receive" component to wallet's views --- .../{components/Receive => views/AccountReceive}/Container.js | 0 .../{components/Receive => views/AccountReceive}/index.js | 2 +- src/js/views/index.js | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/js/views/Wallet/{components/Receive => views/AccountReceive}/Container.js (100%) rename src/js/views/Wallet/{components/Receive => views/AccountReceive}/index.js (98%) diff --git a/src/js/views/Wallet/components/Receive/Container.js b/src/js/views/Wallet/views/AccountReceive/Container.js similarity index 100% rename from src/js/views/Wallet/components/Receive/Container.js rename to src/js/views/Wallet/views/AccountReceive/Container.js diff --git a/src/js/views/Wallet/components/Receive/index.js b/src/js/views/Wallet/views/AccountReceive/index.js similarity index 98% rename from src/js/views/Wallet/components/Receive/index.js rename to src/js/views/Wallet/views/AccountReceive/index.js index 13a8a9e8..5af789d2 100644 --- a/src/js/views/Wallet/components/Receive/index.js +++ b/src/js/views/Wallet/views/AccountReceive/index.js @@ -16,7 +16,7 @@ const StyledH2 = styled(H2)` padding: 20px 48px; `; -const Receive = (props: Props) => { +const AccountReceive = (props: Props) => { const device = props.wallet.selectedDevice; const { account, diff --git a/src/js/views/index.js b/src/js/views/index.js index be4f89eb..d5f2c5fb 100644 --- a/src/js/views/index.js +++ b/src/js/views/index.js @@ -10,6 +10,7 @@ import LandingContainer from 'views/Landing/Container'; // wallet views import WalletContainer from 'views/Wallet'; +import AccountReceive from 'views/Wallet/views/AccountReceive/Container'; import WalletDashboard from 'views/Wallet/views/Dashboard'; import WalletDeviceSettings from 'views/Wallet/views/DeviceSettings'; import WalletSettings from 'views/Wallet/views/WalletSettings'; @@ -22,7 +23,6 @@ import WalletUnreadableDevice from 'views/Wallet/views/UnreadableDevice'; // import SummaryContainer from './Wallet/components/Summary/Container'; import AccountContainer from 'views/Wallet/views/Account/Container'; import SignVerifyContainer from './Wallet/components/Sign'; -import ReceiveContainer from './Wallet/components/Receive/Container'; import SendFormContainer from './Wallet/components/Send/Container'; import store, { history } from '../store'; @@ -48,8 +48,8 @@ const App = () => ( - + From b8c0a577cc7dc67756fe24943fcdbf09873895a5 Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 27 Aug 2018 12:30:42 +0200 Subject: [PATCH 02/10] Move wallet's "Send" component to wallet's views and name it "AccountSend" --- .../{components/Send => views/AccountSend}/Container.js | 0 .../Send => views/AccountSend}/components/AdvancedForm.js | 0 .../AccountSend}/components/CoinSelectOption.js | 0 .../Send => views/AccountSend}/components/FeeSelect.js | 0 .../AccountSend}/components/PendingTransactions.js | 0 .../Wallet/{components/Send => views/AccountSend}/index.js | 2 +- src/js/views/index.js | 6 +++--- 7 files changed, 4 insertions(+), 4 deletions(-) rename src/js/views/Wallet/{components/Send => views/AccountSend}/Container.js (100%) rename src/js/views/Wallet/{components/Send => views/AccountSend}/components/AdvancedForm.js (100%) rename src/js/views/Wallet/{components/Send => views/AccountSend}/components/CoinSelectOption.js (100%) rename src/js/views/Wallet/{components/Send => views/AccountSend}/components/FeeSelect.js (100%) rename src/js/views/Wallet/{components/Send => views/AccountSend}/components/PendingTransactions.js (100%) rename src/js/views/Wallet/{components/Send => views/AccountSend}/index.js (99%) diff --git a/src/js/views/Wallet/components/Send/Container.js b/src/js/views/Wallet/views/AccountSend/Container.js similarity index 100% rename from src/js/views/Wallet/components/Send/Container.js rename to src/js/views/Wallet/views/AccountSend/Container.js diff --git a/src/js/views/Wallet/components/Send/components/AdvancedForm.js b/src/js/views/Wallet/views/AccountSend/components/AdvancedForm.js similarity index 100% rename from src/js/views/Wallet/components/Send/components/AdvancedForm.js rename to src/js/views/Wallet/views/AccountSend/components/AdvancedForm.js diff --git a/src/js/views/Wallet/components/Send/components/CoinSelectOption.js b/src/js/views/Wallet/views/AccountSend/components/CoinSelectOption.js similarity index 100% rename from src/js/views/Wallet/components/Send/components/CoinSelectOption.js rename to src/js/views/Wallet/views/AccountSend/components/CoinSelectOption.js diff --git a/src/js/views/Wallet/components/Send/components/FeeSelect.js b/src/js/views/Wallet/views/AccountSend/components/FeeSelect.js similarity index 100% rename from src/js/views/Wallet/components/Send/components/FeeSelect.js rename to src/js/views/Wallet/views/AccountSend/components/FeeSelect.js diff --git a/src/js/views/Wallet/components/Send/components/PendingTransactions.js b/src/js/views/Wallet/views/AccountSend/components/PendingTransactions.js similarity index 100% rename from src/js/views/Wallet/components/Send/components/PendingTransactions.js rename to src/js/views/Wallet/views/AccountSend/components/PendingTransactions.js diff --git a/src/js/views/Wallet/components/Send/index.js b/src/js/views/Wallet/views/AccountSend/index.js similarity index 99% rename from src/js/views/Wallet/components/Send/index.js rename to src/js/views/Wallet/views/AccountSend/index.js index f9caeefe..cbbf7a54 100644 --- a/src/js/views/Wallet/components/Send/index.js +++ b/src/js/views/Wallet/views/AccountSend/index.js @@ -14,7 +14,7 @@ import SelectedAccount from '../SelectedAccount'; import type { Props } from './index'; -export default class SendContainer extends Component { +export default class AccountSendContainer extends Component { componentWillReceiveProps(newProps: Props) { calculate(this.props, newProps); validation(newProps); diff --git a/src/js/views/index.js b/src/js/views/index.js index d5f2c5fb..09fc3e5f 100644 --- a/src/js/views/index.js +++ b/src/js/views/index.js @@ -10,6 +10,7 @@ import LandingContainer from 'views/Landing/Container'; // wallet views import WalletContainer from 'views/Wallet'; +import AccountSend from 'views/Wallet/views/AccountSend/Container'; import AccountReceive from 'views/Wallet/views/AccountReceive/Container'; import WalletDashboard from 'views/Wallet/views/Dashboard'; import WalletDeviceSettings from 'views/Wallet/views/DeviceSettings'; @@ -23,7 +24,6 @@ import WalletUnreadableDevice from 'views/Wallet/views/UnreadableDevice'; // import SummaryContainer from './Wallet/components/Summary/Container'; import AccountContainer from 'views/Wallet/views/Account/Container'; import SignVerifyContainer from './Wallet/components/Sign'; -import SendFormContainer from './Wallet/components/Send/Container'; import store, { history } from '../store'; @@ -46,9 +46,9 @@ const App = () => ( - - + + From 75c8f59ac95149b6a13e061ed0175c8b5d080de5 Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 27 Aug 2018 12:32:27 +0200 Subject: [PATCH 03/10] Move wallet's "Sign" component to wallet's views and name it "AccountSignVerify" --- .../{components/Sign => views/AccountSignVerify}/index.js | 4 ++-- src/js/views/index.js | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) rename src/js/views/Wallet/{components/Sign => views/AccountSignVerify}/index.js (95%) diff --git a/src/js/views/Wallet/components/Sign/index.js b/src/js/views/Wallet/views/AccountSignVerify/index.js similarity index 95% rename from src/js/views/Wallet/components/Sign/index.js rename to src/js/views/Wallet/views/AccountSignVerify/index.js index 53a8fe78..7935b1e6 100644 --- a/src/js/views/Wallet/components/Sign/index.js +++ b/src/js/views/Wallet/views/AccountSignVerify/index.js @@ -40,7 +40,7 @@ const Textarea = styled.textarea` const Input = styled.input``; -const SignVerify = () => ( +const AccountSignVerify = () => ( Sign message @@ -63,4 +63,4 @@ const SignVerify = () => ( ); -export default SignVerify; \ No newline at end of file +export default AccountSignVerify; \ No newline at end of file diff --git a/src/js/views/index.js b/src/js/views/index.js index 09fc3e5f..4da0d597 100644 --- a/src/js/views/index.js +++ b/src/js/views/index.js @@ -12,6 +12,8 @@ import LandingContainer from 'views/Landing/Container'; import WalletContainer from 'views/Wallet'; import AccountSend from 'views/Wallet/views/AccountSend/Container'; import AccountReceive from 'views/Wallet/views/AccountReceive/Container'; +import AccountSignVerify from 'views/Wallet/views/AccountSignVerify/Container'; + import WalletDashboard from 'views/Wallet/views/Dashboard'; import WalletDeviceSettings from 'views/Wallet/views/DeviceSettings'; import WalletSettings from 'views/Wallet/views/WalletSettings'; @@ -23,7 +25,6 @@ import WalletUnreadableDevice from 'views/Wallet/views/UnreadableDevice'; // wallet views - accounts // import SummaryContainer from './Wallet/components/Summary/Container'; import AccountContainer from 'views/Wallet/views/Account/Container'; -import SignVerifyContainer from './Wallet/components/Sign'; import store, { history } from '../store'; @@ -46,10 +47,10 @@ const App = () => ( - + From c0af63cc5c20dd5bde7fa6d5a7641a94b6d18a08 Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 27 Aug 2018 12:34:01 +0200 Subject: [PATCH 04/10] Move wallet's "Account" component to wallet's view and name it "AccountSummary" --- .../Wallet/views/{Account => AccountSummary}/Container.js | 0 .../components/Details/index.js | 0 .../{Account => AccountSummary}/components/Tokens/index.js | 0 .../Wallet/views/{Account => AccountSummary}/index.js | 0 src/js/views/index.js | 7 ++----- 5 files changed, 2 insertions(+), 5 deletions(-) rename src/js/views/Wallet/views/{Account => AccountSummary}/Container.js (100%) rename src/js/views/Wallet/views/{Account => AccountSummary}/components/Details/index.js (100%) rename src/js/views/Wallet/views/{Account => AccountSummary}/components/Tokens/index.js (100%) rename src/js/views/Wallet/views/{Account => AccountSummary}/index.js (100%) diff --git a/src/js/views/Wallet/views/Account/Container.js b/src/js/views/Wallet/views/AccountSummary/Container.js similarity index 100% rename from src/js/views/Wallet/views/Account/Container.js rename to src/js/views/Wallet/views/AccountSummary/Container.js diff --git a/src/js/views/Wallet/views/Account/components/Details/index.js b/src/js/views/Wallet/views/AccountSummary/components/Details/index.js similarity index 100% rename from src/js/views/Wallet/views/Account/components/Details/index.js rename to src/js/views/Wallet/views/AccountSummary/components/Details/index.js diff --git a/src/js/views/Wallet/views/Account/components/Tokens/index.js b/src/js/views/Wallet/views/AccountSummary/components/Tokens/index.js similarity index 100% rename from src/js/views/Wallet/views/Account/components/Tokens/index.js rename to src/js/views/Wallet/views/AccountSummary/components/Tokens/index.js diff --git a/src/js/views/Wallet/views/Account/index.js b/src/js/views/Wallet/views/AccountSummary/index.js similarity index 100% rename from src/js/views/Wallet/views/Account/index.js rename to src/js/views/Wallet/views/AccountSummary/index.js diff --git a/src/js/views/index.js b/src/js/views/index.js index 4da0d597..603dfbbf 100644 --- a/src/js/views/index.js +++ b/src/js/views/index.js @@ -10,6 +10,7 @@ import LandingContainer from 'views/Landing/Container'; // wallet views import WalletContainer from 'views/Wallet'; +import AccountSummary from 'views/Wallet/views/AccountSummary/Container'; import AccountSend from 'views/Wallet/views/AccountSend/Container'; import AccountReceive from 'views/Wallet/views/AccountReceive/Container'; import AccountSignVerify from 'views/Wallet/views/AccountSignVerify/Container'; @@ -22,10 +23,6 @@ import WalletInitialize from 'views/Wallet/views/Initialize'; import WalletAcquire from 'views/Wallet/views/Acquire'; import WalletUnreadableDevice from 'views/Wallet/views/UnreadableDevice'; -// wallet views - accounts -// import SummaryContainer from './Wallet/components/Summary/Container'; -import AccountContainer from 'views/Wallet/views/Account/Container'; - import store, { history } from '../store'; const App = () => ( @@ -46,7 +43,7 @@ const App = () => ( - + From ad26f2c30b71e307cc8c28ef4bcdbc4e152b6804 Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 27 Aug 2018 12:34:58 +0200 Subject: [PATCH 05/10] Rename "Tabs" to "TopNavigationAccount" --- .../Wallet/components/{Tabs => TopNavigationAccount}/index.js | 4 ++-- src/js/views/Wallet/index.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/js/views/Wallet/components/{Tabs => TopNavigationAccount}/index.js (96%) diff --git a/src/js/views/Wallet/components/Tabs/index.js b/src/js/views/Wallet/components/TopNavigationAccount/index.js similarity index 96% rename from src/js/views/Wallet/components/Tabs/index.js rename to src/js/views/Wallet/components/TopNavigationAccount/index.js index f8b85375..b08dddb3 100644 --- a/src/js/views/Wallet/components/Tabs/index.js +++ b/src/js/views/Wallet/components/TopNavigationAccount/index.js @@ -76,7 +76,7 @@ class Indicator extends Component { } } -const AccountTabs = (props: any) => { +const TopNavigationAccount = (props: any) => { const urlParams = props.match.params; const basePath = `/device/${urlParams.device}/network/${urlParams.network}/account/${urlParams.account}`; @@ -102,4 +102,4 @@ const AccountTabs = (props: any) => { ); }; -export default AccountTabs; \ No newline at end of file +export default TopNavigationAccount; \ No newline at end of file diff --git a/src/js/views/Wallet/index.js b/src/js/views/Wallet/index.js index 494981d1..d2def25f 100644 --- a/src/js/views/Wallet/index.js +++ b/src/js/views/Wallet/index.js @@ -17,7 +17,7 @@ import Log from 'components/Log'; import DeviceSettingsTabs from './views/DeviceSettingsTabs'; import LeftNavigation from './components/LeftNavigation/Container'; -import AccountTabs from './components/Tabs'; +import TopNavigationAccount from './components/TopNavigationAccount'; type WalletContainerProps = { wallet: $ElementType, @@ -80,8 +80,8 @@ const Wallet = (props: WalletContainerProps) => ( - + From 8445ef8214f75239e261e51ff52cac05de4e80e0 Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 27 Aug 2018 12:35:30 +0200 Subject: [PATCH 06/10] Rename "DeviceSettingsTabs" to "TopNavigationDeviceSettings" --- .../TopNavigationDeviceSettings}/index.js | 0 src/js/views/Wallet/index.js | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/js/views/Wallet/{views/DeviceSettingsTabs => components/TopNavigationDeviceSettings}/index.js (100%) diff --git a/src/js/views/Wallet/views/DeviceSettingsTabs/index.js b/src/js/views/Wallet/components/TopNavigationDeviceSettings/index.js similarity index 100% rename from src/js/views/Wallet/views/DeviceSettingsTabs/index.js rename to src/js/views/Wallet/components/TopNavigationDeviceSettings/index.js diff --git a/src/js/views/Wallet/index.js b/src/js/views/Wallet/index.js index d2def25f..eb787da2 100644 --- a/src/js/views/Wallet/index.js +++ b/src/js/views/Wallet/index.js @@ -14,10 +14,10 @@ import Footer from 'components/Footer'; import ModalContainer from 'components/modal'; import Notifications from 'components/Notification'; import Log from 'components/Log'; -import DeviceSettingsTabs from './views/DeviceSettingsTabs'; import LeftNavigation from './components/LeftNavigation/Container'; import TopNavigationAccount from './components/TopNavigationAccount'; +import TopNavigationDeviceSettings from './components/TopNavigationDeviceSettings'; type WalletContainerProps = { wallet: $ElementType, @@ -35,7 +35,7 @@ const AppWrapper = styled.div` display: flex; flex-direction: column; background: ${colors.BACKGROUND}; - + &.resized { min-height: 680px; } @@ -80,8 +80,8 @@ const Wallet = (props: WalletContainerProps) => ( - + From 47f96d7128ee155e46a3a3fcae75e319e2ae84ce Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 27 Aug 2018 12:35:42 +0200 Subject: [PATCH 07/10] Add font size --- src/js/config/variables.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/config/variables.js b/src/js/config/variables.js index a93cb9f7..776cb831 100644 --- a/src/js/config/variables.js +++ b/src/js/config/variables.js @@ -1,4 +1,5 @@ export const FONT_SIZE = { + SMALLEST: '10px', SMALLER: '12px', SMALL: '14px', BASE: '16px', From 85df75c8c538df880a32b1da4631cc33b86bb599 Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 27 Aug 2018 12:38:31 +0200 Subject: [PATCH 08/10] Make props not mandatory --- src/js/components/CoinLogo/index.js | 4 ++-- src/js/components/Paragraph/index.js | 2 +- .../components/LeftNavigation/components/RowCoin/index.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/components/CoinLogo/index.js b/src/js/components/CoinLogo/index.js index fc945cc1..60761e7b 100644 --- a/src/js/components/CoinLogo/index.js +++ b/src/js/components/CoinLogo/index.js @@ -27,7 +27,7 @@ const CoinLogo = ({ return ( ); }; @@ -35,7 +35,7 @@ const CoinLogo = ({ CoinLogo.propTypes = { className: PropTypes.string, coinImg: PropTypes.string, - coinNetwork: PropTypes.string.isRequired, + coinNetwork: PropTypes.string, }; export default CoinLogo; diff --git a/src/js/components/Paragraph/index.js b/src/js/components/Paragraph/index.js index 63a3c8b8..9d61a0d2 100644 --- a/src/js/components/Paragraph/index.js +++ b/src/js/components/Paragraph/index.js @@ -28,7 +28,7 @@ P.propTypes = { children: PropTypes.oneOfType([ PropTypes.array, PropTypes.string, - ]).isRequired, + ]), }; export default P; diff --git a/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js b/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js index a0cad05f..96f302b4 100644 --- a/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js +++ b/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js @@ -83,7 +83,7 @@ const iconShape = { RowCoin.propTypes = { coin: PropTypes.shape({ name: PropTypes.string.isRequired, - network: PropTypes.string.isRequired, + network: PropTypes.string, img: PropTypes.string, }).isRequired, iconLeft: PropTypes.shape(iconShape), From a837db7a49df8685df48857a636a3fac12662b42 Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 27 Aug 2018 12:45:39 +0200 Subject: [PATCH 09/10] Fix imports --- src/js/views/Wallet/views/AccountReceive/index.js | 4 ++-- src/js/views/Wallet/views/AccountSend/index.js | 3 +-- src/js/views/index.js | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/js/views/Wallet/views/AccountReceive/index.js b/src/js/views/Wallet/views/AccountReceive/index.js index 5af789d2..e1289c2d 100644 --- a/src/js/views/Wallet/views/AccountReceive/index.js +++ b/src/js/views/Wallet/views/AccountReceive/index.js @@ -7,7 +7,7 @@ import Tooltip from 'rc-tooltip'; import { QRCode } from 'react-qr-svg'; import { Notification } from 'components/Notification'; -import SelectedAccount from '../SelectedAccount'; +import SelectedAccount from 'views/Wallet/components/SelectedAccount'; import type { Props } from './index'; @@ -96,6 +96,6 @@ const AccountReceive = (props: Props) => { export default (props: Props) => ( - + ); \ No newline at end of file diff --git a/src/js/views/Wallet/views/AccountSend/index.js b/src/js/views/Wallet/views/AccountSend/index.js index cbbf7a54..33ddc752 100644 --- a/src/js/views/Wallet/views/AccountSend/index.js +++ b/src/js/views/Wallet/views/AccountSend/index.js @@ -5,12 +5,11 @@ import styled from 'styled-components'; import Select from 'react-select'; import { H2 } from 'components/Heading'; import { calculate, validation } from 'actions/SendFormActions'; +import SelectedAccount from 'views/Wallet/components/SelectedAccount'; import type { Token } from 'flowtype'; import AdvancedForm from './components/AdvancedForm'; import PendingTransactions from './components/PendingTransactions'; import { FeeSelectValue, FeeSelectOption } from './components/FeeSelect'; -import SelectedAccount from '../SelectedAccount'; - import type { Props } from './index'; diff --git a/src/js/views/index.js b/src/js/views/index.js index 603dfbbf..62186655 100644 --- a/src/js/views/index.js +++ b/src/js/views/index.js @@ -13,7 +13,7 @@ import WalletContainer from 'views/Wallet'; import AccountSummary from 'views/Wallet/views/AccountSummary/Container'; import AccountSend from 'views/Wallet/views/AccountSend/Container'; import AccountReceive from 'views/Wallet/views/AccountReceive/Container'; -import AccountSignVerify from 'views/Wallet/views/AccountSignVerify/Container'; +import AccountSignVerify from 'views/Wallet/views/AccountSignVerify'; import WalletDashboard from 'views/Wallet/views/Dashboard'; import WalletDeviceSettings from 'views/Wallet/views/DeviceSettings'; From 0b1a6ce0e1de3e59a22508dd3707f26be6bf885c Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 27 Aug 2018 12:59:32 +0200 Subject: [PATCH 10/10] Use isWebUSB function in utils --- src/js/utils/device.js | 1 + src/js/views/Landing/index.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/js/utils/device.js b/src/js/utils/device.js index 43f8fb6b..80195154 100644 --- a/src/js/utils/device.js +++ b/src/js/utils/device.js @@ -80,6 +80,7 @@ const getStatusColor = (deviceStatus) => { }; export { + isWebUSB, getStatus, isDisabled, getStatusName, diff --git a/src/js/views/Landing/index.js b/src/js/views/Landing/index.js index ef1fac97..d7c3a414 100644 --- a/src/js/views/Landing/index.js +++ b/src/js/views/Landing/index.js @@ -11,6 +11,7 @@ import Notifications, { Notification } from 'components/Notification'; import colors from 'config/colors'; import P from 'components/Paragraph'; import { H2 } from 'components/Heading'; +import { isWebUSB } from 'utils/device'; import BrowserNotSupported from './components/BrowserNotSupported'; import ConnectDevice from './components/ConnectDevice'; @@ -72,7 +73,6 @@ export default (props: Props) => { const bridgeRoute: boolean = props.router.location.state.hasOwnProperty('bridge'); const deviceLabel = props.wallet.disconnectRequest ? props.wallet.disconnectRequest.label : ''; - const hasWebUsb = transport && transport.version.indexOf('webusb') >= 0; const shouldShowInstallBridge = connectError || bridgeRoute; const shouldShowConnectDevice = props.wallet.ready && devices.length < 1; const shouldShowDisconnectDevice = !!props.wallet.disconnectRequest; @@ -111,7 +111,7 @@ export default (props: Props) => { @@ -119,7 +119,7 @@ export default (props: Props) => { {shouldShowConnectDevice && ( - {hasWebUsb && ( + {isWebUSB(transport) && (

Device not recognized?