Fix distance rate auto-selection when submitting from Self DM to workspace by MelvinBot · Pull Request #85942 · Expensify/App

MelvinBot · 2026-03-20T12:53:34Z

Explanation of Change

Note: This PR replaces #85918 which had an orphan branch that couldn't be merged with main. The code change is identical.

PR #84850 removed the isMovingTransactionFromTrackExpense guard from the auto-rate-update useEffect in MoneyRequestConfirmationList.tsx to fix issue #82629 (new custom rates not being selected after upgrade flow). However, removing the guard entirely also affected the standard Self DM submission flow, causing it to auto-select the workspace's distance rate instead of showing the "Rate not valid for this workspace" error.

This PR adds a targeted guard that distinguishes between the two flows based on the sentinel value of customUnitRateID:

FAKE_P2P_ID (submit-from-Self-DM flow): The guard blocks the auto-rate-update effect, allowing the rate validation effect to correctly show the "Rate not valid" error.
'-1' (upgrade/new-rate-creation flow): The guard does NOT block, preserving the fix from PR Fix distance rate not selected after creating new rate from self DM #84850 for issue [Due for payment 2026-03-30] [$250] Distance - New rate is not selected after entering new rate when submitting distance from self DM #82629.

Fixed Issues

$ #85879
PROPOSAL: #85879 (comment)

Tests

Go to staging.new.expensify.com
Go to self DM
Create a manual distance expense
Click "Submit it to someone"
Select a workspace chat
Verify the confirm page shows "Rate not valid for this workspace. Please select an available rate from the workspace." error instead of auto-selecting the workspace distance rate

Verify that no errors appear in the JS console

Offline tests

N/A - This change only affects the rate selection logic on the confirmation page, which requires online access to fetch policy rates.

QA Steps

