Merge branch 'main' into balance-disorder

tahowallet · Feb 26, 2022 · 11131a7 · 11131a7
2 parents 561fd25 + 483c0dd
commit 11131a7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/background/services/ledger/index.ts b/background/services/ledger/index.ts
@@ -23,6 +23,7 @@ import { getOrCreateDB, LedgerDatabase } from "./db"
 import { ethersTransactionRequestFromEIP1559TransactionRequest } from "../chain/utils"
 import { ETH } from "../../constants"
 import { normalizeEVMAddress } from "../../lib/utils"
+import { HIDE_IMPORT_LEDGER } from "../../features/features"
 
 enum LedgerType {
   UNKNOWN,
@@ -37,6 +38,9 @@ export const LedgerProductDatabase = {
   LEDGER_NANO_X: { productId: 0x4015 },
 }
 
+export const isLedgerSupported =
+  !HIDE_IMPORT_LEDGER && typeof navigator.usb === "object"
+
 const TestedProductId = (productId: number): boolean => {
   return Object.values(LedgerProductDatabase).some(
     (e) => e.productId === productId

diff --git a/ui/pages/Onboarding/OnboardingAddWallet.tsx b/ui/pages/Onboarding/OnboardingAddWallet.tsx
@@ -2,8 +2,8 @@ import React, { ReactElement } from "react"
 import {
   HIDE_ADD_SEED,
   HIDE_CREATE_PHRASE,
-  HIDE_IMPORT_LEDGER,
 } from "@tallyho/tally-background/features/features"
+import { isLedgerSupported } from "@tallyho/tally-background/services/ledger"
 import SharedBackButton from "../../components/Shared/SharedBackButton"
 import SharedButton from "../../components/Shared/SharedButton"
 
@@ -45,9 +45,7 @@ export default function OnboardingStartTheHunt(): ReactElement {
             </SharedButton>
           </li>
         )}
-        {HIDE_IMPORT_LEDGER ? (
-          <></>
-        ) : (
+        {isLedgerSupported && (
           <li className="option standard_width">
             <div className="icon ledger_icon" />
             <SharedButton

diff --git a/ui/pages/SignTransaction.tsx b/ui/pages/SignTransaction.tsx
@@ -110,8 +110,7 @@ export default function SignTransaction({
   const signingMethod = signerAccountTotal?.signingMethod ?? null
   if (
     typeof transactionDetails === "undefined" ||
-    typeof signerAccountTotal === "undefined" ||
-    signingMethod === null
+    typeof signerAccountTotal === "undefined"
   ) {
     // TODO Some sort of unexpected state error if we end up here... Or do we
     // go back in history? That won't work for dApp popovers though.
@@ -122,7 +121,11 @@ export default function SignTransaction({
     await dispatch(rejectTransactionSignature())
   }
   const handleConfirm = async () => {
-    if (isTransactionDataReady && transactionDetails) {
+    if (
+      isTransactionDataReady &&
+      transactionDetails &&
+      signingMethod !== null
+    ) {
       dispatch(
         signTransaction({
           transaction: transactionDetails,