aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-11-23 02:26:16 +0800
committerGitHub <noreply@github.com>2016-11-23 02:26:16 +0800
commitd92741c41984aa9d5268f4aca04ec916a95ef204 (patch)
treef6400549253c2c6459d54ba3211d0fb9bf61f6dd /app/scripts/keyring-controller.js
parentbe6b7b496a95fa036161b6c600eadd733676e954 (diff)
parent60afc41bb65547ace5e3a16b9c743a0dbf36d58a (diff)
downloadtangerine-wallet-browser-d92741c41984aa9d5268f4aca04ec916a95ef204.tar
tangerine-wallet-browser-d92741c41984aa9d5268f4aca04ec916a95ef204.tar.gz
tangerine-wallet-browser-d92741c41984aa9d5268f4aca04ec916a95ef204.tar.bz2
tangerine-wallet-browser-d92741c41984aa9d5268f4aca04ec916a95ef204.tar.lz
tangerine-wallet-browser-d92741c41984aa9d5268f4aca04ec916a95ef204.tar.xz
tangerine-wallet-browser-d92741c41984aa9d5268f4aca04ec916a95ef204.tar.zst
tangerine-wallet-browser-d92741c41984aa9d5268f4aca04ec916a95ef204.zip
Merge pull request #856 from MetaMask/i835-OrganizeKeyrings
I835 organize keyrings
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index cf761c88c..fdef9d7b3 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -67,7 +67,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,
}
}
@@ -312,7 +312,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