From 87e82064816fc019366e32051a4c1c8a214e11fc Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Mon, 8 Nov 2021 14:23:00 +0100
Subject: [PATCH] Expand error messaging for non-Ledger chains (#886)

---
 CHANGELOG.md                                  |  7 +++
 .../src/Popup/Signing/LedgerSign.tsx          |  3 +-
 packages/extension-ui/src/hooks/useLedger.ts  | 45 ++++++++++---------
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94eb09bb..8d2bbdf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## master
+
+Changes:
+
+- Expand error messaging for non-compatible Ledger chains
+
+
 ## 0.41.1 Nov 8, 2021
 
 Contributed:
diff --git a/packages/extension-ui/src/Popup/Signing/LedgerSign.tsx b/packages/extension-ui/src/Popup/Signing/LedgerSign.tsx
index 5ddf32b1..fa14459d 100644
--- a/packages/extension-ui/src/Popup/Signing/LedgerSign.tsx
+++ b/packages/extension-ui/src/Popup/Signing/LedgerSign.tsx
@@ -71,7 +71,7 @@ function LedgerSign ({ accountIndex, addressOffset, className, error, genesisHas
           {error}
         </Warning>
       )}
-      {ledgerLocked
+      {(ledgerLocked || error)
         ? (
           <Button
             isBusy={isBusy || ledgerLoading}
@@ -91,7 +91,6 @@ function LedgerSign ({ accountIndex, addressOffset, className, error, genesisHas
         )
       }
     </div>
-
   );
 }
 
diff --git a/packages/extension-ui/src/hooks/useLedger.ts b/packages/extension-ui/src/hooks/useLedger.ts
index f0a44bf5..431d52d6 100644
--- a/packages/extension-ui/src/hooks/useLedger.ts
+++ b/packages/extension-ui/src/hooks/useLedger.ts
@@ -19,8 +19,6 @@ interface StateBase {
 interface State extends StateBase {
   address: string | null;
   error: string | null;
-  isLedgerCapable: boolean;
-  isLedgerEnabled: boolean;
   isLoading: boolean;
   isLocked: boolean;
   ledger: Ledger | null;
@@ -28,24 +26,8 @@ interface State extends StateBase {
   warning: string | null;
 }
 
-function getNetwork (genesis: string): Network | undefined {
-  return ledgerChains.find(({ genesisHash }) => genesisHash[0] === genesis);
-}
-
-function retrieveLedger (genesis: string): Ledger {
-  let ledger: Ledger | null = null;
-
-  const { isLedgerCapable } = getState();
-
-  assert(isLedgerCapable, 'Incompatible browser, only Chrome is supported');
-
-  const def = getNetwork(genesis);
-
-  assert(def, `Unable to find supported chain for ${genesis}`);
-
-  ledger = new Ledger('webusb', def.network);
-
-  return ledger;
+function getNetwork (genesisHash: string): Network | undefined {
+  return ledgerChains.find(({ genesisHash: [hash] }) => hash === genesisHash);
 }
 
 function getState (): StateBase {
@@ -57,6 +39,22 @@ function getState (): StateBase {
   };
 }
 
+function retrieveLedger (genesis: string): Ledger {
+  let ledger: Ledger | null = null;
+
+  const { isLedgerCapable } = getState();
+
+  assert(isLedgerCapable, 'Incompatible browser, only Chrome is supported');
+
+  const def = getNetwork(genesis);
+
+  assert(def, 'There is no known Ledger app available for this chain');
+
+  ledger = new Ledger('webusb', def.network);
+
+  return ledger;
+}
+
 export function useLedger (genesis?: string | null, accountIndex = 0, addressOffset = 0): State {
   const [isLoading, setIsLoading] = useState(false);
   const [isLocked, setIsLocked] = useState(false);
@@ -66,6 +64,7 @@ export function useLedger (genesis?: string | null, accountIndex = 0, addressOff
   const [address, setAddress] = useState<string | null>(null);
   const { t } = useTranslation();
   const ledger = useMemo(() => {
+    setError(null);
     setIsLocked(false);
     setRefreshLock(false);
 
@@ -77,7 +76,11 @@ export function useLedger (genesis?: string | null, accountIndex = 0, addressOff
         return null;
       }
 
-      return retrieveLedger(genesis);
+      try {
+        return retrieveLedger(genesis);
+      } catch (error) {
+        setError((error as Error).message);
+      }
     }
 
     return null;