From d62a4b0f779045018731c6dd8c330c448856ea83 Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Fri, 20 Sep 2024 14:21:40 +0530 Subject: [PATCH 1/2] fix: [Search v2.3] - Default name is not displayed correctly for multiline system message thread. Signed-off-by: krishna2323 --- src/components/MenuItem.tsx | 2 +- src/components/Search/SearchPageHeader.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx index 2524658d6ffc..08db3a767527 100644 --- a/src/components/MenuItem.tsx +++ b/src/components/MenuItem.tsx @@ -448,7 +448,7 @@ function MenuItem( // eslint-disable-next-line no-nested-ternary shouldPutLeftPaddingWhenNoIcon || (icon && !Array.isArray(icon)) ? (avatarSize === CONST.AVATAR_SIZE.SMALL ? styles.ml2 : styles.ml3) : {}, shouldShowBasicTitle ? {} : styles.textStrong, - numberOfLinesTitle !== 1 ? styles.preWrap : styles.pre, + numberOfLinesTitle !== 1 ? styles.preWrap : styles.noWrap, interactive && disabled ? {...styles.userSelectNone} : {}, styles.ltr, isDeleted ? styles.offlineFeedback.deleted : {}, diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx index 73829989409c..ac9aacba2a19 100644 --- a/src/components/Search/SearchPageHeader.tsx +++ b/src/components/Search/SearchPageHeader.tsx @@ -58,7 +58,7 @@ function HeaderWrapper({icon, title, subtitle, children, subtitleStyles = {}}: H } subtitle={ {subtitle} From f577c7d1f24a973d11215d9167bda6a8eb71268d Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Tue, 24 Sep 2024 00:35:57 +0530 Subject: [PATCH 2/2] use formatReportLastMessageText to retun report action message. Signed-off-by: krishna2323 --- src/components/MenuItem.tsx | 2 +- src/libs/ReportUtils.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx index 08db3a767527..2524658d6ffc 100644 --- a/src/components/MenuItem.tsx +++ b/src/components/MenuItem.tsx @@ -448,7 +448,7 @@ function MenuItem( // eslint-disable-next-line no-nested-ternary shouldPutLeftPaddingWhenNoIcon || (icon && !Array.isArray(icon)) ? (avatarSize === CONST.AVATAR_SIZE.SMALL ? styles.ml2 : styles.ml3) : {}, shouldShowBasicTitle ? {} : styles.textStrong, - numberOfLinesTitle !== 1 ? styles.preWrap : styles.noWrap, + numberOfLinesTitle !== 1 ? styles.preWrap : styles.pre, interactive && disabled ? {...styles.userSelectNone} : {}, styles.ltr, isDeleted ? styles.offlineFeedback.deleted : {}, diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 8746490ecd30..0c8aa936ef7b 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -3756,9 +3756,9 @@ function getReportName( return `${reportActionMessage} (${Localize.translateLocal('common.archived')})`; } if (!isEmptyObject(parentReportAction) && ReportActionsUtils.isModifiedExpenseAction(parentReportAction)) { - return ModifiedExpenseMessage.getForReportAction(report?.reportID, parentReportAction); + const modifiedMessage = ModifiedExpenseMessage.getForReportAction(report?.reportID, parentReportAction); + return formatReportLastMessageText(modifiedMessage); } - if (isTripRoom(report)) { return report?.reportName ?? ''; }