diff --git a/ts/components/SessionWrapperModal.tsx b/ts/components/SessionWrapperModal.tsx
index 9f244c044..5cccdf162 100644
--- a/ts/components/SessionWrapperModal.tsx
+++ b/ts/components/SessionWrapperModal.tsx
@@ -124,7 +124,7 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => {
                       })
                     : null}
                 </Flex>
-                <StyledTitle className="session-modal__header__title">{title}</StyledTitle>
+                <StyledTitle className="session-modal__header__title" data-testid='modal-heading'>{title}</StyledTitle>
                 <Flex
                   container={true}
                   flexDirection={headerReverse ? 'row-reverse' : 'row'}
diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx
index 969e8ff07..2657cfa2a 100644
--- a/ts/components/dialog/SessionConfirm.tsx
+++ b/ts/components/dialog/SessionConfirm.tsx
@@ -16,7 +16,6 @@ import { StyledI18nSubText } from '../basic/StyledI18nSubText';
 
 export interface SessionConfirmDialogProps {
   i18nMessage?: LocalizerComponentPropsObject;
-  i18nMessageSub?: LocalizerComponentPropsObject;
   title?: string;
   radioOptions?: SessionRadioItems;
   onOk?: any;
@@ -51,7 +50,6 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
   const {
     title = '',
     i18nMessage,
-    i18nMessageSub,
     radioOptions,
     okTheme,
     closeTheme = SessionButtonColor.Danger,
@@ -133,9 +131,8 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
       {!showHeader && <SpacerLG />}
 
       <div className="session-modal__centered">
-        {i18nMessage ? <StyledI18nSubText {...i18nMessage} /> : null}
-        {i18nMessageSub ? (
-          <StyledI18nSubText {...i18nMessageSub} className="session-confirm-sub-message" />
+        {i18nMessage ? (
+          <StyledI18nSubText {...i18nMessage} data-testid="modal-description" />
         ) : null}
         {radioOptions && chosenOption !== '' ? (
           <SessionRadioGroup
diff --git a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx
index f24ea0969..ee5c371a4 100644
--- a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx
+++ b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx
@@ -88,7 +88,7 @@ export const BlockOrUnblockDialog = ({ pubkeys, action, onConfirmed }: NonNullab
 
   return (
     <SessionWrapperModal showExitIcon={true} title={localizedAction} onClose={closeModal}>
-      <StyledModalDescriptionContainer data-testid="block-unblock-modal-description">
+      <StyledModalDescriptionContainer data-testid="modal-description">
         <Localizer {...args} />
       </StyledModalDescriptionContainer>
       <Flex container={true} flexDirection="column" alignItems="center">
diff --git a/ts/react.d.ts b/ts/react.d.ts
index 79ff18f09..0e3fc2dc4 100644
--- a/ts/react.d.ts
+++ b/ts/react.d.ts
@@ -233,7 +233,8 @@ declare module 'react' {
     | 'conversation-options-avatar'
     | 'copy-sender-from-details'
     | 'copy-msg-from-details'
-    | 'block-unblock-modal-description'
+    | 'modal-heading'
+    | 'modal-description'
     // modules profile name
     | 'module-conversation__user__profile-name'
     | 'module-message-search-result__header__name__profile-name'