aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2016-08-11 02:03:10 +0800
committerGitHub <noreply@github.com>2016-08-11 02:03:10 +0800
commitc48b60d7a6f14d2d2348be8d9a63965ca1267433 (patch)
tree2d2429f25db1c1d42fc42bb921b8cd95db5c58e4 /app
parentffb48028a35e68bf53041cf34e75e7b9acf87aa2 (diff)
parentdb5779566b6b52753e8a1d8b9f7c666df5d22906 (diff)
downloadtangerine-wallet-browser-c48b60d7a6f14d2d2348be8d9a63965ca1267433.tar.gz
tangerine-wallet-browser-c48b60d7a6f14d2d2348be8d9a63965ca1267433.tar.zst
tangerine-wallet-browser-c48b60d7a6f14d2d2348be8d9a63965ca1267433.zip
Merge pull request #528 from MetaMask/checkout-fix
Fix ether warning checkbox to reflect proper behavior.
Diffstat (limited to 'app')
-rw-r--r--app/scripts/lib/config-manager.js8
-rw-r--r--app/scripts/metamask-controller.js2
2 files changed, 7 insertions, 3 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 dd43ac2fc..e7e96a472 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -243,7 +243,7 @@ module.exports = class MetamaskController {
agreeToEthWarning (cb) {
try {
- this.configManager.setShouldntShowWarning(true)
+ this.configManager.setShouldntShowWarning()
cb()
} catch (e) {
cb(e)