aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorThomas Huang <tmashuang@users.noreply.github.com>2017-11-29 03:58:06 +0800
committerGitHub <noreply@github.com>2017-11-29 03:58:06 +0800
commit2b1f2557c7dbd589724fd690ec72f789f9650e3c (patch)
tree44ad09f1b666dc6ddae0fdc0bc9823de9126bc18 /app/scripts
parent9a3ca5d5022d30415b8f5b32b148293689cfc817 (diff)
parentf131468353aa518b8fc178cd591bfc7ab5bdc32c (diff)
downloadtangerine-wallet-browser-2b1f2557c7dbd589724fd690ec72f789f9650e3c.tar.gz
tangerine-wallet-browser-2b1f2557c7dbd589724fd690ec72f789f9650e3c.tar.zst
tangerine-wallet-browser-2b1f2557c7dbd589724fd690ec72f789f9650e3c.zip
Merge pull request #2615 from jpclark/NewUI-flat
Provide blockie identicon option
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/controllers/preferences.js9
-rw-r--r--app/scripts/metamask-controller.js10
2 files changed, 19 insertions, 0 deletions
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 10004caad..0aed4dbdf 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -9,11 +9,20 @@ class PreferencesController {
frequentRpcList: [],
currentAccountTab: 'history',
tokens: [],
+ useBlockie: false,
}, opts.initState)
this.store = new ObservableStore(initState)
}
// PUBLIC METHODS
+ setUseBlockie (val) {
+ this.store.updateState({ useBlockie: val })
+ }
+
+ getUseBlockie () {
+ return this.store.getState().useBlockie
+ }
+
setSelectedAddress (_address) {
return new Promise((resolve, reject) => {
const address = normalizeAddress(_address)
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index bd71da8e0..4dce89e3a 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)
+ }
+ }
+
}