Disable Bluetooth Ledger in Web extension

lubej · Oct 9, 2023 · 7abf490 · 7abf490
1 parent 9b9f7b0
commit 7abf490
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/app/pages/OpenWalletPage/Features/FromLedger/index.tsx b/src/app/pages/OpenWalletPage/Features/FromLedger/index.tsx
@@ -9,21 +9,25 @@ import { useTranslation } from 'react-i18next'
 
 type SelectOpenMethodProps = {
   webExtensionLedgerAccess?: () => void
+  disableBluetoothLedger?: boolean
 }
 
-export function FromLedger({ webExtensionLedgerAccess }: SelectOpenMethodProps) {
+export function FromLedger({ webExtensionLedgerAccess, disableBluetoothLedger }: SelectOpenMethodProps) {
   const { t } = useTranslation()
   const [supportsUsbLedger, setSupportsUsbLedger] = React.useState<boolean | undefined>(true)
   const [supportsBleLedger, setSupportsBleLedger] = React.useState<boolean | undefined>(true)
 
   useEffect(() => {
     async function getLedgerSupport() {
-      setSupportsUsbLedger(await canAccessNavigatorUsb())
-      setSupportsBleLedger(await canAccessBle())
+      const usbLedgerSupported = await canAccessNavigatorUsb()
+      const bleLedgerSupported = !disableBluetoothLedger && (await canAccessBle())
+
+      setSupportsUsbLedger(usbLedgerSupported)
+      setSupportsBleLedger(bleLedgerSupported)
     }
 
     getLedgerSupport()
-  }, [])
+  }, [disableBluetoothLedger])
 
   return (
     <Box

diff --git a/src/app/pages/OpenWalletPage/webextension.tsx b/src/app/pages/OpenWalletPage/webextension.tsx
@@ -13,5 +13,5 @@ export function OpenWalletPageWebExtension() {
 export function FromLedgerWebExtension() {
   const href = useHref('/open-wallet/connect-device')
 
-  return <FromLedger webExtensionLedgerAccess={() => openLedgerAccessPopup(href)} />
+  return <FromLedger webExtensionLedgerAccess={() => openLedgerAccessPopup(href)} disableBluetoothLedger />
 }
diff --git a/src/app/state/importaccounts/saga.ts b/src/app/state/importaccounts/saga.ts
@@ -206,7 +206,6 @@ function* enumerateAccountsFromLedger(action: PayloadAction<LedgerWalletType>) {
     }
     yield* setStep(ImportAccountsStep.LoadingBalances)
   } catch (e: any) {
-    console.error(e)
     let payload: ErrorPayload
     if (e instanceof WalletError) {
       payload = { code: e.type, message: e.message }