Fix updates of distance and distance units when changing expense recipients by GCyganek · Pull Request #81017 · Expensify/App

GCyganek · 2026-01-30T15:20:35Z

Explanation of Change

setCustomUnitRateID() function updates transaction.comment.customUnit.customUnitRateID, but does not consider that the transaction may have also transaction.comment.customUnit.distanceUnit and transaction.comment.customUnit.quantity set which depend on the current customUnitRateID. Because of this for the GPS and Manual requests the conversion of distance and update of the distance unit does not work properly when changing the recipient of the expense in the draft state. Fixing this by updating the setCustomUnitRateID() to make sure that if either transaction.comment.customUnit.distanceUnit or transaction.comment.customUnit.quantity value is set, they get updated according the the new customUnitRateID.

Fixed Issues

$ #80661
PROPOSAL: N/A

Tests

Preconditions:

Create Workspace 1 (default) with 2 different rates
Create Workspace 2, with at least 2 different rates and different currency and default distance unit than Workspace 1

GPS:

Tap FAB > Track Distance > GPS tab
Track some distance, tap Stop - Stop GPS tracking - Next
Verify that the default expense policy is used for distance unit in Distance and Rate
Tap Rate, select different rate, then switch back to default rate
Tap "To" field and select Workspace 2
Verify that the Distance, Amount and Rate fields display correct values and units
Tap Rates and verify that rates are correct
Switch recipient to selfDM (yourself)
Verify that Distance, Amount and Rate fields display correct values and units

Manual:

Tap FAB > Track Distance > Manual tab
Enter distance and tap Next
Verify that the default expense policy is used for distance unit in Distance and Rate
Tap Rate, select different rate, then switch back to default rate
Tap "To" field and select Workspace 2
Verify that the Distance, Amount and Rate fields display correct values and units
Tap Rates and verify that rates are correct
Switch recipient to selfDM (yourself)
Verify that Distance, Amount and Rate fields display correct values and units

Manual input:

Tap FAB > Track Distance > Manual tab
Enter distance and tap Next
Verify that the default expense policy is used for distance unit in Distance and Rate (correct unit)
Tap "To" field and select Workspace 2
Verify that the Distance, Amount and Rate fields display correct values and units
Tap Back button
Verify that the distance and distance unit have changed back to default (what you entered in 2. step)
Tap Next
Verify that the default expense policy is used for distance unit in Distance and Rate

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests and make sure that there are no regressions when creating other expenses and changing the recipients in draft state

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-01-30.at.15.35.18.mov

Screen.Recording.2026-01-30.at.16.32.00.mov

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…pients

…hen only customUnit: {quantity} is available

codecov · 2026-01-30T15:43:19Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/actions/IOU/MoneyRequest.ts	`97.97% <100.00%> (+85.81%)`	⬆️
...ou/request/step/IOURequestStepDistanceOdometer.tsx	`0.00% <ø> (ø)`
...c/pages/iou/request/step/IOURequestStepUpgrade.tsx	`0.00% <ø> (ø)`
src/libs/GPSDraftDetailsUtils.ts	`0.00% <0.00%> (ø)`
...ges/iou/request/step/IOURequestStepDestination.tsx	`2.94% <0.00%> (+2.94%)`	⬆️
...rc/pages/iou/request/step/IOURequestStepReport.tsx	`60.00% <0.00%> (+60.00%)`	⬆️
src/components/MoneyRequestConfirmationList.tsx	`57.11% <0.00%> (+57.11%)`	⬆️
.../iou/request/step/IOURequestStepDistanceManual.tsx	`0.00% <0.00%> (ø)`
...es/iou/request/step/IOURequestStepParticipants.tsx	`0.00% <0.00%> (ø)`
src/libs/actions/IOU/index.ts	`71.75% <21.05%> (+67.78%)`	⬆️
... and 1081 files with indirect coverage changes

mhawryluk

Great!

melvin-bot · 2026-02-02T17:22:29Z

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

src/libs/actions/IOU/index.ts

github-actions · 2026-02-02T17:25:34Z

src/libs/actions/IOU/index.ts

+
+        if (shouldUpdateDistanceUnit) {
+            newDistanceUnit = distanceRate.unit;
+        }


❌ CONSISTENCY-5 (docs)

The logic for updating newQuantity calls getDistanceInMeters(transaction, transactionDistanceUnit) without verifying that transactionDistanceUnit is defined and valid for the current transactionQuantity. If the transaction has a quantity but no distanceUnit (an inconsistent state), this could lead to incorrect distance conversion.

Suggested fix: Add validation to ensure both quantity and distanceUnit are present before attempting conversion:

if (shouldUpdateQuantity && !!distanceRate?.unit && transactionDistanceUnit) { newQuantity = DistanceRequestUtils.convertDistanceUnit( getDistanceInMeters(transaction, transactionDistanceUnit), distanceRate.unit ); }

Alternatively, add a comment explaining that getDistanceInMeters safely handles undefined units by returning 0, if that's the intended behavior.

Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

