1 files changed, 12 insertions, 12 deletions

diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 1077d263d..cf4353e48 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -44,7 +44,7 @@ function IdentityStore (opts = {}) {
 // public
 //
 
-IdentityStore.prototype.createNewVault = function (password, entropy, cb) {
+IdentityStore.prototype.createNewVault = function (password, cb) {
   delete this._keyStore
   var serializedKeystore = this.configManager.getWallet()
 
@@ -53,7 +53,7 @@ IdentityStore.prototype.createNewVault = function (password, entropy, cb) {
   }
 
   this.purgeCache()
-  this._createVault(password, null, entropy, (err) => {
+  this._createVault(password, null, (err) => {
     if (err) return cb(err)
 
     this._autoFaucet()
@@ -77,7 +77,7 @@ IdentityStore.prototype.recoverSeed = function (cb) {
 IdentityStore.prototype.recoverFromSeed = function (password, seed, cb) {
   this.purgeCache()
 
-  this._createVault(password, seed, null, (err) => {
+  this._createVault(password, seed, (err) => {
     if (err) return cb(err)
 
     this._loadIdentities()
@@ -102,8 +102,7 @@ IdentityStore.prototype.getState = function () {
     isInitialized: !!configManager.getWallet() && !seedWords,
     isUnlocked: this._isUnlocked(),
     seedWords: seedWords,
-    isConfirmed: configManager.getConfirmed(),
-    isEthConfirmed: configManager.getShouldntShowWarning(),
+    isDisclaimerConfirmed: configManager.getConfirmedDisclaimer(),
     unconfTxs: configManager.unconfirmedTxs(),
     transactions: configManager.getTxList(),
     unconfMsgs: messageManager.unconfirmedMsgs(),
@@ -114,7 +113,6 @@ IdentityStore.prototype.getState = function () {
     conversionRate: configManager.getConversionRate(),
     conversionDate: configManager.getConversionDate(),
     gasMultiplier: configManager.getGasMultiplier(),
-
   }))
 }
 
@@ -245,7 +243,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
   ], didComplete)
 
   // perform static analyis on the target contract code
-  function analyzeForDelegateCall(cb){
+  function analyzeForDelegateCall (cb) {
     if (txParams.to) {
       query.getCode(txParams.to, (err, result) => {
         if (err) return cb(err.message || err)
@@ -258,9 +256,9 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
     }
   }
 
-  function estimateGas(cb){
+  function estimateGas (cb) {
     var estimationParams = extend(txParams)
-    query.getBlockByNumber('latest', true, function(err, block){
+    query.getBlockByNumber('latest', true, function (err, block) {
       if (err) return cb(err)
       // check if gasLimit is already specified
       const gasLimitSpecified = Boolean(txParams.gas)
@@ -269,7 +267,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
         estimationParams.gas = block.gasLimit
       }
       // run tx, see if it will OOG
-      query.estimateGas(estimationParams, function(err, estimatedGasHex){
+      query.estimateGas(estimationParams, function (err, estimatedGasHex) {
         if (err) return cb(err.message || err)
         // all gas used - must be an error
         if (estimatedGasHex === estimationParams.gas) {
@@ -466,7 +464,9 @@ IdentityStore.prototype._loadIdentities = function () {
   var addresses = this._getAddresses()
   addresses.forEach((address, i) => {
     // // add to ethStore
-    this._ethStore.addAccount(ethUtil.addHexPrefix(address))
+    if (this._ethStore) {
+      this._ethStore.addAccount(ethUtil.addHexPrefix(address))
+    }
     // add to identities
     const defaultLabel = 'Account ' + (i + 1)
     const nickname = configManager.nicknameForWallet(address)
@@ -523,7 +523,7 @@ IdentityStore.prototype.tryPassword = function (password, cb) {
   })
 }
 
-IdentityStore.prototype._createVault = function (password, seedPhrase, entropy, cb) {
+IdentityStore.prototype._createVault = function (password, seedPhrase, cb) {
   const opts = {
     password,
     hdPathString: this.hdPathString,