Merge pull request #4633 from MetaMask/i4580-import-account-errors

Show all errors on account creation screen.
2018-07-03 07:43:40 -10:00 · 2018-07-03 07:43:40 -10:00 · 3fd5af636f
parent 4bdd59b055 03f17d910a
commit 3fd5af636f
2 changed files with 2 additions and 2 deletions
--- a/ui/app/components/pages/create-account/import-account/json.js
+++ b/ui/app/components/pages/create-account/import-account/json.js
@ -114,7 +114,7 @@ class JsonImportSubview extends Component {
          setSelectedAddress(firstAddress)
        }
      })
-      .catch(err => displayWarning(err))
+      .catch(err => err && displayWarning(err.message || err))
  }
 }

--- a/ui/app/components/pages/create-account/import-account/private-key.js
+++ b/ui/app/components/pages/create-account/import-account/private-key.js
@ -104,5 +104,5 @@ PrivateKeyImportView.prototype.createNewKeychain = function () {
        setSelectedAddress(firstAddress)
      }
    })
-    .catch(err => displayWarning(err))
+    .catch(err => err && displayWarning(err.message || err))
 }