diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2018-02-01 02:50:52 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2018-02-01 02:50:52 +0800 |
| commit | 7e144680134e1bf87727f5dd048e846996e8367a (patch) | |
| tree | c4a67e15102e13abd4b0d694a2a5d09493440c80 | |
| parent | c3adbda5f561c20c011a7b78f1e84513cebba87e (diff) | |
| parent | f690355bd4dc306057d33c85e03023858da09d5b (diff) | |
| download | tangerine-wallet-browser-7e144680134e1bf87727f5dd048e846996e8367a.tar.gz tangerine-wallet-browser-7e144680134e1bf87727f5dd048e846996e8367a.tar.zst tangerine-wallet-browser-7e144680134e1bf87727f5dd048e846996e8367a.zip | |
Merge branch 'localStorage-clean-up' of https://github.com/MetaMask/metamask-extension into localStorage-clean-up
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | ui/app/accounts/import/json.js | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 91bf01b44..f9fa0f5d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Current Master - Remove BlacklistController from disk state +- Add warning for importing some kinds of files. ## 3.13.8 2018-1-29 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) { |