From 8602c1b19e3bea9cdebcd4ef4c3aafd797fff036 Mon Sep 17 00:00:00 2001
From: Serge Zarembsky <serge@ghostery.com>
Date: Wed, 27 Jun 2018 12:49:07 -0400
Subject: [PATCH 1/3] Deleting offer_enabled value.

---
 src/classes/ConfData.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/classes/ConfData.js b/src/classes/ConfData.js
index 11760751f..2bbaf56bc 100644
--- a/src/classes/ConfData.js
+++ b/src/classes/ConfData.js
@@ -92,6 +92,10 @@ class ConfData {
 				_initProperty('trackers_banner_status', true);
 			}
 
+			//Disregard original offers value, so that default value is assigned.
+			//REMOVE THIS IS THE NEXT VERSION
+			delete data.enable_offers;
+
 			// simple props
 			_initProperty('alert_bubble_pos', 'br');
 			_initProperty('alert_bubble_timeout', 15);

From 54f19b3c4296da3bf9bfced6cf44fdabd35095c1 Mon Sep 17 00:00:00 2001
From: Serge Zarembsky <serge@ghostery.com>
Date: Wed, 27 Jun 2018 14:07:25 -0400
Subject: [PATCH 2/3] Fix for Setup checkbox.

---
 src/background.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/background.js b/src/background.js
index 97f1912d0..5e413be48 100644
--- a/src/background.js
+++ b/src/background.js
@@ -612,7 +612,10 @@ function onMessageHandler(request, sender, callback) {
 	if (name === 'disableShowAlert') {
 		conf.show_alert = false;
 	} else if (name === 'updateDataCollection') {
-		if (!IS_CLIQZ && !IS_EDGE) conf.enable_human_web = message && true;
+		if (!IS_CLIQZ && !IS_EDGE) {
+			conf.enable_human_web = message && true;
+			conf.enable_offers = message && true;
+		}
 		conf.enable_metrics = message && true;
 	} else if (name === 'updateDisplayMode') {
 		conf.is_expert = message;

From 1db187fe203964f02680f6887a0871c1a668d879 Mon Sep 17 00:00:00 2001
From: Serge Zarembsky <serge@ghostery.com>
Date: Wed, 27 Jun 2018 15:24:02 -0400
Subject: [PATCH 3/3] Extra fix for enabling offers on upgrade.

---
 src/background.js       | 8 +++-----
 src/classes/ConfData.js | 4 ++--
 src/classes/Rewards.js  | 3 ---
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/background.js b/src/background.js
index 5e413be48..d1e32fed4 100644
--- a/src/background.js
+++ b/src/background.js
@@ -450,9 +450,6 @@ function handleRewards(name, message, tab_id, callback) {
 				rewards.deleteReward(message.offerId);
 				button.update();
 				break;
-			case 'rewardsDisabled':
-				conf.enable_offers = false;
-				break;
 			case 'rewardsPromptAccepted':
 				conf.rewards_accepted = true;
 				break;
@@ -1436,13 +1433,14 @@ function initializeGhosteryModules() {
 			if (globals.JUST_UPGRADED_FROM_7) {
 				conf.enable_ad_block = false;
 				conf.enable_anti_tracking = false;
-				conf.enable_offers = false;
+				conf.enable_offers = !((IS_EDGE || IS_CLIQZ));
 				conf.enable_human_web = (IS_EDGE || IS_CLIQZ) ? false : conf.enable_human_web;
 			} else {
 				conf.enable_ad_block = IS_CLIQZ ? false : !adblocker.isDisabled;
 				conf.enable_anti_tracking = IS_CLIQZ ? false : !antitracking.isDisabled;
 				conf.enable_human_web = (IS_EDGE || IS_CLIQZ) ? false : !humanweb.isDisabled;
-				conf.enable_offers = (IS_EDGE || IS_CLIQZ) ? false : !offers.isDisabled;
+				// This code forces enable_offers to true on upgrade. Remove in the next version of Ghostery!
+				conf.enable_offers = (IS_EDGE || IS_CLIQZ) ? false : globals.JUST_UPGRADED ? true : !offers.isDisabled;
 			}
 		})).catch((e) => {
 		log('cliqzStartup error', e);
diff --git a/src/classes/ConfData.js b/src/classes/ConfData.js
index 2bbaf56bc..631133c8d 100644
--- a/src/classes/ConfData.js
+++ b/src/classes/ConfData.js
@@ -92,8 +92,8 @@ class ConfData {
 				_initProperty('trackers_banner_status', true);
 			}
 
-			//Disregard original offers value, so that default value is assigned.
-			//REMOVE THIS IS THE NEXT VERSION
+			// Disregard original offers value, so that default value is assigned.
+			// REMOVE THIS IS THE NEXT VERSION
 			delete data.enable_offers;
 
 			// simple props
diff --git a/src/classes/Rewards.js b/src/classes/Rewards.js
index 9cbdcd3c8..6fbb5a5b2 100644
--- a/src/classes/Rewards.js
+++ b/src/classes/Rewards.js
@@ -125,9 +125,6 @@ class Rewards {
 									case 'rewardSignal':
 										this.sendSignal(message.message);
 										break;
-									case 'rewardsDisabled':
-										conf.enable_offers = false;
-										break;
 									case 'rewardsPromptAccepted':
 										// @TODO set conf disabled
 										conf.rewards_accepted = true;