aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2018-01-31 07:32:04 +0800
committerGitHub <noreply@github.com>2018-01-31 07:32:04 +0800
commit1a32690a12e053a99396b2f2da1dc08eb03517f2 (patch)
treef752e00d9a659effd4824ea0f53d763ddf24ef8e
parent5f2d8eb5d2923b5b5658a49aafe5f36ccdf408c8 (diff)
parent11a944719f52c256c585e788d064b45d08b8f5cf (diff)
downloadtangerine-wallet-browser-1a32690a12e053a99396b2f2da1dc08eb03517f2.tar.gz
tangerine-wallet-browser-1a32690a12e053a99396b2f2da1dc08eb03517f2.tar.zst
tangerine-wallet-browser-1a32690a12e053a99396b2f2da1dc08eb03517f2.zip
Merge pull request #3145 from MetaMask/i3089-FixNullError
Add warning when importing no valid file
-rw-r--r--CHANGELOG.md2
-rw-r--r--ui/app/accounts/import/json.js6
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87a7a60c7..bab6d4062 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Master
+- Add warning for importing some kinds of files.
+
## 3.13.8 2018-1-29
- Fix provider for Kovan network.
diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js
index 158a3c923..15f9816e7 100644
--- a/ui/app/accounts/import/json.js
+++ b/ui/app/accounts/import/json.js
@@ -81,6 +81,12 @@ JsonImportSubview.prototype.createKeyringOnEnter = function (event) {
JsonImportSubview.prototype.createNewKeychain = function () {
const state = this.state
+
+ if (!state) {
+ const message = 'You must select a valid file to import.'
+ return this.props.dispatch(actions.displayWarning(message))
+ }
+
const { fileContents } = state
if (!fileContents) {