From 9a3b7ac93c3a2233ab7ceb2d49d205317cde8b16 Mon Sep 17 00:00:00 2001
From: Abir Chakraborty <142606190+abirc8010@users.noreply.github.com>
Date: Sun, 22 Dec 2024 13:57:01 +0530
Subject: [PATCH 1/6] Fixed UI issues for Sidebar (#634)

* Fixed UI issues for Sidebar

* Fixed sidebar height issue

* Removed unnecessary spacing

* Fixed reply in thread issue

* Adjusted dynamic header visibility

* Revert zIndex changes

* Linting fix

* Run prettier

* Remove zIndex

* Adjusted zIndex for ViewComponent

* Fix sidebar width

* Remove global css for sidebar

---------

Co-authored-by: Zishan Ahmad <zishan.barun@gmail.com>
---
 packages/react/src/views/ChatHeader/ChatHeader.js    |  4 +++-
 packages/react/src/views/GlobalStyles.js             | 12 +++++++++++-
 packages/react/src/views/Message/Message.js          |  5 +++--
 packages/react/src/views/Message/Message.styles.js   |  3 +++
 .../MessageAggregators/common/MessageAggregator.js   |  9 ++++++++-
 .../src/views/RoomInformation/RoomInformation.js     |  1 +
 packages/react/src/views/RoomMembers/RoomMember.js   |  1 +
 7 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/packages/react/src/views/ChatHeader/ChatHeader.js b/packages/react/src/views/ChatHeader/ChatHeader.js
index 99babdc51..010739977 100644
--- a/packages/react/src/views/ChatHeader/ChatHeader.js
+++ b/packages/react/src/views/ChatHeader/ChatHeader.js
@@ -21,6 +21,7 @@ import {
   usePinnedMessageStore,
   useStarredMessageStore,
   useFileStore,
+  useSidebarStore,
 } from '../../store';
 import { DynamicHeader } from '../DynamicHeader';
 import useFetchChatData from '../../hooks/useFetchChatData';
@@ -84,7 +85,7 @@ const ChatHeader = ({
   const setIsUserAuthenticated = useUserStore(
     (state) => state.setIsUserAuthenticated
   );
-
+  const setShowSidebar = useSidebarStore((state) => state.setShowSidebar);
   const dispatchToastMessage = useToastBarDispatch();
   const { getMessagesAndRoles } = useFetchChatData(showRoles);
   const setMessageLimit = useSettingsStore((state) => state.setMessageLimit);
@@ -130,6 +131,7 @@ const ChatHeader = ({
     try {
       await RCInstance.logout();
       setMessages([]);
+      setShowSidebar(false);
       setUserAvatarUrl(null);
       useMessageStore.setState({ isMessageLoaded: false });
     } catch (e) {
diff --git a/packages/react/src/views/GlobalStyles.js b/packages/react/src/views/GlobalStyles.js
index b26977e63..c9c821fef 100644
--- a/packages/react/src/views/GlobalStyles.js
+++ b/packages/react/src/views/GlobalStyles.js
@@ -8,7 +8,6 @@ const getGlobalStyles = (theme) => css`
     margin: 0;
     padding: 0;
   }
-
   .ec-embedded-chat body {
     font-family: ${theme.typography.default.fontFamily};
     font-size: ${theme.typography.default.fontSize}px;
@@ -36,6 +35,17 @@ const getGlobalStyles = (theme) => css`
   .ec-embedded-chat ::-webkit-scrollbar-button {
     display: none;
   }
+  @media (max-width: 780px) {
+    .ec-sidebar {
+      position: absolute;
+      width: 100% !important;
+      height: calc(100% - 56.39px) !important;
+      min-width: 250px !important;
+      left: 0;
+      bottom: 0;
+      background: ${theme.colors.background}!important;
+    }
+  }
 `;
 
 const GlobalStyles = () => {
diff --git a/packages/react/src/views/Message/Message.js b/packages/react/src/views/Message/Message.js
index e460adad0..b587d09e1 100644
--- a/packages/react/src/views/Message/Message.js
+++ b/packages/react/src/views/Message/Message.js
@@ -11,7 +11,7 @@ import {
 import { Attachments } from '../AttachmentHandler';
 import { Markdown } from '../Markdown';
 import MessageHeader from './MessageHeader';
-import { useMessageStore, useUserStore } from '../../store';
+import { useMessageStore, useUserStore, useSidebarStore } from '../../store';
 import RCContext from '../../context/RCInstance';
 import { MessageBody } from './MessageBody';
 import { MessageReactions } from './MessageReactions';
@@ -49,7 +49,7 @@ const Message = ({
 
   const { RCInstance, ECOptions } = useContext(RCContext);
   showAvatar = ECOptions?.showAvatar && showAvatar;
-
+  const { showSidebar, setShowSidebar } = useSidebarStore();
   const authenticatedUserId = useUserStore((state) => state.userId);
   const authenticatedUserUsername = useUserStore((state) => state.username);
   const userRoles = useUserStore((state) => state.roles);
@@ -137,6 +137,7 @@ const Message = ({
 
   const handleOpenThread = (msg) => async () => {
     openThread(msg);
+    setShowSidebar(false);
   };
 
   const isStarred = message.starred?.find((u) => u._id === authenticatedUserId);
diff --git a/packages/react/src/views/Message/Message.styles.js b/packages/react/src/views/Message/Message.styles.js
index b6b978fb4..9f9358fd9 100644
--- a/packages/react/src/views/Message/Message.styles.js
+++ b/packages/react/src/views/Message/Message.styles.js
@@ -81,6 +81,9 @@ export const getMessageDividerStyles = (theme) => {
       margin-bottom: 0.75rem;
       padding-left: 1.25rem;
       padding-right: 1.25rem;
+      @media (max-width: 780px) {
+        z-index: 1;
+      }
     `,
 
     dividerContent: css`
diff --git a/packages/react/src/views/MessageAggregators/common/MessageAggregator.js b/packages/react/src/views/MessageAggregators/common/MessageAggregator.js
index 3f4f62e73..6e1786a33 100644
--- a/packages/react/src/views/MessageAggregators/common/MessageAggregator.js
+++ b/packages/react/src/views/MessageAggregators/common/MessageAggregator.js
@@ -70,7 +70,11 @@ export const MessageAggregator = ({
       iconName={iconName}
       searchProps={searchProps}
       onClose={() => setExclusiveState(null)}
-      style={{ padding: 0 }}
+      style={{
+        width: '400px',
+        padding: 0,
+        zIndex: window.innerWidth <= 780 ? 1 : null,
+      }}
       {...(viewType === 'Popup'
         ? {
             isPopupHeader: true,
@@ -126,6 +130,9 @@ export const MessageAggregator = ({
                       isInSidebar
                       style={{
                         flex: 1,
+                        paddingLeft: 3,
+                        paddingRight: 2,
+                        minWidth: 0,
                       }}
                     />
 
diff --git a/packages/react/src/views/RoomInformation/RoomInformation.js b/packages/react/src/views/RoomInformation/RoomInformation.js
index 504b0f4ba..3cfdefad0 100644
--- a/packages/react/src/views/RoomInformation/RoomInformation.js
+++ b/packages/react/src/views/RoomInformation/RoomInformation.js
@@ -30,6 +30,7 @@ const Roominfo = () => {
       title="Room Information"
       iconName="info"
       onClose={() => setExclusiveState(null)}
+      style={{ width: '400px', zIndex: window.innerWidth <= 780 ? 1 : null }}
       {...(viewType === 'Popup'
         ? {
             isPopupHeader: true,
diff --git a/packages/react/src/views/RoomMembers/RoomMember.js b/packages/react/src/views/RoomMembers/RoomMember.js
index c52f48c9d..85b268b07 100644
--- a/packages/react/src/views/RoomMembers/RoomMember.js
+++ b/packages/react/src/views/RoomMembers/RoomMember.js
@@ -55,6 +55,7 @@ const RoomMembers = ({ members }) => {
       title="Members"
       iconName="members"
       onClose={() => setExclusiveState(null)}
+      style={{ width: '400px', zIndex: window.innerWidth <= 780 ? 1 : null }}
       {...(viewType === 'Popup'
         ? {
             isPopupHeader: true,

From 3d6700c2f93cc9bb9eb4bd54fdfec4009befca6b Mon Sep 17 00:00:00 2001
From: Anirban Singha <143536290+SinghaAnirban005@users.noreply.github.com>
Date: Sun, 22 Dec 2024 14:21:20 +0530
Subject: [PATCH 2/6] fix(permissions): ensure admin-granted edit message
 permissions apply in EmbeddedChat (#702)

---
 packages/react/src/hooks/useRCAuth.js              | 11 ++++++++++-
 packages/react/src/store/messageStore.js           |  3 +++
 packages/react/src/views/EmbeddedChat.js           |  6 +++++-
 packages/react/src/views/Message/Message.js        |  5 +++++
 packages/react/src/views/Message/MessageToolbox.js |  8 +++++++-
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/packages/react/src/hooks/useRCAuth.js b/packages/react/src/hooks/useRCAuth.js
index 6a997cb56..c0b1d3a3b 100644
--- a/packages/react/src/hooks/useRCAuth.js
+++ b/packages/react/src/hooks/useRCAuth.js
@@ -1,7 +1,12 @@
 import { useContext } from 'react';
 import { useToastBarDispatch } from '@embeddedchat/ui-elements';
 import RCContext from '../context/RCInstance';
-import { useUserStore, totpModalStore, useLoginStore } from '../store';
+import {
+  useUserStore,
+  totpModalStore,
+  useLoginStore,
+  useMessageStore,
+} from '../store';
 
 export const useRCAuth = () => {
   const { RCInstance } = useContext(RCContext);
@@ -23,6 +28,9 @@ export const useRCAuth = () => {
   const setUserPinPermissions = useUserStore(
     (state) => state.setUserPinPermissions
   );
+  const setEditMessagePermissions = useMessageStore(
+    (state) => state.setEditMessagePermissions
+  );
   const dispatchToastMessage = useToastBarDispatch();
 
   const handleLogin = async (userOrEmail, password, code) => {
@@ -61,6 +69,7 @@ export const useRCAuth = () => {
           setEmailorUser(null);
           setPassword(null);
           setUserPinPermissions(permissions.update[150]);
+          setEditMessagePermissions(permissions.update[28]);
           dispatchToastMessage({
             type: 'success',
             message: 'Successfully logged in',
diff --git a/packages/react/src/store/messageStore.js b/packages/react/src/store/messageStore.js
index 507ba3d14..676258c1c 100644
--- a/packages/react/src/store/messageStore.js
+++ b/packages/react/src/store/messageStore.js
@@ -71,6 +71,9 @@ const useMessageStore = create((set, get) => ({
     }
   },
   setEditMessage: (editMessage) => set(() => ({ editMessage })),
+  editMessagePermissions: {},
+  setEditMessagePermissions: (editMessagePermissions) =>
+    set((state) => ({ ...state, editMessagePermissions })),
   addQuoteMessage: (quoteMessage) =>
     set((state) => ({ quoteMessage: [...state.quoteMessage, quoteMessage] })),
   removeQuoteMessage: (quoteMessage) =>
diff --git a/packages/react/src/views/EmbeddedChat.js b/packages/react/src/views/EmbeddedChat.js
index a7e258b44..00557f289 100644
--- a/packages/react/src/views/EmbeddedChat.js
+++ b/packages/react/src/views/EmbeddedChat.js
@@ -18,7 +18,7 @@ import {
 import { ChatLayout } from './ChatLayout';
 import { ChatHeader } from './ChatHeader';
 import { RCInstanceProvider } from '../context/RCInstance';
-import { useUserStore, useLoginStore } from '../store';
+import { useUserStore, useLoginStore, useMessageStore } from '../store';
 import DefaultTheme from '../theme/DefaultTheme';
 import { getTokenStorage } from '../lib/auth';
 import { styles } from './EmbeddedChat.styles';
@@ -87,6 +87,9 @@ const EmbeddedChat = (props) => {
     (state) => state.setUserPinPermissions
   );
 
+  const setEditMessagePermissions = useMessageStore(
+    (state) => state.setEditMessagePermissions
+  );
   if (isClosable && !setClosableState) {
     throw Error(
       'Please provide a setClosableState to props when isClosable = true'
@@ -130,6 +133,7 @@ const EmbeddedChat = (props) => {
         await RCInstance.autoLogin(auth);
         const permissions = await RCInstance.permissionInfo();
         setUserPinPermissions(permissions.update[150]);
+        setEditMessagePermissions(permissions.update[28]);
       } catch (error) {
         console.error(error);
       } finally {
diff --git a/packages/react/src/views/Message/Message.js b/packages/react/src/views/Message/Message.js
index b587d09e1..aafb5642b 100644
--- a/packages/react/src/views/Message/Message.js
+++ b/packages/react/src/views/Message/Message.js
@@ -56,6 +56,9 @@ const Message = ({
   const pinPermissions = useUserStore(
     (state) => state.userPinPermissions.roles
   );
+  const editMessagePermissions = useMessageStore(
+    (state) => state.editMessagePermissions.roles
+  );
   const [setMessageToReport, toggleShowReportMessage] = useMessageStore(
     (state) => [state.setMessageToReport, state.toggleShowReportMessage]
   );
@@ -73,6 +76,7 @@ const Message = ({
   const styles = getMessageStyles(theme);
   const bubbleStyles = useBubbleStyles(isMe);
   const pinRoles = new Set(pinPermissions);
+  const editMessageRoles = new Set(editMessagePermissions);
 
   const variantStyles =
     !isInSidebar && variantOverrides === 'bubble' ? bubbleStyles : {};
@@ -210,6 +214,7 @@ const Message = ({
                     authenticatedUserId={authenticatedUserId}
                     userRoles={userRoles}
                     pinRoles={pinRoles}
+                    editMessageRoles={editMessageRoles}
                     handleOpenThread={handleOpenThread}
                     handleDeleteMessage={handleDeleteMessage}
                     handleStarMessage={handleStarMessage}
diff --git a/packages/react/src/views/Message/MessageToolbox.js b/packages/react/src/views/Message/MessageToolbox.js
index 55af7f64d..61765c8dd 100644
--- a/packages/react/src/views/Message/MessageToolbox.js
+++ b/packages/react/src/views/Message/MessageToolbox.js
@@ -23,6 +23,7 @@ export const MessageToolbox = ({
   authenticatedUserId,
   userRoles,
   pinRoles,
+  editMessageRoles,
   handleOpenThread,
   handleEmojiClick,
   handlePinMessage,
@@ -70,6 +71,11 @@ export const MessageToolbox = ({
   };
 
   const isAllowedToPin = userRoles.some((role) => pinRoles.has(role));
+  const isAllowedToEditMessage = userRoles.some((role) =>
+    editMessageRoles.has(role)
+  )
+    ? true
+    : message.u._id === authenticatedUserId;
   const options = useMemo(
     () => ({
       reply: {
@@ -120,7 +126,7 @@ export const MessageToolbox = ({
         id: 'edit',
         onClick: () => handleEditMessage(message),
         iconName: 'edit',
-        visible: message.u._id === authenticatedUserId,
+        visible: isAllowedToEditMessage,
         color: isEditing ? 'secondary' : 'default',
         ghost: !isEditing,
       },

From 0d7ff8d496326394a21191127b1f8579b209ec54 Mon Sep 17 00:00:00 2001
From: Smriti Doneria <smritidoneria@gmail.com>
Date: Sun, 22 Dec 2024 14:38:04 +0530
Subject: [PATCH 3/6] fixed all markdown issues (#614)

* fix mardown

* fix conflicts

* fix formatting issues

* fixed lint issues

* changes

* prettier

* fix quote

* fixed

* removed markdown from passed prop

---------

Co-authored-by: Zishan Ahmad <zishan.barun@gmail.com>
---
 packages/react/src/views/ChatInput/ChatInput.js |  1 +
 .../react/src/views/Message/MessageToolbox.js   |  4 ++--
 .../src/views/QuoteMessage/QuoteMessage.js      | 17 +++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/react/src/views/ChatInput/ChatInput.js b/packages/react/src/views/ChatInput/ChatInput.js
index 581cbf0d2..86b4b5082 100644
--- a/packages/react/src/views/ChatInput/ChatInput.js
+++ b/packages/react/src/views/ChatInput/ChatInput.js
@@ -34,6 +34,7 @@ import useShowCommands from '../../hooks/useShowCommands';
 import useSearchMentionUser from '../../hooks/useSearchMentionUser';
 import formatSelection from '../../lib/formatSelection';
 import { parseEmoji } from '../../lib/emoji';
+import { Markdown } from '../Markdown';
 
 const ChatInput = ({ scrollToBottom }) => {
   const { styleOverrides, classNames } = useComponentOverrides('ChatInput');
diff --git a/packages/react/src/views/Message/MessageToolbox.js b/packages/react/src/views/Message/MessageToolbox.js
index 61765c8dd..0ed468bd7 100644
--- a/packages/react/src/views/Message/MessageToolbox.js
+++ b/packages/react/src/views/Message/MessageToolbox.js
@@ -10,9 +10,9 @@ import {
   useTheme,
 } from '@embeddedchat/ui-elements';
 import { EmojiPicker } from '../EmojiPicker';
-import { parseEmoji } from '../../lib/emoji';
 import { getMessageToolboxStyles } from './Message.styles';
 import SurfaceMenu from '../SurfaceMenu/SurfaceMenu';
+import { Markdown } from '../Markdown';
 
 export const MessageToolbox = ({
   className = '',
@@ -249,7 +249,7 @@ export const MessageToolbox = ({
               padding: '0 0.5rem 0.5rem',
             }}
           >
-            {parseEmoji(message.msg)}
+            <Markdown body={message} isReaction={false} />
           </Modal.Content>
           <Modal.Footer>
             <Button type="secondary" onClick={handleOnClose}>
diff --git a/packages/react/src/views/QuoteMessage/QuoteMessage.js b/packages/react/src/views/QuoteMessage/QuoteMessage.js
index be715cf0e..2a402da43 100644
--- a/packages/react/src/views/QuoteMessage/QuoteMessage.js
+++ b/packages/react/src/views/QuoteMessage/QuoteMessage.js
@@ -12,6 +12,7 @@ import RCContext from '../../context/RCInstance';
 import { useMessageStore } from '../../store';
 import getQuoteMessageStyles from './QuoteMessage.styles';
 import Attachment from '../AttachmentHandler/Attachment';
+import { Markdown } from '../Markdown';
 
 const QuoteMessage = ({ className = '', style = {}, message }) => {
   const { RCInstance } = useContext(RCContext);
@@ -83,19 +84,19 @@ const QuoteMessage = ({ className = '', style = {}, message }) => {
             </audio>
           ) : (
             <Box css={styles.message}>
-              {message.msg
-                ? message.msg
-                : `${message.file?.name} (${
-                    message.file?.size
-                      ? (message.file.size / 1024).toFixed(2)
-                      : 0
-                  } kB)`}
+              {message.msg ? (
+                <Markdown body={message} isReaction={false} />
+              ) : (
+                `${message.file?.name} (${
+                  message.file?.size ? (message.file.size / 1024).toFixed(2) : 0
+                } kB)`
+              )}
             </Box>
           )
         ) : message?.msg[0] === '[' ? (
           message?.msg.match(/\n(.*)/)[1]
         ) : (
-          message?.msg
+          <Markdown body={message} isReaction={false} />
         )}
         {message.attachments &&
           message.attachments.length > 0 &&

From fbb95b678435e782c690a0348c1d3ea539960b95 Mon Sep 17 00:00:00 2001
From: Anirban Singha <143536290+SinghaAnirban005@users.noreply.github.com>
Date: Sun, 22 Dec 2024 14:42:51 +0530
Subject: [PATCH 4/6] Fix: Make Mentions Interactive with User Detail Modal
 (#680)

* fix(chat): make mentions interactive with user detail modal

* Remove unnecessary space

* Ran format and lint
---
 packages/api/src/EmbeddedChatApi.ts           | 17 +++++++++++
 packages/markups/src/mentions/UserMention.js  | 29 ++++++++++++++++++-
 packages/react/src/views/Markdown/Markdown.js |  2 +-
 .../views/UserInformation/UserInformation.js  |  8 +++--
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/packages/api/src/EmbeddedChatApi.ts b/packages/api/src/EmbeddedChatApi.ts
index 021a82c4d..b9a8cef32 100644
--- a/packages/api/src/EmbeddedChatApi.ts
+++ b/packages/api/src/EmbeddedChatApi.ts
@@ -1124,4 +1124,21 @@ export default class EmbeddedChatApi {
     const data = response.json();
     return data;
   }
+
+  async userData(username: string) {
+    const { userId, authToken } = (await this.auth.getCurrentUser()) || {};
+    const response = await fetch(
+      `${this.host}/api/v1/users.info?username=${username}`,
+      {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+          "X-Auth-Token": authToken,
+          "X-User-Id": userId,
+        },
+      }
+    );
+    const data = response.json();
+    return data;
+  }
 }
diff --git a/packages/markups/src/mentions/UserMention.js b/packages/markups/src/mentions/UserMention.js
index 679ffc0d3..c860a4d70 100644
--- a/packages/markups/src/mentions/UserMention.js
+++ b/packages/markups/src/mentions/UserMention.js
@@ -1,11 +1,30 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import { Box } from '@embeddedchat/ui-elements';
+import { useUserStore } from '@embeddedchat/react/src/store';
+import useSetExclusiveState from '@embeddedchat/react/src/hooks/useSetExclusiveState';
+import RCContext from '@embeddedchat/react/src/context/RCInstance';
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
 import useMentionStyles from '../elements/elements.styles';
 
 const UserMention = ({ contents }) => {
   const { members, username } = useContext(MarkupInteractionContext);
+  const { RCInstance } = useContext(RCContext);
+  const setExclusiveState = useSetExclusiveState();
+  const { setShowCurrentUserInfo, setCurrentUser } = useUserStore((state) => ({
+    setShowCurrentUserInfo: state.setShowCurrentUserInfo,
+    setCurrentUser: state.setCurrentUser,
+  }));
+
+  const handleUserInfo = async (uname) => {
+    const data = await RCInstance.userData(uname);
+    setCurrentUser({
+      _id: data.user._id,
+      username: data.user.username,
+      name: data.user.name,
+    });
+    setExclusiveState(setShowCurrentUserInfo);
+  };
 
   const hasMember = (user) => {
     if (user === 'all' || user === 'here') return true;
@@ -23,7 +42,15 @@ const UserMention = ({ contents }) => {
   return (
     <>
       {hasMember(contents.value) ? (
-        <Box is="span" css={styles.mention}>
+        <Box
+          is="span"
+          css={styles.mention}
+          onClick={
+            ['here', 'all'].includes(contents.value)
+              ? null
+              : () => handleUserInfo(contents.value)
+          }
+        >
           {contents.value}
         </Box>
       ) : (
diff --git a/packages/react/src/views/Markdown/Markdown.js b/packages/react/src/views/Markdown/Markdown.js
index d9ee6b2ad..b98fe7caa 100644
--- a/packages/react/src/views/Markdown/Markdown.js
+++ b/packages/react/src/views/Markdown/Markdown.js
@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { css } from '@emotion/react';
 import { Box } from '@embeddedchat/ui-elements';
-import { Markup, MarkupInteractionContext } from '@embeddedchat/markups';
+import { Markup, MarkupInteractionContext } from '@embeddedchat/markups/src';
 import EmojiReaction from '../EmojiReaction/EmojiReaction';
 import { useMemberStore, useUserStore } from '../../store';
 
diff --git a/packages/react/src/views/UserInformation/UserInformation.js b/packages/react/src/views/UserInformation/UserInformation.js
index d745ee9b7..8d9202677 100644
--- a/packages/react/src/views/UserInformation/UserInformation.js
+++ b/packages/react/src/views/UserInformation/UserInformation.js
@@ -39,7 +39,7 @@ const UserInformation = () => {
   useEffect(() => {
     const getCurrentUserInfo = async () => {
       try {
-        const res = await RCInstance.userInfo(currentUser._id);
+        const res = await RCInstance.userData(currentUser.username);
         if (res?.user) {
           setCurrentUserInfo(res.user);
           setIsUserInfoFetched(true);
@@ -123,7 +123,11 @@ const UserInformation = () => {
             />
             <UserInfoField
               label="Last login"
-              value={formatTimestamp(currentUserInfo.lastLogin)}
+              value={
+                currentUserInfo?.username === 'rocket.cat'
+                  ? 'Never'
+                  : formatTimestamp(currentUserInfo.lastLogin)
+              }
               isAdmin={isAdmin}
               authenticatedUserId={authenticatedUserId}
               currentUserInfo={currentUserInfo}

From 81ad89b5afece3a39e2d44752e3ba5eb2c9be5f4 Mon Sep 17 00:00:00 2001
From: Devansh Kansagra <125076549+devanshkansagra@users.noreply.github.com>
Date: Sun, 22 Dec 2024 14:50:20 +0530
Subject: [PATCH 5/6] Added a feature to copy messages and copy link in message
 tool box (#710)

* Added a feature to copy messages

* Added copy link feature

* fixed inconsistency in layout_editor

* Removed changes in layout_editor
---
 packages/react/src/views/Message/Message.js   | 41 +++++++++++++++++++
 .../react/src/views/Message/MessageToolbox.js | 20 +++++++++
 2 files changed, 61 insertions(+)

diff --git a/packages/react/src/views/Message/Message.js b/packages/react/src/views/Message/Message.js
index aafb5642b..a17a3c3a3 100644
--- a/packages/react/src/views/Message/Message.js
+++ b/packages/react/src/views/Message/Message.js
@@ -118,6 +118,45 @@ const Message = ({
     }
   };
 
+  const handleCopyMessage = async (msg) => {
+    navigator.clipboard
+      .writeText(msg.msg)
+      .then(() => {
+        dispatchToastMessage({
+          type: 'success',
+          message: 'Message copied successfully',
+        });
+      })
+      .catch(() => {
+        dispatchToastMessage({
+          type: 'error',
+          message: 'Error in copying message',
+        });
+      });
+  };
+
+  const getMessageLink = async (id) => {
+    const host = await RCInstance.getHost();
+    const res = await RCInstance.channelInfo();
+    return `${host}/channel/${res.room.name}/?msg=${id}`;
+  };
+
+  const handleCopyMessageLink = async (msg) => {
+    try {
+      const messageLink = await getMessageLink(msg._id);
+      await navigator.clipboard.writeText(messageLink);
+      dispatchToastMessage({
+        type: 'success',
+        message: 'Message link copied successfully',
+      });
+    } catch (err) {
+      dispatchToastMessage({
+        type: 'error',
+        message: 'Error in copying message link',
+      });
+    }
+  };
+
   const handleDeleteMessage = async (msg) => {
     const res = await RCInstance.deleteMessage(msg._id);
 
@@ -215,6 +254,8 @@ const Message = ({
                     userRoles={userRoles}
                     pinRoles={pinRoles}
                     editMessageRoles={editMessageRoles}
+                    handleCopyMessage={handleCopyMessage}
+                    handleCopyMessageLink={handleCopyMessageLink}
                     handleOpenThread={handleOpenThread}
                     handleDeleteMessage={handleDeleteMessage}
                     handleStarMessage={handleStarMessage}
diff --git a/packages/react/src/views/Message/MessageToolbox.js b/packages/react/src/views/Message/MessageToolbox.js
index 0ed468bd7..a3e2c1ec7 100644
--- a/packages/react/src/views/Message/MessageToolbox.js
+++ b/packages/react/src/views/Message/MessageToolbox.js
@@ -30,6 +30,8 @@ export const MessageToolbox = ({
   handleStarMessage,
   handleDeleteMessage,
   handlerReportMessage,
+  handleCopyMessage,
+  handleCopyMessageLink,
   handleEditMessage,
   handleQuoteMessage,
   isEditing = false,
@@ -39,6 +41,8 @@ export const MessageToolbox = ({
       'reply',
       'quote',
       'star',
+      'copy',
+      'link',
       'pin',
       'edit',
       'delete',
@@ -130,6 +134,20 @@ export const MessageToolbox = ({
         color: isEditing ? 'secondary' : 'default',
         ghost: !isEditing,
       },
+      copy: {
+        label: 'Copy message',
+        id: 'copy',
+        onClick: () => handleCopyMessage(message),
+        iconName: 'copy',
+        visible: true,
+      },
+      link: {
+        label: 'Copy link',
+        id: 'link',
+        onClick: () => handleCopyMessageLink(message),
+        iconName: 'link',
+        visible: true,
+      },
       delete: {
         label: 'Delete',
         id: 'delete',
@@ -158,6 +176,8 @@ export const MessageToolbox = ({
       handlePinMessage,
       handleEditMessage,
       handlerReportMessage,
+      handleCopyMessage,
+      isAllowedToPin,
     ]
   );
 

From f0d28488689dcc2ab8172caef17f5d1f8b1e9d11 Mon Sep 17 00:00:00 2001
From: Devansh Kansagra <125076549+devanshkansagra@users.noreply.github.com>
Date: Sun, 22 Dec 2024 15:04:10 +0530
Subject: [PATCH 6/6] Added a validation check for pr approval in the deploy-pr
 workflow (#660)

* Added a validation check for pr approval in the deploy-pr workflow

* Added success() call in downloading artifact and deploy to github-pages steps

* Used Github API to get the pull request number in deploy-pr workflow

* fetching pr number using github user reference
---
 .github/workflows/build-pr.yml  | 11 ++++++-
 .github/workflows/deploy-pr.yml | 58 ++++++++++++++++++++++++++++++---
 2 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 66c97af32..940999222 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -12,7 +12,7 @@ env:
   LAYOUT_EDITOR_BASE_URL: "/EmbeddedChat/pulls/pr-${{github.event.pull_request.number}}/layout_editor"
   DOCS_BASE_URL: "/EmbeddedChat/pulls/pr-${{github.event.pull_request.number}}/docs"
   STORYBOOK_RC_HOST: "https://demo.qa.rocket.chat"
-  
+
 jobs:
   build:
     if: github.event.review.state == 'approved' && (github.event.review.author_association == 'COLLABORATOR' || github.event.review.author_association == 'OWNER')
@@ -22,6 +22,15 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Get user
+        run: echo "${{ github.event.pull_request.head.repo.owner.login }}" > user.txt
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: user
+          path: user.txt
+
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
diff --git a/.github/workflows/deploy-pr.yml b/.github/workflows/deploy-pr.yml
index 4f687507d..c999c5173 100644
--- a/.github/workflows/deploy-pr.yml
+++ b/.github/workflows/deploy-pr.yml
@@ -1,22 +1,71 @@
 name: Deploy PR-Preview
-
 on:
   workflow_run:
     workflows: ["Build PR-Preview"]
     types:
       - completed
-
 permissions:
   contents: write
   pages: write
-
 jobs:
   deploy:
     if: github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/download-artifact@v4
+        with:
+          name: user
+          path: .
+          github-token: ${{github.token}}
+          repository: ${{github.repository}}
+          run-id: ${{github.event.workflow_run.id}}
+
+      - name: Get user
+        id: get_user
+        run: |
+          USER=$(cat user.txt)
+          echo "USER=$USER" >> $GITHUB_ENV
+
+      - name: Get Pull Request Number
+        id: get_pr_number
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_NUMBER=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
+             "https://api.github.com/repos/${{ github.repository }}/pulls?head=${{env.USER}}:${{ github.event.workflow_run.head_branch }}" \
+            | jq -r '.[0].number')
+          echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
+
+      - name: Check PR Approval Status
+        id: approval_check
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_NUMBER=${{ env.PR_NUMBER }}
+
+          RESPONSE=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
+            "https://api.github.com/repos/${{ github.repository }}/pulls/$PR_NUMBER/reviews")
+
+          if ! echo "$RESPONSE" | jq . > /dev/null 2>&1; then
+            echo "Error: Invalid JSON response from GitHub API."
+            exit 1
+          fi
+
+          LATEST_REVIEW=$(echo "$RESPONSE" | jq 'sort_by(.submitted_at) | last')
+
+          STATE=$(echo "$LATEST_REVIEW" | jq -r '.state')
+          AUTHOR_ASSOCIATION=$(echo "$LATEST_REVIEW" | jq -r '.author_association')
+
+          echo "Latest review state: $STATE"
+          echo "Author association: $AUTHOR_ASSOCIATION"
+
+          if [ "$STATE" != "APPROVED" ] || { [ "$AUTHOR_ASSOCIATION" != "COLLABORATOR" ] && [ "$AUTHOR_ASSOCIATION" != "OWNER" ]; }; then
+            echo "The latest review is not an approved review from a collaborator or owner. Exiting."
+            exit 1
+          fi
+
+      - uses: actions/download-artifact@v4
+        if: success()
         with:
           name: github-pages
           path: build/
@@ -25,6 +74,7 @@ jobs:
           run-id: ${{github.event.workflow_run.id}}
 
       - name: Deploy to GitHub Pages
+        if: success()
         uses: crazy-max/ghaction-github-pages@v2
         with:
           target_branch: gh-deploy