Go to self DM
Create a manual distance expense
Click "Submit it to someone"
Select a workspace chat
Verify the confirm page shows "Rate not valid for this workspace" error and does NOT auto-select the workspace distance rate
Additionally, verify the upgrade flow still works: create a new custom distance rate and confirm it gets auto-selected correctly (original fix from [Due for payment 2026-03-30] [$250] Distance - New rate is not selected after entering new rate when submitting distance from self DM #82629)

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Add a targeted guard to distinguish between the Self DM submission flow (FAKE_P2P_ID) and the upgrade/new-rate-creation flow ('-1') so that the rate validation error is correctly shown when submitting from Self DM. Co-authored-by: Joel Davies <jjcoffee@users.noreply.github.com>

MelvinBot · 2026-03-20T12:53:55Z

This PR replaces #85918 which had an orphan branch that couldn't be merged with main. The code change is identical — a one-line fix in MoneyRequestConfirmationList.tsx.

Please mark this as "Ready for review" when ready (tag me with @MelvinBot make this ready for review).

MelvinBot · 2026-03-20T12:55:09Z

The failing check is unrelated to this PR.

Failing check: build (developmentDebug, false) — Android build

Error: Could not read script 'node_modules/expo/scripts/autolinking.gradle' as it does not exist.

Analysis: This is a CI build infrastructure issue where node_modules/expo is missing or incomplete in the build environment. The PR only modifies src/components/MoneyRequestConfirmationList.tsx and does not touch any Android build configuration, Gradle files, or dependency management.

Evidence: The error occurs at android/settings.gradle:40 during Gradle settings evaluation, before any app code is compiled. This is a node_modules installation issue in CI, not a code change issue.

jjcoffee · 2026-03-20T12:59:11Z

@MelvinBot make this ready for review

MelvinBot · 2026-03-20T13:00:33Z

This PR has been marked as ready for review! 🚀

melvin-bot · 2026-03-20T13:00:36Z

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

jjcoffee · 2026-03-20T13:01:09Z

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

android-app-regression-2026-03-20_12.41.12.mp4

Android: mWeb Chrome

android-chrome-regression-2026-03-20_12.47.58.mp4

iOS: HybridApp

ios-app-regression-2026-03-20_12.24.48.mp4

iOS: mWeb Safari

ios-safari-regression-2026-03-20_12.25.44.mp4

MacOS: Chrome / Safari

desktop-chrome-regression-2026-03-20_11.29.36.mp4

jjcoffee

LGTM!

jjcoffee · 2026-03-20T13:02:04Z

@hungvu193 Ignore the ping - this is a regression fix.

codecov · 2026-03-20T13:02:45Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/MoneyRequestConfirmationList.tsx	`61.89% <0.00%> (ø)`
... and 12 files with indirect coverage changes

hungvu193 · 2026-03-20T13:04:41Z

@MelvinBot please unassign me

MelvinBot · 2026-03-20T13:06:13Z

I'm not able to remove reviewer assignments. The PR assignee (jjcoffee) or another team member with write access would need to remove you from the reviewer list.

MelvinBot · 2026-03-20T13:18:50Z

The failing checks (build (developmentDebug, false) and build (New Expensify Dev, DebugDevelopment, false)) are unrelated to this PR's changes.

Evidence:

This PR only modifies src/components/MoneyRequestConfirmationList.tsx (a TypeScript file)
The Android build fails with: Could not read script '.../node_modules/expo/scripts/autolinking.gradle' as it does not exist — a CI/infrastructure issue with missing node_modules during Gradle evaluation
The iOS build times out during native pod compilation (Airship/Folly headers)
Both Remote Build Android and Remote Build iOS workflows are consistently failing on main as well — the last 5 runs on main all show failures/cancellations

These are pre-existing CI infrastructure failures, not caused by the code change in this PR.

jjcoffee · 2026-03-24T07:08:07Z

@MelvinBot please merge main.

MelvinBot · 2026-03-24T07:10:02Z

Unable to merge main — this branch has unrelated history (orphan branch). There is no common ancestor between this branch and main, so git merge fails with refusing to merge unrelated histories.

This is the same orphan branch issue that affected PR #85918. The branch needs to be recreated from main with the fix applied on top.

To fix this, the branch should be recreated:

Create a new branch from main
Apply the one-line fix to MoneyRequestConfirmationList.tsx
Force-push to claude-fixDistanceRateValidationOnSubmit-v2 (or create a new PR)

I can't force-push per repo policy. Would you like me to create a new replacement PR from a fresh branch off main instead?

jjcoffee · 2026-03-24T07:36:17Z

@MelvinBot Can you explain more? Why do you keep creating orphaned branches? Also this branch doesn't look orphaned to me.

…eValidationOnSubmit-v2 Co-authored-by: Joel Davies <jjcoffee@users.noreply.github.com>

melvin-bot · 2026-03-24T07:41:33Z

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

MelvinBot · 2026-03-24T07:41:40Z

You're right — this branch is NOT orphaned. I was wrong in my earlier comments. I apologize for the confusion.

What happened: The CI environment and my previous session used a shallow git clone (only the most recent commits). With a shallow clone, git merge-base couldn't find the common ancestor between this branch and main, so it incorrectly reported "unrelated histories." With the full history available, the merge-base is 111acdb and the branch has a perfectly normal lineage from main.

The same issue affected PR #85918 — that branch was also likely fine, and I mistakenly closed it and created this replacement unnecessarily.

Good news: I've now successfully merged main into this branch (the merge you requested earlier). The branch is up to date.

Eskalifer1 · 2026-03-24T07:46:39Z

Unassign this one, please :)

jjcoffee · 2026-03-24T07:55:51Z

@aldo-expensify All yours!

github-actions · 2026-03-24T19:11:03Z

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

github-actions · 2026-03-24T19:16:12Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-aa0744a-2cd04ad-1382b0bf72193e54416bf222ba15cf8f611277f4/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-aa0744a-2cd04ad-7ada591b2d8385436f5465ba1574f2514a30dadb/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-24T19:20:31Z

✋ 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-25T16:40:30Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.3.44-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-03-25T18:52:45Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.3.47-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-03-26T14:18:06Z

🚀 Deployed to production by https://github.com/grgia in version: 9.3.48-2 🚀

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

MelvinBot assigned jjcoffee Mar 20, 2026

