From 0811553ec9ffecb3a3a19b64b15ff39ffa243316 Mon Sep 17 00:00:00 2001 From: trevor-signal <131492920+trevor-signal@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:32:18 -0500 Subject: [PATCH] Only mark smsOnlyOrUnregistered for direct conversations --- ts/state/smart/CompositionArea.tsx | 6 ++++-- ts/state/smart/ConversationHeader.tsx | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ts/state/smart/CompositionArea.tsx b/ts/state/smart/CompositionArea.tsx index bc278c4993d2..dae083509e49 100644 --- a/ts/state/smart/CompositionArea.tsx +++ b/ts/state/smart/CompositionArea.tsx @@ -66,6 +66,7 @@ import { useStickersActions } from '../ducks/stickers'; import { useToastActions } from '../ducks/toast'; import { isShowingAnyModal } from '../selectors/globalModals'; import { isConversationEverUnregistered } from '../../util/isConversationUnregistered'; +import { isDirectConversation } from '../../util/whatTypeOfConversation'; function renderSmartCompositionRecording( recProps: SmartCompositionRecordingProps @@ -320,8 +321,9 @@ export const SmartCompositionArea = memo(function SmartCompositionArea({ isReported={conversation.isReported ?? false} isHidden={conversation.removalStage != null} isSmsOnlyOrUnregistered={ - isConversationSMSOnly(conversation) || - isConversationEverUnregistered(conversation) + isDirectConversation(conversation) && + (isConversationSMSOnly(conversation) || + isConversationEverUnregistered(conversation)) } isSignalConversation={isSignalConversation(conversation)} isFetchingUUID={conversation.isFetchingUUID ?? null} diff --git a/ts/state/smart/ConversationHeader.tsx b/ts/state/smart/ConversationHeader.tsx index 2a020c288115..95130a382183 100644 --- a/ts/state/smart/ConversationHeader.tsx +++ b/ts/state/smart/ConversationHeader.tsx @@ -44,6 +44,7 @@ import { useItemsActions } from '../ducks/items'; import { getLocalDeleteWarningShown } from '../selectors/items'; import { getDeleteSyncSendEnabled } from '../selectors/items-extra'; import { isConversationEverUnregistered } from '../../util/isConversationUnregistered'; +import { isDirectConversation } from '../../util/whatTypeOfConversation'; export type OwnProps = { id: string; @@ -277,8 +278,9 @@ export const SmartConversationHeader = memo(function SmartConversationHeader({ isSelectMode={isSelectMode} isSignalConversation={isSignalConversation(conversation)} isSmsOnlyOrUnregistered={ - isConversationSMSOnly(conversation) || - isConversationEverUnregistered(conversation) + isDirectConversation(conversation) && + (isConversationSMSOnly(conversation) || + isConversationEverUnregistered(conversation)) } onConversationAccept={onConversationAccept} onConversationArchive={onConversationArchive}