aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-04-28 06:10:16 +0800
committerDan Finlay <dan@danfinlay.com>2017-04-28 06:10:16 +0800
commita9a39bdf8f2b95e8401de6410797a703df91a4e1 (patch)
tree3bc128f651dcd956992fdb2e257269e6507a2f86 /app/scripts/keyring-controller.js
parentf1beb0720a0964e45a71b473f173f62c6abdac6e (diff)
parentd8a5e6a8e43f04a9f123167326fe46dfb8fc2ae6 (diff)
downloadtangerine-wallet-browser-a9a39bdf8f2b95e8401de6410797a703df91a4e1.tar
tangerine-wallet-browser-a9a39bdf8f2b95e8401de6410797a703df91a4e1.tar.gz
tangerine-wallet-browser-a9a39bdf8f2b95e8401de6410797a703df91a4e1.tar.bz2
tangerine-wallet-browser-a9a39bdf8f2b95e8401de6410797a703df91a4e1.tar.lz
tangerine-wallet-browser-a9a39bdf8f2b95e8401de6410797a703df91a4e1.tar.xz
tangerine-wallet-browser-a9a39bdf8f2b95e8401de6410797a703df91a4e1.tar.zst
tangerine-wallet-browser-a9a39bdf8f2b95e8401de6410797a703df91a4e1.zip
Merge branch 'master' into Version-3.5.4
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 16df6efa6..5b3c80e40 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -187,7 +187,7 @@ class KeyringController extends EventEmitter {
.then((accounts) => {
switch (type) {
case 'Simple Key Pair':
- let isNotIncluded = !accounts.find((key) => key === newAccount[0] || key === ethUtil.stripHexPrefix(newAccount[0]))
+ const isNotIncluded = !accounts.find((key) => key === newAccount[0] || key === ethUtil.stripHexPrefix(newAccount[0]))
return (isNotIncluded) ? Promise.resolve(newAccount) : Promise.reject(new Error('The account you\'re are trying to import is a duplicate'))
default:
return Promise.resolve(newAccount)
@@ -582,7 +582,7 @@ class KeyringController extends EventEmitter {
})
}
- _updateMemStoreKeyrings() {
+ _updateMemStoreKeyrings () {
Promise.all(this.keyrings.map(this.displayForKeyring))
.then((keyrings) => {
this.memStore.updateState({ keyrings })