manual distance request updated to set transaction distanceUnit, gps distance request has distance in meters always stored in transaction?.routes?.route0?.distance

src/pages/iou/request/step/IOURequestStepParticipants.tsx

src/pages/iou/request/step/IOURequestStepUpgrade.tsx

src/libs/actions/IOU/index.ts

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4e391a99ef

ℹ️ 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/libs/actions/IOU/index.ts

GCyganek · 2026-02-02T17:57:35Z

@dukenv0307 part of GPS project, could you review?

hoangzinh · 2026-02-03T01:00:22Z

I have been assigned to the original issue, so I can help to review if @dukenv0307 is busy

dukenv0307 · 2026-02-03T04:46:25Z

Thank you @hoangzinh, it's our regression so I'll review this PR soon

dukenv0307 · 2026-02-03T08:20:11Z

Bug: The distance changes after changing to another workspace

Screen.Recording.2026-02-03.at.15.18.59.mov

dukenv0307 · 2026-02-03T08:22:10Z

Bug:

Click FAB
Track distance (manual)
Enter distance
Change to km workspace
Go back to manual distance page
Change the distance
Click next
Observe that the amount isn't saved

Screen.Recording.2026-02-03.at.15.19.25.mov

GCyganek · 2026-02-03T09:30:06Z

Bug: The distance changes after changing to another workspace

Yeah, it works different than on main, but I reported this as a bug recently (see slack and related issue) so this is actually a side effect of this PR that we are fixing this as it now correctly converts miles to kilometers

dukenv0307 · 2026-02-04T12:08:09Z

On it now

dukenv0307 · 2026-02-04T12:15:50Z

@GCyganek I watched the first video here, from the 30th second onwards, the distance displayed was 1 mile on the confirmation page, but after going back, the distance displayed was 1.6 km. Is it correct?

GCyganek · 2026-02-04T12:29:24Z

@GCyganek I watched the first video here, from the 30th second onwards, the distance displayed was 1 mile on the confirmation page, but after going back, the distance displayed was 1.6 km. Is it correct?

@dukenv0307 Yes, when creating Manual expense from FAB > Track distance we show distance and unit based on the default expense policy, which in this case is a policy with km distance unit. This is because when user taps Next in this scenario the default policy is set as the initial recipient, so we have to use it to determine what to show on the screen with input.

I added a test for it in the PR's description:


Manual input:

Tap FAB > Track Distance > Manual tab
Enter distance and tap Next
Verify that the default expense policy is used for distance unit in Distance and Rate (correct unit)
Tap "To" field and select Workspace 2
Verify that the Distance, Amount and Rate fields display correct values and units
Tap Back button
Verify that the distance and distance unit have changed back to default (what you entered in 2. step)
Tap Next
Verify that the default expense policy is used for distance unit in Distance and Rate

See that when you create a distance request from a workspace chat where the distance unit is different than the one used for the default policy, then it uses distance unit of the workspace and tapping Next uses that workspace as the recipient

dukenv0307 · 2026-02-04T16:08:24Z

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

I faced some issues while building Android. The PR author already verified it on Android so I think that's fine

Android: mWeb Chrome

Screen.Recording.2026-02-04.at.22.51.37.mov

iOS: HybridApp

Screen.Recording.2026-02-04.at.23.03.28.mov

Screen.Recording.2026-02-04.at.23.06.20.mov

iOS: mWeb Safari

Screen.Recording.2026-02-04.at.22.51.03.mov

MacOS: Chrome / Safari

Screen.Recording.2026-02-04.at.22.36.21.mov

dukenv0307

LGTM

melvin-bot · 2026-02-04T16:09:07Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #80661 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

GCyganek · 2026-02-05T08:56:32Z

Part of GPS project, @AndrewGable please review

…distance-units

github-actions · 2026-02-06T16:03:43Z

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

github-actions · 2026-02-06T16:09:50Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-b7887d3-b42313a023c8c48c909f0a281f7040b059440c33/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-b7887d3-42b11992783b55955d8fdd9d01fa3ea4d93996b2/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-06T16:13:34Z

✋ 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-02-10T07:23:35Z

🚀 Deployed to staging by https://github.com/AndrewGable in version: 9.3.16-0 🚀

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

…/@GCyganek/fix-distance-conversion-different-distance-units" This reverts commit b7887d3, reversing changes made to 767bdf4.

OSBotify · 2026-02-11T06:28:03Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.16-9 🚀

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

OSBotify · 2026-02-11T06:53:43Z

🚀 Deployed to staging by https://github.com/AndrewGable in version: 9.3.17-0 🚀

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

OSBotify · 2026-02-12T15:23:02Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.17-9 🚀

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

…x-distance-conversion-different-distance-unit Restore "#81017 Fix updates of distance and distance units when changing expense recipients" with fixes

Fix updates of distance and distance units when changing expense reci…

11618b0

…pients

melvin-bot bot assigned GCyganek Jan 30, 2026

