Skip to content

Commit 8f21a5a

Browse files
committed
fix: stop merging pending smart transactions into selectLocalTransactions
1 parent ed4f310 commit 8f21a5a

1 file changed

Lines changed: 3 additions & 16 deletions

File tree

app/selectors/transactionController.ts

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -219,14 +219,12 @@ export const selectSortedEVMTransactionsForSelectedAccountGroup =
219219
export const selectLocalTransactions = createDeepEqualSelector(
220220
[
221221
selectNonReplacedTransactions,
222-
selectPendingSmartTransactionsForSelectedAccountGroup,
223222
selectSelectedAccountGroupEvmInternalAccount,
224223
selectEvmAddress,
225224
selectRequiredTransactionIds,
226225
],
227226
(
228227
nonReplacedTransactions,
229-
pendingSmartTransactions,
230228
groupEvmAccount,
231229
fallbackEvmAddress,
232230
requiredTransactionIds,
@@ -246,20 +244,9 @@ export const selectLocalTransactions = createDeepEqualSelector(
246244
return areAddressesEqual(fromAddress, activeEvmAddress);
247245
});
248246

249-
const pendingSmartTransactionsForActiveAddress =
250-
pendingSmartTransactions.filter((transaction) => {
251-
const fromAddress = transaction.txParams?.from;
252-
if (!fromAddress || !activeEvmAddress) {
253-
return false;
254-
}
255-
256-
return areAddressesEqual(fromAddress, activeEvmAddress);
257-
});
258-
259-
return dedupeTransactions([
260-
...transactions,
261-
...pendingSmartTransactionsForActiveAddress,
262-
]).sort((a, b) => (b?.time ?? 0) - (a?.time ?? 0));
247+
return dedupeTransactions(transactions).sort(
248+
(a, b) => (b?.time ?? 0) - (a?.time ?? 0),
249+
);
263250
},
264251
);
265252

0 commit comments

Comments
 (0)