diff --git a/.eslintignore b/.eslintignore index da77f07f0..cd371d9ae 100644 --- a/.eslintignore +++ b/.eslintignore @@ -14,3 +14,4 @@ preload.js stylesheets/dist/ compiled.d.ts .eslintrc.js +playwright.config.js diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx index 407ee8220..7591a9ac6 100644 --- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx +++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx @@ -48,6 +48,7 @@ import { useMessageStatus, useMessageTimestamp, } from '../../../../state/selectors'; +import { useIsPublic } from '../../../../hooks/useParamSelector'; export type MessageContextMenuSelectorProps = Pick< MessageRenderingProps, @@ -148,10 +149,10 @@ const SaveAttachment = ({ messageId }: MessageId) => { const AdminActionItems = ({ messageId }: MessageId) => { const convoId = useSelectedConversationKey(); - + const isPublic = useIsPublic(); const weAreModerator = useSelectedWeAreModerator(); const weAreAdmin = useSelectedWeAreAdmin(); - const showAdminActions = weAreAdmin || weAreModerator; + const showAdminActions = (weAreAdmin || weAreModerator) && isPublic; const sender = useMessageSender(messageId); const isSenderAdmin = useMessageSenderIsAdmin(messageId);