diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-04-28 05:50:19 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-04-28 05:50:19 +0800 |
| commit | d1a10691802fc7eef65f13126c684b6cdf13d461 (patch) | |
| tree | 9143b42107d8aeb75fa58f8de45c5730bb8621dd /app/scripts/keyring-controller.js | |
| parent | b0919ba7296553200161913ab413f214aa58e741 (diff) | |
| parent | a90b010de891f7936bc17c09c5fd27c61fc0610d (diff) | |
| download | tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.tar.gz tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.tar.zst tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.zip | |
Merge branch 'master' into rinkeby
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 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 }) |