diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-04 03:41:18 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-04 03:41:18 +0800 |
| commit | 3837c2ddd7b3ea7a301f9296176273ac84d90480 (patch) | |
| tree | 6fe1c61c73d6999cd62637e4a0a2fb4eea48617f /ui/app/components/pages | |
| parent | 3290421e2f16bd0ea1b13ba3f3d93fc4d233c750 (diff) | |
| parent | e467eda4f720fa89141ded2e709566102402479b (diff) | |
| download | tangerine-wallet-browser-3837c2ddd7b3ea7a301f9296176273ac84d90480.tar tangerine-wallet-browser-3837c2ddd7b3ea7a301f9296176273ac84d90480.tar.gz tangerine-wallet-browser-3837c2ddd7b3ea7a301f9296176273ac84d90480.tar.bz2 tangerine-wallet-browser-3837c2ddd7b3ea7a301f9296176273ac84d90480.tar.lz tangerine-wallet-browser-3837c2ddd7b3ea7a301f9296176273ac84d90480.tar.xz tangerine-wallet-browser-3837c2ddd7b3ea7a301f9296176273ac84d90480.tar.zst tangerine-wallet-browser-3837c2ddd7b3ea7a301f9296176273ac84d90480.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/components/pages')
| -rw-r--r-- | ui/app/components/pages/create-account/import-account/json.js | 3 | ||||
| -rw-r--r-- | ui/app/components/pages/create-account/import-account/private-key.js | 3 |
2 files changed, 4 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..dd57256a3 100644 --- a/ui/app/components/pages/create-account/import-account/json.js +++ b/ui/app/components/pages/create-account/import-account/json.js @@ -109,12 +109,13 @@ class JsonImportSubview extends Component { .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)) } } 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)) } |