From 6043ea5861f05dd74fa383815157168f19fc1bc5 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Sat, 27 Sep 2025 21:47:49 +0800 Subject: [PATCH] Revert "Merge pull request #70777 from bernhardoj/fix/60746-msg-is-not-shown-correctly" This reverts commit c3b5896a57ce5bfb8d74000db22508c3e67e5c73, reversing changes made to 14b9c29d6b8a6d1ccc8c9f19527a09933cf9d1ef. --- src/components/LHNOptionsList/OptionRowLHN.tsx | 5 +++-- src/libs/OptionsListUtils/index.ts | 14 +++++++------- src/libs/SidebarUtils.ts | 12 ++++++------ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/components/LHNOptionsList/OptionRowLHN.tsx b/src/components/LHNOptionsList/OptionRowLHN.tsx index 10ae16d623ef..1fcfc1d32205 100644 --- a/src/components/LHNOptionsList/OptionRowLHN.tsx +++ b/src/components/LHNOptionsList/OptionRowLHN.tsx @@ -22,6 +22,7 @@ import DateUtils from '@libs/DateUtils'; import DomUtils from '@libs/DomUtils'; import {containsCustomEmoji as containsCustomEmojiUtils, containsOnlyCustomEmoji} from '@libs/EmojiUtils'; import {shouldOptionShowTooltip, shouldUseBoldText} from '@libs/OptionsListUtils'; +import Parser from '@libs/Parser'; import Performance from '@libs/Performance'; import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager'; import {isAdminRoom, isChatUsedForOnboarding as isChatUsedForOnboardingReportUtils, isConciergeChatReport, isGroupChat, isOneOnOneChat, isSystemChat} from '@libs/ReportUtils'; @@ -295,12 +296,12 @@ function OptionRowLHN({ > {alternateTextContainsCustomEmojiWithText ? ( ) : ( - optionItem.alternateText + Parser.htmlToText(optionItem.alternateText) )} )} diff --git a/src/libs/OptionsListUtils/index.ts b/src/libs/OptionsListUtils/index.ts index 3f69aac71008..3d94e678557c 100644 --- a/src/libs/OptionsListUtils/index.ts +++ b/src/libs/OptionsListUtils/index.ts @@ -457,7 +457,7 @@ function getAlternateText(option: OptionData, {showChatPreviewLine = false, forc const isAnnounceRoom = reportUtilsIsAnnounceRoom(report); const isGroupChat = reportUtilsIsGroupChat(report); const isExpenseThread = isMoneyRequest(report); - const formattedLastMessageText = formatReportLastMessageText(option.lastMessageText ?? ''); + const formattedLastMessageText = formatReportLastMessageText(Parser.htmlToText(option.lastMessageText ?? '')); const reportPrefix = getReportSubtitlePrefix(report); const formattedLastMessageTextWithPrefix = reportPrefix + formattedLastMessageText; @@ -639,7 +639,7 @@ function getLastMessageTextForReport({ const movedTransactionOriginalMessage = getOriginalMessage(lastReportAction) ?? {}; const {toReportID} = movedTransactionOriginalMessage as OriginalMessageMovedTransaction; const toReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${toReportID}`]; - lastMessageTextFromReport = Parser.htmlToText(getMovedTransactionMessage(toReport)); + lastMessageTextFromReport = getMovedTransactionMessage(toReport); } else if (isTaskAction(lastReportAction)) { lastMessageTextFromReport = formatReportLastMessageText(getTaskReportActionMessage(lastReportAction).text); } else if (isCreatedTaskReportAction(lastReportAction)) { @@ -651,14 +651,14 @@ function getLastMessageTextForReport({ ) { const wasSubmittedViaHarvesting = !isMarkAsClosedAction(lastReportAction) ? (getOriginalMessage(lastReportAction)?.harvesting ?? false) : false; if (wasSubmittedViaHarvesting) { - lastMessageTextFromReport = Parser.htmlToText(translateLocal('iou.automaticallySubmitted')); + lastMessageTextFromReport = translateLocal('iou.automaticallySubmitted'); } else { lastMessageTextFromReport = translateLocal('iou.submitted', {memo: getOriginalMessage(lastReportAction)?.message}); } } else if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.APPROVED)) { const {automaticAction} = getOriginalMessage(lastReportAction) ?? {}; if (automaticAction) { - lastMessageTextFromReport = Parser.htmlToText(translateLocal('iou.automaticallyApproved')); + lastMessageTextFromReport = translateLocal('iou.automaticallyApproved'); } else { lastMessageTextFromReport = translateLocal('iou.approvedMessage'); } @@ -667,7 +667,7 @@ function getLastMessageTextForReport({ } else if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.FORWARDED)) { const {automaticAction} = getOriginalMessage(lastReportAction) ?? {}; if (automaticAction) { - lastMessageTextFromReport = Parser.htmlToText(translateLocal('iou.automaticallyForwarded')); + lastMessageTextFromReport = translateLocal('iou.automaticallyForwarded'); } else { lastMessageTextFromReport = translateLocal('iou.forwarded'); } @@ -708,9 +708,9 @@ function getLastMessageTextForReport({ } else if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.DELETED_TRANSACTION)) { lastMessageTextFromReport = getDeletedTransactionMessage(lastReportAction); } else if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.TAKE_CONTROL) || isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.REROUTE)) { - lastMessageTextFromReport = Parser.htmlToText(getChangedApproverActionMessage(lastReportAction)); + lastMessageTextFromReport = getChangedApproverActionMessage(lastReportAction); } else if (isMovedAction(lastReportAction)) { - lastMessageTextFromReport = Parser.htmlToText(getMovedActionMessage(lastReportAction, report)); + lastMessageTextFromReport = getMovedActionMessage(lastReportAction, report); } // we do not want to show report closed in LHN for non archived report so use getReportLastMessage as fallback instead of lastMessageText from report diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts index 7e78ba7d7197..b088ee9482f1 100644 --- a/src/libs/SidebarUtils.ts +++ b/src/libs/SidebarUtils.ts @@ -793,7 +793,7 @@ function getOptionData({ } else if (isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.TEAM_DOWNGRADE)) { result.alternateText = translateLocal('workspaceActions.downgradedWorkspace'); } else if (isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.INTEGRATION_SYNC_FAILED)) { - result.alternateText = Parser.htmlToText(getIntegrationSyncFailedMessage(lastAction, report?.policyID)); + result.alternateText = getIntegrationSyncFailedMessage(lastAction, report?.policyID); } else if ( isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_CATEGORY) || isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CATEGORY) || @@ -836,7 +836,7 @@ function getOptionData({ } else if (isCardIssuedAction(lastAction)) { result.alternateText = getCardIssuedMessage({reportAction: lastAction, expensifyCard: card}); } else if (lastAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && lastActorDisplayName && lastMessageTextFromReport) { - result.alternateText = formatReportLastMessageText(`${lastActorDisplayName}: ${lastMessageText}`); + result.alternateText = formatReportLastMessageText(Parser.htmlToText(`${lastActorDisplayName}: ${lastMessageText}`)); } else if (lastAction && isOldDotReportAction(lastAction)) { result.alternateText = getMessageOfOldDotReportAction(lastAction); } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION) { @@ -848,7 +848,7 @@ function getOptionData({ } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_EMPLOYEE) { result.alternateText = getPolicyChangeLogDeleteMemberMessage(lastAction); } else if (isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.UNREPORTED_TRANSACTION)) { - result.alternateText = Parser.htmlToText(getUnreportedTransactionMessage()); + result.alternateText = getUnreportedTransactionMessage(); } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CUSTOM_UNIT_RATE) { result.alternateText = getReportActionMessageText(lastAction) ?? ''; } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_INTEGRATION) { @@ -872,7 +872,7 @@ function getOptionData({ } else if (isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.TRAVEL_UPDATE)) { result.alternateText = getTravelUpdateMessage(lastAction); } else if (isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.TAKE_CONTROL) || isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.REROUTE)) { - result.alternateText = Parser.htmlToText(getChangedApproverActionMessage(lastAction)); + result.alternateText = getChangedApproverActionMessage(lastAction); } else { result.alternateText = lastMessageTextFromReport.length > 0 @@ -894,9 +894,9 @@ function getOptionData({ ); } if (shouldShowLastActorDisplayName(report, lastActorDetails, lastAction) && !isReportArchived) { - result.alternateText = `${lastActorDisplayName}: ${formatReportLastMessageText(lastMessageText)}`; + result.alternateText = `${lastActorDisplayName}: ${formatReportLastMessageText(Parser.htmlToText(lastMessageText))}`; } else { - result.alternateText = formatReportLastMessageText(lastMessageText); + result.alternateText = formatReportLastMessageText(Parser.htmlToText(lastMessageText)); } }