Synchronous delete call link

This commit is contained in:
ayumi-signal 2024-10-09 09:35:24 -07:00 committed by GitHub
parent e60df56500
commit 42cc5e0013
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 443 additions and 135 deletions

View file

@ -49,6 +49,7 @@ type CallsTabProps = Readonly<{
getCallLink: (id: string) => CallLinkType | undefined;
getConversation: (id: string) => ConversationType | void;
hangUpActiveCall: (reason: string) => void;
hasAnyAdminCallLinks: boolean;
hasFailedStorySends: boolean;
hasPendingUpdate: boolean;
i18n: LocalizerType;
@ -105,6 +106,7 @@ export function CallsTab({
getCallLink,
getConversation,
hangUpActiveCall,
hasAnyAdminCallLinks,
hasFailedStorySends,
hasPendingUpdate,
i18n,
@ -370,7 +372,9 @@ export function CallsTab({
},
]}
>
{i18n('icu:CallsTab__ConfirmClearCallHistory__Body')}
{hasAnyAdminCallLinks
? i18n('icu:CallsTab__ConfirmClearCallHistory__Body--call-links')
: i18n('icu:CallsTab__ConfirmClearCallHistory__Body')}
</ConfirmationDialog>
)}
</>

View file

@ -10,7 +10,7 @@ import { Button, ButtonVariant } from './Button';
export type PropsType = {
buttonVariant?: ButtonVariant;
description?: string;
title?: string;
title?: string | null;
onClose: () => void;
i18n: LocalizerType;
@ -40,7 +40,7 @@ export function ErrorModal(props: PropsType): JSX.Element {
modalName="ErrorModal"
i18n={i18n}
onClose={onClose}
title={title || i18n('icu:ErrorModal--title')}
title={title == null ? undefined : i18n('icu:ErrorModal--title')}
modalFooter={footer}
>
<div className="module-error-modal__description">

View file

@ -53,12 +53,16 @@ export type PropsType = {
renderEditNicknameAndNoteModal: () => JSX.Element;
// ErrorModal
errorModalProps:
| { buttonVariant?: ButtonVariant; description?: string; title?: string }
| {
buttonVariant?: ButtonVariant;
description?: string;
title?: string | null;
}
| undefined;
renderErrorModal: (opts: {
buttonVariant?: ButtonVariant;
description?: string;
title?: string;
title?: string | null;
}) => JSX.Element;
// DeleteMessageModal
deleteMessagesProps: DeleteMessagesPropsType | undefined;