[Odometer] Photo is not cropped after saving cropped photo by jakubkalinski0 · Pull Request #85438 · Expensify/App

jakubkalinski0 · 2026-03-16T16:31:43Z

Explanation of Change

Fixed odometer photo crop/rotate not persisting after save. The TransactionReceiptModalContent was using setMoneyRequestReceipt/replaceReceipt for all images, but odometer images require setMoneyRequestOdometerImage. Added an isOdometerImage branch in both the rotate and crop save handlers, and updated their dependency arrays accordingly.

Fixed Issues

$ #85365
PROPOSAL: N/A

Tests

Press FAB -> go to "Track distance" -> choose "Odometer" tab
Enter start and end odometer readings
Press on the photo thumbnail -> capture or pick an image -> verify it is shown in the thumbnail (do that for both Start and End)
Press "Next"
On the confirmation screen go back by pressing < back button until you are brought back to to the "Odometer" tab
Open the odometer photo by pressing on the thumbnail and use the rotate button to rotate the image, then confirm the save.
Verify that the rotated odometer image persists after saving (not reverted to the pre-rotation state).
Now once again open the odometer photo by pressing on the thumbnail and use the crop button to crop the image, then confirm the save.
Verify that the cropped odometer image persists after saving (not reverted to the pre-crop state).
Nowe press "Next"
Verify that the stitched image uses edited odometer photos
On the confirmation page click "Distance" and when you land on odometer screen repeat steps 6 through 9
Then press "Save" and verify that the stitched image uses edited odometer photos

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

iOS needs to be tested on a physcical device

Android: Native

androidnative.mp4

Android: mWeb Chrome

androidweb.mp4

iOS: mWeb Safari

iosweb.mp4

MacOS: Chrome / Safari

web.mov

codecov · 2026-03-16T16:49:04Z

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 Δ
...es/iou/request/step/IOURequestStepConfirmation.tsx	`57.53% <100.00%> (+0.07%)`	⬆️
src/libs/TransactionUtils/index.ts	`82.39% <0.00%> (-0.66%)`	⬇️
...alScreen/routes/TransactionReceiptModalContent.tsx	`0.00% <0.00%> (ø)`
... and 13 files with indirect coverage changes

mhawryluk

LGTM 🖼️

melvin-bot · 2026-03-17T10:17:19Z

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

jakubkalinski0 · 2026-03-17T10:18:29Z

@heyjennahay Hi! Sorry for the trouble but @DylanDylann is the C+ assigned to the odometer project and I think he will be the one taking care of this review

DylanDylann · 2026-03-17T10:38:19Z

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

Screen.Recording.2026-03-18.at.11.37.24.mov

Android: mWeb Chrome

Screen.Recording.2026-03-18.at.11.21.35.mov

iOS: HybridApp

Screen.Recording.2026-03-18.at.11.31.37.mov

iOS: mWeb Safari

Screen.Recording.2026-03-18.at.11.20.21.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-18.at.11.17.10.mov

DylanDylann · 2026-03-17T10:46:53Z

@jakubkalinski0 Could you review all usages of setMoneyRequestReceipt to check if there are any similar cases we might be missing?

DylanDylann · 2026-03-17T10:48:29Z

I noticed a case where the stitched image on the confirmation page can be replaced by uploading another one. We should not allow the stitched image to be replaced on the confirmation page.

Screen.Recording.2026-03-17.at.17.45.59.mov

jakubkalinski0 · 2026-03-17T10:53:13Z

@jakubkalinski0 Could you review all usages of setMoneyRequestReceipt to check if there are any similar cases we might be missing?

@DylanDylann I already did that and all other usages seem to be fine

jakubkalinski0 · 2026-03-17T10:53:50Z

I noticed a case where the stitched image on the confirmation page can be replaced by uploading another one. We should not allow the stitched image to be replaced on the confirmation page.

Wow, thats interesting, I am on it

