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

conversation_view: Move the last of the small functions to redux

Browse source
This commit is contained in:
Scott Nonnenberg 2022-12-20 19:25:10 -08:00 • committed by GitHub
parent 86e92dda51
commit 1a68c3db62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 782 additions and 944 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ts/components/conversation/ContactSpoofingReviewDialog.tsx
View file

@ -25,6 +25,7 @@ import { missingCaseError } from '../../util/missingCaseError';
import { isInSystemContacts } from '../../util/isInSystemContacts';
export type PropsType = {
conversationId: string;
acceptConversation: (conversationId: string) => unknown;
blockAndReportSpam: (conversationId: string) => unknown;
blockConversation: (conversationId: string) => unknown;
@ -32,8 +33,11 @@ export type PropsType = {
getPreferredBadge: PreferredBadgeSelectorType;
i18n: LocalizerType;
onClose: () => void;
onShowContactModal: (contactId: string, conversationId?: string) => unknown;
removeMember: (conversationId: string) => unknown;
showContactModal: (contactId: string, conversationId?: string) => unknown;
removeMember: (
conversationId: string,
memberConversationId: string
) => unknown;
theme: ThemeType;
} & (
| {
@ -65,11 +69,12 @@ export function ContactSpoofingReviewDialog(props: PropsType): JSX.Element {
acceptConversation,
blockAndReportSpam,
blockConversation,
conversationId,
deleteConversation,
getPreferredBadge,
i18n,
onClose,
onShowContactModal,
showContactModal,
removeMember,
theme,
} = props;
@ -150,7 +155,7 @@ export function ContactSpoofingReviewDialog(props: PropsType): JSX.Element {
setConfirmationState(undefined);
}}
onRemove={() => {
removeMember(affectedConversation.id);
removeMember(conversationId, affectedConversation.id);
}}
/>
);
@ -218,7 +223,7 @@ export function ContactSpoofingReviewDialog(props: PropsType): JSX.Element {
getPreferredBadge={getPreferredBadge}
i18n={i18n}
onClick={() => {
onShowContactModal(safeConversation.id);
showContactModal(safeConversation.id);
}}
theme={theme}
/>