From 90fc4812bc75857581e56eb6d63484dbc5c48cb1 Mon Sep 17 00:00:00 2001
From: "Clark, Jason (Contractor)" <Jason_Clark@comcast.com>
Date: Thu, 23 Nov 2017 18:33:44 -0700
Subject: incremental commit

---
 app/scripts/controllers/preferences.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'app/scripts')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 10004caad..c0454f77b 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -14,6 +14,14 @@ class PreferencesController {
   }
 // PUBLIC METHODS
 
+  toggleUseBlockie () {
+    this.store.updateState({ useBlockie: !this.useBlockie() })
+  }
+
+  getUseBlockie () {
+    return this.store.getState().useBlockie
+  }
+
   setSelectedAddress (_address) {
     return new Promise((resolve, reject) => {
       const address = normalizeAddress(_address)
-- 
cgit 


From fc46a16a329df296cb565e3a0b04f268d2aeceb5 Mon Sep 17 00:00:00 2001
From: Jason Clark <jason@longview.tech>
Date: Fri, 24 Nov 2017 10:35:17 -0700
Subject: toggle wired up to preferences property store

---
 app/scripts/controllers/preferences.js |  4 ++--
 app/scripts/metamask-controller.js     | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index c0454f77b..7ccb0e730 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -14,8 +14,8 @@ class PreferencesController {
   }
 // PUBLIC METHODS
 
-  toggleUseBlockie () {
-    this.store.updateState({ useBlockie: !this.useBlockie() })
+  setUseBlockie (val) {
+    this.store.updateState({ useBlockie: val })
   }
 
   getUseBlockie () {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index bd71da8e0..3a935d895 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -315,6 +315,7 @@ module.exports = class MetamaskController extends EventEmitter {
       // etc
       getState: (cb) => cb(null, this.getState()),
       setCurrentCurrency: this.setCurrentCurrency.bind(this),
+      setUseBlockie: this.setUseBlockie.bind(this),
       markAccountsFound: this.markAccountsFound.bind(this),
 
       // coinbase
@@ -774,4 +775,13 @@ module.exports = class MetamaskController extends EventEmitter {
     return rpcTarget
   }
 
+  setUseBlockie(val, cb) {
+    try {
+      this.preferencesController.setUseBlockie(val)
+      cb(null)
+    } catch (err) {
+      cb(err)
+    }
+  }
+
 }
-- 
cgit 


From abefcc9612d75067474e521486d62684dfeae9c7 Mon Sep 17 00:00:00 2001
From: Jason Clark <jason@longview.tech>
Date: Sat, 25 Nov 2017 15:57:54 -0700
Subject: more eslint fixes

---
 app/scripts/metamask-controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 3a935d895..4dce89e3a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -775,7 +775,7 @@ module.exports = class MetamaskController extends EventEmitter {
     return rpcTarget
   }
 
-  setUseBlockie(val, cb) {
+  setUseBlockie (val, cb) {
     try {
       this.preferencesController.setUseBlockie(val)
       cb(null)
-- 
cgit 


From a34362b7765f48d24375c9953fa7c49cf3306491 Mon Sep 17 00:00:00 2001
From: Jason Clark <jason@longview.tech>
Date: Mon, 27 Nov 2017 08:11:48 -0700
Subject: Fixes changes requested in pullrequestreview-79088534

---
 app/scripts/controllers/preferences.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/scripts')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 7ccb0e730..0aed4dbdf 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -9,6 +9,7 @@ class PreferencesController {
       frequentRpcList: [],
       currentAccountTab: 'history',
       tokens: [],
+      useBlockie: false,
     }, opts.initState)
     this.store = new ObservableStore(initState)
   }
-- 
cgit