diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-11-23 02:51:48 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-11-23 02:51:48 +0800 |
commit | 0289444fcb032eca53fca591a10eb6743f2ff485 (patch) | |
tree | 6f9455eb5effff26057c8927f81190f5b24ccc2d /app/scripts/keyring-controller.js | |
parent | ea56426b2355c1076c18256fb0b4e74f47ff4b39 (diff) | |
parent | ca819781cb68fc89af5a299df2710101b4b9cfe3 (diff) | |
download | tangerine-wallet-browser-0289444fcb032eca53fca591a10eb6743f2ff485.tar.gz tangerine-wallet-browser-0289444fcb032eca53fca591a10eb6743f2ff485.tar.zst tangerine-wallet-browser-0289444fcb032eca53fca591a10eb6743f2ff485.zip |
Merge branch 'dev' into i842-WaitForSeedWord
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 49a41df66..51369eac8 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, } } @@ -317,7 +317,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 |