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

feature/default_network_editable
Niranjana Binoy 3 years ago committed by Dan Miller
parent c3feabf4de
commit 3f0fa89d8d
  1. 4
      app/scripts/controllers/transactions/tx-state-manager.js

@ -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 (

Loading…
Cancel
Save