diff options
| author | Dan J Miller <danjm.com@gmail.com> | 2018-02-08 08:48:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 08:48:10 +0800 |
| commit | c50a197ab95b462b4416cbf85139f80db9b70f0c (patch) | |
| tree | 6488ba3f3781a446aafb359a5340fd981eea23ff /ui/app/accounts | |
| parent | a9ecf9c6fcbffb2b1984058fa6c6eef3c968b9c4 (diff) | |
| parent | 6f14dc4702bf4d4593c4585f95d8b1ca3896043f (diff) | |
| download | tangerine-wallet-browser-c50a197ab95b462b4416cbf85139f80db9b70f0c.tar.gz tangerine-wallet-browser-c50a197ab95b462b4416cbf85139f80db9b70f0c.tar.zst tangerine-wallet-browser-c50a197ab95b462b4416cbf85139f80db9b70f0c.zip | |
Merge pull request #3203 from danjm/merge-master-to-uat-feb72018
Merge master to UAT feb72018
Diffstat (limited to 'ui/app/accounts')
| -rw-r--r-- | ui/app/accounts/import/json.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js index 9cefcfa77..dd5dfad22 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) { |