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

Fix updating of pending transactions

Browse Source 
Transaction statuses were not being properly updated when:

- MetaMask was unlocked
- The network was changed

This PR fixes both of those. Fixes #5174
This commit is contained in:
Dan Finlay 2018-10-04 15:57:38 -07:00 committed by Dan Finlay
parent 182970c318
commit 507397f6c3
4 changed files with 167 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

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

1
app/scripts/controllers/transactions/index.js
View File

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

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

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

317
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff