diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-06-17 08:34:44 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-06-17 08:34:44 +0800 |
commit | 451be3b10e4550d80cf11c73f38e879d13a15e3d (patch) | |
tree | fb1c1fb3099bd650a4a5501f9b3ced44e045596b /app/scripts/lib | |
parent | fe83a19c0847b8d4ca051bbd4d37e13d9d7bdd39 (diff) | |
parent | bdb113fabe9091b195d70f7f61246b6647b3b0a4 (diff) | |
download | tangerine-wallet-browser-451be3b10e4550d80cf11c73f38e879d13a15e3d.tar.gz tangerine-wallet-browser-451be3b10e4550d80cf11c73f38e879d13a15e3d.tar.zst tangerine-wallet-browser-451be3b10e4550d80cf11c73f38e879d13a15e3d.zip |
Merge branch 'master' into SignFullDataNotHash
Diffstat (limited to 'app/scripts/lib')
-rw-r--r-- | app/scripts/lib/config-manager.js | 11 | ||||
-rw-r--r-- | app/scripts/lib/idStore.js | 1 |
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(), |