diff options
author | kumavis <aaron@kumavis.me> | 2018-07-04 03:42:14 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-07-04 03:42:14 +0800 |
commit | 77daed5c74aa3c1fdbf1d9c71f544928f47f3993 (patch) | |
tree | 4a614dbdfce84b452562dcabccffa53b8393e2b0 /ui/app/components/pages/create-account/import-account/private-key.js | |
parent | 2b2cd87e2d6e93dadb3ddd20ebf854ab6f2d2382 (diff) | |
parent | e467eda4f720fa89141ded2e709566102402479b (diff) | |
download | tangerine-wallet-browser-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.tar.gz tangerine-wallet-browser-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.tar.zst tangerine-wallet-browser-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.zip |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
Diffstat (limited to 'ui/app/components/pages/create-account/import-account/private-key.js')
-rw-r--r-- | ui/app/components/pages/create-account/import-account/private-key.js | 3 |
1 files changed, 2 insertions, 1 deletions
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..1db999f2f 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 @@ -99,10 +99,11 @@ PrivateKeyImportView.prototype.createNewKeychain = function () { .then(({ selectedAddress }) => { if (selectedAddress) { history.push(DEFAULT_ROUTE) + displayWarning(null) } else { displayWarning('Error importing account.') setSelectedAddress(firstAddress) } }) - .catch(err => displayWarning(err)) + .catch(err => err && displayWarning(err.message || err)) } |