diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2017-06-27 07:35:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 07:35:47 +0800 |
| commit | 48f7cff8c0e765e85532c860c5f3061ca1d6deb7 (patch) | |
| tree | eac91e50b77c6452faebed9324a187003a5b2711 | |
| parent | 62c4501160b23e526ea4a5d496182666273fbf66 (diff) | |
| parent | 8194b398f6a2f3756e551c068a2dc8c150495c7d (diff) | |
| download | tangerine-wallet-browser-48f7cff8c0e765e85532c860c5f3061ca1d6deb7.tar tangerine-wallet-browser-48f7cff8c0e765e85532c860c5f3061ca1d6deb7.tar.gz tangerine-wallet-browser-48f7cff8c0e765e85532c860c5f3061ca1d6deb7.tar.bz2 tangerine-wallet-browser-48f7cff8c0e765e85532c860c5f3061ca1d6deb7.tar.lz tangerine-wallet-browser-48f7cff8c0e765e85532c860c5f3061ca1d6deb7.tar.xz tangerine-wallet-browser-48f7cff8c0e765e85532c860c5f3061ca1d6deb7.tar.zst tangerine-wallet-browser-48f7cff8c0e765e85532c860c5f3061ca1d6deb7.zip | |
Merge pull request #1678 from MetaMask/i1584-seederror
Display error when seed phrase is invalid
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/scripts/keyring-controller.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bfec12dc..96dc79d9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fix bug where slowly mined txs would sometimes be incorrectly marked as failed. - Fix bug where badge count did not reflect personal_sign pending messages. - Seed word confirmation wording is now scarier. +- Fix error for invalid seed words. - Prevent users from submitting two duplicate transactions by disabling submit. ## 3.7.8 2017-6-12 diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 5b3c80e40..2edc8060e 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -87,7 +87,7 @@ class KeyringController extends EventEmitter { } if (!bip39.validateMnemonic(seed)) { - return Promise.reject('Seed phrase is invalid.') + return Promise.reject(new Error('Seed phrase is invalid.')) } this.clearKeyrings() |