l-min-components 1.0.660 → 1.0.664

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "l-min-components",
-  "version": "1.0.660",
+  "version": "1.0.664",
   "type": "module",
   "files": [
     "src/assets",

package/src/components/header/index.jsx

@@ -267,60 +267,43 @@ const HeaderComponent = (props) => {
   const generalSocket = useRef()
   const token = getCookie("access");
   const account_id = generalData?.defaultAccount?.id || "";
- 
-  useEffect(() => {
-    if(!socket?.current){
-      socket.current = new WebSocket(
-        `wss://${socketUrl}?account=${account_id}&authorization=${token}`
-      )
-
-      socket.current.onopen = () => {
-        console.log("websocket connection established");
-      };
-      socket.current.onmessage = (event) => {
-        const response = JSON?.parse(event?.data);
-        console.log(response)
-        if(response?.data){
-          handleGetUnreadNotification();
-        }
-        
-      };
 
-    }
+  // websocket for all notification account
+  const websocket = new WebSocket(
+    `wss://${socketUrl}?account=${account_id}&authorization=${token}`
+  );
 
-    return () => {
-      console.log("websocket closed");
+  useEffect(() => {
+    websocket.onopen = () => {
+      //check if socket is connected
+      console.log("websocket connection established");
     };
-   
-  }, [socket]);
 
+    websocket.onmessage = (event) => {
+      const data = JSON.parse(event.data);
+      console.log("websocket data", data);
+    };
 
-  // websocket for all notification account
-  useEffect(() => {
-    if(!generalSocket?.current){
-      generalSocket.current = new WebSocket(
-        `wss://${socketUrl}?authorization=${token}`
-      )
-
-      generalSocket.current.onopen = () => {
-        console.log("General websocket connection established");
-      };
-      generalSocket.current.onmessage = (event) => {
-        const response = JSON?.parse(event?.data);
-        console.log(response)
-        if(response?.data){
-          handleGeneralNotificationCount();
+    const handler = (event) => {
+      if (event?.data) {
+        const data = JSON.parse(event?.data); //check for incoming message from socket
+        if (data.event === "new.notification.result") {
+          if (data.data) {
+            console.log(data)
+            handleGetUnreadNotification();
+            handleGeneralNotificationCount();
+          }
         }
-        
-      };
 
-    }
+      }
+    };
+    websocket.addEventListener("message", handler, { passive: true });
 
     return () => {
-      console.log("General websocket closed");
+      websocket.removeEventListener("message", handler);
+      console.log("websocket closed");
     };
-   
-  }, [generalSocket]);
+  }, [websocket]);
 
 
   return (