From 458d8750b4b4a87336eaa68a02c1a9b3558f8535 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Mon, 12 Aug 2024 21:49:11 -0400
Subject: [PATCH] Updates

---
 extension/src/background/store/apiMiddleware.ts | 10 ++++++----
 extension/src/devpanel/devpanel.pug             |  4 ----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/extension/src/background/store/apiMiddleware.ts b/extension/src/background/store/apiMiddleware.ts
index 72e5a3f2..a8271f6f 100644
--- a/extension/src/background/store/apiMiddleware.ts
+++ b/extension/src/background/store/apiMiddleware.ts
@@ -249,7 +249,6 @@ const chunks: {
   >;
 } = {};
 let monitors = 0;
-let isMonitored = false;
 
 const getId = (sender: chrome.runtime.MessageSender, name?: string) =>
   sender.tab ? sender.tab.id! : name || sender.id!;
@@ -418,7 +417,6 @@ function toAllTabs(msg: TabMessage) {
 }
 
 function monitorInstances(shouldMonitor: boolean, id?: string) {
-  if (!id && isMonitored === shouldMonitor) return;
   const action = {
     type: shouldMonitor ? ('START' as const) : ('STOP' as const),
   };
@@ -427,7 +425,6 @@ function monitorInstances(shouldMonitor: boolean, id?: string) {
   } else {
     toAllTabs(action);
   }
-  isMonitored = shouldMonitor;
 }
 
 function getReducerError() {
@@ -594,7 +591,7 @@ function onConnect<S, A extends Action<string>>(port: chrome.runtime.Port) {
           chrome.action.enable(id);
           chrome.action.setIcon({ tabId: id, path: 'img/logo/38x38.png' });
         }
-        if (isMonitored) port.postMessage({ type: 'START' });
+        port.postMessage({ type: 'START' });
 
         const state = store.getState();
         if (state.instances.persisted) {
@@ -623,6 +620,11 @@ function onConnect<S, A extends Action<string>>(port: chrome.runtime.Port) {
     id = getId(port.sender!, port.name);
     connections.monitor[id] = port;
     monitorInstances(true);
+    listener = (msg: BackgroundAction | 'heartbeat') => {
+      if (msg === 'heartbeat') return;
+      store.dispatch(msg);
+    };
+    port.onMessage.addListener(listener);
     monitors++;
     port.onDisconnect.addListener(disconnect('monitor', id));
   } else {
diff --git a/extension/src/devpanel/devpanel.pug b/extension/src/devpanel/devpanel.pug
index a4e1a741..517f0622 100644
--- a/extension/src/devpanel/devpanel.pug
+++ b/extension/src/devpanel/devpanel.pug
@@ -5,10 +5,6 @@ html
     meta(charset='UTF-8')
   title Redux DevTools
   include ../style.pug
-  style.
-    body {
-      min-height: 100px;
-    }
 
   body
     #root