refactor: Remove deprecated report name functions in ReportUtils (Part 4) by mohammadjafarinejad · Pull Request #84485 · Expensify/App

mohammadjafarinejad · 2026-03-07T07:00:52Z

Explanation of Change

Migrates non-component call sites from the deprecated ReportUtils.getReportName to ReportNameUtils.getReportName, passing report (and optionally reportAttributes) directly as arguments.

Task.ts
BrowserNotifications.ts
ModifiedExpenseMessage.ts
SearchQueryUtils.ts
MoneyRequestReportPreviewContent.tsx
MoneyRequestReportPreview.test.tsx

Fixed Issues

$ #76852
PROPOSAL:

Tests

1. Task Share Destination (`Task.ts`)

getShareDestination uses getReportName to display the name of the report a task is being shared/assigned to.

Test Steps:

Open the app and navigate to a workspace with multiple reports.
Create a new task (e.g., from the + menu → Task).
Tap the Assignee or Share destination field.
Verify report names appear correctly in the destination list (e.g., workspace expense chats, DMs, group rooms).
Assign the task to a workspace expense chat and submit.
Verify the task is created with the correct destination name shown.

2. Browser/Desktop Notification — Room or Group Chat Comment (`BrowserNotifications.ts`, `LocalNotification/index.ts`)

pushReportCommentNotification uses getReportName as the notification title for rooms/group chats.

Test Steps:

