aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
diff options
context:
space:
mode:
authorDan J Miller <danjm.com@gmail.com>2018-07-04 02:33:55 +0800
committerGitHub <noreply@github.com>2018-07-04 02:33:55 +0800
commita049627752163ef978f04ff0fba61d213d4ba580 (patch)
treef6fa6bec0186e1d1ca94743f976b49e7240c289c /ui/app/components
parent2e9bd7e9d101287b4466475561df9131f0ef56a6 (diff)
parentd126887bc3a795d27f54a4ca5178503e522d41d9 (diff)
downloadtangerine-wallet-browser-a049627752163ef978f04ff0fba61d213d4ba580.tar
tangerine-wallet-browser-a049627752163ef978f04ff0fba61d213d4ba580.tar.gz
tangerine-wallet-browser-a049627752163ef978f04ff0fba61d213d4ba580.tar.bz2
tangerine-wallet-browser-a049627752163ef978f04ff0fba61d213d4ba580.tar.lz
tangerine-wallet-browser-a049627752163ef978f04ff0fba61d213d4ba580.tar.xz
tangerine-wallet-browser-a049627752163ef978f04ff0fba61d213d4ba580.tar.zst
tangerine-wallet-browser-a049627752163ef978f04ff0fba61d213d4ba580.zip
Merge pull request #4716 from MetaMask/i4663-clearErrorMessages
fixes #4663 - Clear Error Messages when Importing Accounts are Successful
Diffstat (limited to 'ui/app/components')
-rw-r--r--ui/app/components/pages/create-account/import-account/json.js1
-rw-r--r--ui/app/components/pages/create-account/import-account/private-key.js1
2 files changed, 2 insertions, 0 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 c9d14be5f..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,6 +109,7 @@ class JsonImportSubview extends Component {
.then(({ selectedAddress }) => {
if (selectedAddress) {
history.push(DEFAULT_ROUTE)
+ displayWarning(null)
} else {
displayWarning('Error importing account.')
setSelectedAddress(firstAddress)
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 c38c39206..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,6 +99,7 @@ PrivateKeyImportView.prototype.createNewKeychain = function () {
.then(({ selectedAddress }) => {
if (selectedAddress) {
history.push(DEFAULT_ROUTE)
+ displayWarning(null)
} else {
displayWarning('Error importing account.')
setSelectedAddress(firstAddress)