1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00

Deleting transactions from currentNetworkTxnList based on unique address along with nonce and chainId (#13669)

This commit is contained in:
Niranjana Binoy 2022-02-22 12:59:13 -05:00 committed by GitHub
parent 30b2afe7bc
commit 2bab7ada8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -249,9 +249,9 @@ export default class TransactionStateManager extends EventEmitter {
const txsToDelete = transactions const txsToDelete = transactions
.reverse() .reverse()
.filter((tx) => { .filter((tx) => {
const { nonce } = tx.txParams; const { nonce, from } = tx.txParams;
const { chainId, metamaskNetworkId, status } = tx; const { chainId, metamaskNetworkId, status } = tx;
const key = `${nonce}-${chainId ?? metamaskNetworkId}`; const key = `${nonce}-${chainId ?? metamaskNetworkId}-${from}`;
if (nonceNetworkSet.has(key)) { if (nonceNetworkSet.has(key)) {
return false; return false;
} else if ( } else if (