From 0b1a6ce0e1de3e59a22508dd3707f26be6bf885c Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 27 Aug 2018 12:59:32 +0200 Subject: [PATCH] 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?