Merge pull request #76059 from Expensify/revert-73242-follow-up-71434

Revert "fix: thread header is not showing the exact message sent"

(cherry picked from commit 06c12c8)

(cherry-picked to staging by puneetlath)

Author: puneetlath

src/components/DisplayNames/index.native.tsx

@@ -8,14 +8,9 @@ import TextWithEmojiFragment from '@pages/home/report/comment/TextWithEmojiFragm
 import type DisplayNamesProps from './types';
 
 // As we don't have to show tooltips of the Native platform so we simply render the full display names list.
-function DisplayNames({accessibilityLabel, fullTitle, textStyles = [], numberOfLines = 1, renderAdditionalText, forwardedFSClass, testID, shouldParseFullTitle = true}: DisplayNamesProps) {
+function DisplayNames({accessibilityLabel, fullTitle, textStyles = [], numberOfLines = 1, renderAdditionalText, forwardedFSClass, testID}: DisplayNamesProps) {
     const {translate} = useLocalize();
     const titleContainsTextAndCustomEmoji = useMemo(() => containsCustomEmoji(fullTitle) && !containsOnlyCustomEmoji(fullTitle), [fullTitle]);
-    const title = useMemo(() => {
-        const processedTitle = shouldParseFullTitle ? Parser.htmlToText(fullTitle) : fullTitle;
-        return StringUtils.lineBreaksToSpaces(processedTitle) || translate('common.hidden');
-    }, [fullTitle, shouldParseFullTitle, translate]);
-
     return (
         <Text
             accessibilityLabel={accessibilityLabel}
@@ -26,11 +21,11 @@ function DisplayNames({accessibilityLabel, fullTitle, textStyles = [], numberOfL
         >
             {titleContainsTextAndCustomEmoji ? (
                 <TextWithEmojiFragment
-                    message={title}
+                    message={StringUtils.lineBreaksToSpaces(Parser.htmlToText(fullTitle)) || translate('common.hidden')}
                     style={textStyles}
                 />
             ) : (
-                title
+                StringUtils.lineBreaksToSpaces(Parser.htmlToText(fullTitle)) || translate('common.hidden')
             )}
             {renderAdditionalText?.()}
         </Text>

src/components/DisplayNames/index.tsx

@@ -1,4 +1,4 @@
-import React, {useMemo} from 'react';
+import React from 'react';
 import useLocalize from '@hooks/useLocalize';
 import Parser from '@libs/Parser';
 import StringUtils from '@libs/StringUtils';
@@ -16,13 +16,9 @@ function DisplayNames({
     displayNamesWithTooltips,
     renderAdditionalText,
     forwardedFSClass,
-    shouldParseFullTitle = true,
 }: DisplayNamesProps) {
     const {translate} = useLocalize();
-    const title = useMemo(() => {
-        const processedTitle = shouldParseFullTitle ? Parser.htmlToText(fullTitle) : fullTitle;
-        return StringUtils.lineBreaksToSpaces(processedTitle) || translate('common.hidden');
-    }, [fullTitle, shouldParseFullTitle, translate]);
+    const title = StringUtils.lineBreaksToSpaces(Parser.htmlToText(fullTitle)) || translate('common.hidden');
 
     if (!tooltipEnabled) {
         return (

src/components/DisplayNames/types.ts

@@ -20,14 +20,6 @@ type DisplayNamesProps = ForwardedFSClassProps & {
     /** The full title of the DisplayNames component (not split up) */
     fullTitle: string;
 
-    /**
-     * Whether `fullTitle` should be processed through Parser.htmlToText().
-     * Set to true when `fullTitle` contains HTML that needs to be converted to plain text
-     * Set to false when `fullTitle` is already plain text or when you want to preserve
-     * any HTML formatting in the display.
-     */
-    shouldParseFullTitle?: boolean;
-
     /** Array of objects that map display names to their corresponding tooltip */
     displayNamesWithTooltips?: DisplayNameWithTooltip[];
 

src/components/HeaderWithBackButton/types.ts

@@ -132,9 +132,6 @@ type HeaderWithBackButtonProps = Partial<ChildrenProps> & {
     /** Whether we should enable detail page navigation */
     shouldEnableDetailPageNavigation?: boolean;
 
-    /** Number of lines to display for the title */
-    numberOfTitleLines?: number;
-
     /** Whether we should overlay the 3 dots menu */
     shouldOverlayDots?: boolean;
 

src/components/LHNOptionsList/OptionRowLHN.tsx

@@ -267,7 +267,6 @@ function OptionRowLHN({
                                                 <DisplayNames
                                                     accessibilityLabel={translate('accessibilityHints.chatUserDisplayNames')}
                                                     fullTitle={optionItem.text ?? ''}
-                                                    shouldParseFullTitle={false}
                                                     displayNamesWithTooltips={optionItem.displayNamesWithTooltips ?? []}
                                                     tooltipEnabled
                                                     numberOfLines={1}

src/components/MenuItem.tsx

@@ -596,7 +596,6 @@ function MenuItem({
             return (
                 <DisplayNames
                     fullTitle={title}
-                    shouldParseFullTitle={!shouldRenderAsHTML}
                     displayNamesWithTooltips={titleWithTooltips}
                     tooltipEnabled
                     numberOfLines={1}

src/pages/home/HeaderView.tsx

@@ -153,8 +153,6 @@ function HeaderView({report, parentReportAction, onNavigationMenuButtonClicked,
     const policyDescription = getPolicyDescriptionText(policy);
     const isPersonalExpenseChat = isPolicyExpenseChat && isCurrentUserSubmitter(report);
     const hasTeam2025Pricing = useHasTeam2025Pricing();
-    // This is used to ensure that we display the text exactly as the user entered it when displaying thread header text, instead of parsing their text to HTML.
-    const shouldParseFullTitle = parentReportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT;
     const subscriptionPlan = useSubscriptionPlan();
     const ancestors = useAncestors(report);
     const displayNamesFSClass = FS.getChatFSClass(personalDetails, report);
@@ -302,7 +300,6 @@ function HeaderView({report, parentReportAction, onNavigationMenuButtonClicked,
                                             <DisplayNames
                                                 fullTitle={title}
                                                 displayNamesWithTooltips={displayNamesWithTooltips}
-                                                shouldParseFullTitle={shouldParseFullTitle}
                                                 tooltipEnabled
                                                 numberOfLines={1}
                                                 textStyles={[styles.headerText, styles.pre]}