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

Merge branch 'develop' into update-balance-on-unlock

Browse Source
This commit is contained in:
Dan Finlay 2018-10-05 10:46:48 -07:00 committed by GitHub
commit a909af92aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 0 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

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