Use chrome storage util

src/app/hooks/useChromeLocalStorage.ts

@@ -1,18 +1,19 @@
+import { chromeLocalStorage } from '@utils/chromeStorage';
 import { useEffect, useState } from 'react';
 
 export const useChromeLocalStorage = <T extends unknown>(key: string, defaultValue?: T) => {
   const [value, setValueState] = useState<T | undefined>(undefined);
 
   useEffect(() => {
     setValueState(undefined);
-    chrome.storage.local.get(key, (result) => {
-      const newValue = result[key] === undefined ? defaultValue : result[key];
+    chromeLocalStorage.getItem<T>(key).then((result) => {
+      const newValue = result === undefined ? defaultValue : result;
       setValueState(newValue);
     });
   }, [key]);
 
   const setValue = (newValue: T) => {
-    chrome.storage.local.set({ [key]: newValue });
+    chromeLocalStorage.setItem(key, newValue);
     setValueState(newValue);
   };
 

src/app/utils/chromeLocalStorage.ts

@@ -1,15 +1,13 @@
+import { chromeLocalStorage } from './chromeStorage';
+
 export const chromeLocalStorageKeys = {
   isPriorityWallet: 'isPriorityWallet',
 };
 
-export function getIsPriorityWallet(): Promise<boolean> {
-  return new Promise((resolve) => {
-    try {
-      chrome.storage.local.get(chromeLocalStorageKeys.isPriorityWallet, (result) => {
-        resolve(result[chromeLocalStorageKeys.isPriorityWallet]);
-      });
-    } catch (e) {
-      resolve(false);
-    }
-  });
+export async function getIsPriorityWallet(): Promise<boolean> {
+  const isPriorityWallet = await chromeLocalStorage.getItem<boolean>(
+    chromeLocalStorageKeys.isPriorityWallet,
+  );
+
+  return isPriorityWallet ?? true;
 }

src/app/utils/chromeStorage.ts

@@ -19,7 +19,7 @@ class ChromeStorage {
     return runtimeMap.get(this).lastError;
   }
 
-  setItem(key: string, item: any): Promise<any> {
+  setItem(key: string, item: any): Promise<true> {
     return new Promise((resolve, reject) => {
       this.getDriver().set({ [key]: item }, () => {
         if (this.hasError()) {
@@ -30,7 +30,7 @@ class ChromeStorage {
     });
   }
 
-  getItem<T = any>(key: string): Promise<T> {
+  getItem<T = any>(key: string): Promise<T | undefined> {
     return new Promise((resolve, reject) => {
       this.getDriver().get(key, (response: any) => {
         if (this.hasError()) {
@@ -41,7 +41,7 @@ class ChromeStorage {
     });
   }
 
-  removeItem(key: string): Promise<any> {
+  removeItem(key: string): Promise<true> {
     return new Promise((resolve, reject) => {
       this.getDriver().remove(key, () => {
         if (this.hasError()) {

src/content-scripts/content-script.ts

@@ -205,10 +205,18 @@ document.addEventListener(DomEventName.createRepeatInscriptionsRequest, ((
 }) as EventListener);
 
 // Inject in-page script (Stacks and Bitcoin Providers)
-getIsPriorityWallet().then((isPriorityWallet) => {
+const injectInPageScript = (isPriority) => {
   const inpage = document.createElement('script');
   inpage.src = chrome.runtime.getURL('inpage.js');
   inpage.id = 'xverse-wallet-provider';
-  inpage.setAttribute('data-is-priority', isPriorityWallet ? 'true' : '');
+  inpage.setAttribute('data-is-priority', isPriority ? 'true' : '');
   document.body.appendChild(inpage);
-});
+};
+
+getIsPriorityWallet()
+  .then((isPriorityWallet) => {
+    injectInPageScript(isPriorityWallet);
+  })
+  .catch(() => {
+    injectInPageScript(false);
+  });