EX-9657: Ghostery custom UI for rewards

CHANGELOG.md

@@ -1,6 +1,8 @@
 ### GHOSTERY 8.5.0 ()
 
-+ Fixes bug in site-specific tracker white-listing (Fixes #519)
++ Fixes bug in site-specific tracker white-listing (#522, Fixes #519)
++ Standardize all Ghostery staging and production global URLs (#511)
++ Updated Rewards UI (#521)
 + Update legacy unit tests (#526)
 
 ### GHOSTERY 8.4.9 (April 9, 2019)

_locales/en/messages.json

@@ -2063,9 +2063,6 @@
 	"myoffrz_turnoff_rewards": {
 		"message": "Turn off Ghostery Rewards"
 	},
-	"OFFERS_ALREADY_TRANSLATED": {
-		"message": ""
-	},
 	"myoffrz_help": {
 		"message": "Help"
 	},
@@ -2144,6 +2141,18 @@
 			}
 		}
 	},
+	"myoffrz_check_conditions": {
+		"message": "Check the following conditions"
+	},
+	"myoffrz_redeem_code": {
+		"message": "Redeem code"
+	},
+	"myoffrz_voucher_found": {
+		"message": "Voucher found"
+	},
+	"myoffrz_redeeming_voucher": {
+		"message": "Redeeming voucher"
+	},
 	"OFFERS_ENDS": {
 		"message": ""
 	},
@@ -2338,34 +2347,34 @@
 	"settings": {
 		"message": "Settings"
 	},
-  	"try_ghostery_midnight": {
-	  "message": "Try Ghostery Midnight"
+	"try_ghostery_midnight": {
+		"message": "Try Ghostery Midnight"
 	},
-  	"seven_day_free_trial": {
-	  "message": "7 Day Free Trial ($14/mo)"
+	"seven_day_free_trial": {
+		"message": "7 Day Free Trial ($14/mo)"
 	},
-  	"full_coverage_protection_promise": {
-	  "message": "Get full-coverage protection across all browsers & apps on your device"
+	"full_coverage_protection_promise": {
+		"message": "Get full-coverage protection across all browsers & apps on your device"
 	},
-  	"system_wide_tracker_and_ad_blocking": {
-	  "message": "System-wide tracker & ad-blocking"
+	"system_wide_tracker_and_ad_blocking": {
+		"message": "System-wide tracker & ad-blocking"
 	},
-  	"built_in_vpn": {
-	  "message": "Built-in VPN"
+	"built_in_vpn": {
+		"message": "Built-in VPN"
 	},
-  	"custom_whitelist_options": {
-	  "message": "Custom whitelist options"
+	"custom_whitelist_options": {
+		"message": "Custom whitelist options"
 	},
-  	"historical_tracking_insights": {
-	  "message": "Historical tracking insights"
+	"historical_tracking_insights": {
+		"message": "Historical tracking insights"
 	},
-  	"download_for_free": {
-	  "message": "Download for free"
+	"download_for_free": {
+		"message": "Download for free"
 	},
-  	"support_ghostery_for_2_instead": {
-	  "message": "Support Ghostery for $2/mo instead"
+	"support_ghostery_for_2_instead": {
+		"message": "Support Ghostery for $2/mo instead"
 	},
-  	"no_thanks_continue_with_basic": {
-	  "message": "No thanks, continue with basic"
+	"no_thanks_continue_with_basic": {
+		"message": "No thanks, continue with basic"
 	}
 }

app/panel/components/Rewards.jsx

@@ -95,7 +95,7 @@ class Rewards extends React.Component {
 	sendToIframe(message) {
 		if (!this.iframe.current) { return; }
 		this.iframe.current.contentWindow.postMessage(JSON.stringify({
-			target: 'cliqz-offers-cc',
+			target: 'cliqz-offers-templates',
 			origin: 'window',
 			message,
 		}), '*');
@@ -130,7 +130,7 @@ class Rewards extends React.Component {
 			return;
 		}
 
-		if (target !== 'cliqz-offers-cc') { return; }
+		if (target !== 'cliqz-offers-templates') { return; }
 		if (message.action === 'resize') {
 			this.iframeResize(message.data);
 		} else {
@@ -263,7 +263,7 @@ class Rewards extends React.Component {
 		} = this.state;
 		if (shouldHideRewards) { return this.renderRewardsNoneFoundText(); }
 
-		const src = chrome.runtime.getURL('cliqz/offers-cc/index.html?cross-origin');
+		const src = chrome.runtime.getURL('cliqz/offers-templates/control-center.html?cross-origin');
 		const text = t(`panel_rewards_view__reward${rewardsCount === 1 ? '' : 's'}`);
 		return (
 			<>

manifest.json

@@ -101,8 +101,8 @@
 	"web_accessible_resources": [
 		"app/images/*",
 		"dist/css/rewards_styles.css",
-		"cliqz/offers-cc/index.html",
-		"cliqz/offers-reminder/index.html",
-		"cliqz/popup-notification/images/*"
+		"cliqz/offers-templates/reminder.html",
+		"cliqz/offers-templates/checkout.html",
+		"cliqz/offers-templates/control-center.html"
 	]
 }

package.json

@@ -45,7 +45,7 @@
   "dependencies": {
     "@cliqz/adblocker-circumvention": "^1.12.2",
     "@cliqz/url-parser": "^1.1.3",
-    "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.43.7/browser-core-7.43.7.tgz",
+    "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/7.45.0/browser-core-7.45.0.tgz",
     "classnames": "^2.2.5",
     "d3": "^5.15.1",
     "foundation-sites": "^6.6.2",