diff options
author | Esteban MIno <efmino@uc.cl> | 2018-08-04 02:56:02 +0800 |
---|---|---|
committer | Esteban MIno <efmino@uc.cl> | 2018-08-04 02:56:02 +0800 |
commit | 21a61f2987ae83a48bb1f7256ec9c34978413eb2 (patch) | |
tree | 3bc9ef3d342f17269942cd3fe58da1f3b97ef214 /ui/app/components/pages/create-account/import-account/json.js | |
parent | 0481335dda447ba4c228d146834952bac0ad641b (diff) | |
parent | fa4423bab2886017996955f809b6e3102cbf1781 (diff) | |
download | tangerine-wallet-browser-21a61f2987ae83a48bb1f7256ec9c34978413eb2.tar.gz tangerine-wallet-browser-21a61f2987ae83a48bb1f7256ec9c34978413eb2.tar.zst tangerine-wallet-browser-21a61f2987ae83a48bb1f7256ec9c34978413eb2.zip |
merge develop
Diffstat (limited to 'ui/app/components/pages/create-account/import-account/json.js')
-rw-r--r-- | ui/app/components/pages/create-account/import-account/json.js | 3 |
1 files changed, 2 insertions, 1 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)) } } |