jakubkalinski0 · 2026-03-17T11:33:49Z

@DylanDylann Simple fix, you can continue with your review. Thanks for catching that!

Screen.Recording.2026-03-17.at.12.32.32.mov

DylanDylann · 2026-03-17T11:58:17Z

@jakubkalinski0 Thanks. It's looking fine now

DylanDylann · 2026-03-17T12:04:39Z

@jakubkalinski0 The crop and rotate buttons only appear if we are going from the confirmation page. Is this expected?

jakubkalinski0 · 2026-03-17T12:13:04Z

@DylanDylann No, I don't think it should look this way. On it

jakubkalinski0 · 2026-03-17T15:48:48Z

I think I've fixed it but I am testing it on all platforms now and looking for possible regressions

jakubkalinski0 · 2026-03-17T16:39:35Z

@Julesssss One question, while testing I noticed that we also had this Crop, Rotate and Replace buttons turned off for an already created odometer expense. Do we want to have them available on for an existing odometer expense? How does it work on classic?

It's a small change and I have it ready but we can do it as a lower priority followup if you want (if we want to do that at all of course)

jakubkalinski0 · 2026-03-17T17:13:03Z

@DylanDylann Besides the comment above this PR is all yours once again

Julesssss · 2026-03-17T17:25:44Z

Do we want to have them available on for an existing odometer expense? How does it work on classic?

No it's fine to not allow that.

jakubkalinski0 · 2026-03-17T17:32:25Z

No it's fine to not allow that.

Unlucky then that I took some time to figure out a fix 😅 Thanks for the info, then this PR is all for @DylanDylann

Julesssss

👍

DylanDylann · 2026-03-18T04:16:43Z

Improvement: (Should fix separately in another PR) When clicking “Replace,” the app navigates to the odometer distance page and then to the odometer image page. I think we should open the picker directly instead of navigating the user back to the odometer image page.

Screen.Recording.2026-03-18.at.11.13.54.mov

src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx

DylanDylann

The rest looks fine to me

src/libs/TransactionUtils/index.ts

DylanDylann · 2026-03-18T04:42:32Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c8d61224f7

ℹ️ 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/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx

DylanDylann · 2026-03-18T06:23:30Z

@jakubkalinski0 Please take a look at above comments

jakubkalinski0 · 2026-03-18T09:06:06Z

Improvement: (Should fix separately in another PR) When clicking “Replace,” the app navigates to the odometer distance page and then to the odometer image page. I think we should open the picker directly instead of navigating the user back to the odometer image page.

@DylanDylann Why? I don't think I actually agree. Why do we want to limit the user to attachment picker only? I think that design would have to make that call anyway, so we can ask them if you wish.

…_after_saving_cropped_photo

DylanDylann · 2026-03-18T10:30:04Z

@DylanDylann Why? I don't think I actually agree. Why do we want to limit the user to attachment picker only? I think that design would have to make that call anyway, so we can ask them if you wish.

Let’s move forward for now, this is just my suggestion for improvement. We can discuss it later.

Julesssss · 2026-03-18T22:40:44Z

When clicking “Replace,” the app navigates to the odometer distance page and then to the odometer image page

Thanks, bug created here.

@jakubkalinski0 IMO it should be improved, to not show the distance tabs page. Navigating back seems odd

github-actions · 2026-03-18T22:46:15Z

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

github-actions · 2026-03-18T22:51:32Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-15266c6-d361e22-8e2e8dbbe73f9e784eb6a358ed2f2728a2cd8211/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-15266c6-d361e22-d5d8691387aa9578f1a417418f8e0e7747084c07/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-18T22:52: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 · 2026-03-19T20:25:37Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.3.41-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-03-23T09:28:42Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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

fix: odometer photo crop/rotate not persisting after save

ca6df48

melvin-bot bot assigned jakubkalinski0 Mar 16, 2026

