removed showing roles from sidebars

RocketChat · May 9, 2024 · 590f7a0 · 590f7a0
1 parent 2ef51f9
commit 590f7a0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/packages/react/src/components/AllThreads/AllThreads.js b/packages/react/src/components/AllThreads/AllThreads.js
@@ -125,11 +125,7 @@ const AllThreads = () => {
                     />
                   )}
                   <MessageBodyContainer>
-                    <MessageHeader
-                      message={message}
-                      isTimeStamped={false}
-                      isRoles={false}
-                    />
+                    <MessageHeader message={message} isTimeStamped={false} />
 
                     <MessageBody>
                       {message.attachments && message.attachments.length > 0

diff --git a/packages/react/src/components/Message/Message.js b/packages/react/src/components/Message/Message.js
@@ -59,6 +59,7 @@ const Message = ({
   className = '',
   style = {},
   showToolbox = true,
+  showRoles = true,
 }) => {
   const { classNames, styleOverrides } = useComponentOverrides(
     'Message',
@@ -183,7 +184,9 @@ const Message = ({
           />
         )}
         <MessageBodyContainer>
-          {shouldShowHeader && <MessageHeader message={message} />}
+          {shouldShowHeader && (
+            <MessageHeader message={message} isRoles={showRoles} />
+          )}
           {!message.t ? (
             <>
               <MessageBody css={message.isPending && PendingMessageBody}>

diff --git a/packages/react/src/components/Message/MessageHeader.js b/packages/react/src/components/Message/MessageHeader.js
@@ -73,7 +73,7 @@ const MessageHeaderTimestapCss = css`
   color: #9ea2a8;
 `;
 
-const MessageHeader = ({ message, isTimeStamped = true, isRoles = true }) => {
+const MessageHeader = ({ message, isTimeStamped = true, isRoles = false }) => {
   const { styleOverrides, classNames } = useComponentOverrides('MessageHeader');
   const authenticatedUserId = useUserStore((state) => state.userId);
   const showRoles = useUserStore((state) => state.showRoles);

diff --git a/packages/react/src/components/PinnedMessages/PinnedMessages.js b/packages/react/src/components/PinnedMessages/PinnedMessages.js
@@ -90,6 +90,7 @@ const PinnedMessages = () => {
                     variant="default"
                     showAvatar
                     showToolbox={false}
+                    showRoles={false}
                   />
                 </Box>
               );

diff --git a/packages/react/src/components/SearchMessage/SearchMessage.js b/packages/react/src/components/SearchMessage/SearchMessage.js
@@ -1,5 +1,4 @@
 import React, { useState, useContext, useEffect } from 'react';
-import { css } from '@emotion/react';
 import { isSameDay, format } from 'date-fns';
 import { debounce } from 'lodash';
 import RCContext from '../../context/RCInstance';
@@ -103,6 +102,7 @@ const Search = () => {
                   variant="default"
                   showAvatar
                   showToolbox={false}
+                  showRoles={false}
                 />
               </Box>
             );

diff --git a/packages/react/src/components/StarredMessages/StarredMessages.js b/packages/react/src/components/StarredMessages/StarredMessages.js
@@ -99,6 +99,7 @@ const StarredMessages = () => {
                     variant="default"
                     showAvatar
                     showToolbox={false}
+                    showRoles={false}
                   />
                 </Box>
               );