diff options
| author | Frankie <frankie.diamond@gmail.com> | 2018-01-31 07:36:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 07:36:24 +0800 |
| commit | f690355bd4dc306057d33c85e03023858da09d5b (patch) | |
| tree | 4acceae9e035c03f1d40cb4452fabc8e5706d7d2 | |
| parent | e0caeae06ded5d0e7c74b5e174583fae378e7123 (diff) | |
| parent | 1a32690a12e053a99396b2f2da1dc08eb03517f2 (diff) | |
| download | tangerine-wallet-browser-f690355bd4dc306057d33c85e03023858da09d5b.tar.gz tangerine-wallet-browser-f690355bd4dc306057d33c85e03023858da09d5b.tar.zst tangerine-wallet-browser-f690355bd4dc306057d33c85e03023858da09d5b.zip | |
Merge branch 'master' 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) { |