diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-10-06 01:46:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-06 01:46:48 +0800 |
| commit | a909af92aae8b9f0560e43db428e7a7cf43b1aca (patch) | |
| tree | 3ca9cfee996bd140c41e0f8ae52752a4e7ac7621 /app/scripts | |
| parent | bc6d32e51eef892f30d9913f3f62472df490f7d9 (diff) | |
| parent | 99045d47842b8c7811204e534b663a040235a942 (diff) | |
| download | tangerine-wallet-browser-a909af92aae8b9f0560e43db428e7a7cf43b1aca.tar tangerine-wallet-browser-a909af92aae8b9f0560e43db428e7a7cf43b1aca.tar.gz tangerine-wallet-browser-a909af92aae8b9f0560e43db428e7a7cf43b1aca.tar.bz2 tangerine-wallet-browser-a909af92aae8b9f0560e43db428e7a7cf43b1aca.tar.lz tangerine-wallet-browser-a909af92aae8b9f0560e43db428e7a7cf43b1aca.tar.xz tangerine-wallet-browser-a909af92aae8b9f0560e43db428e7a7cf43b1aca.tar.zst tangerine-wallet-browser-a909af92aae8b9f0560e43db428e7a7cf43b1aca.zip | |
Merge branch 'develop' into update-balance-on-unlock
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/controllers/transactions/index.js | 1 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js index e2965ceb6..ebd49f882 100644 --- a/app/scripts/controllers/transactions/index.js +++ b/app/scripts/controllers/transactions/index.js @@ -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(), diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index a7754c388..a04c63da6 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -556,6 +556,7 @@ module.exports = class MetamaskController extends EventEmitter { await this.preferencesController.syncAddresses(accounts) await this.balancesController.updateAllBalances() + await this.txController.pendingTxTracker.updatePendingTxs() return this.keyringController.fullUpdate() } |