Use the same method to get activeTab consistently

Author: ruihildt

Diff for: src/helpers/proxyBadge.ts

@@ -3,10 +3,10 @@ import { ProxyDetails } from '@/helpers/socksProxy.types';
 import { checkDomain } from './domain';
 
 export const updateCurrentTabProxyBadge = async () => {
-  const activeTab = await browser.tabs.query({ active: true, currentWindow: true });
+  const [activeTab] = await browser.tabs.query({ active: true, currentWindow: true });
 
-  if (activeTab[0]) {
-    await updateTabProxyBadge(activeTab[0], await getActiveProxyDetails());
+  if (activeTab) {
+    await updateTabProxyBadge(activeTab, await getActiveProxyDetails());
   }
 };
 

Diff for: src/helpers/socksProxy.ts

@@ -13,16 +13,18 @@ const getGlobalProxyDetails = async (): Promise<ProxyDetails> => {
 };
 
 export const getActiveTabDetails = async () => {
-  const activeWindow = await browser.windows.getCurrent({ populate: true });
-  const activeTab = activeWindow.tabs!.find((tab) => tab.active);
-  const activeTabURL = new URL(activeTab!.url!);
-
-  return activeTabURL
-    ? {
-        host: activeTabURL.hostname,
-        protocol: activeTabURL.protocol,
-      }
-    : { host: '', protocol: '' };
+  const [activeTab] = await browser.tabs.query({ active: true, currentWindow: true });
+
+  // activeTab will be null if tabs permission has not been granted
+  if (!activeTab?.url) {
+    return { host: '', protocol: '' };
+  }
+
+  const activeTabURL = new URL(activeTab.url);
+  return {
+    host: activeTabURL.hostname,
+    protocol: activeTabURL.protocol,
+  };
 };
 
 export const getActiveProxyDetails = async () => {
@@ -31,8 +33,8 @@ export const getActiveProxyDetails = async () => {
 
   if (hostProxiesDetails) {
     const hostProxiesDetailsParsed = JSON.parse(hostProxiesDetails);
-    const activeTab = await browser.tabs.query({ active: true, currentWindow: true });
-    const tabHost = new URL(activeTab[0].url!).hostname;
+    const [activeTab] = await browser.tabs.query({ active: true, currentWindow: true });
+    const tabHost = new URL(activeTab.url!).hostname;
     const { domain } = checkDomain(tabHost);
 
     // Check subdomain proxy first