Merge branch 'master' into FrankieDisclaimer

4 files changed, 5 insertions, 12 deletions

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 0af82c89c..caaae8a75 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -149,12 +149,6 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
   }
 }
 
-ConfigManager.prototype.clearWallet = function () {
-  var data = this.getConfig()
-  delete data.wallet
-  this.setData(data)
-}
-
 ConfigManager.prototype.setData = function (data) {
   this.migrator.saveData(data)
 }
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index f705c07a7..cbc8c1e48 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -43,9 +43,6 @@ function IdentityStore (opts = {}) {
 
 IdentityStore.prototype.createNewVault = function (password, entropy, cb) {
   delete this._keyStore
-  if (this.configManager) {
-    this.configManager.clearWallet()
-  }
 
   this._createIdmgmt(password, null, entropy, (err) => {
     if (err) return cb(err)
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 398086274..470591323 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -195,7 +195,7 @@ module.exports = class MetamaskController {
     if (!state.isUnlocked) {
       this.opts.unlockAccountMessage()
     } else {
-      this.addUnconfirmedMsg(msgParams, cb)
+      this.addUnconfirmedMessage(msgParams, cb)
     }
   }
 
diff --git a/app/scripts/popup.js b/app/scripts/popup.js
index 5c5cf0455..2e5b98896 100644
--- a/app/scripts/popup.js
+++ b/app/scripts/popup.js
@@ -54,12 +54,14 @@ function setupControllerConnection (stream, cb) {
 }
 
 function getCurrentDomain (cb) {
+  const unknown = '<unknown>'
+  if (!chrome.tabs) return cb(null, unknown)
   chrome.tabs.query({active: true, currentWindow: true}, function (results) {
     var activeTab = results[0]
     var currentUrl = activeTab && activeTab.url
     var currentDomain = url.parse(currentUrl).host
     if (!currentUrl) {
-      return cb(null, '<unknown>')
+      return cb(null, unknown)
     }
     cb(null, currentDomain)
   })
@@ -78,7 +80,7 @@ function setupApp (err, opts) {
     alert(err.stack)
     throw err
   }
-  
+
   clearNotifications()
 
   var container = document.getElementById('app-content')