aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2018-10-05 06:57:38 +0800
committerDan Finlay <542863+danfinlay@users.noreply.github.com>2018-10-06 01:35:14 +0800
commit507397f6c366d570af5c6846d7e6a6f6ad3117ed (patch)
treefd4c6dfab5dd8a4956e9763a4d7799a2b5e6393b /app
parent182970c3181fa50c6e6767b0810d98f4cd6380e0 (diff)
downloadtangerine-wallet-browser-507397f6c366d570af5c6846d7e6a6f6ad3117ed.tar
tangerine-wallet-browser-507397f6c366d570af5c6846d7e6a6f6ad3117ed.tar.gz
tangerine-wallet-browser-507397f6c366d570af5c6846d7e6a6f6ad3117ed.tar.bz2
tangerine-wallet-browser-507397f6c366d570af5c6846d7e6a6f6ad3117ed.tar.lz
tangerine-wallet-browser-507397f6c366d570af5c6846d7e6a6f6ad3117ed.tar.xz
tangerine-wallet-browser-507397f6c366d570af5c6846d7e6a6f6ad3117ed.tar.zst
tangerine-wallet-browser-507397f6c366d570af5c6846d7e6a6f6ad3117ed.zip
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
Diffstat (limited to 'app')
-rw-r--r--app/scripts/controllers/transactions/index.js1
-rw-r--r--app/scripts/metamask-controller.js1
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 78dc57972..921a58e91 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -555,6 +555,7 @@ module.exports = class MetamaskController extends EventEmitter {
}
await this.preferencesController.syncAddresses(accounts)
+ await this.txController.pendingTxTracker.updatePendingTxs()
return this.keyringController.fullUpdate()
}