Merge pull request #3145 from MetaMask/i3089-FixNullError

Add warning when importing no valid file

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.

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) {