fix: p2p rate is selected when tracking distance in a workspace by gijoe0295 · Pull Request #74662 · Expensify/App

gijoe0295 · 2025-11-09T15:44:09Z

Explanation of Change

When first being invited to a workspace, the distance rates data policy.customUnits is not available yet -> Distance expense gets initiated with P2P rate instead -> BE fails with "The selected rate has been deleted" error. This data is only available when user reaches the confirmation step. This PR updates the correct distance rate in confirmation step when it's available.

Fixed Issues

$ #73800
PROPOSAL: #73800 (comment)

Tests

Sign in with an account that has no workspace
On a secondary device sign in as the Admin of a workspace, invite Member to your WS
As a Member, click FAB - Track distance, enter valid waypoints and create a distance expense
Verify the expense is successfully created with the workspace's default distance rate ($0.7/mile for USD workspaces for example)
Track a manual distance expense in self DM
Create a workspace then enable Distance rates feature
Update the workspace default rate to be different from the rate used in step 5
Go to self DM > Submit it to someone > Select the workspace from step 6
Verify error shows "Rate not valid for this workspace"

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-11-10.at.23.19.27.mov

Android: mWeb Chrome

Screen.Recording.2025-11-10.at.23.23.01.mp4

iOS: Native

Screen.Recording.2025-11-10.at.23.11.56.mp4

iOS: mWeb Safari

Screen.Recording.2025-11-10.at.23.13.47.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-11-10.at.23.09.16.mp4

Screen.Recording.2025-11-12.at.00.58.05.mov

MacOS: Desktop

Screen.Recording.2025-11-10.at.23.14.35.mp4

codecov · 2025-11-09T15:55:40Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/MoneyRequestConfirmationList.tsx	`58.57% <54.54%> (+0.55%)`	⬆️
... and 35 files with indirect coverage changes

melvin-bot · 2025-11-10T16:21:22Z

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

github-actions · 2025-11-10T16:23:05Z

src/components/MoneyRequestConfirmationList.tsx


        setCustomUnitRateID(transactionID, rateID);
-    }, [defaultMileageRate, customUnitRateID, lastSelectedDistanceRates, policy?.id, transactionID, isDistanceRequest]);
+    }, [defaultMileageRate, customUnitRateID, lastSelectedDistanceRates, policy?.id, transactionID, isDistanceRequest, isPolicyExpenseChat, isMovingTransactionFromTrackExpense]);


❌ PERF-6 (docs)

Passing entire objects (defaultMileageRate, lastSelectedDistanceRates) as dependencies causes the useEffect to re-execute whenever any property changes, even unrelated ones. This hook only uses defaultMileageRate?.customUnitRateID and accesses lastSelectedDistanceRates?.[policy.id].

Suggested fix:

// Extract specific properties before the useEffect const defaultMileageRateID = defaultMileageRate?.customUnitRateID; const lastSelectedRateForPolicy = lastSelectedDistanceRates?.[policy?.id ?? '']; // Then in the useEffect, use these values and update the dependency array: }, [defaultMileageRateID, customUnitRateID, lastSelectedRateForPolicy, policy?.id, transactionID, isDistanceRequest, isPolicyExpenseChat, isMovingTransactionFromTrackExpense]);

DylanDylann · 2025-11-11T07:58:20Z

src/components/MoneyRequestConfirmationList.tsx

+            !isPolicyExpenseChat ||
+            !transactionID ||
+            !lastSelectedRate ||
+            isMovingTransactionFromTrackExpense


Please add a test case in the test step to cover this additional change

I added test case:

Track a manual distance expense in self DM

Create a workspace then enable Distance rates feature

Update the workspace default rate to be different from the rate used in step 5

Go to self DM > Submit it to someone > Select the workspace from step 6

Verify error shows "Rate not valid for this workspace"

In the step 5, do you get this error? I notice it also happen on main but It's blocking us from testing your change

DylanDylann · 2025-11-11T07:59:01Z

@gijoe0295 Also please update the latest main to trigger failed test again

DylanDylann · 2025-11-12T08:08:43Z

@gijoe0295 Could you please check the failed test? I don't see It happens on other PRs