Use two browser tabs logged in as two different accounts (or use two devices).
Open a Group Chat or a Room (#admins, #announce, etc.) in Account A.
From Account B, send a message into that same group chat or room.
On Account A's desktop/web, verify a browser notification pops up.
Verify the notification title matches the exact room/group chat name as displayed in the LHN.

3. Modified Expense Notification — Expense Moved Between Reports (`ModifiedExpenseMessage.ts`, `BrowserNotifications.ts`)

getMovedFromOrToReportMessage uses getReportName for the "moved from report" text in the notification.

Test Steps:

Create an expense and submit it to a workspace report (Report A).
While logged in as an admin on another browser/device, move that expense to a different report (Report B).
On either account, open Report A and scroll to find the system/automated message about the moved expense.
Verify the message reads something like "Moved from [Report A name]" — confirming the report name resolves correctly (not undefined, blank, or a raw report ID).
Open Report B and verify that a corresponding message appears there as well.

4. Search — "In" Filter Display Value (`SearchQueryUtils.ts`, `SearchPageHeaderInput.tsx`, `buildSubstitutionsMap.ts`)

getFilterDisplayValue for filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.IN uses getReportName to resolve a report ID to a human-readable name. buildUserReadableQueryString and buildSubstitutionsMap now propagate reportAttributes.

Test Steps:

Open the Search page and click/focus the search input.
Type in: and select a specific report/room from the autocomplete suggestions.
Verify the report name appears inline in the search input as styled text (not a raw report ID like in:123456789).
Submit the search.
Verify the query display bar below the input shows the human-readable report name (e.g., in: My Room) instead of the raw ID.
Navigate away (e.g., open a report) and return to Search via the LHN — verify the query bar still shows the correct report name.
Repeat with a #room, a DM, and a group chat to cover different report type name resolutions.

5. Money Request Report Preview Header (`MoneyRequestReportPreviewContent.tsx`)

getReportName(iouReport, reportAttributes) is used as the heading text of the MoneyRequestReportPreview component (the preview card visible in the 1:1 chat).

Test Steps:

Open a 1:1 chat where an IOU/expense report exists.
Locate the MoneyRequestReportPreview card in the chat thread.
Verify the header shows the correct IOU/expense report name (e.g., "Expense Report" or a custom report name).
Open a workspace-based expense report and find its preview card — verify the name matches the report's actual name.
If the report has a custom reportName, verify that custom name is shown.

6. Pusher-Triggered Notifications (`User.ts`, `Report/index.ts`)

triggerNotifications in User.ts now passes reportAttributes?.reports to showReportActionNotification, which then threads it through to both showCommentNotification and showModifiedExpenseNotification.

Test Steps:

Have two accounts open simultaneously.
From Account B, send a message in a Room chatting with Account A.
Verify Account A receives a browser notification with the correct room name as the title.
From Account B, send a message in a 1:1 DM with Account A.
Verify Account A's notification title shows the sender's name (not the room name path).

Verify that no errors appear in the JS console

Offline tests

Same as tests.

QA Steps

Same as tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Tests

Task.ts

BrowserNotifications.ts / LocalNotification/index.ts

ModifiedExpenseMessage.ts

`SearchQueryUtils.ts` / `SearchPageHeaderInput.tsx` / `buildSubstitutionsMap.ts`

codecov · 2026-03-07T07:07:14Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
...ReportPreview/MoneyRequestReportPreviewContent.tsx	`61.87% <100.00%> (ø)`
src/components/Search/SearchAutocompleteList.tsx	`71.76% <ø> (ø)`
.../Search/SearchPageHeader/SearchPageHeaderInput.tsx	`50.00% <100.00%> (+0.35%)`	⬆️
...nents/Search/SearchRouter/buildSubstitutionsMap.ts	`100.00% <ø> (ø)`
src/hooks/useSearchTypeMenu.tsx	`69.33% <100.00%> (ø)`
src/libs/ModifiedExpenseMessage.ts	`90.09% <100.00%> (ø)`
...Navigation/AppNavigator/AuthScreensInitHandler.tsx	`96.92% <100.00%> (ø)`
src/libs/SearchQueryUtils.ts	`76.20% <100.00%> (ø)`
src/libs/actions/Task.ts	`46.66% <ø> (ø)`
src/libs/actions/User.ts	`30.90% <100.00%> (ø)`
... and 5 more
... and 50 files with indirect coverage changes

mohammadjafarinejad · 2026-03-07T08:27:59Z

Hey @sosek108, quick question on this refactor

The new getReportName in ReportNameUtils only returns report.reportName or the cached value from reportAttributes, but the old one in ReportUtils always computed the name dynamically. So if callers don't pass reportAttributes, they might get wrong results silently — is that right?

If yes, should we make it required to enforce correct usage, or keep it optional to allow graceful degradation for call sites that don't have easy access to it?

// required
function testCall(reportAttributes: ReportAttributesDerivedValue['reports']) {}

// optional
function testCall(reportAttributes?: ReportAttributesDerivedValue['reports']) {}
function testCall(reportAttributes: ReportAttributesDerivedValue['reports'] | undefined) {}

melvin-bot · 2026-03-07T11:07:38Z

@eVoloshchak Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 44f626279b

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

src/libs/Notification/LocalNotification/index.ts

src/libs/SearchQueryUtils.ts

…SearchTypeMenu, BrowserNotifications, and SavedSearchList components

sosek108

LGTM

JmillsExpensify

All looks good for product.

eVoloshchak · 2026-03-10T10:16:04Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Screen.Recording.2026-03-12.at.15.43.33.mov

Screen.Recording.2026-03-12.at.16.07.28.mov

Screen.Recording.2026-03-12.at.16.17.49.mov

sosek108 · 2026-03-10T10:20:26Z

@mohammadjafarinejad can you resolve conflicts? And also eslint is failing

eVoloshchak · 2026-03-10T13:28:16Z

src/libs/actions/User.ts


+let reportAttributes: ReportAttributesDerivedValue | undefined;
+Onyx.connect({
+    key: ONYXKEYS.DERIVED.REPORT_ATTRIBUTES,


Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function

We should be able to pass reportAttributes from the function call on AuthScreen (useReportAttributes hook)

mohammadjafarinejad · 2026-03-11T07:18:02Z

@eVoloshchak Ready for re-review.

eVoloshchak

LGTM!

neil-marcellini

Good to go. Thank you. We do need to fix merge conflicts first. Let me know when that's fixed.

…meter

…and update related calls

mohammadjafarinejad · 2026-03-14T06:44:20Z

@neil-marcellini Ready for re-review.

eVoloshchak · 2026-03-16T15:18:45Z

@mohammadjafarinejad, this branch has conflicts that must be resolved

sosek108 · 2026-03-18T14:17:59Z

@mohammadjafarinejad can you please work on the merge conflicts?

neil-marcellini · 2026-03-19T16:45:07Z

Asking @sosek108 if he can fix conflicts since @mohammadjafarinejad hasn't responded in a while

mohammadjafarinejad · 2026-03-19T17:02:29Z

@neil-marcellini Sorry for the delay, I’ll work on it now.

…p in tests

sosek108

you left behind unused useEffect dep. Please remove this

sosek108 · 2026-03-20T09:25:53Z

src/components/Search/SearchPageHeader/SearchPageHeaderInput.tsx

        );
        setAutocompleteSubstitutions(substitutionsMap);
-    }, [allFeeds, personalAndWorkspaceCards, originalInputQuery, personalDetails, reports, taxRates, policies, currentUserAccountID, translate, conciergeReportID]);
+    }, [allFeeds, personalAndWorkspaceCards, originalInputQuery, personalDetails, reports, taxRates, policies, currentUserAccountID, translate, conciergeReportID, reportAttributes]);


