fix(background): use default icon on non-http/https tabs (#549)

interledger · Sep 4, 2024 · a6da5ac · a6da5ac
1 parent e42ffbe
commit a6da5ac
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/background/services/background.ts b/src/background/services/background.ts
@@ -236,7 +236,7 @@ export class Background {
   private async updateVisualIndicatorsForCurrentTab() {
     const activeTab = await getCurrentActiveTab(this.browser);
     if (activeTab?.id) {
-      void this.tabEvents.updateVisualIndicators(activeTab.id);
+      void this.tabEvents.updateVisualIndicators(activeTab.id, activeTab.url);
     }
   }
 
@@ -251,8 +251,9 @@ export class Background {
       await this.updateVisualIndicatorsForCurrentTab();
     });
 
-    this.events.on('monetization.state_update', (tabId) => {
-      void this.tabEvents.updateVisualIndicators(tabId);
+    this.events.on('monetization.state_update', async (tabId) => {
+      const tab = await this.browser.tabs.get(tabId);
+      void this.tabEvents.updateVisualIndicators(tabId, tab?.url);
     });
 
     this.events.on('storage.balance_update', (balance) =>

diff --git a/src/background/services/tabEvents.ts b/src/background/services/tabEvents.ts
@@ -1,6 +1,7 @@
 import browser from 'webextension-polyfill';
 import type { Browser } from 'webextension-polyfill';
 import { isOkState, removeQueryParams } from '@/shared/helpers';
+import { ALLOWED_PROTOCOLS } from '@/shared/defines';
 import type { Storage, TabId } from '@/shared/types';
 import type { Cradle } from '@/background/container';
 
@@ -81,7 +82,7 @@ export class TabEvents {
       if (clearOverpaying) {
         this.tabState.clearOverpayingByTabId(tabId);
       }
-      void this.updateVisualIndicators(tabId);
+      void this.updateVisualIndicators(tabId, url);
     }
   };
 
@@ -91,23 +92,28 @@ export class TabEvents {
   };
 
   onActivatedTab: CallbackTab<'onActivated'> = async (info) => {
-    await this.updateVisualIndicators(info.tabId);
+    const tab = await this.browser.tabs.get(info.tabId);
+    await this.updateVisualIndicators(info.tabId, tab?.url);
   };
 
   onCreatedTab: CallbackTab<'onCreated'> = async (tab) => {
     if (!tab.id) return;
-    await this.updateVisualIndicators(tab.id);
+    await this.updateVisualIndicators(tab.id, tab.url);
   };
 
   updateVisualIndicators = async (
     tabId: TabId,
+    tabUrl?: string,
     isTabMonetized: boolean = tabId
       ? this.tabState.isTabMonetized(tabId)
       : false,
     hasTabAllSessionsInvalid: boolean = tabId
       ? this.tabState.tabHasAllSessionsInvalid(tabId)
       : false,
   ) => {
+    const canMonetizeTab = ALLOWED_PROTOCOLS.some((scheme) =>
+      tabUrl?.startsWith(scheme),
+    );
     const { enabled, connected, state } = await this.storage.get([
       'enabled',
       'connected',
@@ -117,6 +123,7 @@ export class TabEvents {
       enabled,
       connected,
       state,
+      canMonetizeTab,
       isTabMonetized,
       hasTabAllSessionsInvalid,
     });
@@ -140,18 +147,20 @@ export class TabEvents {
     enabled,
     connected,
     state,
+    canMonetizeTab,
     isTabMonetized,
     hasTabAllSessionsInvalid,
   }: {
     enabled: Storage['enabled'];
     connected: Storage['connected'];
     state: Storage['state'];
+    canMonetizeTab: boolean;
     isTabMonetized: boolean;
     hasTabAllSessionsInvalid: boolean;
   }) {
     let title = this.t('appName');
     let iconData = ICONS.default;
-    if (!connected) {
+    if (!connected || !canMonetizeTab) {
       // use defaults
     } else if (!isOkState(state) || hasTabAllSessionsInvalid) {
       iconData = enabled ? ICONS.enabled_warn : ICONS.disabled_warn;