fix: filter signingTx by tx.from (#2284)

RabbyHub · May 23, 2024 · eed44a2 · eed44a2
1 parent 5d6345c
commit eed44a2
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/background/service/transactionHistory.ts b/src/background/service/transactionHistory.ts
@@ -1,4 +1,4 @@
-import { createPersistStore } from 'background/utils';
+import { createPersistStore, isSameAddress } from 'background/utils';
 import maxBy from 'lodash/maxBy';
 import cloneDeep from 'lodash/cloneDeep';
 import { Object as ObjectType } from 'ts-toolbelt';
@@ -881,10 +881,17 @@ class TxHistory {
     );
 
     const firstSigningTx = this._signingTxList.find((item) => {
-      return item.rawTx.chainId === chainId && !item.isSubmitted;
+      return (
+        item.rawTx.chainId === chainId &&
+        !item.isSubmitted &&
+        isSameAddress(item.rawTx.from, address)
+      );
     });
     const processingTx = this._signingTxList.find(
-      (item) => item.rawTx.chainId === chainId && item.isSubmitted
+      (item) =>
+        item.rawTx.chainId === chainId &&
+        item.isSubmitted &&
+        isSameAddress(item.rawTx.from, address)
     );
 
     if (!maxNonceTx) return null;