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

30
ts/components/conversation/MessageRequestActionsConfirmation.tsx
View file

@ -16,25 +16,27 @@ export enum MessageRequestState {
}
export type Props = {
i18n: LocalizerType;
acceptConversation(conversationId: string): unknown;
blockAndReportSpam(conversationId: string): unknown;
blockConversation(conversationId: string): unknown;
conversationId: string;
conversationType: 'group' | 'direct';
deleteConversation(conversationId: string): unknown;
i18n: LocalizerType;
isBlocked?: boolean;
onBlock(): unknown;
onBlockAndReportSpam(): unknown;
onUnblock(): unknown;
onDelete(): unknown;
state: MessageRequestState;
onChangeState(state: MessageRequestState): unknown;
state: MessageRequestState;
} & Omit<ContactNameProps, 'module'>;
export function MessageRequestActionsConfirmation({
acceptConversation,
blockAndReportSpam,
blockConversation,
conversationId,
conversationType,
deleteConversation,
i18n,
onBlock,
onBlockAndReportSpam,
onChangeState,
onDelete,
onUnblock,
state,
title,
}: Props): JSX.Element | null {
@ -58,14 +60,14 @@ export function MessageRequestActionsConfirmation({
? [
{
text: i18n('MessageRequests--block-and-report-spam'),
action: onBlockAndReportSpam,
action: () => blockAndReportSpam(conversationId),
style: 'negative' as const,
},
]
: []),
{
text: i18n('MessageRequests--block'),
action: onBlock,
action: () => blockConversation(conversationId),
style: 'negative',
},
]}
@ -95,7 +97,7 @@ export function MessageRequestActionsConfirmation({
actions={[
{
text: i18n('MessageRequests--unblock'),
action: onUnblock,
action: () => acceptConversation(conversationId),
style: 'affirmative',
},
]}
@ -123,7 +125,7 @@ export function MessageRequestActionsConfirmation({
actions={[
{
text: i18n(`MessageRequests--delete-${conversationType}`),
action: onDelete,
action: () => deleteConversation(conversationId),
style: 'negative',
},
]}