refactor trackExpense function to use useOnyx data by daledah · Pull Request #95570 · Expensify/App

daledah · 2026-07-08T10:58:28Z

Explanation of Change

Fixed Issues

$ #66414
PROPOSAL:

Tests

Open Self-DM report
Click the "+" button → select "Create expense"
Enter an amount → click Next
Fill in merchant/description → click Create expense
Verify that: the expense is created successfully in the Self-DM
Click More dropdown and select "duplicated expense"
Verify that: a duplicated expense is created in workspace chat

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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-07-09.at.10.20.02.mov

…Onyx data

codecov · 2026-07-08T11:03:01Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/hooks/useBulkDuplicateAction.ts	`100.00% <100.00%> (ø)`
src/hooks/useExpenseActions.ts	`67.13% <100.00%> (+1.09%)`	⬆️
src/libs/IOUAmountSubmission.ts	`86.70% <ø> (ø)`
src/libs/ReportUtils.ts	`87.16% <ø> (-0.05%)`	⬇️
src/libs/actions/IOU/Duplicate.ts	`91.94% <ø> (ø)`
src/libs/actions/IOU/MoneyRequest.ts	`76.15% <ø> (+0.33%)`	⬆️
src/libs/actions/IOU/TrackExpense.ts	`84.84% <100.00%> (+0.11%)`	⬆️
...quest/step/DynamicIOURequestStepDistanceManual.tsx	`2.20% <ø> (ø)`
...stance/handleMoneyRequestStepDistanceNavigation.ts	`83.33% <ø> (ø)`
...RequestStepDistance/hooks/useDistanceNavigation.ts	`91.30% <ø> (ø)`
... and 6 more
... and 8 files with indirect coverage changes

melvin-bot · 2026-07-09T03:26:32Z

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

daledah · 2026-07-09T03:26:51Z

the failing test is not related to this PR and will merge main to fix soon

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: bf2bbc3d83

ℹ️ 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".

trjExpensify · 2026-07-09T15:02:20Z

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

DylanDylann · 2026-07-13T10:06:58Z

@daledah Could you fix the failed check?

daledah · 2026-07-14T03:41:00Z

@DylanDylann i resolved conflict and the failed check

daledah · 2026-07-15T06:58:41Z

@DylanDylann i updated, please check again

daledah · 2026-07-27T07:50:14Z

In most cases, isDraftReport should be computed from chatReport.reportID in the line below. Even though we reassign chatReport afterward, in those cases, we can assume isDraftReport is false, since it will be a DM report.

App/src/libs/actions/IOU/TrackExpense.ts

Line 900 in e6ea035

let chatReport = !isEmptyObject(parentChatReport) && parentChatReport?.reportID ? parentChatReport : null;

Currently, to compute isDraftReport, we'd need to recompute the line above at the component level. My suggestion is to move this logic entirely to the component level and pass chatReport down as a param, so we avoid computing that line twice. Wdyt? Feel free to give your idea before updating

The catch is that chatReport inside getTrackExpenseInformation isn't just parentChatReport - it also falls back to (and optimistically creates) the self-DM report, and that optimistic creation has to stay in the action. So we can't fully resolve chatReport at the component level without moving the self-DM creation up too

App/src/libs/actions/IOU/TrackExpense.ts

