resolved conflicts

2 files changed, 22 insertions, 24 deletions

diff --git a/apps/extension/src/SideBar.tsx b/apps/extension/src/SideBar.tsx
index 9704511b..385c0f22 100644
--- a/apps/extension/src/SideBar.tsx
+++ b/apps/extension/src/SideBar.tsx
@@ -79,7 +79,7 @@ function SideBar({ jwt }: { jwt: string }) {
   const fetchSpaces = async () => {
     setLoading(true);
     chrome.runtime.sendMessage({ type: "fetchSpaces" }, (resp) => {
-      console.log(resp);
+      console.log("response", resp);
       setSpaces(resp);
       setLoading(false);
     });
diff --git a/apps/extension/src/background.ts b/apps/extension/src/background.ts
index ec71810b..d2f8759e 100644
--- a/apps/extension/src/background.ts
+++ b/apps/extension/src/background.ts
@@ -52,12 +52,13 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
     const spaces = request.spaces(
       // eslint-disable-next-line no-unexpected-multiline
       async () => {
-        chrome.storage.local.get(["jwt"], async ({ jwt }) => {
+        chrome.storage.local.get(["jwt"], ({ jwt }) => {
           if (!jwt) {
             console.error("No JWT found");
             return;
           }
-          await fetch(`${backendUrl}/api/spaces`, {
+          fetch(`${backendUrl}/api/store`, {
+            method: "POST",
             headers: {
               Authorization: `Bearer ${jwt}`,
             },
@@ -67,29 +68,26 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
       },
     )();
   } else if (request.type === "fetchSpaces") {
-    const run = () =>
-      chrome.storage.local.get(["jwt"], async ({ jwt }) => {
-        if (!jwt) {
-          console.error("No JWT found");
-          return;
-        }
-        const resp = await fetch(`${backendUrl}/api/spaces`, {
-          headers: {
-            Authorization: `Bearer ${jwt}`,
-          },
-        });
-
-        const data: {
-          message: "OK" | string;
-          data: Space[] | undefined;
-        } = await resp.json();
-
-        if (data.message === "OK" && data.data) {
-          sendResponse(data.data);
-        }
+    chrome.storage.local.get(["jwt"], async ({ jwt }) => {
+      if (!jwt) {
+        console.error("No JWT found");
+        return;
+      }
+      const resp = await fetch(`${backendUrl}/api/spaces`, {
+        headers: {
+          Authorization: `Bearer ${jwt}`,
+        },
       });
 
-    run();
+      const data: {
+        message: "OK" | string;
+        data: Space[] | undefined;
+      } = await resp.json();
+
+      if (data.message === "OK" && data.data) {
+        sendResponse(data.data);
+      }
+    });
 
     return true;
   } else if (request.type === "queryApi") {