GCyganek added 2 commits January 30, 2026 16:27

Require passing distanceUnit

d1627f2

Do not round to two decimal places to fix problems with conversions w…

c010f5f

…hen only customUnit: {quantity} is available

Refactor code for better readability

e894f66

GCyganek mentioned this pull request Feb 2, 2026

[$125] Distance does not convert while the transaction is still a draft and distance unit changes (when changing the recipient) #80494

Closed

7 tasks

mhawryluk approved these changes Feb 2, 2026

View reviewed changes

Lint fix

4e391a9

GCyganek marked this pull request as ready for review February 2, 2026 17:22

GCyganek requested review from a team as code owners February 2, 2026 17:22

melvin-bot bot requested review from JmillsExpensify and hoangzinh and removed request for a team February 2, 2026 17:22

github-actions bot reviewed Feb 2, 2026

View reviewed changes

src/libs/actions/IOU/index.ts Show resolved Hide resolved

github-actions bot reviewed Feb 2, 2026

View reviewed changes

src/pages/iou/request/step/IOURequestStepParticipants.tsx Show resolved Hide resolved

github-actions bot reviewed Feb 2, 2026

View reviewed changes

src/pages/iou/request/step/IOURequestStepUpgrade.tsx Show resolved Hide resolved

github-actions bot reviewed Feb 2, 2026

View reviewed changes

src/libs/actions/IOU/index.ts Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Feb 2, 2026

View reviewed changes

src/libs/actions/IOU/index.ts Outdated Show resolved Hide resolved

0 distance check

de3b97f

dukenv0307 approved these changes Feb 4, 2026

View reviewed changes

melvin-bot bot requested a review from rlinoz February 4, 2026 16:09

Merge branch 'main' into @GCyganek/fix-distance-conversion-different-…

56d13e0

…distance-units

rlinoz removed the request for review from hoangzinh February 5, 2026 14:07

GCyganek added 2 commits February 6, 2026 11:48

Merge branch 'main' into @GCyganek/fix-distance-conversion-different-…

5c662dd

…distance-units

Mobile-Expensify

4d0935e

AndrewGable approved these changes Feb 6, 2026

View reviewed changes

AndrewGable merged commit b7887d3 into Expensify:main Feb 6, 2026
29 checks passed

OSBotify mentioned this pull request Feb 10, 2026

Deploy Checklist: New Expensify 2026-02-10 #81937

Closed

nlemma mentioned this pull request Feb 10, 2026

Distance - Distance and Rate revert to old unit after reopening distance expense #82004

Closed

7 tasks

lanitochka17 mentioned this pull request Feb 10, 2026

[$250] Distance - Distance and Rate unit on confirm page and created expense are different #82009

Closed

7 tasks

GCyganek mentioned this pull request Feb 10, 2026

[CP Staging] Revert "Fix updates of distance and distance units when changing expense recipients" #82023

Merged

52 tasks

GCyganek mentioned this pull request Feb 11, 2026

Restore "#81017 Fix updates of distance and distance units when changing expense recipients" with fixes #82148

Merged

54 tasks

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

[Due for payment 2026-02-23] [GPS mileage expenses] Unit is shown incorrectly in Distance and Rate fields after switching the workspace #80661

Closed

7 tasks

OSBotify mentioned this pull request Feb 15, 2026

Distance - Wrong distance unit on confirm page when submissions are disabled #82514

Open

7 tasks

Conversation

GCyganek commented Jan 30, 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 Jan 30, 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 Feb 2, 2026

Uh oh!

Uh oh!

github-actions bot Feb 2, 2026

Choose a reason for hiding this comment

❌ CONSISTENCY-5 (docs)

Uh oh!

GCyganek Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

GCyganek commented Feb 2, 2026

Uh oh!

hoangzinh commented Feb 3, 2026

Uh oh!

dukenv0307 commented Feb 3, 2026

Uh oh!

dukenv0307 commented Feb 3, 2026

Uh oh!

dukenv0307 commented Feb 3, 2026

Uh oh!

GCyganek commented Feb 3, 2026

Uh oh!

dukenv0307 commented Feb 4, 2026

Uh oh!

dukenv0307 commented Feb 4, 2026

Uh oh!

GCyganek commented Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dukenv0307 commented Feb 4, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Feb 4, 2026

Uh oh!

GCyganek commented Feb 5, 2026

Uh oh!

Uh oh!

github-actions bot commented Feb 6, 2026

Uh oh!

github-actions bot commented Feb 6, 2026

Uh oh!

OSBotify commented Feb 6, 2026

Uh oh!

OSBotify commented Feb 10, 2026

Uh oh!

OSBotify commented Feb 11, 2026

Uh oh!

OSBotify commented Feb 11, 2026

Uh oh!

OSBotify commented Feb 12, 2026

GCyganek commented Jan 30, 2026 •

edited

Loading

codecov bot commented Jan 30, 2026 •

edited by github-actions bot

Loading

GCyganek commented Feb 4, 2026 •

edited

Loading