[CP Staging] Show rate name on merge confirmation page for distance expenses by MelvinBot · Pull Request #84247 · Expensify/App

MelvinBot · 2026-03-05T06:54:10Z

Explanation of Change

When merging workspace distance expenses, the merge confirmation page was showing the rate value (e.g., "$0.67 / mi") instead of the rate name (e.g., "Default Rate"). This happened because in MoneyRequestView.tsx, an unconditional override (from PR #71675) was discarding the correctly computed rate name and replacing it with the rate value parsed from the merchant string.

The fix makes this override conditional: it now only falls back to getRateFromMerchant() when rateName is unavailable (i.e., for P2P expenses that don't have rate names). For workspace expenses where getRate() successfully resolves the rate name from the policy, the correctly computed value from getRateForExpenseDisplay() is preserved.

Fixed Issues

$ #84181
PROPOSAL: #84181 (comment)

Tests

Go to a workspace chat
Create two manual distance expenses
Open the expense report
Open any distance expense
Click More > Merge
Select the other distance expense > Continue
Select any details and reach the confirm page
Verify the distance rate field shows the rate name (e.g., "Default Rate") instead of the rate value (e.g., "$0.67 / mi")

Verify that no errors appear in the JS console

Offline tests

N/A — this is a display-only change that uses data already available locally. The merge confirmation page renders from local Onyx data.

QA Steps

Go to a workspace chat on staging
Create two manual distance expenses
Open the expense report
Open any distance expense
Click More > Merge
Select the other distance expense > Continue
Select any details and reach the confirm page
Verify the distance rate field shows the rate name (e.g., "Default Rate") instead of the rate value

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

Screen.Recording.Mar.5.2026.mp4

…istance expenses When merging workspace distance expenses, the merge confirmation page was unconditionally overriding the rate display with the rate value parsed from the merchant string. This happened because a pre-existing workaround (from PR #71675) assumed that policy rate data was not available in the merge flow. Since the merge flow now properly preserves customUnit data (including customUnitRateID), getRate() can resolve the rate name from the policy. The override is now conditional, only falling back to getRateFromMerchant() when rateName is unavailable (P2P expenses). Co-authored-by: Mohammad Luthfi Fathur Rahman <mollfpr@users.noreply.github.com>

codecov · 2026-03-05T07:14:59Z

Codecov Report

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

Files with missing lines	Coverage Δ
...c/components/ReportActionItem/MoneyRequestView.tsx	`0.44% <0.00%> (ø)`
... and 10 files with indirect coverage changes

github-actions · 2026-03-05T15:05:31Z

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

mollfpr · 2026-03-05T15:17:16Z

Test looks good!

melvin-bot · 2026-03-05T15:18:00Z

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

situchan · 2026-03-05T15:24:46Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

before:

after:

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: aed7d38430

ℹ️ 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/components/ReportActionItem/MoneyRequestView.tsx

github-actions · 2026-03-05T15:29:00Z

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

github-actions · 2026-03-05T15:34:09Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-8e54216-18d2287-e648523f04e5106217dae3b5cf5c74d08a223e9e/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-8e54216-18d2287-5eaa4bf14ee6d54997288fd2457eb78c4d7ba3bb/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-05T15:34:14Z

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

…isplay [CP Staging] Show rate name on merge confirmation page for distance expenses (cherry picked from commit 8e54216) (cherry-picked to staging by blimpich)

OSBotify · 2026-03-06T00:05:02Z

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.3.31-11 🚀

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

OSBotify · 2026-03-06T03:35:30Z

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.3.31-12 🚀

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

OSBotify · 2026-03-06T03:51:35Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.31-12 🚀

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

OSBotify · 2026-03-06T04:17:11Z

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

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

OSBotify · 2026-03-06T22:46:22Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.32-3 🚀

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

MelvinBot assigned mollfpr Mar 5, 2026

MelvinBot requested a review from a team March 5, 2026 06:54

MelvinBot mentioned this pull request Mar 5, 2026

Distance - Distance rate field on merge confirm page shows rate value instead of rate name #84181

Closed

7 tasks

This comment has been minimized.

Sign in to view

mollfpr marked this pull request as ready for review March 5, 2026 15:17

mollfpr requested a review from a team as a code owner March 5, 2026 15:17

melvin-bot bot requested review from JmillsExpensify and removed request for a team March 5, 2026 15:17

mollfpr changed the title ~~Show rate name on merge confirmation page for distance expenses~~ [CP Staging] Show rate name on merge confirmation page for distance expenses Mar 5, 2026

melvin-bot bot requested review from mjasikowski and removed request for a team March 5, 2026 15:17

mollfpr requested a review from neil-marcellini March 5, 2026 15:18

JS00001 approved these changes Mar 5, 2026

View reviewed changes

situchan approved these changes Mar 5, 2026

View reviewed changes

melvin-bot bot requested a review from mollfpr March 5, 2026 15:25

Beamanator approved these changes Mar 5, 2026

View reviewed changes

Beamanator merged commit 8e54216 into main Mar 5, 2026
40 of 41 checks passed

Beamanator deleted the claude-fixMergeDistanceRateDisplay branch March 5, 2026 15:25

chatgpt-codex-connector bot reviewed Mar 5, 2026

View reviewed changes

src/components/ReportActionItem/MoneyRequestView.tsx Show resolved Hide resolved

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

OSBotify mentioned this pull request Mar 5, 2026

Deploy Checklist: New Expensify 2026-03-04 #84164

Closed

Conversation

MelvinBot commented Mar 5, 2026 • edited by mollfpr 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 Mar 5, 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!

github-actions bot commented Mar 5, 2026

Uh oh!

This comment has been minimized.

mollfpr commented Mar 5, 2026

Uh oh!

melvin-bot bot commented Mar 5, 2026

Uh oh!

situchan commented Mar 5, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

github-actions bot commented Mar 5, 2026

Uh oh!

OSBotify commented Mar 5, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

MelvinBot commented Mar 5, 2026 •

edited by mollfpr

Loading

codecov bot commented Mar 5, 2026 •

edited by github-actions bot

Loading