diff --git a/ts/components/conversation/header/ConversationHeaderTitle.tsx b/ts/components/conversation/header/ConversationHeaderTitle.tsx index 9499d17b3..c839268aa 100644 --- a/ts/components/conversation/header/ConversationHeaderTitle.tsx +++ b/ts/components/conversation/header/ConversationHeaderTitle.tsx @@ -7,7 +7,7 @@ import { resetRightOverlayMode, setRightOverlayMode } from '../../../state/ducks import { isRightPanelShowing } from '../../../state/selectors/conversations'; import { useSelectedConversationKey, - useSelectedConversationExpirationType, + useSelectedConversationDisappearingMode, useSelectedExpireTimer, useSelectedIsGroup, useSelectedIsKickedFromGroup, @@ -46,7 +46,7 @@ export const ConversationHeaderTitle = () => { const isGroup = useSelectedIsGroup(); const members = useSelectedMembers(); - const expirationMode = useSelectedConversationExpirationType(); + const expirationMode = useSelectedConversationDisappearingMode(); const expireTimer = useSelectedExpireTimer(); const convoName = useConversationUsername(selectedConvoKey); 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 d78053e19..f5089df60 100644 --- a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx +++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx @@ -8,7 +8,7 @@ import { resetRightOverlayMode } from '../../../../../state/ducks/section'; import { getSelectedConversationExpirationModes, useSelectedConversationKey, - useSelectedConversationExpirationType, + useSelectedConversationDisappearingMode, useSelectedExpireTimer, useSelectedIsGroup, useSelectedWeAreAdmin, @@ -84,7 +84,7 @@ export const OverlayDisappearingMessages = () => { const hasOnlyOneMode = Boolean(singleMode && singleMode.length > 0); const isGroup = useSelectedIsGroup(); - const expirationMode = useSelectedConversationExpirationType(); + const expirationMode = useSelectedConversationDisappearingMode(); const expireTimer = useSelectedExpireTimer(); const weAreAdmin = useSelectedWeAreAdmin(); diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index 369ae52a4..11008e6ba 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -312,7 +312,7 @@ export function useSelectedExpireTimer(): number | undefined { return useSelector((state: StateType) => getSelectedConversation(state)?.expireTimer); } -export function useSelectedConversationExpirationType(): +export function useSelectedConversationDisappearingMode(): | DisappearingMessageConversationModeType | undefined { return useSelector((state: StateType) => getSelectedConversation(state)?.expirationMode);