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

Moves blockAndReportSpam to redux

Browse source
This commit is contained in:
Josh Perez 2022-12-06 14:03:09 -05:00 • committed by GitHub
parent 92a512a16d
commit 105162dc66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 282 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

32
ts/components/CompositionArea.tsx
View file

@ -240,11 +240,10 @@ export function CompositionArea({
isMissingMandatoryProfileSharing,
left,
messageRequestsEnabled,
onAccept,
onBlock,
onBlockAndReportSpam,
onDelete,
onUnblock,
acceptConversation,
blockConversation,
blockAndReportSpam,
deleteConversation,
title,
// GroupV1 Disabled Actions
isGroupV1AndDisabled,
@ -497,14 +496,14 @@ export function CompositionArea({
) {
return (
<MessageRequestActions
i18n={i18n}
acceptConversation={acceptConversation}
blockAndReportSpam={blockAndReportSpam}
blockConversation={blockConversation}
conversationId={conversationId}
conversationType={conversationType}
deleteConversation={deleteConversation}
i18n={i18n}
isBlocked={isBlocked}
onBlock={onBlock}
onBlockAndReportSpam={onBlockAndReportSpam}
onUnblock={onUnblock}
onDelete={onDelete}
onAccept={onAccept}
title={title}
/>
);
@ -549,12 +548,13 @@ export function CompositionArea({
) {
return (
<MandatoryProfileSharingActions
i18n={i18n}
acceptConversation={acceptConversation}
blockAndReportSpam={blockAndReportSpam}
blockConversation={blockConversation}
conversationId={conversationId}
conversationType={conversationType}
onBlock={onBlock}
onBlockAndReportSpam={onBlockAndReportSpam}
onDelete={onDelete}
onAccept={onAccept}
deleteConversation={deleteConversation}
i18n={i18n}
title={title}
/>
);