fix: ledger tx sign error process

leather-io · Oct 18, 2023 · 618923f · 618923f
1 parent 47aa2e2
commit 618923f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/src/app/features/ledger/flows/stacks-tx-signing/ledger-sign-tx-container.tsx b/src/app/features/ledger/flows/stacks-tx-signing/ledger-sign-tx-container.tsx
@@ -67,34 +67,34 @@ export function LedgerSignStacksTxContainer() {
       },
     });
 
-    const versionInfo = await getStacksAppVersion(stacksApp);
-    ledgerAnalytics.trackDeviceVersionInfo(versionInfo);
-    setLatestDeviceResponse(versionInfo);
+    try {
+      const versionInfo = await getStacksAppVersion(stacksApp);
+      ledgerAnalytics.trackDeviceVersionInfo(versionInfo);
+      setLatestDeviceResponse(versionInfo);
 
-    if (versionInfo.deviceLocked) {
-      setAwaitingDeviceConnection(false);
-      return;
-    }
+      if (versionInfo.deviceLocked) {
+        setAwaitingDeviceConnection(false);
+        return;
+      }
 
-    if (versionInfo.returnCode !== LedgerError.NoErrors) {
-      logger.error('Return code from device has error', versionInfo);
-      return;
-    }
+      if (versionInfo.returnCode !== LedgerError.NoErrors) {
+        logger.error('Return code from device has error', versionInfo);
+        return;
+      }
 
-    if (isVersionOfLedgerStacksAppWithContractPrincipalBug(versionInfo)) {
-      navigate(RouteUrls.LedgerOutdatedAppWarning);
-      const response = await hasUserSkippedBuggyAppWarning.wait();
+      if (isVersionOfLedgerStacksAppWithContractPrincipalBug(versionInfo)) {
+        navigate(RouteUrls.LedgerOutdatedAppWarning);
+        const response = await hasUserSkippedBuggyAppWarning.wait();
 
-      if (response === 'cancelled-operation') {
-        ledgerNavigate.cancelLedgerAction();
-        return;
+        if (response === 'cancelled-operation') {
+          ledgerNavigate.cancelLedgerAction();
+          return;
+        }
       }
-    }
 
-    ledgerNavigate.toDeviceBusyStep('Verifying public key on Ledger…');
-    await verifyLedgerPublicKey(stacksApp);
+      ledgerNavigate.toDeviceBusyStep('Verifying public key on Ledger…');
+      await verifyLedgerPublicKey(stacksApp);
 
-    try {
       ledgerNavigate.toConnectionSuccessStep('stacks');
       await delay(1000);
       if (!unsignedTransaction) throw new Error('No unsigned tx');

diff --git a/src/app/features/ledger/generic-steps/connect-device/connect-ledger.tsx b/src/app/features/ledger/generic-steps/connect-device/connect-ledger.tsx
@@ -80,7 +80,7 @@ export function ConnectLedger(props: ConnectLedgerProps) {
           {showBitcoinConnectButton && (
             <LeatherButton
               onClick={onConnectLedger || connectBitcoin}
-              disabled={awaitingLedgerConnection}
+              aria-busy={awaitingLedgerConnection}
               display="flex"
               alignItems="center"
             >
@@ -93,7 +93,7 @@ export function ConnectLedger(props: ConnectLedgerProps) {
           {showStacksConnectButton && (
             <LeatherButton
               onClick={onConnectLedger || connectStacks}
-              disabled={awaitingLedgerConnection}
+              aria-busy={awaitingLedgerConnection}
               display="flex"
               alignItems="center"
             >