heyjennahay

No concern with product change

DylanDylann · 2025-11-19T09:06:57Z

@gijoe0295 Kindly bump

gijoe0295 · 2025-11-20T17:33:56Z

@DylanDylann Thanks for the bump. It's fixed now after merging main

DylanDylann · 2025-11-21T03:24:41Z

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.2025-11-21.at.10.40.14.mov

Android: mWeb Chrome

Screen.Recording.2025-11-21.at.10.35.45.mov

iOS: HybridApp

Screen.Recording.2025-11-21.at.10.38.02.mov

iOS: mWeb Safari

Screen.Recording.2025-11-21.at.10.31.40.mov

Uploading Screen Recording 2025-11-21 at 10.31.40.mov…

MacOS: Chrome / Safari

Screen.Recording.2025-11-21.at.10.28.23.mov

MacOS: Desktop

Screen.Recording.2025-11-21.at.10.33.48.mov

DylanDylann

LGTM

OSBotify · 2025-11-21T08:19:39Z

✋ 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 · 2025-11-21T12:26:36Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.2.62-0 🚀

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

OSBotify · 2025-11-24T20:01:38Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.2.62-5 🚀

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

fix: p2p rate when tracking distance

37a93d5

melvin-bot bot assigned gijoe0295 Nov 9, 2025

update condition

917209f

gijoe0295 marked this pull request as ready for review November 10, 2025 16:21

gijoe0295 requested review from a team as code owners November 10, 2025 16:21

melvin-bot bot requested review from DylanDylann and removed request for a team November 10, 2025 16:21

melvin-bot bot requested review from heyjennahay and removed request for a team November 10, 2025 16:21

github-actions bot reviewed Nov 10, 2025

View reviewed changes

fix PERF-6 violation

11dc4a1

gijoe0295 changed the title ~~fix: p2p rate when tracking distance~~ fix: p2p rate is selected when tracking distance in a workspace Nov 10, 2025

gijoe0295 added 2 commits November 10, 2025 23:42

fix lint

dc1c907

fix pretty

5e31c37

DylanDylann reviewed Nov 11, 2025

View reviewed changes

Merge branch 'main' of github.com:gijoe0295/App into gijoe/73800

3076680

heyjennahay approved these changes Nov 12, 2025

View reviewed changes

Merge branch 'main' of github.com:gijoe0295/App into gijoe/73800

305f181

DylanDylann approved these changes Nov 21, 2025

View reviewed changes

melvin-bot bot requested a review from Beamanator November 21, 2025 03:45

Beamanator approved these changes Nov 21, 2025

View reviewed changes

Beamanator merged commit ed859cc into Expensify:main Nov 21, 2025
31 checks passed

OSBotify mentioned this pull request Nov 21, 2025

Deploy Checklist: New Expensify 2025-11-21 #75728

Closed

bernhardoj mentioned this pull request Nov 24, 2025

Prevent editing expense on unreported IOU #75854

Merged

54 tasks

jjcoffee mentioned this pull request Mar 12, 2026

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

Merged

52 tasks

Conversation

gijoe0295 commented Nov 9, 2025 • 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 Nov 9, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot bot commented Nov 10, 2025

Uh oh!

github-actions bot Nov 10, 2025

Choose a reason for hiding this comment

❌ PERF-6 (docs)

Uh oh!

gijoe0295 Nov 10, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann Nov 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gijoe0295 Nov 11, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Nov 11, 2025

Uh oh!

DylanDylann commented Nov 12, 2025

Uh oh!

heyjennahay left a comment

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Nov 19, 2025

Uh oh!

gijoe0295 commented Nov 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DylanDylann commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Nov 21, 2025

Uh oh!

OSBotify commented Nov 21, 2025

Uh oh!

OSBotify commented Nov 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

gijoe0295 commented Nov 9, 2025 •

edited

Loading

codecov bot commented Nov 9, 2025 •

edited by github-actions bot

Loading

DylanDylann Nov 11, 2025 •

edited

Loading

gijoe0295 commented Nov 20, 2025 •

edited

Loading

DylanDylann commented Nov 21, 2025 •

edited

Loading