mhawryluk approved these changes Mar 17, 2026

View reviewed changes

jakubkalinski0 marked this pull request as ready for review March 17, 2026 10:17

jakubkalinski0 requested review from a team as code owners March 17, 2026 10:17

melvin-bot bot requested review from Ollyws and heyjennahay and removed request for a team March 17, 2026 10:17

melvin-bot bot removed the request for review from a team March 17, 2026 10:17

DylanDylann mentioned this pull request Mar 17, 2026

Hide crop/rotate buttons for individual odometer images #85457

Closed

52 tasks

fix: disable DragAndDropProvider on confirmation page for odometer

e43922d

jakubkalinski0 mentioned this pull request Mar 17, 2026

[Due for payment 2026-03-30] [$250] Odometer - Photo is not cropped after saving cropped photo #85365

Open

7 tasks

fix: enable crop/rotate for odometer photos before confirmation page

c8d6122

Julesssss requested review from DylanDylann and removed request for Ollyws March 17, 2026 17:32

Julesssss reviewed Mar 17, 2026

View reviewed changes

DylanDylann reviewed Mar 18, 2026

View reviewed changes

src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx Outdated Show resolved Hide resolved

DylanDylann approved these changes Mar 18, 2026

View reviewed changes

melvin-bot bot requested a review from Julesssss March 18, 2026 04:34

DylanDylann reviewed Mar 18, 2026

View reviewed changes

src/libs/TransactionUtils/index.ts Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Mar 18, 2026

View reviewed changes

src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx Show resolved Hide resolved

jakubkalinski0 added 2 commits March 18, 2026 10:09

Merge branch 'main' into jakubkalinski0/Odometer_photo_is_not_cropped…

00f3f9c

…_after_saving_cropped_photo

refactor: replace ternary with logical AND in receipt modal condition

ff02b72

Julesssss approved these changes Mar 18, 2026

View reviewed changes

Julesssss merged commit 15266c6 into Expensify:main Mar 18, 2026
32 checks passed

OSBotify mentioned this pull request Mar 19, 2026

Deploy Checklist: New Expensify 2026-03-19 #85862

Closed

Conversation

jakubkalinski0 commented Mar 16, 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 Mar 16, 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!

mhawryluk left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 17, 2026

Uh oh!

jakubkalinski0 commented Mar 17, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann commented Mar 17, 2026

Uh oh!

DylanDylann commented Mar 17, 2026

Uh oh!

jakubkalinski0 commented Mar 17, 2026

Uh oh!

jakubkalinski0 commented Mar 17, 2026

Uh oh!

jakubkalinski0 commented Mar 17, 2026

Uh oh!

DylanDylann commented Mar 17, 2026

Uh oh!

DylanDylann commented Mar 17, 2026

Uh oh!

jakubkalinski0 commented Mar 17, 2026

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

jakubkalinski0 commented Mar 17, 2026

Uh oh!

Julesssss commented Mar 17, 2026

Uh oh!

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

Uh oh!

Uh oh!

Julesssss left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

Uh oh!

DylanDylann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DylanDylann commented Mar 18, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

DylanDylann commented Mar 18, 2026

Uh oh!

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

Uh oh!

Uh oh!

DylanDylann commented Mar 18, 2026

jakubkalinski0 commented Mar 16, 2026 •

edited

Loading

codecov bot commented Mar 16, 2026 •

edited by github-actions bot

Loading

DylanDylann commented Mar 17, 2026 •

edited

Loading

jakubkalinski0 commented Mar 17, 2026 •

edited

Loading

jakubkalinski0 commented Mar 17, 2026 •

edited

Loading

jakubkalinski0 commented Mar 17, 2026 •

edited

Loading

DylanDylann commented Mar 18, 2026 •

edited

Loading

jakubkalinski0 commented Mar 18, 2026 •

edited

Loading

Julesssss commented Mar 18, 2026 •

edited

Loading