diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-03-08 13:30:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 13:30:43 +0800 |
| commit | 0889309bf32fbb23f8bcea037338a9b240439e64 (patch) | |
| tree | 378135a51316e92cf58025b8823e7f109145a88b /app/scripts | |
| parent | 1f0a4dd0331cbcc210ab9c8fc2a323af84fe4bf5 (diff) | |
| parent | a8551c4fe2c86b0cab5afa23040cc0c9b0cf444f (diff) | |
| download | tangerine-wallet-browser-0889309bf32fbb23f8bcea037338a9b240439e64.tar.gz tangerine-wallet-browser-0889309bf32fbb23f8bcea037338a9b240439e64.tar.zst tangerine-wallet-browser-0889309bf32fbb23f8bcea037338a9b240439e64.zip | |
Merge branch 'master' into i1118-IncreaseGasBuffer
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/keyring-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 7669b9f8f..72f613641 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -188,7 +188,7 @@ class KeyringController extends EventEmitter { switch (type) { case 'Simple Key Pair': let isNotIncluded = !accounts.find((key) => key === newAccount[0] || key === ethUtil.stripHexPrefix(newAccount[0])) - return (isNotIncluded) ? Promise.resolve(newAccount) : Promise.reject(new Error('The account your are trying to import is a duplicate')) + 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) } |