flushSignal action added - updated browser-core dep

app/content-scripts/rewards/OfferCard.jsx

@@ -155,9 +155,8 @@ class OfferCard extends Component {
 	}
 
 	disableRewards() {
-		this.sendSignal('rewards_off', null, false);
 		sendMessage('ping', 'rewards_off');
-		this.messageBackground('rewardsDisabled');
+		this.sendSignal('rewards_off', null, false);
 	}
 
 	disableRewardsNotification() {

app/panel/reducers/rewards.js

@@ -41,7 +41,6 @@ export default (state = initialState, action) => {
 		}
 		case TOGGLE_OFFERS_ENABLED: {
 			const enable_offers = action.data.enabled;
-			sendMessage('setPanelData', { enable_offers });
 			return Object.assign({}, state, { enable_offers });
 		}
 

src/background.js

@@ -424,6 +424,13 @@ 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();
+				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);

src/classes/EventHandlers.js

@@ -158,7 +158,7 @@ class EventHandlers {
 			// we look for a cliqz offer which does not have urls specified (meaning good for any site)
 			// All Cliqz offers have Dismiss === 1, so the found one is injected and removed.
 			// Lastly we look for non-cliqz offers (classic CMPs)
-			if (!rewards.currentOffer && cmp.CMP_DATA.length !== 0) {
+			if (cmp.CMP_DATA.length !== 0) {
 				const CMPS = cmp.CMP_DATA;
 				const numOffers = CMPS.length;
 				let cliqzOffer;