Merge pull request #125 from HunnySajid/fix/action-icon

fix: add trycatch and persist actionIcon
WebOfTrust · Mar 6, 2024 · 44b570a · 44b570a
2 parents 6d2e770 + c8c5072
commit 44b570a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/src/pages/background/index.ts b/src/pages/background/index.ts
@@ -17,6 +17,17 @@ import {
 
 console.log("Background script loaded");
 
+chrome.runtime.onStartup.addListener(function () {
+  (async () => {
+    const vendorData = await configService.getData();
+    if(vendorData?.icon) {
+      setActionIcon(vendorData?.icon)
+    }
+  })()
+
+  return true;
+});
+
 chrome.runtime.onInstalled.addListener(function (object) {
   if (object.reason === chrome.runtime.OnInstalledReason.INSTALL) {
     console.log("Signify Browser Extension installed");
@@ -297,7 +308,7 @@ chrome.runtime.onMessage.addListener(function (
         const aidIssuee = indentifiers.aids.find((aid: IIdentifier) => {
           return aid.prefix === issueePrefix;
         });
-        credential.issueeName = aidIssuee.name;
+        credential.issueeName = aidIssuee?.name;
       });
 
       sendResponse({ data: { credentials: credentials ?? [] } });

diff --git a/src/pages/background/utils.ts b/src/pages/background/utils.ts
@@ -1,7 +1,10 @@
 export const senderIsPopup = (sender: chrome.runtime.MessageSender) => {
-  return ((sender.url?.startsWith('moz-extension://') || sender.url?.startsWith('chrome-extension://'))&& 
-    sender.url?.endsWith('/src/pages/popup/index.html') && 
-    sender.id === chrome.runtime.id);
+  return (
+    (sender.url?.startsWith("moz-extension://") ||
+      sender.url?.startsWith("chrome-extension://")) &&
+    sender.url?.endsWith("/src/pages/popup/index.html") &&
+    sender.id === chrome.runtime.id
+  );
 };
 
 export const isValidUrl = (str: string) => {
@@ -54,11 +57,13 @@ export const removeWhiteSpace = (s: string, replace = "") => {
 };
 
 export const setActionIcon = async (iconUrl: string) => {
-  const imageBlob = await fetch(iconUrl).then((r) => r.blob());
-  const bitmap = await createImageBitmap(imageBlob);
-  const canvas = new OffscreenCanvas(bitmap.width, bitmap.height);
-  const context = canvas.getContext("2d");
-  context?.drawImage(bitmap, 0, 0);
-  const imageData = context?.getImageData(0, 0, bitmap.width, bitmap.height);
-  chrome.action.setIcon({ imageData: imageData });
+  try {
+    const imageBlob = await fetch(iconUrl).then((r) => r.blob());
+    const bitmap = await createImageBitmap(imageBlob);
+    const canvas = new OffscreenCanvas(bitmap.width, bitmap.height);
+    const context = canvas.getContext("2d");
+    context?.drawImage(bitmap, 0, 0);
+    const imageData = context?.getImageData(0, 0, bitmap.width, bitmap.height);
+    chrome.action.setIcon({ imageData: imageData });
+  } catch (error) {}
 };