From b98d686d5f63be72435700d883ae2ec4e12a5230 Mon Sep 17 00:00:00 2001 From: lubej <9722540+lubej@users.noreply.github.com> Date: Wed, 16 Aug 2023 13:03:36 +0200 Subject: [PATCH] Navigate directly to ble/usb Ledger screen --- .../OpenWalletPage/Features/FromLedger/index.tsx | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/app/pages/OpenWalletPage/Features/FromLedger/index.tsx b/src/app/pages/OpenWalletPage/Features/FromLedger/index.tsx index f846557690..c27215cefb 100644 --- a/src/app/pages/OpenWalletPage/Features/FromLedger/index.tsx +++ b/src/app/pages/OpenWalletPage/Features/FromLedger/index.tsx @@ -6,6 +6,7 @@ import { Button } from 'grommet/es6/components/Button' import { Text } from 'grommet/es6/components/Text' import { canAccessBle, canAccessNavigatorUsb } from '../../../../lib/ledger' import { useTranslation } from 'react-i18next' +import { useNavigate } from 'react-router-dom' type SelectOpenMethodProps = { webExtensionLedgerAccess?: () => void @@ -15,11 +16,21 @@ export function FromLedger({ webExtensionLedgerAccess }: SelectOpenMethodProps) const { t } = useTranslation() const [supportsUsbLedger, setSupportsUsbLedger] = React.useState(true) const [supportsBleLedger, setSupportsBleLedger] = React.useState(true) + const navigate = useNavigate() useEffect(() => { async function getLedgerSupport() { - setSupportsUsbLedger(await canAccessNavigatorUsb()) - setSupportsBleLedger(await canAccessBle()) + const usbLedgerSupported = await canAccessNavigatorUsb() + const bleLedgerSupported = await canAccessBle() + + if (usbLedgerSupported && !bleLedgerSupported) { + navigate('usb') + } else if (bleLedgerSupported && !usbLedgerSupported) { + navigate('ble') + } + + setSupportsUsbLedger(usbLedgerSupported) + setSupportsBleLedger(bleLedgerSupported) } getLedgerSupport()