aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-09-23 04:29:13 +0800
committerDan Finlay <dan@danfinlay.com>2017-09-23 04:29:13 +0800
commit08b36b9b582853b411a19e48b407c70596381f61 (patch)
tree9161637c0a643ddb678b51f127b9dedf28dc2296
parent4c971ebfd1fad18368ec418c36c4d05a6bb37e6d (diff)
downloadtangerine-wallet-browser-08b36b9b582853b411a19e48b407c70596381f61.tar
tangerine-wallet-browser-08b36b9b582853b411a19e48b407c70596381f61.tar.gz
tangerine-wallet-browser-08b36b9b582853b411a19e48b407c70596381f61.tar.bz2
tangerine-wallet-browser-08b36b9b582853b411a19e48b407c70596381f61.tar.lz
tangerine-wallet-browser-08b36b9b582853b411a19e48b407c70596381f61.tar.xz
tangerine-wallet-browser-08b36b9b582853b411a19e48b407c70596381f61.tar.zst
tangerine-wallet-browser-08b36b9b582853b411a19e48b407c70596381f61.zip
Allow metamaskController to define keyring types
-rw-r--r--app/scripts/keyring-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index adfa4a813..4454f0b63 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -27,7 +27,7 @@ class KeyringController extends EventEmitter {
constructor (opts) {
super()
const initState = opts.initState || {}
- this.keyringTypes = keyringTypes
+ this.keyringTypes = opts.keyringTypes || keyringTypes
this.store = new ObservableStore(initState)
this.memStore = new ObservableStore({
isUnlocked: false,