Merge branch 'fix/sign-helper' into tmp/20241101

RabbyHub · Nov 1, 2024 · 9d7b9d1 · 9d7b9d1
2 parents e21acfa + 7fe84a9
commit 9d7b9d1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/ui/utils/sendTransaction.ts b/src/ui/utils/sendTransaction.ts
@@ -473,6 +473,7 @@ export const sendTransaction = async ({
     await handleSendAfter();
     const err = new Error(e.message);
     err.name = FailedCode.SubmitTxFailed;
+    eventBus.emit(EVENTS.COMMON_HARDWARE.REJECTED, e.message);
     throw err;
   }
 

diff --git a/src/ui/views/Approval/components/MiniSignTx/MiniLedgerAction.tsx b/src/ui/views/Approval/components/MiniSignTx/MiniLedgerAction.tsx
@@ -89,10 +89,10 @@ export const MiniLedgerAction: React.FC<Props> = ({
       }
     };
 
-    eventBus.addEventListener(EVENTS.LEDGER.REJECTED, listener);
+    eventBus.addEventListener(EVENTS.COMMON_HARDWARE.REJECTED, listener);
 
     return () => {
-      eventBus.removeEventListener(EVENTS.LEDGER.REJECTED, listener);
+      eventBus.removeEventListener(EVENTS.COMMON_HARDWARE.REJECTED, listener);
     };
   }, []);
 
@@ -106,7 +106,7 @@ export const MiniLedgerAction: React.FC<Props> = ({
 
   React.useEffect(() => {
     if (task.status === 'active' && status === 'DISCONNECTED') {
-      eventBus.emit(EVENTS.LEDGER.REJECTED, 'DISCONNECTED');
+      eventBus.emit(EVENTS.COMMON_HARDWARE.REJECTED, 'DISCONNECTED');
     }
   }, [task.status, status]);
   const { t } = useTranslation();

diff --git a/src/ui/views/ApprovalManagePage/components/BatchRevoke/RevokeActionLedgerButton.tsx b/src/ui/views/ApprovalManagePage/components/BatchRevoke/RevokeActionLedgerButton.tsx
@@ -59,16 +59,16 @@ export const RevokeActionLedgerButton: React.FC<{
       }
     };
 
-    eventBus.addEventListener(EVENTS.LEDGER.REJECTED, listener);
+    eventBus.addEventListener(EVENTS.COMMON_HARDWARE.REJECTED, listener);
 
     return () => {
-      eventBus.removeEventListener(EVENTS.LEDGER.REJECTED, listener);
+      eventBus.removeEventListener(EVENTS.COMMON_HARDWARE.REJECTED, listener);
     };
   }, [task.addRevokeTask]);
 
   React.useEffect(() => {
     if (task.status === 'active' && status === 'DISCONNECTED') {
-      eventBus.emit(EVENTS.LEDGER.REJECTED, 'DISCONNECTED');
+      eventBus.emit(EVENTS.COMMON_HARDWARE.REJECTED, 'DISCONNECTED');
     }
   }, [task.status, status]);