fix: always show disappearing desc for group in right panel

previously it was only shown when we were not the admin
pull/3206/head
Audric Ackermann 7 months ago
parent 59303cf7d0
commit 1a05e78744

@ -13,7 +13,6 @@ import {
useSelectedConversationKey, useSelectedConversationKey,
useSelectedExpireTimer, useSelectedExpireTimer,
useSelectedIsGroupOrCommunity, useSelectedIsGroupOrCommunity,
useSelectedWeAreAdmin,
} from '../../../../../state/selectors/selectedConversation'; } from '../../../../../state/selectors/selectedConversation';
import { ReleasedFeatures } from '../../../../../util/releaseFeature'; import { ReleasedFeatures } from '../../../../../util/releaseFeature';
import { Flex } from '../../../../basic/Flex'; import { Flex } from '../../../../basic/Flex';
@ -117,7 +116,6 @@ export const OverlayDisappearingMessages = () => {
const isGroup = useSelectedIsGroupOrCommunity(); const isGroup = useSelectedIsGroupOrCommunity();
const expirationMode = useSelectedConversationDisappearingMode(); const expirationMode = useSelectedConversationDisappearingMode();
const expireTimer = useSelectedExpireTimer(); const expireTimer = useSelectedExpireTimer();
const weAreAdmin = useSelectedWeAreAdmin();
const [modeSelected, setModeSelected] = useState< const [modeSelected, setModeSelected] = useState<
DisappearingMessageConversationModeType | undefined DisappearingMessageConversationModeType | undefined
@ -204,9 +202,11 @@ export const OverlayDisappearingMessages = () => {
/> />
</> </>
)} )}
{isGroup && isV2Released && !weAreAdmin && (
{isGroup && (
<> <>
<SpacerLG /> <SpacerLG />
{/* We want those to be shown no matter our admin rights in a group. */}
<StyledNonAdminDescription> <StyledNonAdminDescription>
{window.i18n('disappearingMessagesDescription')} {window.i18n('disappearingMessagesDescription')}
<br /> <br />

Loading…
Cancel
Save