Merge branch 'master' into SignFullDataNotHash

2 files changed, 12 insertions, 0 deletions

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index f5e1cf38d..24571748f 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -270,6 +270,17 @@ ConfigManager.prototype._emitUpdates = function(state){
   })
 }
 
+ConfigManager.prototype.setConfirmed = function(confirmed) {
+  var data = this.getData()
+  data.isConfirmed = confirmed
+  this.setData(data)
+}
+
+ConfigManager.prototype.getConfirmed = function() {
+  var data = this.getData()
+  return ('isConfirmed' in data) && data.isConfirmed
+}
+
 
 function loadData() {
 
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 68a38bc0b..61b9a4455 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -93,6 +93,7 @@ IdentityStore.prototype.getState = function(){
     isInitialized: !!configManager.getWallet() && !seedWords,
     isUnlocked: this._isUnlocked(),
     seedWords: seedWords,
+    isConfirmed: configManager.getConfirmed(),
     unconfTxs: configManager.unconfirmedTxs(),
     transactions: configManager.getTxList(),
     unconfMsgs: messageManager.unconfirmedMsgs(),