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

GCyganek · 2026-02-11T15:32:01Z

Explanation of Change

Reverts #82023 with fixes that caused the #81017 to be reverted at first because of #82009 and #82004 which should be fixed in this PR

Easiest to review by checking commits one by one. First is a revert, second $ #82004 and third $ #82009

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

=============================

test for #82004:

Precondition: Enable Distance rates in workspace settings.

Go to workspace chat.
Create a manual distance expense.
Go to workspace settings > Distance rates.
Click Settings > Unit.
Change it to another unit.
Open the distance expense from Step 2.
Click Distance. Without changing anything, click Save.
Verify that the Distance and Rate are updated to the new unit and that Amount is also updated correctly
Close the distance expense.
Reopen the distance expense.
Verify that the Distance and Rate are correct

=============================

test for #82009:

Precondition:

User location is not US or change default payment currency to EUR or MYR in Preferences.
Default workspace has enabled Distance rates.
Default distance unit is Kilometers in distance rates settings.

Go to self DM.
Click + > Track distance > Manual.
Enter amount > Next.
On confirm page, click Rate.
Click Upgrade > Got it, thanks.
Enter any rate > Save.
On confirm page, Distance and Rate units should be miles, Amount should be correctly updated
Click Create expense.
Open the created expense.
Verify that Distance, Rate and Amount values are correct

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

GPS:

Screen.Recording.2026-02-11.at.17.38.29.mov

Manual:

Screen.Recording.2026-02-11.at.17.40.11.mov

Manual input:

Screen.Recording.2026-02-11.at.17.41.06.mov

iOS: Native

Manual:

Screen.Recording.2026-02-11.at.17.55.19.mov

GPS:

Screen.Recording.2026-02-11.at.17.54.43.mov

Manual input:

Screen.Recording.2026-02-11.at.17.55.43.mov

MacOS: Chrome / Safari

#82009 fix demo:

Screen.Recording.2026-02-11.at.16.43.39.mov

#82004 fix demo:

Screen.Recording.2026-02-11.at.16.46.05.mov

…/revert-81017-fix/distance-conversion-different-distance-unit" This reverts commit 48538a5, reversing changes made to 0eeac00.

…ense

…fferent

codecov · 2026-02-11T15:40:03Z

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/actions/IOU/MoneyRequest.ts	`97.97% <100.00%> (ø)`
...ou/request/step/IOURequestStepDistanceOdometer.tsx	`0.00% <ø> (ø)`
src/libs/GPSDraftDetailsUtils.ts	`0.00% <0.00%> (-3.85%)`	⬇️
...ges/iou/request/step/IOURequestStepDestination.tsx	`2.73% <0.00%> (ø)`
...rc/pages/iou/request/step/IOURequestStepReport.tsx	`60.00% <0.00%> (ø)`
...c/pages/iou/request/step/IOURequestStepUpgrade.tsx	`0.00% <0.00%> (ø)`
...es/iou/request/step/IOURequestStepParticipants.tsx	`0.00% <0.00%> (ø)`
src/components/MoneyRequestConfirmationList.tsx	`57.11% <41.66%> (-0.57%)`	⬇️
.../iou/request/step/IOURequestStepDistanceManual.tsx	`0.00% <0.00%> (ø)`
src/libs/actions/IOU/index.ts	`72.92% <17.39%> (-0.03%)`	⬇️
... and 10 files with indirect coverage changes

GCyganek · 2026-02-11T15:54:06Z

src/components/MoneyRequestConfirmationList.tsx

+            !transactionID ||
+            !lastSelectedRate ||
+            isMovingTransactionFromTrackExpense ||
+            !selectedParticipants.some((participant) => participant.policyID === policy?.id)


This is the only change added to this hook. This prevents situations where setCustomUnitRateID is called for a policy that is not a participant of the current transaction (was being called for example when for selfDM user tried to change rate and IOURequestStepUpgrade logic was used and updated transactions participants to the new workspace)

GCyganek · 2026-02-11T15:57:47Z

src/libs/actions/IOU/index.ts

    }

-    const distanceRate = DistanceRequestUtils.getRateByCustomUnitRateID({policy, customUnitRateID});
+    const newDistanceUnit = getDistanceRateCustomUnit(policy)?.attributes?.unit;


DistanceRequestUtils.getRateByCustomUnitRateID() was basically using this function under the hood, but by using it directly we do not require the transaction to have the passed customUnitRateID to be present in the transaction at the moment, which is crucial for when this function is called from CreateDistanceRatePage component immediately after customUnitRate is created (so policy object does not have it persisted yet)

jakubkalinski0

Looks very good! Excellent fix, well done 🚀

melvin-bot · 2026-02-11T18:28:37Z

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

src/components/MoneyRequestConfirmationList.tsx

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

…ent-distance-unit

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: bc5e8cc001

ℹ️ 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/iou/request/step/IOURequestStepDistanceOdometer.tsx

AndrewGable · 2026-02-11T23:32:11Z

All yours @dukenv0307

dukenv0307 · 2026-02-12T03:57:09Z

@GCyganek

On confirm page, Distance and Rate units should be miles, Amount should be correctly updated

I think it should be On confirm page, Distance and Rate units should be kilometers, Amount should be correctly updated

dukenv0307 · 2026-02-12T04:20:12Z

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-02-12.at.11.08.05.mov

Android: mWeb Chrome

Screen.Recording.2026-02-12.at.11.00.47.mov

iOS: HybridApp

Screen.Recording.2026-02-12.at.11.05.47.mov

iOS: mWeb Safari