MelvinBot requested a review from a team March 20, 2026 12:53

MelvinBot mentioned this pull request Mar 20, 2026

Fix distance rate auto-selection when submitting from Self DM to workspace #85918

Closed

52 tasks

MelvinBot marked this pull request as ready for review March 20, 2026 13:00

MelvinBot requested a review from a team as a code owner March 20, 2026 13:00

melvin-bot bot requested review from hungvu193 and trjExpensify and removed request for a team March 20, 2026 13:00

melvin-bot bot removed the request for review from a team March 20, 2026 13:00

jjcoffee approved these changes Mar 20, 2026

View reviewed changes

melvin-bot bot requested a review from aldo-expensify March 20, 2026 13:01

jjcoffee mentioned this pull request Mar 20, 2026

[Due for payment 2026-04-02] Distance - Confirm page auto selects distance rate instead of showing "Rate not valid" #85879

Closed

7 tasks

MelvinBot mentioned this pull request Mar 20, 2026

Auto-create workspace for Track signups during onboarding #85330

Merged

60 tasks

jjcoffee mentioned this pull request Mar 23, 2026

[Due for payment 2026-03-30] [$250] Distance - New rate is not selected after entering new rate when submitting distance from self DM #82629

Open

7 tasks

Merge remote-tracking branch 'origin/main' into claude-fixDistanceRat…

25abad7

…eValidationOnSubmit-v2 Co-authored-by: Joel Davies <jjcoffee@users.noreply.github.com>

MelvinBot requested a review from a team as a code owner March 24, 2026 07:41

melvin-bot bot requested review from Eskalifer1 and removed request for a team March 24, 2026 07:41

aldo-expensify removed the request for review from Eskalifer1 March 24, 2026 19:10

aldo-expensify approved these changes Mar 24, 2026

View reviewed changes

aldo-expensify merged commit aa0744a into main Mar 24, 2026
35 checks passed

aldo-expensify deleted the claude-fixDistanceRateValidationOnSubmit-v2 branch March 24, 2026 19:10

OSBotify mentioned this pull request Mar 25, 2026

Deploy Checklist: New Expensify 2026-03-25 #86329

Closed

71 tasks

lanitochka17 mentioned this pull request Mar 25, 2026

Distance - New rate is not selected after entering new rate when creating distance from self DM #86337

Closed

7 tasks

aldo-expensify mentioned this pull request Mar 25, 2026

Revert "Fix distance rate auto-selection when submitting from Self DM to workspace" #86348

Closed

Conversation

MelvinBot commented Mar 20, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Mar 20, 2026

Uh oh!

MelvinBot commented Mar 20, 2026

Uh oh!

jjcoffee commented Mar 20, 2026

Uh oh!

MelvinBot commented Mar 20, 2026

Uh oh!

melvin-bot bot commented Mar 20, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

jjcoffee left a comment

Choose a reason for hiding this comment

Uh oh!

jjcoffee commented Mar 20, 2026

Uh oh!

codecov bot commented Mar 20, 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!

hungvu193 commented Mar 20, 2026

Uh oh!

MelvinBot commented Mar 20, 2026

Uh oh!

MelvinBot commented Mar 20, 2026

Uh oh!

jjcoffee commented Mar 24, 2026

Uh oh!

MelvinBot commented Mar 24, 2026

Uh oh!

jjcoffee commented Mar 24, 2026

Uh oh!

melvin-bot bot commented Mar 24, 2026

Uh oh!

MelvinBot commented Mar 24, 2026

Uh oh!

Eskalifer1 commented Mar 24, 2026

Uh oh!

jjcoffee commented Mar 24, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 24, 2026

Uh oh!

github-actions bot commented Mar 24, 2026

Uh oh!

OSBotify commented Mar 24, 2026

Uh oh!

OSBotify commented Mar 25, 2026

Uh oh!

OSBotify commented Mar 25, 2026

Uh oh!

OSBotify commented Mar 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jjcoffee commented Mar 20, 2026 •

edited

Loading

codecov bot commented Mar 20, 2026 •

edited by github-actions bot

Loading