refactor trackExpense by dukenv0307 · Pull Request #79944 · Expensify/App

dukenv0307 · 2026-01-20T04:59:28Z

Explanation of Change

Fixed Issues

$ #67778
PROPOSAL:

Tests

Open SelfDM
Track expense
Verify that the track expense is created succesfully

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I verified there are no new alerts related to the canBeMissing param for useOnyx
I followed proper code patterns (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
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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 new assets were added or existing ones were modified, I verified that:
- The assets are optimized and compressed (for SVG files, run npm run compress-svg)
- The assets load correctly across all supported platforms.
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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

codecov · 2026-01-20T05:08:39Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/actions/IOU/Duplicate.ts	`97.71% <ø> (ø)`
src/libs/actions/IOU/MoneyRequest.ts	`95.83% <100.00%> (+0.02%)`	⬆️
src/pages/Share/SubmitDetailsPage.tsx	`0.00% <ø> (ø)`
...rc/pages/iou/request/step/IOURequestStepAmount.tsx	`65.00% <ø> (ø)`
...es/iou/request/step/IOURequestStepConfirmation.tsx	`57.42% <100.00%> (+0.07%)`	⬆️
.../pages/iou/request/step/IOURequestStepDistance.tsx	`58.21% <100.00%> (+0.66%)`	⬆️
src/selectors/TransactionDraft.ts	`100.00% <100.00%> (ø)`
...st/step/IOURequestStepDistanceGPS/index.native.tsx	`0.00% <0.00%> (ø)`
.../iou/request/step/IOURequestStepDistanceManual.tsx	`0.00% <0.00%> (ø)`
...ges/iou/request/step/IOURequestStepDistanceMap.tsx	`0.00% <0.00%> (ø)`
... and 2 more
... and 13 files with indirect coverage changes

melvin-bot · 2026-01-20T09:07:17Z

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

melvin-bot · 2026-01-20T09:08:01Z

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

JmillsExpensify

Product review not required.

src/components/MoneyReportHeader.tsx

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 52418f1d78

ℹ️ 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-01-20T09:23:02Z

src/libs/actions/IOU/index.ts

    introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
    activePolicyID: string | undefined;
    quickAction: OnyxEntry<OnyxTypes.QuickAction>;
+    allTransactionDrafts: OnyxCollection<OnyxTypes.Transaction>;


Avoid serializing full draft collection into retry params

Adding allTransactionDrafts to CreateTrackExpenseParams means trackExpense’s retryParams (built via ...params) now carries the entire draft collection, and getReceiptError JSON‑stringifies it. When a receipt upload fails and the user retries, those drafts already contain errors.retryParams, so each subsequent failure nests the previous payload and can balloon quickly. That can bloat Onyx error data and noticeably slow retries; consider omitting allTransactionDrafts when constructing retryParams (or pass it separately to removeDraftTransactions).

Useful? React with 👍 / 👎.

I already omitted allTransactionDrafts from retryParams

DylanDylann · 2026-01-21T12:15:41Z

@dukenv0307 Please merge main again

DylanDylann · 2026-01-23T08:49:08Z

@dukenv0307 Could you fix the failed eslint?

dukenv0307 · 2026-01-25T16:43:01Z

@DylanDylann Done

MarioExpensify · 2026-01-26T17:25:55Z

Looks like we have many conflicts.

DylanDylann · 2026-01-27T08:28:22Z

@dukenv0307 The change looks good to me. Lots of conflict on my side that prevents me from testing after merging the latest main. Could you please fix the conflict?

MarioExpensify · 2026-01-28T19:02:49Z

Bump @dukenv0307 for checking the conflicts

dukenv0307 · 2026-01-29T03:01:29Z

@DylanDylann @MarioExpensify I think we should wait for this PR to be merged first

dukenv0307 · 2026-03-09T03:01:33Z

@MarioExpensify I just merged main to resolve the conflicts. We're good to merge now

DylanDylann · 2026-03-09T10:24:29Z

@dukenv0307 Failed Eslint

MarioExpensify · 2026-03-09T13:29:44Z

@dukenv0307 please check the failing ESLint and feel free to ping me when we're ready to merge

dukenv0307 · 2026-03-09T15:51:01Z

@MarioExpensify I fixed the lint issue

MarioExpensify · 2026-03-09T20:50:29Z

Sorry guys, another conflict has shown up 🤦 @dukenv0307 please fix the conflict.

DylanDylann · 2026-03-10T04:33:00Z

@dukenv0307 Failed Eslint

dukenv0307 · 2026-03-11T07:37:03Z

@DylanDylann I fixed

DylanDylann · 2026-03-11T07:47:22Z

cc @MarioExpensify For final review

MarioExpensify · 2026-03-11T12:37:40Z

@dukenv0307 another round of conflicts.... this is being hard. Please ping me in Slack if you fix this today so I can merge it as soon as it is ready so we don't have any more conflicts.

CC: @DylanDylann

MarioExpensify

LGTM!!

OSBotify · 2026-03-11T16:58:39Z

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

github-actions · 2026-03-11T17:09:15Z

🚧 @MarioExpensify has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-03-11T17:14:04Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #79944.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-6a60af1-ba88656-2d6e1dba90e12c98b2242be6554e96454cc00244/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-6a60af1-ba88656-4ce67aad99cbbbe7b3f252186ee4456a0557656b/index.html

Web 🕸️
https://79944.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-11T20:03:51Z

🚀 Deployed to staging by https://github.com/MarioExpensify in version: 9.3.36-0 🚀

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

OSBotify · 2026-03-12T22:48:33Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.36-10 🚀

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

refactor trackExpense

3fe4d80

melvin-bot bot assigned dukenv0307 Jan 20, 2026

fix lint

52418f1

dukenv0307 marked this pull request as ready for review January 20, 2026 09:07

dukenv0307 requested review from a team as code owners January 20, 2026 09:07

melvin-bot bot requested review from DylanDylann and JmillsExpensify and removed request for a team January 20, 2026 09:07

melvin-bot bot requested review from a team and MarioExpensify and removed request for a team January 20, 2026 09:07

JmillsExpensify reviewed Jan 20, 2026

View reviewed changes

github-actions bot reviewed Jan 20, 2026

View reviewed changes

src/components/MoneyReportHeader.tsx Outdated Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Jan 20, 2026

View reviewed changes

dukenv0307 added 4 commits January 23, 2026 18:58

update test

a006e4e

lint fix

2722d6e

merge main

1e57df9

fix ts

3ecde63

dukenv0307 dismissed MarioExpensify’s stale review via c11382d March 9, 2026 03:00

dukenv0307 added 2 commits March 9, 2026 21:54

Merge branch 'main' into fix/67778-part-2

bbcdaf0

update lint

60f348f

DylanDylann approved these changes Mar 9, 2026

View reviewed changes

melvin-bot bot requested a review from MarioExpensify March 9, 2026 16:22

merge main

ed9e3d7

dukenv0307 force-pushed the fix/67778-part-2 branch from d02ea1a to ed9e3d7 Compare March 10, 2026 09:38

Merge branch 'main' into fix/67778-part-2

8b5611e

DylanDylann approved these changes Mar 11, 2026

View reviewed changes

dukenv0307 added 2 commits March 11, 2026 23:15

merge main

3312747

update test

f48c5fb

MarioExpensify approved these changes Mar 11, 2026

View reviewed changes

MarioExpensify merged commit 6a60af1 into Expensify:main Mar 11, 2026
32 checks passed

OSBotify mentioned this pull request Mar 11, 2026

Deploy Checklist: New Expensify 2026-03-11 #84953

Closed

MelvinBot mentioned this pull request Mar 12, 2026

[Due for payment 2026-03-19] Report - Cancel payment doesn't work and leads to blank page #85019

Closed

7 tasks

melvin-bot bot mentioned this pull request Mar 12, 2026

[Due for payment 2026-03-19] Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT in src/libs/actions/Transaction.ts #67778

Open

Conversation

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants