Fix: Expenses moved to Self DM, display a Join button on top of report by nkdengineer · Pull Request #76043 · Expensify/App

nkdengineer · 2025-11-25T16:37:11Z

Explanation of Change

Expenses moved to Self DM, display a Join button on top of report

Fixed Issues

$ #74897
PROPOSAL: #74897 (comment)

Tests

Login with a new account
Complete onboarding selecting "Track and budget expenses" option.
Once redirected to "Inbox" create a new workspace.
Navigate to workspace chat.
Create two manual expenses.
Open the report of the just created expenses.
Tap on "More" and delete the report.
Navigate to Self DM.
Open one of the just moved expenses.
Verify that the Join button is not displayed

Verify that no errors appear in the JS console

Offline tests

Same

QA Steps

Same as test

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-11-25.at.23.29.46.mov

Android: mWeb Chrome

Screen.Recording.2025-11-25.at.23.32.08.mov

iOS: Native

Screen.Recording.2025-11-25.at.23.32.49.mov

iOS: mWeb Safari

Screen.Recording.2025-11-25.at.23.33.29.mov

MacOS: Chrome / Safari

Screen.Recording.2025-11-25.at.23.29.02.mov

codecov · 2025-11-25T16:45:00Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/ReportUtils.ts	`73.51% <100.00%> (+0.05%)`	⬆️
src/pages/ReportDetailsPage.tsx	`59.59% <100.00%> (ø)`
src/pages/home/HeaderView.tsx	`81.81% <100.00%> (ø)`
... and 6 files with indirect coverage changes

melvin-bot · 2025-11-25T17:10:09Z

@Krishna2323 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]

Krishna2323 · 2025-11-26T11:51:49Z

