aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.eslintignore1
-rw-r--r--.nsprc3
-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
4 files changed, 5 insertions, 1 deletions
diff --git a/.eslintignore b/.eslintignore
index 44b38c3de..6c7f99f40 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,7 @@
node_modules/**
dist/**
builds/**
+test-builds/**
docs/**
development/bundle.js
diff --git a/.nsprc b/.nsprc
index cb37fad49..bd3a4f039 100644
--- a/.nsprc
+++ b/.nsprc
@@ -1,6 +1,7 @@
{
"exceptions": [
"https://nodesecurity.io/advisories/566",
- "https://nodesecurity.io/advisories/157"
+ "https://nodesecurity.io/advisories/157",
+ "https://nodesecurity.io/advisories/577"
]
}
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)