Minor fixes

Author: smalluban

extension-manifest-v2/package.json

@@ -51,7 +51,7 @@
     "foundation-sites": "^6.6.2",
     "ghostery-common": "^1.3.12",
     "history": "^4.10.1",
-    "hybrids": "^8.2.15",
+    "hybrids": "^8.2.16",
     "linkedom": "^0.14.21",
     "moment": "^2.29.1",
     "prop-types": "^15.6.2",

extension-manifest-v3/package.json

@@ -39,7 +39,7 @@
     "@ghostery/ui": "^1.0.0",
     "@github/relative-time-element": "^4.3.0",
     "@whotracksme/webextension-packages": "5.0.5",
-    "hybrids": "^8.2.15",
+    "hybrids": "^8.2.16",
     "idb": "^7.1.1",
     "jwt-decode": "^4.0.0",
     "tldts-experimental": "^6.0.19"

extension-manifest-v3/src/pages/panel/views/navigation.js

@@ -20,7 +20,7 @@ import assets from '/pages/settings/assets/index.js';
 const MENU = [
   {},
   {
-    icon: 'alert',
+    icon: 'report',
     label: msg`Report a broken page`,
     href: 'https://www.ghostery.com/support?utm_source=gbe',
   },
@@ -36,10 +36,34 @@ const MENU = [
   },
   {},
   {
-    icon: 'settings',
-    label: msg`Ghostery settings`,
-    href: chrome.runtime.getURL('/pages/settings/index.html'),
+    icon: 'shield-menu',
+    label: msg`Privacy protection`,
+    href: chrome.runtime.getURL(
+      '/pages/settings/index.html#@gh-settings-privacy',
+    ),
   },
+  {
+    icon: 'websites',
+    label: msg`Websites`,
+    href: chrome.runtime.getURL(
+      '/pages/settings/index.html#@gh-settings-websites',
+    ),
+  },
+  {
+    icon: 'block-m',
+    label: msg`Trackers`,
+    href: chrome.runtime.getURL(
+      '/pages/settings/index.html#@gh-settings-trackers',
+    ),
+  },
+  {
+    icon: 'wtm',
+    label: msg`WhoTracks.Me`,
+    href: chrome.runtime.getURL(
+      '/pages/settings/index.html#@gh-settings-whotracksme',
+    ),
+  },
+  {},
   {
     icon: 'info-menu',
     label: msg`About`,

extension-manifest-v3/src/pages/panel/views/protection-status.js

@@ -82,7 +82,7 @@ export default {
                   : msg`Our recommendation for this activity: Trusted`}
               </ui-text>
             </gh-panel-card>
-            <gh-panel-card layout="row gap items:center">
+            <gh-panel-card layout="row gap">
               <div layout="grow">
                 <ui-text type="label-m">
                   Add ${stats.domain} as exception
@@ -100,6 +100,7 @@ export default {
                       onchange="${toggleException('blocked')}"
                       type="status"
                       color="danger-500"
+                      layout="margin:top:0.5"
                     ></ui-toggle>
                   `
                 : html`
@@ -108,6 +109,7 @@ export default {
                       onchange="${toggleException('allowed')}"
                       type="status"
                       color="success-500"
+                      layout="margin:top:0.5"
                     ></ui-toggle>
                   `}
             </gh-panel-card>

extension-manifest-v3/src/pages/settings/settings.js

@@ -41,7 +41,7 @@ export default {
           class="${{ active: router.active(Websites) }}"
           slot="nav"
         >
-          <ui-icon name="settings" color="nav" layout="size:3"></ui-icon>
+          <ui-icon name="websites" color="nav" layout="size:3"></ui-icon>
           Websites
         </a>
         <a

extension-manifest-v3/src/utils/tabs.js

@@ -9,9 +9,23 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0
  */
 
-export function openTabWithUrl(host, event) {
+export async function openTabWithUrl(host, event) {
   const { href } = event.currentTarget;
 
   event.preventDefault();
+
+  try {
+    const tabs = await chrome.tabs.query({ url: href.split('#')[0] });
+
+    if (tabs.length) {
+      await chrome.tabs.update(tabs[0].id, { active: true, url: href });
+      globalThis.close();
+
+      return;
+    }
+  } catch (e) {
+    console.error('Error while try to find existing tab:', e);
+  }
+
   chrome.tabs.create({ url: href });
 }

package-lock.json

@@ -21,6 +21,6 @@
     "test": "npm run lint"
   },
   "dependencies": {
-    "hybrids": "^8.2.15"
+    "hybrids": "^8.2.16"
   }
 }