src/libs/ReportUtils.ts

 function isTrackExpenseReport(report: OnyxInputOrEntry<Report>): boolean {
    if (isThread(report)) {
-        const selfDMReportID = findSelfDMReportID();
+        const parentReport = getParentReport(report);


@nkdengineer we shouldn't use getParentReport. See #74738 (comment)

@Krishna2323 To avoid unnecessary change in the PR, which can cause the regression, I create a new isTrackExpenseReportNew function.

trjExpensify

👍

src/libs/ReportUtils.ts

Krishna2323 · 2025-11-28T08:34:52Z

src/libs/ReportUtils.ts

+ * A Track Expense Report is a thread where the parent the parentReportAction is a transaction, and
+ * parentReportAction has type of track.
+ */
+function isTrackExpenseReportNew(report: OnyxInputOrEntry<Report>, parentReport: OnyxInputOrEntry<Report>, parentReportAction: OnyxInputOrEntry<ReportAction>): boolean {


@pecanoro Is this fine to do? The current isTrackExpenseReport uses values from the Onyx.connect() method, and we want to avoid using those functions. Updating isTrackExpenseReport to use values passed from the UI can be complex and time-consuming. Let me know what you think about this.

Slack thread: https://expensify.slack.com/archives/C02NK2DQWUX/p1759913248186279

cc: @DylanDylann

@nkdengineer @Krishna2323

If that we need to mark isTrackExpenseReport as deprecated

So how do you ensure that your change in isTrackExpenseReport function don't cause regression?

So how do you ensure that your change in isTrackExpenseReport function don't cause regression?

What do you mean?

Because you created a new function, we will need to migrate to this new function in other places later. But in the new function, you updated the logic. This update can cause regression in other places but we can't see that here because you only use isTrackExpenseReportNew in one place

This update can cause regression in other places but we can't see that here because you only use isTrackExpenseReportNew in one place

It's just a better way to check the selfDM, so I don't think it can cause any regression.

Thanks @DylanDylann, I think that's a better approach and has very low chances of causing regression.

@nkdengineer could you please mark the old function as deprecated so it’s clear that we shouldn’t use it anymore?

What is the plan to remove the other function? Do we need to create a new issue so someone can handle it?

@pecanoro We can create a new issue for this. Happy to handle this if needed.

What is the plan to remove the other function? Do we need to create a new issue so someone can handle it?

@pecanoro Do we want to create a new issue for this?

Krishna2323 · 2025-12-02T10:52:38Z

Completing the checklist...

Krishna2323 · 2025-12-02T11:10:17Z

src/libs/ReportUtils.ts

+ * A Track Expense Report is a thread where the parent the parentReportAction is a transaction, and
+ * parentReportAction has type of track.
+ */
+function isTrackExpenseReportNew(report: OnyxInputOrEntry<Report>, parentReport: OnyxInputOrEntry<Report>, parentReportAction: OnyxInputOrEntry<ReportAction>): boolean {


@nkdengineer could you please mark the old function as deprecated so it’s clear that we shouldn’t use it anymore?

Krishna2323 · 2025-12-02T11:12:51Z

Verify that the Join button is displayed

@nkdengineer please update this to Verify that the Join button is not displayed

Krishna2323 · 2025-12-02T11:35:28Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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

Android: HybridApp

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: HybridApp

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

Krishna2323 · 2025-12-02T11:38:07Z

After deleting the report from the workspace, the LHN shows two Self DMs. This is also reproducible on staging, so I don’t think we should block on it.

Monosnap.screencast.2025-12-02.16-46-18.mp4

Krishna2323 · 2025-12-03T19:42:25Z

@nkdengineer there are conflicts.

nkdengineer · 2025-12-04T09:18:27Z

@Krishna2323 Updated.

Krishna2323

LGTM! 🚀

Krishna2323 · 2025-12-05T17:22:58Z

@nkdengineer we have conflicts now.

Krishna2323 · 2025-12-08T10:15:30Z

@nkdengineer bump

nkdengineer · 2025-12-08T10:51:16Z

Updated.

Krishna2323 · 2025-12-08T14:30:05Z

@pecanoro this one is ready for your review. Thanks!

pecanoro · 2025-12-08T18:36:16Z

src/libs/ReportUtils.ts

+    parentReportAction: OnyxInputOrEntry<ReportAction>,
+    policy: OnyxInputOrEntry<Policy>,
+    isReportArchived = false,
+    parentReport?: Report,


If parentReportAction is not optional, why are we making parentReport optional?

Just add as an optional parameter then we don't need to edit the unit test.

I think it would be best, if possible, to make it mandatory rather than optional, to avoid confusion. I don't think changing the unit tests would be too painful, right?

Got it, I will give an update soon.

@pecanoro I updated.

pecanoro · 2025-12-08T18:36:49Z

src/libs/ReportUtils.ts

+ * A Track Expense Report is a thread where the parent the parentReportAction is a transaction, and
+ * parentReportAction has type of track.
+ */
+function isTrackExpenseReportNew(report: OnyxInputOrEntry<Report>, parentReport: OnyxInputOrEntry<Report>, parentReportAction: OnyxInputOrEntry<ReportAction>): boolean {


What is the plan to remove the other function? Do we need to create a new issue so someone can handle it?

pecanoro · 2025-12-11T23:01:13Z

@nkdengineer Friendly bump! I left a couple of questions in the review before

Krishna2323 · 2025-12-12T09:43:30Z

Recent changes looks good to me!

Krishna2323 · 2025-12-15T16:02:40Z

@nkdengineer we have conflicts now 👀

OSBotify · 2025-12-15T22:56:36Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2025-12-16T22:46:40Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 9.2.79-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OSBotify · 2025-12-17T12:24:22Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 9.2.81-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OSBotify · 2025-12-18T18:45:51Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.81-5 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	success ✅

OSBotify · 2025-12-18T21:09:15Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.81-5 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Expenses moved to Self DM, display a Join button on top of report

f1bc53d

melvin-bot bot assigned nkdengineer Nov 25, 2025

nkdengineer changed the title ~~Expenses moved to Self DM, display a Join button on top of report~~ Fix: Expenses moved to Self DM, display a Join button on top of report Nov 25, 2025

nkdengineer marked this pull request as ready for review November 25, 2025 17:10

nkdengineer requested review from a team as code owners November 25, 2025 17:10

melvin-bot bot requested review from Krishna2323 and trjExpensify and removed request for a team November 25, 2025 17:10

melvin-bot bot removed the request for review from a team November 25, 2025 17:10

Krishna2323 suggested changes Nov 26, 2025

View reviewed changes

trjExpensify previously approved these changes Nov 26, 2025

View reviewed changes

nkdengineer added 2 commits November 27, 2025 22:39

Merge branch 'main' into fix/74897

f094cea

implement isTrackExpenseReportNew function

1fa8e2b

nkdengineer dismissed trjExpensify’s stale review via 1fa8e2b November 27, 2025 15:44

Krishna2323 suggested changes Nov 28, 2025

View reviewed changes

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

remove parentReportAction getting from Onyx

a18adbc

nkdengineer force-pushed the fix/74897 branch from 7fa8ee7 to a18adbc Compare November 28, 2025 07:38

Krishna2323 reviewed Nov 28, 2025

View reviewed changes

Krishna2323 suggested changes Dec 2, 2025

View reviewed changes

nkdengineer added 4 commits December 3, 2025 17:27

Merge branch 'main' into fix/74897

0062dd7

mark isTrackExpenseReport deprecated

63dfb15

fix eslint

f1952de

fix eslint

eee3bce

resolve conflict

2e331c5

Krishna2323 approved these changes Dec 4, 2025

View reviewed changes

melvin-bot bot requested a review from pecanoro December 4, 2025 15:19

nkdengineer added 4 commits December 8, 2025 17:17

resolve conflict

a867b08

fix lint

25dcb4c

remove unnecessary dependency

dcc2f9b

fix lint

1cbdd80

pecanoro requested changes Dec 8, 2025

View reviewed changes

Merge branch 'main' into fix/74897

45d96c0

make parentReport as require parameter

4d1b4e2

resolve conflict

48ae36c

pecanoro approved these changes Dec 15, 2025

View reviewed changes

pecanoro merged commit a45c7a6 into Expensify:main Dec 15, 2025
38 of 39 checks passed

GCyganek mentioned this pull request Dec 16, 2025

Add GPS tab to the Distance Request page #77242

Merged

53 tasks

OSBotify mentioned this pull request Dec 16, 2025

Deploy Checklist: New Expensify 2025-12-16 #77818

Closed

mitarachim mentioned this pull request Dec 17, 2025

[$250] Expense - "Search in" is missing report name and is not clickable #77844

Closed

7 tasks

Conversation

nkdengineer commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

melvin-bot bot commented Nov 25, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Dec 2, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Dec 2, 2025

Uh oh!

Krishna2323 commented Dec 2, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Krishna2323 commented Dec 2, 2025

Uh oh!

Krishna2323 commented Dec 3, 2025

Uh oh!

nkdengineer commented Dec 4, 2025

Uh oh!

Krishna2323 left a comment

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Dec 5, 2025

Uh oh!

Krishna2323 commented Dec 8, 2025

Uh oh!

nkdengineer commented Dec 8, 2025

Uh oh!

Krishna2323 commented Dec 8, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nkdengineer commented Nov 25, 2025 •

edited

Loading

codecov bot commented Nov 25, 2025 •

edited by github-actions bot

Loading