mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Only mark smsOnlyOrUnregistered for direct conversations

Browse source
This commit is contained in:
trevor-signal 2025-01-06 13:32:18 -05:00 • committed by GitHub
parent f7f84c463f
commit 0811553ec9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ts/state/smart/CompositionArea.tsx
View file

@ -66,6 +66,7 @@ import { useStickersActions } from '../ducks/stickers';
import { useToastActions } from '../ducks/toast'; import { useToastActions } from '../ducks/toast';
import { isShowingAnyModal } from '../selectors/globalModals'; import { isShowingAnyModal } from '../selectors/globalModals';
import { isConversationEverUnregistered } from '../../util/isConversationUnregistered'; import { isConversationEverUnregistered } from '../../util/isConversationUnregistered';
import { isDirectConversation } from '../../util/whatTypeOfConversation';
function renderSmartCompositionRecording( function renderSmartCompositionRecording(
recProps: SmartCompositionRecordingProps recProps: SmartCompositionRecordingProps
@ -320,8 +321,9 @@ export const SmartCompositionArea = memo(function SmartCompositionArea({
isReported={conversation.isReported ?? false} isReported={conversation.isReported ?? false}
isHidden={conversation.removalStage != null} isHidden={conversation.removalStage != null}
isSmsOnlyOrUnregistered={ isSmsOnlyOrUnregistered={
isConversationSMSOnly(conversation) || isDirectConversation(conversation) &&
isConversationEverUnregistered(conversation) (isConversationSMSOnly(conversation) ||
isConversationEverUnregistered(conversation))
} }
isSignalConversation={isSignalConversation(conversation)} isSignalConversation={isSignalConversation(conversation)}
isFetchingUUID={conversation.isFetchingUUID ?? null} isFetchingUUID={conversation.isFetchingUUID ?? null}

6
ts/state/smart/ConversationHeader.tsx
View file

@ -44,6 +44,7 @@ import { useItemsActions } from '../ducks/items';
import { getLocalDeleteWarningShown } from '../selectors/items'; import { getLocalDeleteWarningShown } from '../selectors/items';
import { getDeleteSyncSendEnabled } from '../selectors/items-extra'; import { getDeleteSyncSendEnabled } from '../selectors/items-extra';
import { isConversationEverUnregistered } from '../../util/isConversationUnregistered'; import { isConversationEverUnregistered } from '../../util/isConversationUnregistered';
import { isDirectConversation } from '../../util/whatTypeOfConversation';
export type OwnProps = { export type OwnProps = {
id: string; id: string;
@ -277,8 +278,9 @@ export const SmartConversationHeader = memo(function SmartConversationHeader({
isSelectMode={isSelectMode} isSelectMode={isSelectMode}
isSignalConversation={isSignalConversation(conversation)} isSignalConversation={isSignalConversation(conversation)}
isSmsOnlyOrUnregistered={ isSmsOnlyOrUnregistered={
isConversationSMSOnly(conversation) || isDirectConversation(conversation) &&
isConversationEverUnregistered(conversation) (isConversationSMSOnly(conversation) ||
isConversationEverUnregistered(conversation))
} }
onConversationAccept={onConversationAccept} onConversationAccept={onConversationAccept}
onConversationArchive={onConversationArchive} onConversationArchive={onConversationArchive}