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:
automated-signal 2025-01-06 13:56:35 -06:00 committed by GitHub
parent c25f83bc0b
commit f5c012be50
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show stats 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 { 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}

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

@ -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}