From 1a05e7874411bd7e857d459bf61f3f61a80dad7f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 3 Sep 2024 15:53:31 +1000 Subject: [PATCH] fix: always show disappearing desc for group in right panel previously it was only shown when we were not the admin --- .../disappearing-messages/OverlayDisappearingMessages.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx index 561a1690d..e8bee94bc 100644 --- a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx +++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx @@ -13,7 +13,6 @@ import { useSelectedConversationKey, useSelectedExpireTimer, useSelectedIsGroupOrCommunity, - useSelectedWeAreAdmin, } from '../../../../../state/selectors/selectedConversation'; import { ReleasedFeatures } from '../../../../../util/releaseFeature'; import { Flex } from '../../../../basic/Flex'; @@ -117,7 +116,6 @@ export const OverlayDisappearingMessages = () => { const isGroup = useSelectedIsGroupOrCommunity(); const expirationMode = useSelectedConversationDisappearingMode(); const expireTimer = useSelectedExpireTimer(); - const weAreAdmin = useSelectedWeAreAdmin(); const [modeSelected, setModeSelected] = useState< DisappearingMessageConversationModeType | undefined @@ -204,9 +202,11 @@ export const OverlayDisappearingMessages = () => { /> )} - {isGroup && isV2Released && !weAreAdmin && ( + + {isGroup && ( <> + {/* We want those to be shown no matter our admin rights in a group. */} {window.i18n('disappearingMessagesDescription')}