chore: add modal dataTestId for title & description

pull/3281/head
Audric Ackermann 1 year ago
parent c96627f9d6
commit 6036c6c918
No known key found for this signature in database

@ -124,7 +124,7 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => {
}) })
: null} : null}
</Flex> </Flex>
<StyledTitle className="session-modal__header__title">{title}</StyledTitle> <StyledTitle className="session-modal__header__title" data-testid='modal-heading'>{title}</StyledTitle>
<Flex <Flex
container={true} container={true}
flexDirection={headerReverse ? 'row-reverse' : 'row'} flexDirection={headerReverse ? 'row-reverse' : 'row'}

@ -16,7 +16,6 @@ import { StyledI18nSubText } from '../basic/StyledI18nSubText';
export interface SessionConfirmDialogProps { export interface SessionConfirmDialogProps {
i18nMessage?: LocalizerComponentPropsObject; i18nMessage?: LocalizerComponentPropsObject;
i18nMessageSub?: LocalizerComponentPropsObject;
title?: string; title?: string;
radioOptions?: SessionRadioItems; radioOptions?: SessionRadioItems;
onOk?: any; onOk?: any;
@ -51,7 +50,6 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
const { const {
title = '', title = '',
i18nMessage, i18nMessage,
i18nMessageSub,
radioOptions, radioOptions,
okTheme, okTheme,
closeTheme = SessionButtonColor.Danger, closeTheme = SessionButtonColor.Danger,
@ -133,9 +131,8 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
{!showHeader && <SpacerLG />} {!showHeader && <SpacerLG />}
<div className="session-modal__centered"> <div className="session-modal__centered">
{i18nMessage ? <StyledI18nSubText {...i18nMessage} /> : null} {i18nMessage ? (
{i18nMessageSub ? ( <StyledI18nSubText {...i18nMessage} data-testid="modal-description" />
<StyledI18nSubText {...i18nMessageSub} className="session-confirm-sub-message" />
) : null} ) : null}
{radioOptions && chosenOption !== '' ? ( {radioOptions && chosenOption !== '' ? (
<SessionRadioGroup <SessionRadioGroup

@ -88,7 +88,7 @@ export const BlockOrUnblockDialog = ({ pubkeys, action, onConfirmed }: NonNullab
return ( return (
<SessionWrapperModal showExitIcon={true} title={localizedAction} onClose={closeModal}> <SessionWrapperModal showExitIcon={true} title={localizedAction} onClose={closeModal}>
<StyledModalDescriptionContainer data-testid="block-unblock-modal-description"> <StyledModalDescriptionContainer data-testid="modal-description">
<Localizer {...args} /> <Localizer {...args} />
</StyledModalDescriptionContainer> </StyledModalDescriptionContainer>
<Flex container={true} flexDirection="column" alignItems="center"> <Flex container={true} flexDirection="column" alignItems="center">

3
ts/react.d.ts vendored

@ -233,7 +233,8 @@ declare module 'react' {
| 'conversation-options-avatar' | 'conversation-options-avatar'
| 'copy-sender-from-details' | 'copy-sender-from-details'
| 'copy-msg-from-details' | 'copy-msg-from-details'
| 'block-unblock-modal-description' | 'modal-heading'
| 'modal-description'
// modules profile name // modules profile name
| 'module-conversation__user__profile-name' | 'module-conversation__user__profile-name'
| 'module-message-search-result__header__name__profile-name' | 'module-message-search-result__header__name__profile-name'

Loading…
Cancel
Save