l-min-components 1.0.1050 → 1.0.1055

package/package.json

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

package/src/components/AppMainLayout/index.jsx

@@ -269,7 +269,7 @@ const AppMainLayout = () => {
                         <SideMenu
                           user={user}
                           routes={sideMenuOptions}
-                          affiliatesActive={affiliatesActive}
+                          affiliatesActive={affiliateAccount}
                           userType={generalData?.selectedAccount?.type?.toLowerCase()}
                           isOpen={isOpen}
                           setIsOpen={setIsOpen}
@@ -294,17 +294,15 @@ const AppMainLayout = () => {
                   }
                 </LeftLayout>
                 <CenterLayout isOpen={isOpen} style={centerLayoutStyle}>
-                  {
-                    // window.location.pathname.includes("instructor") &&
+                  {window.location.pathname.includes("instructor") &&
                     !window.location.pathname.includes("enterprise") &&
-                      !window.location.pathname.includes("manage-teams") && (
-                        <InstructorAccountSwitcher
-                          setAccountType={setAffiliatesActive}
-                          generalData={generalData}
-                          onChange={(v) => setAffiliateAccount(v)}
-                        />
-                      )
-                  }
+                    !window.location.pathname.includes("manage-teams") && (
+                      <InstructorAccountSwitcher
+                        setAccountType={setAffiliatesActive}
+                        generalData={generalData}
+                        onChange={(v) => setAffiliateAccount(v)}
+                      />
+                    )}
 
                   {window.location.pathname.includes("enterprise") &&
                   planState === "GRACE PERIOD" ? (

package/src/components/messageAddon/messages/chatheader/index.jsx

@@ -89,9 +89,9 @@ const ChatHeader = ({
           </div>
         </div>
 
-        <span onClick={() => setChatOptions(!chatOptions)}>
+        {/* <span onClick={() => setChatOptions(!chatOptions)}>
           <MoreSvg style={{ color: "#636666" }} />
-        </span>
+        </span> */}
 
         {/* {chatOptions && (
           <div className="more-options" ref={dropdownContainer}>

package/src/components/messageAddon/messages/index.styled.js

@@ -984,6 +984,7 @@ export const TextMessagePanel = styled.div`
     justify-content: center;
     border: none;
     outline: none;
+    cursor: pointer;
 
     &.disabled {
       background-color: #c6cccc !important;

package/src/components/messageAddon/messages/messages.jsx

@@ -206,11 +206,26 @@ const Messages = ({
     if (receiverID && courseID) {
       getMessages();
     }
-  }, [receiverID, courseID]);
+  }, [receiverID, courseID, roomID]);
 
   useEffect(() => {
     if (createMessageData?.data) {
-      getMessages(accountType, receiverID, courseID, roomID);
+      if (accountType === "enterprise") {
+        handleRoomMessage(accountType, receiverID, courseID);
+        handleRoomRecipientDetails(accountType, receiverID, courseID);
+      }
+      if (!affiliates && accountType === "instructor") {
+        handleRoomMessage(accountType, receiverID, courseID);
+        handleRoomRecipientDetails(accountType, receiverID, courseID);
+      }
+      if (affiliates && accountType === "instructor") {
+        handleRoomMessageAffiliate(receiverID, courseID, roomID);
+        handleRoomRecipientDetails(accountType, receiverID, courseID);
+      }
+      if (accountType === "personal") {
+        handleRetrieveMessage(receiverID, courseID, roomID);
+        handleRoomRecipientDetailsPersonal(receiverID, courseID);
+      }
     }
   }, [createMessageData?.data]);
 
@@ -311,11 +326,17 @@ const Messages = ({
     };
   }, [scrollRef]);
 
+  const messagesEndRef = useRef(null);
+  useEffect(() => {
+    messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
+  }, [allMessages]); // Run this effect whenever `allMessages` changes
+
+
   return (
     <>
       <MessagesWrapper>
         <div className="message_by_wrapper">
-          <p className="mbw_name"> Message {user} </p>
+          <p className="mbw_name"> Message {userFullName} </p>
 
           <div className="icon-box">
             <span onClick={() => setIsFullHeight(!isFullHeight)}>
@@ -379,6 +400,8 @@ const Messages = ({
                             lastMessage={lastMessage}
                           />
                         ))}
+                         {/* Add a dummy div to scroll to */}
+                         <div ref={messagesEndRef} />
                       </>
                     ))}
                   </>