Merge branch 'master' into i#495CustomGasField

2 files changed, 13 insertions, 0 deletions

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 715efb42e..ecc9bc5f7 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -277,6 +277,17 @@ ConfigManager.prototype.getConfirmed = function () {
   return ('isConfirmed' in data) && data.isConfirmed
 }
 
+ConfigManager.prototype.setTOSHash = function (hash) {
+  var data = this.getData()
+  data.TOSHash = hash
+  this.setData(data)
+}
+
+ConfigManager.prototype.getTOSHash = function () {
+  var data = this.getData()
+  return ('TOSHash' in data) && data.TOSHash
+}
+
 ConfigManager.prototype.setCurrentFiat = function (currency) {
   var data = this.getData()
   data.fiatCurrency = currency
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 89c0c3abc..6837a1e8d 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -60,6 +60,8 @@ IdentityStore.prototype.createNewVault = function (password, entropy, cb) {
     this.configManager.setShowSeedWords(true)
     var seedWords = this._idmgmt.getSeed()
 
+    this._loadIdentities()
+
     cb(null, seedWords)
   })
 }