l-min-components 1.0.679 → 1.0.680

package/package.json

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

package/src/components/header/index.jsx

@@ -6,7 +6,10 @@ import { PeopleIcon } from "./assets/svg/people";
 import { MessageIcon } from "./assets/svg/message";
 import { SettingIcon } from "./assets/svg/setting";
 import { SearchIcon } from "./assets/svg/search";
-import { NotificationEmptyIcon, NotificationIcon } from "./assets/svg/notification";
+import {
+  NotificationEmptyIcon,
+  NotificationIcon,
+} from "./assets/svg/notification";
 import { ArrowDownIcon } from "./assets/svg/arrow-down";
 import AccountDropdown from "./account-dropdown";
 import avatar from "./assets/images/avatar.png";
@@ -54,7 +57,7 @@ const HeaderComponent = (props) => {
     handleGetUnreadNotification,
     generalNotificationCountData,
     handleGeneralNotificationCount,
-    notificationMarkReadData
+    notificationMarkReadData,
   } = useHeader();
   const { pathname } = useLocation();
   const { setGeneralData, generalData } = useContext(OutletContext);
@@ -70,17 +73,21 @@ const HeaderComponent = (props) => {
 
   // Merge the notification_count into the results data using find
 
-  const allUserAccountsDetail = userAccountsDetail?.data?.results.map(item => {
-    const detail = generalNotificationCountData?.data?.detail?.find(detailItem => detailItem?.account_id === item?.id);
-    return {
-      ...item,
-      notification_count: detail ? detail?.notification_count : 0
-    };
-  });
+  const allUserAccountsDetail = userAccountsDetail?.data?.results.map(
+    (item) => {
+      const detail = generalNotificationCountData?.data?.detail?.find(
+        (detailItem) => detailItem?.account_id === item?.id
+      );
+      return {
+        ...item,
+        notification_count: detail ? detail?.notification_count : 0,
+      };
+    }
+  );
 
   useEffect(() => {
-    handleGeneralNotificationCount(); 
-  }, [])
+    handleGeneralNotificationCount();
+  }, []);
 
   useEffect(() => {
     if (userAccountsDetail?.data) {
@@ -143,7 +150,8 @@ const HeaderComponent = (props) => {
       if (
         window.location.host?.includes("developer") ||
         window.location.host?.includes("coming") ||
-        window.location.host?.includes("localhost") || window.location.pathname.includes('developer')
+        window.location.host?.includes("localhost") ||
+        window.location.pathname.includes("developer")
       ) {
         setSelectedAccount(
           developerArray?.find(
@@ -262,8 +270,8 @@ const HeaderComponent = (props) => {
   const [socketUrl, setSocketUrl] = useState(
     "dev-117782726-api.learngual.com/notify/v1/ws/connect/"
   );
-  const socket = useRef()
-  const generalSocket = useRef()
+  const socket = useRef();
+  const generalSocket = useRef();
   const token = getCookie("access");
   const account_id = generalData?.defaultAccount?.id || "";
 
@@ -288,12 +296,11 @@ const HeaderComponent = (props) => {
         const data = JSON.parse(event?.data); //check for incoming message from socket
         if (data.event === "new.notification.result") {
           if (data.data) {
-            console.log(data)
+            console.log(data);
             handleGetUnreadNotification();
             handleGeneralNotificationCount();
           }
         }
-
       }
     };
     websocket.addEventListener("message", handler, { passive: true });
@@ -308,7 +315,6 @@ const HeaderComponent = (props) => {
     `wss://${socketUrl}?account=${account_id}&authorization=${token}&room_id=${account_id}`
   );
 
-
   // websocket for room
   useEffect(() => {
     websocket2.onopen = () => {
@@ -326,16 +332,15 @@ const HeaderComponent = (props) => {
         const data = JSON.parse(event?.data); //check for incoming message from socket
         if (data.event === "new.notification.result") {
           if (data.data) {
-            
           }
         }
         if (data.event === "message.new") {
         }
         if (data.event === "new.room.result") {
-          console.log(data)
+          console.log(data);
           if (data.status) {
             handleGetUnreadNotification();
-            handleGeneralNotificationCount(); 
+            handleGeneralNotificationCount();
           }
         }
       }
@@ -349,9 +354,9 @@ const HeaderComponent = (props) => {
   }, [websocket2]);
 
   useEffect(() => {
-      handleGetUnreadNotification();
-      handleGeneralNotificationCount();
-  }, [notificationMarkReadData?.response])
+    handleGetUnreadNotification();
+    handleGeneralNotificationCount();
+  }, [notificationMarkReadData?.response]);
 
   return (
     <Navbar>
@@ -393,7 +398,11 @@ const HeaderComponent = (props) => {
         </li>
         <li>
           <a
-            href={`https://559staging.learngual.com/${selectedAccount?.type? selectedAccount?.type?.toLowerCase(): userAccountsDetail?.data[0]?.type?.toLowerCase()}/notifications/`}
+            href={`https://559staging.learngual.com/${
+              selectedAccount?.type
+                ? selectedAccount?.type?.toLowerCase()
+                : userAccountsDetail?.data?.[0]?.type?.toLowerCase()
+            }/notifications/`}
             className={
               window.location.pathname.includes("notifications") ? "active" : ""
             }