Different fixes.

app/content-scripts/rewards/OfferCard.jsx

@@ -137,7 +137,6 @@ class OfferCard extends Component {
 	disableRewards() {
 		sendMessage('ping', 'rewards_off');
 		this.props.actions.sendSignal('rewards_off', null, false);
-		this.props.actions.messageBackground('rewardsDisabled');
 	}
 
 	disableRewardsNotification() {

app/content-scripts/rewards/index.jsx

@@ -211,7 +211,9 @@ class RewardsApp {
 	}
 
 	messageBackground(name, message) {
-		if (this.port) {
+		if (this.port &&
+			(message.actionId !== 'rewards_off') &&
+			(message.actionId !== 'rewards_on')) {
 			this.port.postMessage({
 				name,
 				message

src/background.js

@@ -69,6 +69,7 @@ const humanweb = cliqz.modules['human-web'];
 const { adblocker, antitracking, hpn } = cliqz.modules;
 const messageCenter = cliqz.modules['message-center'];
 const offers = cliqz.modules['offers-v2'];
+let OFFERS_ENABLE_SIGNAL;
 
 /**
  * Enable or disable specified module.
@@ -421,40 +422,49 @@ function handleBlockedRedirect(name, message, tab_id, callback) {
  * @param  {function} 	callback 	function to call (at most once) when you have a response
  */
 function handleRewards(name, message, tab_id, callback) {
-	switch (name) {
-		case 'rewardSignal':
-			rewards.sendSignal(message);
-			if (message.actionId === 'rewards_off') {
-				cliqz.modules['offers-v2'].background.actions.flushSignals();
+	if (!offers.isEnabled) {
+		switch (name) {
+			case 'rewardSignal':
+				if (message.actionId === 'rewards_on') {
+					OFFERS_ENABLE_SIGNAL = message;
+					conf.enable_offers = true;
+				}
+				break;
+			default:
+				break;
+		}
+	} else {
+		switch (name) {
+			case 'rewardSignal':
+				rewards.sendSignal(message);
+				if (message.actionId === 'rewards_off') {
+					conf.enable_offers = false;
+				}
+				break;
+			case 'rewardSeen':
+				rewards.markRewardRead(message.offerId);
+				button.update();
+				break;
+			case 'deleteReward':
+				rewards.markRewardRead(message.offerId);
+				rewards.deleteReward(message.offerId);
+				button.update();
+				break;
+			case 'rewardsDisabled':
 				conf.enable_offers = false;
-			} else if (message.actionId === 'rewards_on') {
-				cliqz.modules['offers-v2'].background.actions.flushSignals();
-				conf.enable_offers = true;
-			}
-			break;
-		case 'rewardSeen':
-			rewards.markRewardRead(message.offerId);
-			button.update();
-			break;
-		case 'deleteReward':
-			rewards.markRewardRead(message.offerId);
-			rewards.deleteReward(message.offerId);
-			button.update();
-			break;
-		case 'rewardsDisabled':
-			conf.enable_offers = false;
-			break;
-		case 'rewardsPromptAccepted':
-			conf.rewards_accepted = true;
-			break;
-		case 'ping':
-			metrics.ping(message);
-			break;
-		case 'removeDisconnectListener':
-			rewards.panelPort.onDisconnect.removeListener(rewards.panelHubClosedListener);
-			break;
-		default:
-			break;
+				break;
+			case 'rewardsPromptAccepted':
+				conf.rewards_accepted = true;
+				break;
+			case 'ping':
+				metrics.ping(message);
+				break;
+			case 'removeDisconnectListener':
+				rewards.panelPort.onDisconnect.removeListener(rewards.panelHubClosedListener);
+				break;
+			default:
+				break;
+		}
 	}
 }
 
@@ -859,6 +869,14 @@ function initializeDispatcher() {
 		button.update();
 		if (!IS_EDGE && !IS_CLIQZ) {
 			if (!enableOffers) {
+				const actions = cliqz &&
+				cliqz.modules['offers-v2'] &&
+				cliqz.modules['offers-v2'].background &&
+				cliqz.modules['offers-v2'].background.actions;
+				if (actions) {
+					actions.flushSignals();
+				}
+				OFFERS_ENABLE_SIGNAL = undefined;
 				registerWithOffers(offers, enableOffers);
 			}
 			setCliqzModuleEnabled(offers, enableOffers);
@@ -1072,7 +1090,19 @@ adblocker.on('enabled', () => {
 offers.on('enabled', () => {
 	offers.isReady().then(() => {
 		log('IN OFFERS ON ENABLED', offers, messageCenter);
+		if (OFFERS_ENABLE_SIGNAL) {
+			rewards.sendSignal(OFFERS_ENABLE_SIGNAL);
+
+			const actions = cliqz &&
+			cliqz.modules['offers-v2'] &&
+			cliqz.modules['offers-v2'].background &&
+			cliqz.modules['offers-v2'].background.actions;
+			if (actions) {
+				actions.flushSignals();
+			}
 
+			OFFERS_ENABLE_SIGNAL = undefined;
+		}
 		if (DEBUG) {
 			offers.action('setConfiguration', {
 				config_location: 'de',

yarn.lock

@@ -1708,9 +1708,9 @@ brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
-"browser-core@https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.27/7.27.9.tgz?v=1":
-  version "7.27.9"
-  resolved "https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.27/7.27.9.tgz?v=1#a4f30ba0ba96cd896aa4cdac4a97323001a4861b"
+"browser-core@https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.27/7.27.10.tgz?v=1":
+  version "7.27.10"
+  resolved "https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.27/7.27.10.tgz?v=1#901d3f582be9a6aa839106b7d403c7cff34bbb28"
   dependencies:
     "@cliqz-oss/dexie" "2.0.3"
     "@cliqz-oss/pouchdb" "6.3.4-security-error-fix-2"