hub closed signal on disconnect

app/panel/components/Rewards.jsx

@@ -15,7 +15,7 @@ import React, { Component } from 'react';
 import ClassNames from 'classnames';
 import { Link, Route } from 'react-router-dom';
 import { ToggleSlider, RewardListItem, RewardDetail } from './BuildingBlocks';
-import { sendMessage } from '../utils/msg';
+import { sendMessage, sendRewardMessage } from '../utils/msg';
 import globals from '../../../src/classes/Globals';
 
 const IS_EDGE = (globals.BROWSER_INFO.name === 'edge');
@@ -84,7 +84,9 @@ class Rewards extends React.Component {
 	 * Lifecycle event
 	 */
 	componentWillUnmount() {
+		/* @TODO send message to background to remove port onDisconnect event */
 		this.props.actions.sendSignal('hub_closed');
+		sendRewardMessage('removeDisconnectListener');
 	}
 
 	/**

src/background.js

@@ -443,6 +443,9 @@ function handleRewards(name, message, tab_id, callback) {
 		case 'ping':
 			metrics.ping(message);
 			break;
+		case 'removeDisconnectListener':
+			rewards.panelPort.onDisconnect.removeListener(rewards.panelHubClosedListener);
+			break;
 		default:
 			break;
 	}
@@ -1272,7 +1275,7 @@ function initializeEventListeners() {
 	chrome.runtime.onConnect.addListener((port) => {
 		if (port && port.name === 'rewardsPanelPort') {
 			rewards.panelPort = port;
-			rewards.panelHubClosedListener();
+			rewards.panelPort.onDisconnect.addListener(rewards.panelHubClosedListener);
 		}
 	});
 }

src/classes/Rewards.js

@@ -36,6 +36,7 @@ class Rewards {
 		this.panelPort = null;
 		this.ports = new Map();
 		this.channelsSupported = (typeof chrome.runtime.onConnect === 'object');
+		this.panelHubClosedListener = this.panelHubClosedListener.bind(this);
 	}
 
 	deleteReward(offerId) {
@@ -152,13 +153,11 @@ class Rewards {
 	}
 
 	panelHubClosedListener() {
-		this.panelPort.onDisconnect.addListener(() => {
-			this.sendSignal({
-				offerId: null,
-				actionId: 'hub_closed',
-				origin: 'ghostery-rewards-hub',
-				type: 'action-signal'
-			});
+		this.sendSignal({
+			offerId: null,
+			actionId: 'hub_closed',
+			origin: 'rewards-hub',
+			type: 'action-signal'
 		});
 	}
 }