diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-23 02:50:15 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-23 02:50:15 +0800 |
| commit | 8261cf232d5d7225f83747460cb7dbed52d5f8b8 (patch) | |
| tree | d91ae54c29a0203e2cc3883f0183355cf1588f63 /app/scripts/keyring-controller.js | |
| parent | 17d63acaed8fd9a885368831858ba216558ff155 (diff) | |
| parent | ca819781cb68fc89af5a299df2710101b4b9cfe3 (diff) | |
| download | tangerine-wallet-browser-8261cf232d5d7225f83747460cb7dbed52d5f8b8.tar tangerine-wallet-browser-8261cf232d5d7225f83747460cb7dbed52d5f8b8.tar.gz tangerine-wallet-browser-8261cf232d5d7225f83747460cb7dbed52d5f8b8.tar.bz2 tangerine-wallet-browser-8261cf232d5d7225f83747460cb7dbed52d5f8b8.tar.lz tangerine-wallet-browser-8261cf232d5d7225f83747460cb7dbed52d5f8b8.tar.xz tangerine-wallet-browser-8261cf232d5d7225f83747460cb7dbed52d5f8b8.tar.zst tangerine-wallet-browser-8261cf232d5d7225f83747460cb7dbed52d5f8b8.zip | |
Merge branch 'dev' into dev-cleanup
Diffstat (limited to 'app/scripts/keyring-controller.js')
| -rw-r--r-- | app/scripts/keyring-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 31d144ca9..989103993 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -65,7 +65,7 @@ module.exports = class KeyringController extends EventEmitter { currentFiat: this.configManager.getCurrentFiat(), conversionRate: this.configManager.getConversionRate(), conversionDate: this.configManager.getConversionDate(), - keyringTypes: this.keyringTypes.map((krt) => krt.type()), + keyringTypes: this.keyringTypes.map(krt => krt.type), identities: this.identities, } } @@ -310,7 +310,7 @@ module.exports = class KeyringController extends EventEmitter { getKeyringClassForType (type) { const Keyring = this.keyringTypes.reduce((res, kr) => { - if (kr.type() === type) { + if (kr.type === type) { return kr } else { return res |