aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-09-14 05:20:19 +0800
committerDan Finlay <dan@danfinlay.com>2017-09-14 05:28:51 +0800
commit86cd4e4fedbea9639de33827733b4b85ef988bee (patch)
tree03a36e8442c6d91552d7cf10e101e053a397bac0 /app/scripts/metamask-controller.js
parente4d7fb244790d547b03d18763aa1d8e501d88b89 (diff)
downloadtangerine-wallet-browser-86cd4e4fedbea9639de33827733b4b85ef988bee.tar
tangerine-wallet-browser-86cd4e4fedbea9639de33827733b4b85ef988bee.tar.gz
tangerine-wallet-browser-86cd4e4fedbea9639de33827733b4b85ef988bee.tar.bz2
tangerine-wallet-browser-86cd4e4fedbea9639de33827733b4b85ef988bee.tar.lz
tangerine-wallet-browser-86cd4e4fedbea9639de33827733b4b85ef988bee.tar.xz
tangerine-wallet-browser-86cd4e4fedbea9639de33827733b4b85ef988bee.tar.zst
tangerine-wallet-browser-86cd4e4fedbea9639de33827733b4b85ef988bee.zip
Got pending balance updating correctly
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 81e31a556..f2df45947 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -20,6 +20,7 @@ const BlacklistController = require('./controllers/blacklist')
const MessageManager = require('./lib/message-manager')
const PersonalMessageManager = require('./lib/personal-message-manager')
const TransactionController = require('./controllers/transactions')
+const BalancesController = require('./controllers/balances')
const ConfigManager = require('./lib/config-manager')
const nodeify = require('./lib/nodeify')
const accountImporter = require('./account-import-strategies')
@@ -174,6 +175,7 @@ module.exports = class MetamaskController extends EventEmitter {
this.networkController.store.subscribe(this.sendUpdate.bind(this))
this.ethStore.subscribe(this.sendUpdate.bind(this))
this.txController.memStore.subscribe(this.sendUpdate.bind(this))
+ this.balancesController.store.subscribe(this.sendUpdate.bind(this))
this.messageManager.memStore.subscribe(this.sendUpdate.bind(this))
this.personalMessageManager.memStore.subscribe(this.sendUpdate.bind(this))
this.keyringController.memStore.subscribe(this.sendUpdate.bind(this))
@@ -248,6 +250,7 @@ module.exports = class MetamaskController extends EventEmitter {
const wallet = this.configManager.getWallet()
const vault = this.keyringController.store.getState().vault
const isInitialized = (!!wallet || !!vault)
+
return extend(
{
isInitialized,
@@ -258,6 +261,7 @@ module.exports = class MetamaskController extends EventEmitter {
this.messageManager.memStore.getState(),
this.personalMessageManager.memStore.getState(),
this.keyringController.memStore.getState(),
+ this.balancesController.store.getState(),
this.preferencesController.store.getState(),
this.addressBookController.store.getState(),
this.currencyController.store.getState(),