fix: get last tx

bgd-labs · Nov 25, 2022 · e3b3a3e · e3b3a3e
1 parent 07ef87e
commit e3b3a3e
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/src/web3/store/transactionsSelectors.ts b/src/web3/store/transactionsSelectors.ts
@@ -23,12 +23,27 @@ export const selectTXByHash = <T extends BaseTx>(
   return state.transactionsPool[hash];
 };
 
+export const selectAllTransactionsByWallet = <T extends BaseTx>(
+  state: ITransactionsState<T>,
+  from: string
+) => {
+  return selectAllTransactions(state).filter((tx) => tx.from == from);
+};
+
+export const selectPendingTransactionByWallet = <T extends BaseTx>(
+  state: ITransactionsState<T>,
+  from: string
+) => {
+  return selectPendingTransactions(state).filter((tx) => tx.from == from);
+};
+
 export const selectLastTxByTypeAndPayload = <T extends BaseTx>(
   state: ITransactionsState<T>,
+  from: string,
   type: T['type'],
   payload: T['payload']
 ) => {
-  const allTransactions = selectAllTransactions(state);
+  const allTransactions = selectAllTransactionsByWallet(state, from);
   const filteredTransactions = allTransactions.filter(
     (tx) => tx.type === type && isEqual(tx.payload, payload)
   );
@@ -41,17 +56,3 @@ export const selectLastTxByTypeAndPayload = <T extends BaseTx>(
     return undefined;
   }
 };
-
-export const selectAllTransactionsByWallet = <T extends BaseTx>(
-  state: ITransactionsState<T>,
-  from: string
-) => {
-  return selectAllTransactions(state).filter((tx) => tx.from == from);
-};
-
-export const selectPendingTransactionByWallet = <T extends BaseTx>(
-  state: ITransactionsState<T>,
-  from: string
-) => {
-  return selectPendingTransactions(state).filter((tx) => tx.from == from);
-};