aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-08-12 05:07:49 +0800
committerKevin Serrano <kevgagser@gmail.com>2016-08-12 05:07:49 +0800
commitad468c188080d5442487c0c8f53270541ad0f7b1 (patch)
treece36b4cda39feffcd40a71c71c6d8ab8d4d668ae /app
parent804e8df87f6ccd4cad62c659022c00791a3921e9 (diff)
parentc48b60d7a6f14d2d2348be8d9a63965ca1267433 (diff)
downloadtangerine-wallet-browser-ad468c188080d5442487c0c8f53270541ad0f7b1.tar.gz
tangerine-wallet-browser-ad468c188080d5442487c0c8f53270541ad0f7b1.tar.zst
tangerine-wallet-browser-ad468c188080d5442487c0c8f53270541ad0f7b1.zip
Merge branch 'master' into logging-fix
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 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)