Merge branch 'develop' into feat/code-highlight

RocketChat · Jan 5, 2025 · dae74a4 · dae74a4
2 parents 5a46d5e + 843adf0
commit dae74a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/react/src/views/Message/MessageHeader.js b/packages/react/src/views/Message/MessageHeader.js
@@ -127,7 +127,7 @@ const MessageHeader = ({
               css={styles.userRole}
               className={appendClassNames('ec-message-user-role')}
             >
-              admin
+              Admin
             </Box>
           )}
 
@@ -138,7 +138,7 @@ const MessageHeader = ({
               css={styles.userRole}
               className={appendClassNames('ec-message-user-role')}
             >
-              {role}
+              {role.charAt(0).toUpperCase() + role.slice(1)}
             </Box>
           ))}
         </>

diff --git a/packages/react/src/views/MessageAggregators/common/MessageAggregator.js b/packages/react/src/views/MessageAggregators/common/MessageAggregator.js
@@ -17,6 +17,7 @@ import LoadingIndicator from './LoadingIndicator';
 import NoMessagesIndicator from './NoMessageIndicator';
 import FileDisplay from '../../FileMessage/FileMessage';
 import useSetExclusiveState from '../../../hooks/useSetExclusiveState';
+import { useRCContext } from '../../../context/RCInstance';
 
 export const MessageAggregator = ({
   title,
@@ -33,6 +34,8 @@ export const MessageAggregator = ({
   const { theme } = useTheme();
   const styles = getMessageAggregatorStyles(theme);
   const setExclusiveState = useSetExclusiveState();
+  const { ECOptions } = useRCContext();
+  const showRoles = ECOptions?.showRoles;
   const messages = useMessageStore((state) => state.messages);
   const threadMessages = useMessageStore((state) => state.threadMessages) || [];
   const allMessages = useMemo(
@@ -126,7 +129,7 @@ export const MessageAggregator = ({
                       type="default"
                       showAvatar
                       showToolbox={false}
-                      showRoles={false}
+                      showRoles={showRoles}
                       isInSidebar
                       style={{
                         flex: 1,