Screen.Recording.2026-02-12.at.10.58.31.mov

MacOS: Chrome / Safari

Screen.Recording.2026-02-12.at.10.41.44.mov

Screen.Recording.2026-02-12.at.10.47.31.mov

Screen.Recording.2026-02-12.at.10.49.25.mov

Screen.Recording.2026-02-12.at.10.55.59.mov

dukenv0307

LGTM

GCyganek · 2026-02-12T09:24:09Z

@GCyganek

On confirm page, Distance and Rate units should be miles, Amount should be correctly updated

I think it should be On confirm page, Distance and Rate units should be kilometers, Amount should be correctly updated

@dukenv0307 from what I've tested the new policies usually have miles set as default distance units (and when user upgrades the distance rates from selfDM a new policy is created which is set as a transaction's recipient). Do you have kilometers in this step instead?

dukenv0307 · 2026-02-12T09:40:41Z

@GCyganek Ah ok, I misunderstood the unit on distance page

Screen.Recording.2026-02-12.at.16.39.28.mov

dukenv0307 · 2026-02-12T09:40:52Z

LGTM

github-actions · 2026-02-12T17:08:29Z

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

github-actions · 2026-02-12T17:11:48Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-dac6d0e-6e0bd734832aca5e0c011b5db4ce7b6116b4a25a/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-dac6d0e-35afce3bd2fca5c95529c935475466eeae913220/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-12T17:15:38Z

✋ 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-13T19:11:54Z

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

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

OSBotify · 2026-02-16T15:27:17Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.19-5 🚀

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

GCyganek added 3 commits February 11, 2026 10:28

Revert "Merge pull request Expensify#82023 from software-mansion-labs…

4a6472b

…/revert-81017-fix/distance-conversion-different-distance-unit" This reverts commit 48538a5, reversing changes made to 0eeac00.

Fix distance and rate revert to old unit after reopening distance exp…

e48c017

…ense

Fix Distance and Rate unit on confirm page and created expense are di…

bc5e8cc

…fferent

melvin-bot bot assigned GCyganek Feb 11, 2026

GCyganek changed the title ~~@g cyganek/gps/fix distance conversion different distance unit~~ Restore "Fix updates of distance and distance units when changing expense recipients" with fixes Feb 11, 2026

GCyganek changed the title ~~Restore "Fix updates of distance and distance units when changing expense recipients" with fixes~~ Restore "#81017 Fix updates of distance and distance units when changing expense recipients" with fixes Feb 11, 2026

GCyganek commented Feb 11, 2026

View reviewed changes

GCyganek mentioned this pull request Feb 11, 2026

[HOLD] Fix distance and rate revert to old unit after reopening distance expense #82012

Closed

54 tasks

jakubkalinski0 approved these changes Feb 11, 2026

View reviewed changes

GCyganek marked this pull request as ready for review February 11, 2026 18:28

GCyganek requested review from a team as code owners February 11, 2026 18:28

melvin-bot bot requested review from dukenv0307 and trjExpensify and removed request for a team February 11, 2026 18:28

melvin-bot bot removed the request for review from a team February 11, 2026 18:28

github-actions bot reviewed Feb 11, 2026

View reviewed changes

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

github-actions bot reviewed Feb 11, 2026

View reviewed changes

src/components/MoneyRequestConfirmationList.tsx Show resolved Hide resolved

github-actions bot reviewed Feb 11, 2026

View reviewed changes

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

GCyganek added 2 commits February 11, 2026 19:31

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

bfc191a

…ent-distance-unit

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

9a8860c

…ent-distance-unit

chatgpt-codex-connector bot reviewed Feb 11, 2026

View reviewed changes

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

dukenv0307 approved these changes Feb 12, 2026

View reviewed changes

melvin-bot bot requested a review from rlinoz February 12, 2026 04:23

GCyganek 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

AndrewGable approved these changes Feb 12, 2026

View reviewed changes

rlinoz approved these changes Feb 12, 2026

View reviewed changes

rlinoz merged commit dac6d0e into Expensify:main Feb 12, 2026
31 of 32 checks passed

OSBotify mentioned this pull request Feb 13, 2026

Deploy Checklist: New Expensify 2026-02-13 #82449

Closed

69 tasks

mitarachim mentioned this pull request Feb 15, 2026

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

Open

7 tasks

kacper-mikolajczak mentioned this pull request Feb 16, 2026

[AI Reviewer] Rule improvement: PERF-6 #82526

Closed

MelvinBot mentioned this pull request Mar 12, 2026

Fix distance rate not selected after creating new rate from self DM #84850

Merged

52 tasks

Conversation

GCyganek commented Feb 11, 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 Feb 11, 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!

GCyganek Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

GCyganek Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

jakubkalinski0 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Feb 11, 2026

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!

AndrewGable commented Feb 11, 2026

Uh oh!

dukenv0307 commented Feb 12, 2026

Uh oh!

dukenv0307 commented Feb 12, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

dukenv0307 commented Feb 12, 2026

Uh oh!

dukenv0307 commented Feb 12, 2026

Uh oh!

Uh oh!

github-actions bot commented Feb 12, 2026

Uh oh!

github-actions bot commented Feb 12, 2026

Uh oh!

OSBotify commented Feb 12, 2026

Uh oh!

OSBotify commented Feb 13, 2026

Uh oh!

OSBotify commented Feb 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

GCyganek commented Feb 11, 2026 •

edited

Loading

codecov bot commented Feb 11, 2026 •

edited by github-actions bot

Loading

GCyganek commented Feb 12, 2026 •

edited

Loading