Merge pull request #224 from HunnySajid/fix/223

fix: could not establish connection error
WebOfTrust · Nov 13, 2024 · 1b8c663 · 1b8c663
2 parents 6ae062f + f6974d2
commit 1b8c663
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/components/main.tsx b/src/components/main.tsx
@@ -26,6 +26,7 @@ export function Main(props: IMain): JSX.Element {
   const [currentTabState, setCurrentTabState] = useState(TAB_STATE.NONE);
 
   const fetchTabState = async () => {
+   try {
     const tab = await getCurrentTab();
     const { data } = await sendMessageTab(tab.id!, {
       type: "tab",
@@ -51,6 +52,9 @@ export function Main(props: IMain): JSX.Element {
         setActiveSidebar(SIDEBAR[2]);
       }
     }
+   } catch (error) {
+    console.log("Error fetching tab state", error);
+   }
   };
 
   useEffect(() => {

diff --git a/src/pages/popup/Popup.tsx b/src/pages/popup/Popup.tsx
@@ -97,16 +97,20 @@ export default function Popup(): JSX.Element {
     });
     setIsConnected(!!data.isConnected);
     if (data.isConnected) {
-      const tab = await getCurrentTab();
-      const { data } = await sendMessageTab(tab.id!, {
-        type: "tab",
-        subtype: "get-tab-state",
-      });
-      sendMessageTab(tab.id!, {
-        type: "tab",
-        subtype: "reload-state",
-        eventType: data?.tabState,
-      });
+      try {
+        const tab = await getCurrentTab();
+        const { data } = await sendMessageTab(tab.id!, {
+          type: "tab",
+          subtype: "get-tab-state",
+        });
+        sendMessageTab(tab.id!, {
+          type: "tab",
+          subtype: "reload-state",
+          eventType: data?.tabState,
+        });
+      } catch (error) {
+        console.log("Error in popup from sendMessageTab", error);
+      }
     }
   };