l-min-components 1.0.1216 → 1.6.1222

package/package.json

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

package/src/components/AppMainLayout/index.styled.js

@@ -26,6 +26,7 @@ export const MainLayout = styled.div`
   justify-content: space-between;
   width: 100%;
   padding: 84px 20px 20px 0;
+  max-height: 100vh;
 `;
 
 export const LeftLayout = styled.div`

package/src/hooks/messaging-kit/index.jsx

@@ -231,15 +231,6 @@ const useMessageKit = (affiliatesActive, selectedAccount, affiliateAccount) => {
     );
   }, [selectedAccount?.id]);
 
-  // handle socket connection
-  // const { sendJsonMessage, lastJsonMessage, readyState } = useWebSocket(
-  //   buildSocketUrl(),
-  //   {
-  //     share: false,
-  //     shouldReconnect: () => true,
-  //   }
-  // );
-
   // get account type
   const [, request] = useAxios(
     {
@@ -528,7 +519,7 @@ const useMessageKit = (affiliatesActive, selectedAccount, affiliateAccount) => {
       // --- 2a. Update chats state ---
       const currentChatHistory = prevState.chats[roomId] || [];
       let updatedChatHistory = [...currentChatHistory];
-      const todayDateString = "today"; // Or derive actual date string if needed
+      const todayDateString = "today"; // Assume API uses "today" for current day
 
       const todayGroupIndex = updatedChatHistory.findIndex(
         (group) => group.date === todayDateString
@@ -537,12 +528,15 @@ const useMessageKit = (affiliatesActive, selectedAccount, affiliateAccount) => {
       if (todayGroupIndex !== -1) {
         // "today" group exists, add message to it
         const todayGroup = updatedChatHistory[todayGroupIndex];
-        const updatedTodayGroup = {
-          ...todayGroup,
-          messages: [...todayGroup.messages, newChatMessage], // Add new message
-        };
-        // Replace the old group with the updated one
-        updatedChatHistory.splice(todayGroupIndex, 1, updatedTodayGroup);
+        // Avoid adding duplicates if WS sends the same message back
+        if (!todayGroup.messages.some((msg) => msg.id === newChatMessage.id)) {
+          const updatedTodayGroup = {
+            ...todayGroup,
+            messages: [...todayGroup.messages, newChatMessage], // Add new message
+          };
+          // Replace the old group with the updated one
+          updatedChatHistory.splice(todayGroupIndex, 1, updatedTodayGroup);
+        }
       } else {
         // "today" group doesn't exist, create it and add to the beginning
         const newTodayGroup = {
@@ -645,7 +639,10 @@ const useMessageKit = (affiliatesActive, selectedAccount, affiliateAccount) => {
             `Room ${roomId} not found in state, refetching room list.`
           );
           getMessageRoomsByCourses(null, true); // Refetch rooms once
-          return; // Stop processing this message until room list is updated
+          // Room not found, trigger refetch but DO NOT return early.
+          // Allow the message to be processed for the 'chats' state at least.
+          getMessageRoomsByCourses(null, true); // Refetch rooms once
+          // Continue processing the message...
         }
 
         // --- Format WebSocket data into ChatMessage ---
@@ -672,13 +669,14 @@ const useMessageKit = (affiliatesActive, selectedAccount, affiliateAccount) => {
           // --- Update chats state ---
           const currentChatHistory = prevState.chats[roomId] || [];
           let updatedChatHistory = [...currentChatHistory];
-          const todayDateString = "today"; // Or derive actual date string
+          const todayDateString = "today"; // Assume API uses "today" for current day
 
           const todayGroupIndex = updatedChatHistory.findIndex(
             (group) => group.date === todayDateString
           );
 
           if (todayGroupIndex !== -1) {
+            // "today" group exists
             const todayGroup = updatedChatHistory[todayGroupIndex];
             // Avoid adding duplicate messages if WS sends what we already added via sendMessage response
             if (
@@ -686,15 +684,17 @@ const useMessageKit = (affiliatesActive, selectedAccount, affiliateAccount) => {
             ) {
               const updatedTodayGroup = {
                 ...todayGroup,
-                messages: [...todayGroup.messages, newChatMessage],
+                messages: [...todayGroup.messages, newChatMessage], // Add message
               };
-              updatedChatHistory.splice(todayGroupIndex, 1, updatedTodayGroup);
+              updatedChatHistory.splice(todayGroupIndex, 1, updatedTodayGroup); // Replace group
             }
           } else {
+            // "today" group doesn't exist, create it and prepend
             const newTodayGroup = {
               date: todayDateString,
               messages: [newChatMessage],
             };
+            // Prepend to maintain reverse chronological order of groups
             updatedChatHistory = [newTodayGroup, ...updatedChatHistory];
           }