Copy odometer data during transaction merge by MelvinBot · Pull Request #86557 · Expensify/App

MelvinBot · 2026-03-27T15:27:50Z

Explanation of Change

When merging two odometer distance expenses, the odometer readings (odometerStart, odometerEnd) and their images (odometerStartImage, odometerEndImage) were not being transferred from the selected transaction to the merged result. This caused the merged expense to display stale odometer data from the target transaction instead of the user's chosen values.

The fix propagates odometer data through the entire merge pipeline:

MergeTransaction type — Added odometerStart, odometerEnd, odometerStartImage, odometerEndImage fields so the merge flow has storage for these values.
getMergeFieldUpdatedValues — When the merchant field is selected for an odometer distance request, copies the odometer readings and images from the selected transaction's comment.
buildMergedTransactionData — Overrides the target transaction's odometer values in the comment with the merge transaction's values (when present).
API params (mergeTransactionRequest) — Includes odometer data in the comment JSON sent to the backend.
Optimistic data (getOnyxTargetTransactionData) — Includes odometer data in the optimistic Onyx update for immediate UI feedback.

Fixed Issues

$ #82658

Tests

Log in with an Expensifail account
Go to a workspace chat
Create two odometer expenses with different start/end readings
Open the expense report
Open any expense, click More > Merge
Select the other odometer expense > Continue
Select the second merchant > Continue
Click Merge expenses
Click Distance
Verify the odometer data updates to the value of the selected (merged) expense, not the old target values

Verify that no errors appear in the JS console

Offline tests

Go offline before step 8 above (clicking "Merge expenses")
Verify the merged expense optimistically shows the correct odometer readings from the selected transaction
Go back online and verify the data persists correctly

QA Steps

Log in with an Expensifail account on staging
Go to a workspace chat
Create two odometer expenses with different distances (e.g., start: 1000, end: 1050 for one; start: 2000, end: 2100 for the other)
Open the expense report
Open any expense, click More > Merge
Select the other odometer expense > Continue
Select the second merchant > Continue
Click Merge expenses
Click Distance
Verify the odometer data matches the selected expense's values

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

… merge When merging two odometer distance expenses, the odometer readings (odometerStart, odometerEnd) and their images were not being transferred from the selected transaction. This caused the merged expense to show stale odometer data from the target transaction. The fix adds odometerStart/odometerEnd/odometerStartImage/odometerEndImage fields to the MergeTransaction type and propagates them through: - getMergeFieldUpdatedValues (copies from selected transaction) - buildMergedTransactionData (applies to merged display data) - mergeTransactionRequest API params (sends to backend) - getOnyxTargetTransactionData optimistic data (immediate UI update) Co-authored-by: Manan <mananjadhav@users.noreply.github.com>

Co-authored-by: Manan <mananjadhav@users.noreply.github.com>

MelvinBot · 2026-03-27T15:31:37Z

Fixed the failing ESLint check: FileObject was imported from a non-existent module @libs/FileUtils in src/types/onyx/MergeTransaction.ts. Changed the import to @src/types/utils/Attachment where the type is actually defined. This was the root cause of all 10 ESLint errors — the invalid import made FileObject resolve as an error type (any), which cascaded into no-redundant-type-constituents and no-unsafe-assignment errors in MergeTransactionUtils.ts and MergeTransaction.ts.

MelvinBot · 2026-03-27T15:35:40Z

The failing checks have been fixed. The previous TypeScript error (Cannot find module '@libs/FileUtils') was caused by an incorrect import path in MergeTransaction.ts. The fix commit corrected the import to @src/types/utils/Attachment. Both the TypeScript and ESLint checks are now passing.

codecov · 2026-03-27T15:39:45Z

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/libs/MergeTransactionUtils.ts	`76.31% <55.55%> (-0.86%)`	⬇️
src/libs/actions/MergeTransaction.ts	`58.08% <50.00%> (-0.41%)`	⬇️
... and 12 files with indirect coverage changes

mananjadhav · 2026-03-29T17:49:40Z

@MelvinBot Please check the lint errors and the codecov has also decreased.

MelvinBot · 2026-03-29T17:50:55Z

All CI checks are currently passing on this PR, including:

ESLint check — ✅ pass
Changed files ESLint check — ✅ pass
codecov/patch — ✅ pass
codecov/project — ✅ pass
All test jobs (1–8) — ✅ pass
typecheck — ✅ pass
Prettier check — ✅ pass

