From 9cc1e8a6d867b7f0663c55b017b471132f6a719e Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 18 Oct 2017 14:22:04 -0700
Subject: Refresh computed balances controller when restoring vault

---
 app/scripts/controllers/computed-balances.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/scripts/controllers/computed-balances.js')

diff --git a/app/scripts/controllers/computed-balances.js b/app/scripts/controllers/computed-balances.js
index 2479e1b3a..3479eae2b 100644
--- a/app/scripts/controllers/computed-balances.js
+++ b/app/scripts/controllers/computed-balances.js
@@ -25,6 +25,10 @@ class ComputedbalancesController {
     }
   }
 
+  forgetAllBalances () {
+    this.balances = {}
+  }
+
   _initBalanceUpdating () {
     const store = this.accountTracker.store.getState()
     this.addAnyAccountsFromStore(store)
-- 
cgit 


From 75177ce34cac589be26fb8089aac04feccdbae81 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 18 Oct 2017 15:08:34 -0700
Subject: Make account tracking more reactive

We were doing a lot of conditional observation & updating.
Pulled out a bunch of that for generic observer/syncers.
---
 app/scripts/controllers/computed-balances.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'app/scripts/controllers/computed-balances.js')

diff --git a/app/scripts/controllers/computed-balances.js b/app/scripts/controllers/computed-balances.js
index 3479eae2b..009405d29 100644
--- a/app/scripts/controllers/computed-balances.js
+++ b/app/scripts/controllers/computed-balances.js
@@ -25,22 +25,28 @@ class ComputedbalancesController {
     }
   }
 
-  forgetAllBalances () {
-    this.balances = {}
-  }
-
   _initBalanceUpdating () {
     const store = this.accountTracker.store.getState()
-    this.addAnyAccountsFromStore(store)
-    this.accountTracker.store.subscribe(this.addAnyAccountsFromStore.bind(this))
+    this.syncAllAccountsFromStore(store)
+    this.accountTracker.store.subscribe(this.syncAllAccountsFromStore.bind(this))
   }
 
-  addAnyAccountsFromStore(store) {
-    const balances = store.accounts
+  syncAllAccountsFromStore(store) {
+    const upstream = Object.keys(store.accounts)
+    const balances = Object.keys(this.balances)
+    .map(address => this.balances[address])
 
+    // Follow new addresses
     for (let address in balances) {
       this.trackAddressIfNotAlready(address)
     }
+
+    // Unfollow old ones
+    balances.forEach(({ address }) => {
+      if (!upstream.includes(address)) {
+        delete this.balances[address]
+      }
+    })
   }
 
   trackAddressIfNotAlready (address) {
-- 
cgit 


From 0ae406e489a635ea094913ee5c20d1e8f2165db5 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 19 Oct 2017 09:59:57 -0700
Subject: Allow computed balances to enumerate its own view

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

(limited to 'app/scripts/controllers/computed-balances.js')

diff --git a/app/scripts/controllers/computed-balances.js b/app/scripts/controllers/computed-balances.js
index 009405d29..9855f715e 100644
--- a/app/scripts/controllers/computed-balances.js
+++ b/app/scripts/controllers/computed-balances.js
@@ -20,9 +20,10 @@ class ComputedbalancesController {
   }
 
   updateAllBalances () {
-    for (let address in this.accountTracker.store.getState().accounts) {
+    Object.keys(this.balances).forEach((balance) => {
+      const address = balance.address
       this.balances[address].updateBalance()
-    }
+    })
   }
 
   _initBalanceUpdating () {
-- 
cgit