conciergeReportID is not used anymore

sosek108 · 2026-03-20T09:26:31Z

src/components/Search/SearchPageHeader/SearchPageHeaderInput.tsx

    const feedKeysWithCards = useFeedKeysWithAssignedCards();
    const {inputQuery: originalInputQuery} = queryJSON;
    const [currentUserAccountID = -1] = useOnyx(ONYXKEYS.SESSION, {selector: accountIDSelector});
    const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);


conciergeReportID is not used anymore

sosek108 · 2026-03-20T15:52:00Z

@mohammadjafarinejad There are unfortunately another conflicts :/

sosek108 · 2026-03-20T15:54:24Z

@mohammadjafarinejad @neil-marcellini

because there are more and more merge conflicts can we plan a time slot where we resolve them, quickly test & review them, and then merge them into main?

neil-marcellini · 2026-03-20T16:27:57Z

Yes, sounds good. I started a group chat in Slack to coordinate timings.

neil-marcellini

A bit more clean up is needed from resolving the merge conflict.

neil-marcellini · 2026-03-20T16:47:04Z

tests/actions/ReportTest.ts

@@ -843,6 +873,154 @@ describe('actions/Report', () => {
            });
    });

+    it('should pass conciergeReportID through to showReportActionNotification when provided', () => {


This test no longer has a purpose. I suggest we remove it.

Let's also remove all the other "pass conciergeReportID" tests below.

neil-marcellini · 2026-03-20T16:48:59Z

tests/ui/AuthScreensInitHandlerTest.tsx

Same here, a lot of these tests don't make sense anymore.

neil-marcellini · 2026-03-20T17:47:11Z

Hubert is available now and so am I, and he cannot push to your fork for this PR, so we have created a new PR and we're moving forward there to try to get this merged today.

refactor: Remove deprecated report name functions in ReportUtils (Part 4) - Hubert's fork #85975

refactor: Remove deprecated report name functions in ReportUtils

61b7e0e

melvin-bot bot assigned mohammadjafarinejad Mar 7, 2026

refactor: pass report attributes to getReportName calls

4f08930

mohammadjafarinejad added 2 commits March 7, 2026 13:41

refactor: add reportAttributes to notification functions

8cec2a8

refactor: pass reportAttributes to getShareDestination function

44f6262

mohammadjafarinejad marked this pull request as ready for review March 7, 2026 11:07

mohammadjafarinejad requested review from a team as code owners March 7, 2026 11:07

melvin-bot bot requested review from JmillsExpensify and eVoloshchak March 7, 2026 11:07

melvin-bot bot removed request for a team March 7, 2026 11:07

mohammadjafarinejad mentioned this pull request Mar 7, 2026

[Due for payment 2026-03-31] Remove deprecated report name functions in ReportUtils #76852

Open

1 task

chatgpt-codex-connector bot reviewed Mar 7, 2026

View reviewed changes

src/libs/Notification/LocalNotification/index.ts Outdated Show resolved Hide resolved

src/libs/SearchQueryUtils.ts Show resolved Hide resolved

refactor: integrate reportAttributes into SearchAutocompleteList, use…

677c770

…SearchTypeMenu, BrowserNotifications, and SavedSearchList components

sosek108 approved these changes Mar 9, 2026

View reviewed changes

JmillsExpensify previously approved these changes Mar 9, 2026

View reviewed changes

eVoloshchak reviewed Mar 10, 2026

View reviewed changes

eVoloshchak suggested changes Mar 10, 2026

View reviewed changes

Merge branch 'main' into fix/76852-part4

775a1dc

mohammadjafarinejad dismissed JmillsExpensify’s stale review via 775a1dc March 11, 2026 06:40

mohammadjafarinejad added 2 commits March 11, 2026 11:08

refactor: pass reportAttributes to user event subscription

6ef9cfc

fix: handle optional getReportAttributes in user event subscription

c65fd64

mohammadjafarinejad requested a review from eVoloshchak March 11, 2026 07:18

eVoloshchak approved these changes Mar 12, 2026

View reviewed changes

melvin-bot bot requested a review from neil-marcellini March 12, 2026 15:21

neil-marcellini previously approved these changes Mar 12, 2026

View reviewed changes

mohammadjafarinejad added 2 commits March 13, 2026 11:38

Merge branch 'main' into fix/76852-part4

18ba6af

Refactor showCommentNotification signature to remove unnecessary para…

3c08df4

…meter

mohammadjafarinejad dismissed neil-marcellini’s stale review via 3c08df4 March 13, 2026 07:39

mohammadjafarinejad added 3 commits March 14, 2026 09:52

Remove unnecessary parameter from showCommentNotification call

54b08ff

Merge branch 'main' into fix/76852-part4

e970f05

Refactor: Remove conciergeReportID parameter from multiple functions …

9670e1c

…and update related calls

mohammadjafarinejad requested a review from neil-marcellini March 14, 2026 06:44

mohammadjafarinejad added 2 commits March 20, 2026 00:38

Merge branch 'main' into fix/76852-part4

2e5a5c4

fix: Remove 'concierge-report-id' parameter from buildSubstitutionsMa…

5c616b8

…p in tests

sosek108 suggested changes Mar 20, 2026

View reviewed changes

neil-marcellini requested changes Mar 20, 2026

View reviewed changes

neil-marcellini closed this Mar 20, 2026

Conversation

mohammadjafarinejad commented Mar 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

1. Task Share Destination (Task.ts)

2. Browser/Desktop Notification — Room or Group Chat Comment (BrowserNotifications.ts, LocalNotification/index.ts)

3. Modified Expense Notification — Expense Moved Between Reports (ModifiedExpenseMessage.ts, BrowserNotifications.ts)

4. Search — "In" Filter Display Value (SearchQueryUtils.ts, SearchPageHeaderInput.tsx, buildSubstitutionsMap.ts)

5. Money Request Report Preview Header (MoneyRequestReportPreviewContent.tsx)

6. Pusher-Triggered Notifications (User.ts, Report/index.ts)

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Task.ts

BrowserNotifications.ts / LocalNotification/index.ts

ModifiedExpenseMessage.ts

SearchQueryUtils.ts / SearchPageHeaderInput.tsx / buildSubstitutionsMap.ts

Uh oh!

codecov bot commented Mar 7, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

mohammadjafarinejad commented Mar 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

melvin-bot bot commented Mar 7, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

sosek108 left a comment

Choose a reason for hiding this comment

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

eVoloshchak commented Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

sosek108 commented Mar 10, 2026

Uh oh!

eVoloshchak Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

mohammadjafarinejad Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

mohammadjafarinejad commented Mar 11, 2026

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

mohammadjafarinejad commented Mar 14, 2026

Uh oh!

eVoloshchak commented Mar 16, 2026

Uh oh!

sosek108 commented Mar 18, 2026

Uh oh!

neil-marcellini commented Mar 19, 2026

Uh oh!

mohammadjafarinejad commented Mar 19, 2026

Uh oh!

sosek108 left a comment

Choose a reason for hiding this comment

Uh oh!

sosek108 Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

sosek108 Mar 20, 2026

mohammadjafarinejad commented Mar 7, 2026 •

edited

Loading

1. Task Share Destination (`Task.ts`)

2. Browser/Desktop Notification — Room or Group Chat Comment (`BrowserNotifications.ts`, `LocalNotification/index.ts`)

3. Modified Expense Notification — Expense Moved Between Reports (`ModifiedExpenseMessage.ts`, `BrowserNotifications.ts`)

4. Search — "In" Filter Display Value (`SearchQueryUtils.ts`, `SearchPageHeaderInput.tsx`, `buildSubstitutionsMap.ts`)

5. Money Request Report Preview Header (`MoneyRequestReportPreviewContent.tsx`)

6. Pusher-Triggered Notifications (`User.ts`, `Report/index.ts`)

`SearchQueryUtils.ts` / `SearchPageHeaderInput.tsx` / `buildSubstitutionsMap.ts`

codecov bot commented Mar 7, 2026 •

edited by github-actions bot

Loading

mohammadjafarinejad commented Mar 7, 2026 •

edited

Loading

eVoloshchak commented Mar 10, 2026 •

edited

Loading

neil-marcellini commented Mar 20, 2026 •

edited

Loading