There are no lint errors or codecov failures at this time. The issues you saw may have been from a previous commit that has since been resolved, or they may have been transient CI failures. If you're still seeing failures, could you share which specific check or error you're referring to?

mananjadhav · 2026-04-10T13:38:18Z

@rlinoz can you mark it ready for review. The code changes look fine.

melvin-bot · 2026-04-10T15:35:25Z

@mananjadhav 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-04-10T15:35:30Z

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

joekaufmanexpensify

👍

rlinoz · 2026-04-13T13:20:24Z

@codex review

rlinoz · 2026-04-13T13:20:52Z

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 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: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-04-13.at.10.17.24.mov

chatgpt-codex-connector · 2026-04-13T13:41:30Z

Codex Review: Something went wrong. Try again later by commenting “@codex review”.

We were unable to download your code in a timely manner.

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

rlinoz · 2026-04-13T13:44:18Z

@codex review

chatgpt-codex-connector · 2026-04-13T14:01:12Z

Codex Review: Something went wrong. Try again later by commenting “@codex review”.

Failed to set up container

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

github-actions · 2026-04-13T16:47:28Z

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

github-actions · 2026-04-13T16:52:32Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-021e139-40b89df-efebd42d561f09dee4fe665e743b277aa3cccc64/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-021e139-40b89df-aa6f0f5dced658e24bc7514f10c6ec01066e4e75/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-13T16:56:13Z

✋ 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 · 2026-04-13T20:32:29Z

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.3.59-0 🚀

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

Bundle Size Analysis (Sentry):

Android

MelvinBot · 2026-04-13T20:34:14Z

No help site changes are required for this PR.

This is a code-level bug fix that ensures odometer data (odometerStart, odometerEnd, and their images) is properly propagated during transaction merges. The user-facing merge workflow is unchanged — no new steps, UI labels, or features were introduced.

I reviewed the two relevant help site articles:

How-to-Merge-Expenses.md — Describes the merge flow generically, which is correct for all expense types including odometer
Distance-Expenses.md — Covers creating distance expenses; doesn't need merge-specific updates

Both articles remain accurate as-is.

OSBotify · 2026-04-16T03:29:08Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.59-4 🚀

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

MelvinBot assigned mananjadhav Mar 27, 2026

MelvinBot requested a review from a team March 27, 2026 15:27

MelvinBot mentioned this pull request Mar 27, 2026

[Due for payment 2026-04-23] [$250] Odometer - After merging expenses, odometer distance is showing old data #82658

Closed

7 tasks

Fix: correct FileObject import path in MergeTransaction type

8b9113c

Co-authored-by: Manan <mananjadhav@users.noreply.github.com>

rlinoz marked this pull request as ready for review April 10, 2026 15:35

rlinoz requested a review from a team as a code owner April 10, 2026 15:35

melvin-bot Bot requested review from a team, joekaufmanexpensify and mananjadhav and removed request for a team April 10, 2026 15:35

melvin-bot Bot requested review from rlinoz and removed request for a team April 10, 2026 15:35

joekaufmanexpensify approved these changes Apr 10, 2026

View reviewed changes

rlinoz approved these changes Apr 13, 2026

View reviewed changes

rlinoz merged commit 021e139 into main Apr 13, 2026
40 of 41 checks passed

rlinoz deleted the claude-fixOdometerMergeData branch April 13, 2026 16:46

OSBotify mentioned this pull request Apr 13, 2026

Deploy Checklist: New Expensify 2026-04-13 #87792

Closed

89 tasks

Conversation

MelvinBot commented Mar 27, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Mar 27, 2026

Uh oh!

MelvinBot commented Mar 27, 2026

Uh oh!

codecov Bot commented Mar 27, 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!

mananjadhav commented Mar 29, 2026

Uh oh!

MelvinBot commented Mar 29, 2026

Uh oh!

mananjadhav commented Apr 10, 2026

Uh oh!

melvin-bot Bot commented Apr 10, 2026

Uh oh!

melvin-bot Bot commented Apr 10, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

rlinoz commented Apr 13, 2026

Uh oh!

rlinoz commented Apr 13, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

chatgpt-codex-connector Bot commented Apr 13, 2026

Uh oh!

rlinoz commented Apr 13, 2026

Uh oh!

chatgpt-codex-connector Bot commented Apr 13, 2026

Uh oh!

Uh oh!

github-actions Bot commented Apr 13, 2026

Uh oh!

github-actions Bot commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

MelvinBot commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov Bot commented Mar 27, 2026 •

edited by github-actions Bot

Loading