From 40f1d0868401662c42f6a031549c9b023427ccef Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 25 Sep 2017 11:42:08 -0700
Subject: Made some requested changes

---
 app/scripts/controllers/balance.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/scripts/controllers/balance.js')

diff --git a/app/scripts/controllers/balance.js b/app/scripts/controllers/balance.js
index ddeb06cf9..840b7abc3 100644
--- a/app/scripts/controllers/balance.js
+++ b/app/scripts/controllers/balance.js
@@ -16,7 +16,7 @@ class BalanceController {
     this.store = new ObservableStore(initState)
 
     this.balanceCalc = new PendingBalanceCalculator({
-      getBalance: () => Promise.resolve(this._getBalance()),
+      getBalance: () => this._getBalance(),
       getPendingTransactions: this._getPendingTransactions.bind(this),
     })
 
@@ -35,24 +35,24 @@ class BalanceController {
     this.txController.on('submitted', update)
     this.txController.on('confirmed', update)
     this.txController.on('failed', update)
+    this.accountTracker.subscribe(update)
     this.txController.blockTracker.on('block', update)
   }
 
-  _getBalance () {
-    const store = this.accountTracker.getState()
-    const balances = store.accounts
-    const entry = balances[this.address]
+  async _getBalance () {
+    const { accounts } = this.accountTracker.getState()
+    const entry = accounts[this.address]
     const balance = entry.balance
     return balance ? new BN(balance.substring(2), 16) : undefined
   }
 
-  _getPendingTransactions () {
+  async _getPendingTransactions () {
     const pending = this.txController.getFilteredTxList({
       from: this.address,
       status: 'submitted',
       err: undefined,
     })
-    return Promise.resolve(pending)
+    return pending
   }
 
 }
-- 
cgit v1.2.3


From 8cd7329c91b047ef15c81b164075ea6c1d15b0df Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 25 Sep 2017 14:36:49 -0700
Subject: Implemented feedback

---
 app/scripts/controllers/balance.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/scripts/controllers/balance.js')

diff --git a/app/scripts/controllers/balance.js b/app/scripts/controllers/balance.js
index 840b7abc3..9b2566852 100644
--- a/app/scripts/controllers/balance.js
+++ b/app/scripts/controllers/balance.js
@@ -20,7 +20,7 @@ class BalanceController {
       getPendingTransactions: this._getPendingTransactions.bind(this),
     })
 
-    this.registerUpdates()
+    this._registerUpdates()
   }
 
   async updateBalance () {
@@ -30,7 +30,7 @@ class BalanceController {
     })
   }
 
-  registerUpdates () {
+  _registerUpdates () {
     const update = this.updateBalance.bind(this)
     this.txController.on('submitted', update)
     this.txController.on('confirmed', update)
-- 
cgit v1.2.3


From 674aac83ce49d21606be7be7afdf1b6a8ceb386f Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 25 Sep 2017 14:39:22 -0700
Subject: Make blockTracker an independent param

---
 app/scripts/controllers/balance.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/scripts/controllers/balance.js')

diff --git a/app/scripts/controllers/balance.js b/app/scripts/controllers/balance.js
index 9b2566852..ab0cfe907 100644
--- a/app/scripts/controllers/balance.js
+++ b/app/scripts/controllers/balance.js
@@ -5,10 +5,11 @@ const BN = require('ethereumjs-util').BN
 class BalanceController {
 
   constructor (opts = {}) {
-    const { address, accountTracker, txController } = opts
+    const { address, accountTracker, txController, blockTracker } = opts
     this.address = address
     this.accountTracker = accountTracker
     this.txController = txController
+    this.blockTracker = blockTracker
 
     const initState = {
       ethBalance: undefined,
@@ -36,7 +37,7 @@ class BalanceController {
     this.txController.on('confirmed', update)
     this.txController.on('failed', update)
     this.accountTracker.subscribe(update)
-    this.txController.blockTracker.on('block', update)
+    this.blockTracker.on('block', update)
   }
 
   async _getBalance () {
-- 
cgit v1.2.3


From 2eca5455c0c80d99b10c7d56858f84e605494fba Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 26 Sep 2017 14:15:16 -0700
Subject: Move obs store into account-tracker instead of inheriting

---
 app/scripts/controllers/balance.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/scripts/controllers/balance.js')

diff --git a/app/scripts/controllers/balance.js b/app/scripts/controllers/balance.js
index ab0cfe907..964dff0df 100644
--- a/app/scripts/controllers/balance.js
+++ b/app/scripts/controllers/balance.js
@@ -36,12 +36,12 @@ class BalanceController {
     this.txController.on('submitted', update)
     this.txController.on('confirmed', update)
     this.txController.on('failed', update)
-    this.accountTracker.subscribe(update)
+    this.accountTracker.store.subscribe(update)
     this.blockTracker.on('block', update)
   }
 
   async _getBalance () {
-    const { accounts } = this.accountTracker.getState()
+    const { accounts } = this.accountTracker.store.getState()
     const entry = accounts[this.address]
     const balance = entry.balance
     return balance ? new BN(balance.substring(2), 16) : undefined
-- 
cgit v1.2.3