From 69d92b6f9540493d86763bd1380e09a9bf5fac4c Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 2 Nov 2022 13:58:02 -0500 Subject: [PATCH] Chats: make chatsExpiration a conditional feature --- .../chat-page/components/chat-page-main.tsx | 57 ++++++++++--------- .../components/chat-widget/chat-settings.tsx | 35 ++++++------ app/soapbox/utils/features.ts | 6 ++ 3 files changed, 55 insertions(+), 43 deletions(-) diff --git a/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx b/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx index 90f7e6be9..c4bc06105 100644 --- a/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx +++ b/app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx @@ -7,7 +7,7 @@ import List, { ListItem } from 'soapbox/components/list'; import { Avatar, HStack, Icon, IconButton, Menu, MenuButton, MenuItem, MenuList, Stack, Text } from 'soapbox/components/ui'; import VerificationBadge from 'soapbox/components/verification_badge'; import { useChatContext } from 'soapbox/contexts/chat-context'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; +import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks'; import { MessageExpirationValues, useChatActions } from 'soapbox/queries/chats'; import { secondsToDays } from 'soapbox/utils/numbers'; @@ -41,6 +41,7 @@ const messages = defineMessages({ const ChatPageMain = () => { const dispatch = useAppDispatch(); const intl = useIntl(); + const features = useFeatures(); const inputRef = useRef(null); @@ -138,32 +139,34 @@ const ChatPageMain = () => { - - - handleUpdateChat(MessageExpirationValues.SEVEN)} - isSelected={chat.message_expiration === MessageExpirationValues.SEVEN} - /> - handleUpdateChat(MessageExpirationValues.FOURTEEN)} - isSelected={chat.message_expiration === MessageExpirationValues.FOURTEEN} - /> - handleUpdateChat(MessageExpirationValues.THIRTY)} - isSelected={chat.message_expiration === MessageExpirationValues.THIRTY} - /> - handleUpdateChat(MessageExpirationValues.NINETY)} - isSelected={chat.message_expiration === MessageExpirationValues.NINETY} - /> - + {features.chatsExpiration && ( + + + handleUpdateChat(MessageExpirationValues.SEVEN)} + isSelected={chat.message_expiration === MessageExpirationValues.SEVEN} + /> + handleUpdateChat(MessageExpirationValues.FOURTEEN)} + isSelected={chat.message_expiration === MessageExpirationValues.FOURTEEN} + /> + handleUpdateChat(MessageExpirationValues.THIRTY)} + isSelected={chat.message_expiration === MessageExpirationValues.THIRTY} + /> + handleUpdateChat(MessageExpirationValues.NINETY)} + isSelected={chat.message_expiration === MessageExpirationValues.NINETY} + /> + + )} { const dispatch = useAppDispatch(); const intl = useIntl(); + const features = useFeatures(); const { chat, setEditing, toggleChatPane } = useChatContext(); const { deleteChat, updateChat } = useChatActions(chat?.id as string); @@ -113,21 +114,23 @@ const ChatSettings = () => { - - - - - + {features.chatsExpiration && ( + + + + + + )}