Lines 910 to 916 in e6ea035

    
           if (!chatReport) { 
        
               const currentTime = DateUtils.getDBTime(); 
        
               const selfDMReport = buildOptimisticSelfDMReport(currentTime, optimisticChatReportID); 
        
               const selfDMCreatedReportAction = buildOptimisticCreatedReportAction({emailCreatingAction: currentUserEmailParam, created: currentTime}); 
        
               optimisticReportID = selfDMReport.reportID; 
        
               optimisticReportActionID = selfDMCreatedReportAction.reportActionID; 
        
               chatReport = selfDMReport;

But your goal is already met: since isDraftReport only needs the initial chatReport (= parentChatReport), and the component already computes isDraftChatReport from exactly that report. So we're not computing it twice. I'd keep isDraftChatReport as a param. Wdyt?

DylanDylann · 2026-08-03T07:59:25Z

@daledah Don't worry about the self-DM report case, because self-DMs don't have a draft report, so it will always be false

DylanDylann · 2026-08-03T08:00:53Z

The only logic I suggest moving to the component level is


let chatReport = !isEmptyObject(parentChatReport) && parentChatReport?.reportID ? parentChatReport : null;

daledah · 2026-08-04T10:04:25Z

@DylanDylann I removed that line from the action - it now just trusts the passed report. This is equivalent for every caller (none pass an empty/report-less object), so the!isEmptyObject(...) && parentChatReport?.reportID guard was redundant here.

DylanDylann · 2026-08-05T08:09:06Z

        report,
+        parentChatReport: parentChatReportParam,
        action,


COuld we remove report param?

I resolved - 5397500

report and parentChatReport look duplicated. I mean, we should remove report param

@DylanDylann They look duplicated in most callers, but they're not the same thing. parentChatReport is the (already-resolved) parent chat report, while report is the source report - which can be a money request/expense report (e.g. in the categorize/share/move flows via useExpenseSubmission). We still need report to compute isMoneyRequestReport / moneyRequestReportID, ... deriving those from parentChatReport (always a chat report) would make moneyRequestReportID empty and the expense would no longer be added to the existing money request report.

In the useExpenseSubmission case, isMoneyRequestReport should be checked via parentChatReport. First, could you explain why you pass parentChatReport: isSelfDMDestination ? selfDMReport : currentChatReport in useExpenseSubmission?

@DylanDylann i checked again, report is redundant, so I've removed it.

could you explain why you pass parentChatReport: isSelfDMDestination ? selfDMReport : currentChatReport

parentChatReport is the chat the expense attaches to, so it must always be a chat: for a self-DM destination we force the self-DM, otherwise currentChatReport (the report itself, or its parent chat if report is a money-request report). It always resolves to a chat, so isMoneyRequestReport is always false here - that's why dropping report is safe.

DylanDylann · 2026-08-05T08:12:38Z

@daledah Could you please review the PR again? You marked some of my previous comments as resolved, but I still see them in the codebase. Please only resolve a discussion once it's actually done

daledah · 2026-08-06T16:18:57Z

@DylanDylann i updated, please check again

daledah · 2026-08-11T14:14:20Z

@DylanDylann i updated, please check again

DylanDylann · 2026-08-18T09:53:33Z

@daledah replied #95570 (comment), let me know when the PR is ready

DylanDylann · 2026-08-19T07:39:29Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d94b1d40ef

ℹ️ 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".

chatgpt-codex-connector · 2026-08-19T07:43:12Z

+    const targetChatForDuplicate = isSourcePolicyValid ? chatReport : activePolicyExpenseChat;
+    const [isDraftChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${targetChatForDuplicate?.reportID}`, {selector: isDraftReportSelector});


Subscribe to the expense duplicate's target chat

When the source expense belongs to an accessible policy other than the default expense policy, this subscribes to the source chatReport draft state, but duplicateExpenseTransaction targets activePolicyExpenseChat with defaultExpensePolicy and forwards this boolean as its draft state. Consequently, duplicating into a draft default workspace can treat it as non-draft and omit the workspace-creation Onyx/API data; use the active policy expense chat's draft state for the single-expense duplicate path, separately from the report-duplicate target.

Useful? React with 👍 / 👎.

daledah · 2026-08-19T08:54:21Z

@DylanDylann The scope of this PR is quite complex and difficult to test and review, so I think we should split it into multiple PRs. I'll close this PR, and we have another PR open here

refactor duplicateExpenseTransaction and createTransaction to use use…

959f7ca

…Onyx data

melvin-bot Bot assigned daledah Jul 8, 2026

daledah changed the title ~~refactor duplicateExpenseTransaction and createTransaction to use use…~~ refactor trackExpense function to use useOnyx data Jul 8, 2026

daledah added 2 commits July 9, 2026 10:08

remove optional and redundant fallback

9fe6d73

fix knip and remove redundant function

bf2bbc3

daledah marked this pull request as ready for review July 9, 2026 03:26

daledah requested review from a team as code owners July 9, 2026 03:26

melvin-bot Bot requested review from DylanDylann and removed request for a team July 9, 2026 03:26

melvin-bot Bot requested review from trjExpensify and removed request for a team July 9, 2026 03:26

chatgpt-codex-connector Bot reviewed Jul 9, 2026

View reviewed changes

Comment thread src/libs/actions/IOU/TrackExpense.ts Resolved

trjExpensify removed their request for review July 9, 2026 15:02

daledah added 2 commits July 14, 2026 10:14

resolve conflict

46b30fa

fix ts

ff45df7

DylanDylann reviewed Jul 14, 2026

View reviewed changes

Comment thread src/hooks/useExpenseActions.ts Resolved

daledah added 2 commits July 15, 2026 01:15

resolve conflict

ec41cd4

Refactor trackExpense to accept parentChatReport directly

27ef5ec

daledah added 4 commits July 19, 2026 08:46

resolve conflict

5e07f31

Merge branch 'main' into refactor/66414-4

687dc5c

Merge branch 'main' into refactor/66414-4

b92c64e

fix jest test

48f66c6

daledah added 2 commits July 27, 2026 14:02

Merge branch 'main' into refactor/66414-4

e25eb3d

remove redundant variable

fd475ea

daledah added 2 commits August 4, 2026 16:15

Merge branch 'main' into refactor/66414-4

33f4ea8

remove redundant logic

4af8944

DylanDylann reviewed Aug 5, 2026

View reviewed changes

daledah added 3 commits August 6, 2026 22:55

Merge branch 'main' into refactor/66414-4

ebfba12

remove redundant alias

5397500

resolve comments

811ed6f

daledah added 5 commits August 11, 2026 14:35

resolve conflict

04107c8

fix ts

413237f

remove ? in isDraftChatReport param

33d0a58

refactor MoneyRequestStepDistanceNavigationParams

3dcbe7b

remove optional isDraftChatReport param

374a4fc

daledah added 3 commits August 13, 2026 15:28

resolve conflict

bd2c069

Merge branch 'main' into refactor/66414-4

dcf200d

remove redundant report param

24219a3

daledah added 2 commits August 18, 2026 17:15

fix failing test

135e596

Merge branch 'main' into refactor/66414-4

d94b1d4

chatgpt-codex-connector Bot reviewed Aug 19, 2026

View reviewed changes

daledah closed this Aug 19, 2026

		const targetChatForDuplicate = isSourcePolicyValid ? chatReport : activePolicyExpenseChat;
		const [isDraftChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${targetChatForDuplicate?.reportID}`, {selector: isDraftReportSelector});

Conversation

daledah commented Jul 8, 2026 • 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 Jul 8, 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!

melvin-bot Bot commented Jul 9, 2026

Uh oh!

daledah commented Jul 9, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

trjExpensify commented Jul 9, 2026

Uh oh!

DylanDylann commented Jul 13, 2026

Uh oh!

daledah commented Jul 14, 2026

Uh oh!

Uh oh!

daledah commented Jul 15, 2026

Uh oh!

daledah commented Jul 27, 2026

Uh oh!

DylanDylann commented Aug 3, 2026

Uh oh!

DylanDylann commented Aug 3, 2026

Uh oh!

daledah commented Aug 4, 2026

Uh oh!

DylanDylann Aug 5, 2026

Choose a reason for hiding this comment

Uh oh!

daledah Aug 6, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann Aug 11, 2026

Choose a reason for hiding this comment

Uh oh!

daledah Aug 11, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann Aug 18, 2026

Choose a reason for hiding this comment

Uh oh!

daledah Aug 19, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Aug 5, 2026

Uh oh!

daledah commented Aug 6, 2026

Uh oh!

daledah commented Aug 11, 2026

Uh oh!

DylanDylann commented Aug 18, 2026

Uh oh!

DylanDylann commented Aug 19, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Aug 19, 2026

Choose a reason for hiding this comment

Uh oh!

daledah commented Aug 19, 2026

Uh oh!

Reviewers

Uh oh!

daledah commented Jul 8, 2026 •

edited

Loading

codecov Bot commented Jul 8, 2026 •

edited by github-actions Bot

Loading