Fix updating of pending transactions

Transaction statuses were not being properly updated when:

- MetaMask was unlocked
- The network was changed

This PR fixes both of those. Fixes #5174
feature/default_network_editable
Dan Finlay 6 years ago committed by Dan Finlay
parent 182970c318
commit 507397f6c3
  1. 2
      CHANGELOG.md
  2. 1
      app/scripts/controllers/transactions/index.js
  3. 1
      app/scripts/metamask-controller.js
  4. 317
      package-lock.json

@ -2,6 +2,8 @@
## Current Develop Branch
- Update transaction statuses when switching networks.
## 4.12.0 Thursday September 27 2018
- Reintroduces changes from 4.10.0

@ -530,6 +530,7 @@ class TransactionController extends EventEmitter {
Updates the memStore in transaction controller
*/
_updateMemstore () {
this.pendingTxTracker.updatePendingTxs()
const unapprovedTxs = this.txStateManager.getUnapprovedTxList()
const selectedAddressTxList = this.txStateManager.getFilteredTxList({
from: this.getSelectedAddress(),

@ -555,6 +555,7 @@ module.exports = class MetamaskController extends EventEmitter {
}
await this.preferencesController.syncAddresses(accounts)
await this.txController.pendingTxTracker.updatePendingTxs()
return this.keyringController.fullUpdate()
}

317
package-lock.json generated

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save