diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/images/.DS_Store | bin | 6148 -> 6148 bytes | |||
| -rw-r--r-- | app/images/icon-128.png | bin | 6535 -> 5770 bytes | |||
| -rw-r--r-- | app/images/icon-16.png | bin | 778 -> 564 bytes | |||
| -rw-r--r-- | app/images/icon-19.png | bin | 751 -> 662 bytes | |||
| -rw-r--r-- | app/images/icon-38.png | bin | 1668 -> 1450 bytes | |||
| -rw-r--r-- | app/scripts/background.js | 10 | ||||
| -rw-r--r-- | app/scripts/lib/config-manager.js | 11 | ||||
| -rw-r--r-- | app/scripts/lib/idStore.js | 1 |
8 files changed, 22 insertions, 0 deletions
diff --git a/app/images/.DS_Store b/app/images/.DS_Store Binary files differindex 5008ddfcf..d28ef2089 100644 --- a/app/images/.DS_Store +++ b/app/images/.DS_Store diff --git a/app/images/icon-128.png b/app/images/icon-128.png Binary files differindex 730a8f688..ae687147d 100644 --- a/app/images/icon-128.png +++ b/app/images/icon-128.png diff --git a/app/images/icon-16.png b/app/images/icon-16.png Binary files differindex 63bd8e0fc..ba7529073 100644 --- a/app/images/icon-16.png +++ b/app/images/icon-16.png diff --git a/app/images/icon-19.png b/app/images/icon-19.png Binary files differindex b149ba77a..07ac2f33f 100644 --- a/app/images/icon-19.png +++ b/app/images/icon-19.png diff --git a/app/images/icon-38.png b/app/images/icon-38.png Binary files differindex 974501640..83c04800d 100644 --- a/app/images/icon-38.png +++ b/app/images/icon-38.png diff --git a/app/scripts/background.js b/app/scripts/background.js index f64209ecc..1098efe87 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -188,6 +188,7 @@ function setupControllerConnection(stream){ setRpcTarget: setRpcTarget, setProviderType: setProviderType, useEtherscanProvider: useEtherscanProvider, + agreeToDisclaimer: agreeToDisclaimer, // forward directly to idStore createNewVault: idStore.createNewVault.bind(idStore), recoverFromSeed: idStore.recoverFromSeed.bind(idStore), @@ -295,6 +296,15 @@ function addUnconfirmedMsg(msgParams, cb){ // config // +function agreeToDisclaimer(cb) { + try { + configManager.setConfirmed(true) + cb() + } catch (e) { + cb(e) + } +} + // called from popup function setRpcTarget(rpcTarget){ configManager.setRpcTarget(rpcTarget) 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(), |
