diff options
| author | Alexander Tseung <alextsg@users.noreply.github.com> | 2018-07-04 01:43:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 01:43:40 +0800 |
| commit | 3fd5af636fb5c8887a28e8016f0a61a2890ad8d5 (patch) | |
| tree | 03ae6d40de3aa9a0eb76a297a97f87fccff25e63 | |
| parent | 4bdd59b055730ee05c82546cd2eba55d8ac4506c (diff) | |
| parent | 03f17d910a17abe3fe8c8dae2ef38a66bb86f222 (diff) | |
| download | tangerine-wallet-browser-3fd5af636fb5c8887a28e8016f0a61a2890ad8d5.tar tangerine-wallet-browser-3fd5af636fb5c8887a28e8016f0a61a2890ad8d5.tar.gz tangerine-wallet-browser-3fd5af636fb5c8887a28e8016f0a61a2890ad8d5.tar.bz2 tangerine-wallet-browser-3fd5af636fb5c8887a28e8016f0a61a2890ad8d5.tar.lz tangerine-wallet-browser-3fd5af636fb5c8887a28e8016f0a61a2890ad8d5.tar.xz tangerine-wallet-browser-3fd5af636fb5c8887a28e8016f0a61a2890ad8d5.tar.zst tangerine-wallet-browser-3fd5af636fb5c8887a28e8016f0a61a2890ad8d5.zip | |
Merge pull request #4633 from MetaMask/i4580-import-account-errors
Show all errors on account creation screen.
| -rw-r--r-- | ui/app/components/pages/create-account/import-account/json.js | 2 | ||||
| -rw-r--r-- | ui/app/components/pages/create-account/import-account/private-key.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/components/pages/create-account/import-account/json.js b/ui/app/components/pages/create-account/import-account/json.js index 1dc2ba534..c9d14be5f 100644 --- a/ui/app/components/pages/create-account/import-account/json.js +++ b/ui/app/components/pages/create-account/import-account/json.js @@ -114,7 +114,7 @@ class JsonImportSubview extends Component { setSelectedAddress(firstAddress) } }) - .catch(err => displayWarning(err)) + .catch(err => err && displayWarning(err.message || err)) } } diff --git a/ui/app/components/pages/create-account/import-account/private-key.js b/ui/app/components/pages/create-account/import-account/private-key.js index 5df3777da..c38c39206 100644 --- a/ui/app/components/pages/create-account/import-account/private-key.js +++ b/ui/app/components/pages/create-account/import-account/private-key.js @@ -104,5 +104,5 @@ PrivateKeyImportView.prototype.createNewKeychain = function () { setSelectedAddress(firstAddress) } }) - .catch(err => displayWarning(err)) + .catch(err => err && displayWarning(err.message || err)) } |