From 20c56c7daedfb382716d04bdab4f665939f8fe8f Mon Sep 17 00:00:00 2001 From: FitseTLT Date: Mon, 26 May 2025 20:11:27 +0300 Subject: [PATCH 1/3] refactored the condition to show expense reprot reportName --- src/libs/ReportUtils.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index dc0aae3942516..0675ffe5e3c0c 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -3671,10 +3671,7 @@ function getMoneyRequestReportName({ policy?: OnyxEntry | SearchPolicy; invoiceReceiverPolicy?: OnyxEntry | SearchPolicy; }): string { - const reportFields = getReportFieldsByPolicyID(report?.policyID); - const titleReportField = Object.values(reportFields ?? {}).find((reportField) => reportField?.fieldID === CONST.REPORT_FIELD_TITLE_FIELD_ID); - - if (titleReportField && report?.reportName && isPaidGroupPolicyExpenseReport(report)) { + if (report?.reportName && isExpenseReport(report)) { return report.reportName; } From 5d23e9e43ce265823953ee1a4104ae968271357b Mon Sep 17 00:00:00 2001 From: FitseTLT Date: Tue, 27 May 2025 00:49:55 +0300 Subject: [PATCH 2/3] fix test --- tests/unit/Search/SearchUIUtilsTest.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts index 04a0d140372f6..60e99216c1533 100644 --- a/tests/unit/Search/SearchUIUtilsTest.ts +++ b/tests/unit/Search/SearchUIUtilsTest.ts @@ -384,7 +384,7 @@ const reportActionListItems = [ ], reportActionID: 'Admin', reportID: '123456789', - reportName: 'Unavailable workspace owes $50.00', + reportName: 'Expense Report #123', }, ] as ReportActionListItemType[]; @@ -913,7 +913,7 @@ describe('SearchUIUtils', () => { ], reportActionID: 'Admin', reportID: '123456789', - reportName: 'Unavailable workspace owes $50.00', + reportName: 'Expense Report #123', }, ]); }); From 2d535177e0017c7b7727539d1d2bac1b80fb7b16 Mon Sep 17 00:00:00 2001 From: FitseTLT Date: Tue, 27 May 2025 00:53:22 +0300 Subject: [PATCH 3/3] fix another test --- tests/unit/SidebarOrderTest.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/unit/SidebarOrderTest.ts b/tests/unit/SidebarOrderTest.ts index e0a6da42d84a2..83e710ff7d6d6 100644 --- a/tests/unit/SidebarOrderTest.ts +++ b/tests/unit/SidebarOrderTest.ts @@ -406,6 +406,7 @@ describe('Sidebar', () => { managerID: 4, policyName: fakePolicy.name, policyID: fakeReport.policyID, + reportName: 'Report Name', total: -10000, currency: 'USD', stateNum: CONST.REPORT.STATE_NUM.SUBMITTED, @@ -458,7 +459,7 @@ describe('Sidebar', () => { const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(4); expect(displayNames.at(0)).toHaveTextContent(`Email One's expenses`); - expect(displayNames.at(1)).toHaveTextContent('Workspace-Test-001 owes $100.00'); + expect(displayNames.at(1)).toHaveTextContent('Report Name'); expect(displayNames.at(2)).toHaveTextContent('Email Three'); expect(displayNames.at(3)).toHaveTextContent('Email Two'); })