diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-08-12 05:07:49 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-08-12 05:07:49 +0800 |
| commit | ad468c188080d5442487c0c8f53270541ad0f7b1 (patch) | |
| tree | ce36b4cda39feffcd40a71c71c6d8ab8d4d668ae | |
| parent | 804e8df87f6ccd4cad62c659022c00791a3921e9 (diff) | |
| parent | c48b60d7a6f14d2d2348be8d9a63965ca1267433 (diff) | |
| download | tangerine-wallet-browser-ad468c188080d5442487c0c8f53270541ad0f7b1.tar.gz tangerine-wallet-browser-ad468c188080d5442487c0c8f53270541ad0f7b1.tar.zst tangerine-wallet-browser-ad468c188080d5442487c0c8f53270541ad0f7b1.zip | |
Merge branch 'master' into logging-fix
| -rw-r--r-- | app/scripts/lib/config-manager.js | 8 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 2 | ||||
| -rw-r--r-- | ui/app/reducers/metamask.js | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index 727cd46fc..3d84edfd0 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -274,9 +274,13 @@ ConfigManager.prototype.getConfirmed = function () { return ('isConfirmed' in data) && data.isConfirmed } -ConfigManager.prototype.setShouldntShowWarning = function (confirmed) { +ConfigManager.prototype.setShouldntShowWarning = function () { var data = this.getData() - data.isEthConfirmed = confirmed + if (data.isEthConfirmed) { + data.isEthConfirmed = !data.isEthConfirmed + } else { + data.isEthConfirmed = true + } this.setData(data) } diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index a5c167223..ac0f32117 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -246,7 +246,7 @@ module.exports = class MetamaskController { agreeToEthWarning (cb) { try { - this.configManager.setShouldntShowWarning(true) + this.configManager.setShouldntShowWarning() cb() } catch (e) { cb(e) diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 8d4520fb1..4eef20f56 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -10,6 +10,7 @@ function reduceMetamask (state, action) { var metamaskState = extend({ isInitialized: false, isUnlocked: false, + isEthConfirmed: false, currentDomain: 'example.com', rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, @@ -33,7 +34,7 @@ function reduceMetamask (state, action) { case actions.AGREE_TO_ETH_WARNING: return extend(metamaskState, { - isEthConfirmed: true, + isEthConfirmed: !metamaskState.isEthConfirmed, }) case actions.UNLOCK_METAMASK: |