m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-26 12:29:06 +01:00
Code

wipe only transactions for current account

Browse Source
This commit is contained in:
Bruno Barbieri 2018-01-31 04:25:32 -05:00
parent 5f39844382
commit 03d17c75ae
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/controllers/transactions.js
View File

@ -152,8 +152,8 @@ module.exports = class TransactionController extends EventEmitter {
} }
} }
wipeTransactions(){ wipeTransactions (address) {
this.txStateManager.wipeTransactions(); this.txStateManager.wipeTransactions(address)
} }
// Adds a tx to the txlist // Adds a tx to the txlist

12
app/scripts/lib/tx-state-manager.js
View File

@ -221,10 +221,16 @@ module.exports = class TransactionStateManger extends EventEmitter {
this._setTxStatus(txId, 'failed') this._setTxStatus(txId, 'failed')
} }
wipeTransactions () { wipeTransactions (address) {
this._saveTxList([]); // network only tx
const txs = this.getTxList()
// Filter out the ones from the current account
const otherAccountTxs = txs.filter((txMeta) => txMeta.from !== address)
// Update state
this._saveTxList(otherAccountTxs)
} }
// //
// PRIVATE METHODS // PRIVATE METHODS
// //

8
app/scripts/metamask-controller.js
View File

@ -605,10 +605,10 @@ module.exports = class MetamaskController extends EventEmitter {
cb(null, this.preferencesController.getSelectedAddress()) cb(null, this.preferencesController.getSelectedAddress())
} }
resetAccount (cb) {
resetAccount(cb){ const selectedAddress = this.preferencesController.getSelectedAddress()
this.txController.wipeTransactions(); this.txController.wipeTransactions(selectedAddress)
cb(null, this.preferencesController.getSelectedAddress()) cb(null, selectedAddress)
} }