Trigger metrics broken page watcher on individual tracker site specif…

…ic or global unblock as well as on site-specific allow

app/panel/reducers/blocking.js

@@ -144,6 +144,7 @@ const _updateTrackerTrustRestrict = (state, action) => {
 	sendMessage('setPanelData', {
 		site_specific_unblocks: updated_site_specific_unblocks,
 		site_specific_blocks: updated_site_specific_blocks,
+		brokenPageMetricsTrackerTrustOrUnblock: msg.trust || (!msg.trust && !msg.restrict),
 	});
 
 	return {

app/panel/utils/blocking.js

@@ -214,7 +214,10 @@ export function updateTrackerBlocked(state, action) {
 	});
 
 	// persist to background
-	sendMessage('setPanelData', { selected_app_ids: updated_app_ids });
+	sendMessage('setPanelData', {
+		selected_app_ids: updated_app_ids,
+		brokenPageMetricsTrackerTrustOrUnblock: !blocked
+	});
 
 	return {
 		categories: updated_categories,

src/background.js

@@ -1096,10 +1096,6 @@ function initializeDispatcher() {
 		// can't simply compare num_selected and size(db.apps) since apps get removed sometimes
 		db.allSelected = (!!num_selected && every(db.apps, (app, app_id) => appIds.hasOwnProperty(app_id)));
 	});
-	dispatcher.on('conf.save.site_specific_unblocks', () => {
-		// if user has unblock a tracker on this page, suspect a broken page
-		metrics.handleBrokenPageTrigger(globals.BROKEN_PAGE_LOCAL_TRACKER_UNBLOCK);
-	})
 	dispatcher.on('conf.save.site_whitelist', () => {
 		// TODO debounce with below
 		button.update();

src/classes/Globals.js

@@ -74,7 +74,7 @@ class Globals {
 		this.BROKEN_PAGE_REFRESH = 1;
 		this.BROKEN_PAGE_WHITELIST = 2;
 		this.BROKEN_PAGE_PAUSE = 3;
-		this.BROKEN_PAGE_LOCAL_TRACKER_UNBLOCK = 4;
+		this.BROKEN_PAGE_TRACKER_TRUST_OR_UNBLOCK = 4;
 		this.BROKEN_PAGE_NEW_TAB = 86;
 
 		// data stores

src/classes/PanelData.js

@@ -21,6 +21,7 @@ import conf from './Conf';
 import foundBugs from './FoundBugs';
 import bugDb from './BugDb';
 import globals from './Globals';
+import metrics from './Metrics';
 import Policy from './Policy';
 import tabInfo from './TabInfo';
 import rewards from './Rewards';
@@ -643,6 +644,10 @@ class PanelData {
 			tabInfo.setTabInfo(this._activeTab.id, 'needsReload', data.needsReload);
 		}
 
+		if (data.brokenPageMetricsTrackerTrustOrUnblock) {
+			metrics.handleBrokenPageTrigger(globals.BROKEN_PAGE_TRACKER_TRUST_OR_UNBLOCK);
+		}
+
 		if (syncSetDataChanged) {
 			// Push conf changes to the server
 			account.saveUserSettings().catch(err => log('PanelData saveUserSettings', err));