reverting back

src/routes/crypto/[tickerID]/+layout.server.ts

@@ -24,7 +24,6 @@ const fetchData = async (apiURL, apiKey, endpoint, ticker) => {
 };
 
 const fetchWatchlist = async (fastifyURL, userId) => {
-  try {
   const postData = { userId: userId };
   const response = await fetch(fastifyURL + "/all-watchlists", {
     method: "POST",
@@ -36,10 +35,6 @@ const fetchWatchlist = async (fastifyURL, userId) => {
 
   const output = (await response.json())?.items;
   return output;
-  } catch (e) {
-    console.log(e);
-    return [];
-  }
 };
 
 /*

src/routes/crypto/[tickerID]/+layout.svelte

@@ -318,36 +318,32 @@ onMount(async () => {
 
 });
 
+afterUpdate( async () => {
  
-  afterUpdate(async () => {
+ if(previousTicker !== $cryptoTicker && typeof socket !== 'undefined')
-    if (previousTicker !== $cryptoTicker && typeof socket !== "undefined") {
+ {
    previousTicker = $cryptoTicker;
    //socket.send('close')
-      if (socket?.readyState === WebSocket?.OPEN) {
    socket?.close();
-      }
-      
    await new Promise((resolve, reject) => {
-        socket?.addEventListener("close", resolve);
+     socket?.addEventListener('close', resolve);
    });
   
-      if (socket?.readyState === WebSocket?.CLOSED) {
+   if(socket?.readyState === WebSocket?.CLOSED)
-        await websocketRealtimeData();
+   {
-        console.log("connecting again");
+     await websocketRealtimeData()
+     console.log('connecting again')
    }
+
  }
-  });
+
+});
 
 
-  onDestroy(() => {
+onDestroy(() => {
   try {
     //socket?.send('close')
-       if (socket && typeof socket !== "undefined") {
+    socket?.close()
-        if (socket.readyState === WebSocket.OPEN) {
-          socket?.close(); // Close the WebSocket connection
-        }
-        socket = null; // Ensure socket is set to null
-      }
   }
   catch(e) {
     console.log(e)
@@ -357,8 +353,10 @@ onMount(async () => {
   $currentPortfolioPrice = null;
   $currentPrice = null;
   $priceIncrease = null;
-    //$traded = false
+  $traded = false
-  });
+  
+});
+
 
     
     

src/routes/etf/[tickerID]/+layout.server.ts

@@ -31,7 +31,6 @@ const fetchData = async (apiURL, apiKey, endpoint, ticker) => {
 };
 
 const fetchFromFastify = async (fastifyURL, endpoint, userId) => {
-  try {
   const response = await fetch(`${fastifyURL}${endpoint}`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -39,10 +38,6 @@ const fetchFromFastify = async (fastifyURL, endpoint, userId) => {
   });
   const { items } = await response.json();
   return items;
-  } catch (e) {
-    console.log(e);
-    return [];
-  }
 };
 
 export const load = async ({ params, locals, setHeaders }) => {

src/routes/etf/[tickerID]/+layout.svelte

@@ -336,9 +336,7 @@ async function fetchPortfolio()
    {
      previousTicker = $etfTicker;
      //socket.send('close')
-      if (socket.readyState === WebSocket.OPEN) {
+     socket?.close();
-        socket?.close(); // Close the WebSocket connection
-      }
      await new Promise((resolve, reject) => {
        socket.addEventListener('close', resolve);
      });
@@ -357,12 +355,7 @@ async function fetchPortfolio()
   onDestroy(() => {
     try {
       //socket?.send('close')
-       if (socket && typeof socket !== "undefined") {
+      socket?.close()
-        if (socket.readyState === WebSocket.OPEN) {
-          socket?.close(); // Close the WebSocket connection
-        }
-        socket = null; // Ensure socket is set to null
-      }
     }
     catch(e) {
       console.log(e)

src/routes/stocks/[tickerID]/+layout.server.ts

@@ -31,7 +31,6 @@ const fetchData = async (apiURL, apiKey, endpoint, ticker) => {
 };
 
 const fetchFromFastify = async (fastifyURL, endpoint, userId) => {
-  try {
   const response = await fetch(`${fastifyURL}${endpoint}`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -39,10 +38,6 @@ const fetchFromFastify = async (fastifyURL, endpoint, userId) => {
   });
   const { items } = await response.json();
   return items;
-  } catch (e) {
-    console.log(e);
-    return [];
-  }
 };
 
 const fetchCommunitySentiment = async (pb, ticker, cookies) => {

src/routes/stocks/[tickerID]/+layout.svelte

@@ -237,10 +237,7 @@ async function fetchPortfolio()
     if (previousTicker !== $stockTicker && typeof socket !== "undefined") {
       previousTicker = $stockTicker;
       //socket.send('close')
-      if (socket?.readyState === WebSocket?.OPEN) {
       socket?.close();
-      }
-      
       await new Promise((resolve, reject) => {
         socket?.addEventListener("close", resolve);
       });
@@ -255,15 +252,9 @@ async function fetchPortfolio()
   onDestroy(() => {
     try {
       //socket?.send('close')
-       if (socket && typeof socket !== "undefined") {
+      socket?.close();
-        if (socket.readyState === WebSocket.OPEN) {
+    } catch (e) {
-          socket?.close(); // Close the WebSocket connection
+      console.log(e);
-        }
-        socket = null; // Ensure socket is set to null
-      }
-    }
-    catch(e) {
-      console.log(e)
     }
 
     //$displayCompanyName = '';