[CP Staging] Revert "Fix updates of distance and distance units when changing expense recipients" by GCyganek · Pull Request #82023 · Expensify/App

GCyganek · 2026-02-10T18:09:25Z

Reverts #81017

$ #82009

$ #82004

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
- MacOS: Desktop
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

MacOS: Desktop

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

melvin-bot · 2026-02-10T18:10:05Z

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

codecov · 2026-02-10T18:26:36Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/GPSDraftDetailsUtils.ts	`3.84% <100.00%> (+3.84%)`	⬆️
src/libs/actions/IOU/MoneyRequest.ts	`97.97% <100.00%> (ø)`
...ou/request/step/IOURequestStepDistanceOdometer.tsx	`0.00% <ø> (ø)`
...c/pages/iou/request/step/IOURequestStepUpgrade.tsx	`0.00% <ø> (ø)`
src/libs/actions/IOU/index.ts	`74.09% <50.00%> (+0.03%)`	⬆️
...ges/iou/request/step/IOURequestStepDestination.tsx	`2.94% <0.00%> (ø)`
...rc/pages/iou/request/step/IOURequestStepReport.tsx	`60.00% <0.00%> (ø)`
src/components/MoneyRequestConfirmationList.tsx	`57.76% <77.77%> (+0.40%)`	⬆️
.../iou/request/step/IOURequestStepDistanceManual.tsx	`0.00% <0.00%> (ø)`
...es/iou/request/step/IOURequestStepParticipants.tsx	`0.00% <0.00%> (ø)`
... and 110 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 703de120ef

ℹ️ 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-02-10T18:27:04Z

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

+    const customUnitRateID = getRateID(transaction);
+    const unit = DistanceRequestUtils.getRate({transaction, policy: shouldUseDefaultExpensePolicy ? defaultExpensePolicy : policy}).unit;
+    const distance = typeof transaction?.comment?.customUnit?.quantity === 'number' ? roundToTwoDecimalPlaces(transaction.comment.customUnit.quantity) : undefined;


Read manual distance from split draft when editing split expense

In IOURequestStepDistanceManual, split-edit mode builds currentTransaction from splitDraftTransaction, but these lines still read customUnitRateID, unit, and distance from transaction. When a user edits a split expense distance, navigates back, and reopens this step, the input is repopulated from the original transaction instead of the draft, so the UI shows stale data and a subsequent save can overwrite the already-updated split draft value.

Useful? React with 👍 / 👎.

AndrewGable · 2026-02-10T18:57:23Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

OSBotify · 2026-02-10T19:13:46Z

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

…/distance-conversion-different-distance-unit [CP Staging] Revert "Fix updates of distance and distance units when changing expense recipients" (cherry picked from commit 48538a5) (cherry-picked to staging by AndrewGable)

…879284777-1 🍒 Cherry pick PR #82023 to staging 🍒

OSBotify · 2026-02-10T20:26:22Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 9.3.16-7 🚀

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

OSBotify · 2026-02-11T06:32:27Z

🚀 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:56:26Z

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

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

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

OSBotify · 2026-02-12T15:25:26Z

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

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

OSBotify · 2026-02-13T19:11:30Z

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 9.3.19-0 🚀

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

OSBotify · 2026-02-16T15:26:53Z

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

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

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

703de12

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

GCyganek requested review from a team as code owners February 10, 2026 18:09

melvin-bot bot assigned GCyganek Feb 10, 2026

melvin-bot bot requested review from JmillsExpensify and puneetlath and removed request for a team February 10, 2026 18:09

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

chatgpt-codex-connector bot reviewed Feb 10, 2026

View reviewed changes

Fix import

052bd60

AndrewGable approved these changes Feb 10, 2026

View reviewed changes

AndrewGable merged commit 48538a5 into Expensify:main Feb 10, 2026
29 of 30 checks passed

os-botify bot mentioned this pull request Feb 10, 2026

🍒 Cherry pick PR #82023 to staging 🍒 #82039

Merged

52 tasks

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Feb 10, 2026

francoisl added a commit that referenced this pull request Feb 10, 2026

Merge pull request #82039 from Expensify/cherry-pick-staging-82023-21…

fc83571

…879284777-1 🍒 Cherry pick PR #82023 to staging 🍒

OSBotify mentioned this pull request Feb 10, 2026

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

Closed

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

OSBotify mentioned this pull request Feb 13, 2026

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

Closed

69 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

[CP Staging] Revert "Fix updates of distance and distance units when changing expense recipients"#82023
AndrewGable merged 2 commits intoExpensify:mainfrom
software-mansion-labs:revert-81017-fix/distance-conversion-different-distance-unit

GCyganek commented Feb 10, 2026 •

edited by AndrewGable

Loading

Uh oh!

melvin-bot bot commented Feb 10, 2026

Uh oh!

codecov bot commented Feb 10, 2026 •

edited by github-actions bot

Loading

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

chatgpt-codex-connector bot Feb 10, 2026

Uh oh!

AndrewGable commented Feb 10, 2026

Uh oh!

Uh oh!

OSBotify commented Feb 10, 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

Uh oh!

OSBotify commented Feb 13, 2026

Uh oh!

OSBotify commented Feb 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

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

Uh oh!

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 10, 2026

Uh oh!

codecov bot commented Feb 10, 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!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

AndrewGable commented Feb 10, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Feb 10, 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

Uh oh!

OSBotify commented Feb 13, 2026

Uh oh!

OSBotify commented Feb 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

GCyganek commented Feb 10, 2026 •

edited by AndrewGable

Loading

codecov bot commented Feb 10, 2026 •

edited by github-actions bot

Loading