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

Fix ErrorModal title

Browse source
This commit is contained in:
ayumi-signal 2024-10-16 10:08:44 -07:00 committed by GitHub
parent 1649808727
commit a0b7539620
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ts/components/ErrorModal.stories.tsx
View file

@ -17,7 +17,7 @@ const i18n = setupI18n('en', enMessages);
const createProps = (overrideProps: Partial<PropsType> = {}): PropsType => ({ const createProps = (overrideProps: Partial<PropsType> = {}): PropsType => ({
buttonVariant: overrideProps.buttonVariant ?? undefined, buttonVariant: overrideProps.buttonVariant ?? undefined,
description: overrideProps.description ?? '', description: overrideProps.description ?? '',
title: overrideProps.title ?? '', title: Object.hasOwn(overrideProps, 'title') ? overrideProps.title : '',
i18n, i18n,
onClose: action('onClick'), onClose: action('onClick'),
}); });
@ -48,3 +48,14 @@ export function CustomStrings(): JSX.Element {
/> />
); );
} }
export function NoTitle(): JSX.Element {
return (
<ErrorModal
{...createProps({
title: null,
description: 'This is a fun error!',
})}
/>
);
}

2
ts/components/ErrorModal.tsx
View file

@ -40,7 +40,7 @@ export function ErrorModal(props: PropsType): JSX.Element {
modalName="ErrorModal" modalName="ErrorModal"
i18n={i18n} i18n={i18n}
onClose={onClose} onClose={onClose}
title={title == null ? undefined : i18n('icu:ErrorModal--title')} title={title == null ? undefined : title || i18n('icu:ErrorModal--title')}
modalFooter={footer} modalFooter={footer}
> >
<div className="module-error-modal__description"> <div className="module-error-modal__description">