handle statefulness of popup widget data current to the tab user is on

src/js/contentscripts/socialwidgets.js

@@ -658,6 +658,7 @@ function replaceIndividualButton(widget) {
   // make an object for each widget type getting replaced, with option for multiple replacements of it on page
   replacedWidgetsForPopup.name = widget.name;
   replacedWidgetsForPopup.replacementUrls = [];
+  replacedWidgetsForPopup.tabUrl = window.location.href;
 
   elsToReplace.forEach(function (el) {
     createReplacementElement(widget, el, function (replacementEl) {

src/js/popup.js

@@ -229,7 +229,7 @@ function init() {
     $('#expand-firstparty-popup').show();
   }
 
-  // show replaced widgets section if there's more than zero replaced widgets on page
+  // show replaced widgets section if there are replaced widgets on page
   if (POPUP_DATA.enabled && Object.keys(POPUP_DATA.replacedWidgets).length) {
     $('#replaced-widgets-container').show();
     $('#expand-widgets-popup').show();

src/js/webrequest.js

@@ -35,7 +35,7 @@ let constants = require("constants"),
 /************ Local Variables *****************/
 let tempAllowlist = {},
   tempAllowedWidgets = {},
-  replacedWidgets = [];
+  replacedWidgets = {};
 
 /***************** Blocking Listener Functions **************/
 
@@ -1063,8 +1063,10 @@ function dispatcher(request, sender, sendResponse) {
   }
 
   case "sendReplacedWidgetsToPopup": {
-    // this new set of replaced widgets on a given page should completely replace what might already be on badger object
-    replacedWidgets = request.widgetReplacementDetails;
+    // replace whatever previously stored widget data is already locally stored here
+    if (request.widgetReplacementDetails.replacementUrls.length) {
+      replacedWidgets = request.widgetReplacementDetails;
+    }
     break;
   }
 
@@ -1091,6 +1093,13 @@ function dispatcher(request, sender, sendResponse) {
       }
     }
 
+    // wipe out stored replacedWidgets var if user is on a new page with no widgets replaced
+    if (Object.keys(replacedWidgets).length) {
+      if (!replacedWidgets.tabUrl.includes(tab_host)) {
+        replacedWidgets = {};
+      }
+    }
+
     sendResponse({
       cookieblocked,
       criticalError: badger.criticalError,