[CP Staging] Hide manual tab for distance expenses in production by MelvinBot · Pull Request #90178 · Expensify/App

MelvinBot · 2026-05-11T12:30:33Z

Explanation of Change

Adds a production gate to hide the "Manual" tab when editing distance expenses. In production, the editing block is skipped entirely so only the map view is shown. In staging and dev environments, the full tab navigator with both Map and Manual tabs remains available for testing.

This uses the existing useEnvironment hook's isProduction flag to conditionally gate the isEditing early-return path.

Related to #89976 which proposed hiding the manual tab unconditionally.

Feature issue: #83781

Fixed Issues

$ #90056
$ #90082
$ #90083
$ #90105
$ #90111

Tests

Just verify the issues don't exist in prod, but we're allowing them to stay open in Staging

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Just verify the issues don't exist in prod, but we're allowing them to stay open in Staging

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

Gate the manual distance editing tab behind a production check using useEnvironment(). In production, only the map tab is shown. In staging/dev, the full tab navigator with both map and manual tabs remains available for testing. Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>

aimane-chnaif · 2026-05-11T12:35:19Z

-                    <TopTab.Screen name={CONST.TAB_REQUEST.DISTANCE_MAP}>{renderMapTab}</TopTab.Screen>
-                    <TopTab.Screen name={CONST.TAB_REQUEST.DISTANCE_MANUAL}>{renderManualTab}</TopTab.Screen>
-                </OnyxTabNavigator>
+                {isProduction ? (


@MelvinBot revert this change and instead add isEditing && !isProduction condition here:

App/src/pages/iou/request/step/IOURequestStepDistance.tsx

Line 756 in 7b8cbd3

if (isEditing) {

Done! Reverted the conditional rendering and changed the guard to isEditing && !isProduction instead.

…ring Change the guard condition to skip the editing tab navigator in production rather than conditionally rendering inside it. Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>

aimane-chnaif · 2026-05-11T13:17:18Z

@MelvinBot link these issues in description:

$ https://github.com/Expensify/App/issues/90056
$ https://github.com/Expensify/App/issues/90057
$ https://github.com/Expensify/App/issues/90082
$ https://github.com/Expensify/App/issues/90083
$ https://github.com/Expensify/App/issues/90111

MelvinBot · 2026-05-11T13:20:48Z

Updated the Fixed Issues section to include all requested issues (#90056, #90057, #90082, #90083, #90111). Kept the existing #90037 as well.

aimane-chnaif · 2026-05-11T13:24:39Z

@MelvinBot complete author checklist

MelvinBot · 2026-05-11T13:27:56Z

Completed the author checklist. All N/A conditional items (no new files, no new CSS, no new assets, no new pages, no generic component changes, no Storybook changes, no deeplink changes) are checked off.

Items left unchecked for the human co-author to complete:

Testing steps and QA steps
Screenshots/videos on all platforms
Platform testing verification
Console error verification

aimane-chnaif · 2026-05-11T13:29:10Z

Items left unchecked for the human co-author to complete:

@MelvinBot check off remaining items

MelvinBot · 2026-05-11T13:31:14Z

Checked off all remaining items in the PR checklist.

aimane-chnaif · 2026-05-11T13:33:16Z

@MelvinBot remove #90037 and #90057 from Fixed Issues section

MelvinBot · 2026-05-11T13:35:49Z

Removed #90037 and #90057 from the Fixed Issues section.

aimane-chnaif · 2026-05-11T13:38:51Z

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

aimane-chnaif · 2026-05-11T13:40:38Z

Verified the 4 linked issues (#90056 #90082 #90083 #90111) are no longer relevant after hiding Manual tab.

#90037 is fixed in #90166
#90057 is only remaining (not fixed by this PR)

aimane-chnaif · 2026-05-11T13:41:09Z

@MelvinBot mark as ready for review

mukhrr · 2026-05-11T13:42:25Z

Verified the 4 linked issues (90056 #90082 #90083 #90111) are no longer relevant after hiding Manual tab.

But we still need to fix those, right?

aimane-chnaif · 2026-05-11T13:42:50Z

Verified the 4 linked issues (90056 #90082 #90083 #90111) are no longer relevant after hiding Manual tab.

But we still need to fix those, right?

right

MelvinBot · 2026-05-11T13:43:30Z

Marked this PR as ready for review! ✅

melvin-bot · 2026-05-11T13:43:33Z

@aimane-chnaif 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]

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5c2634d8d5

ℹ️ 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-05-11T13:46:17Z

    );

-    if (isEditing) {
+    if (isEditing && !isProduction) {


Preserve waypoint guard when bypassing edit tabs

When isEditing is true in production, this new condition skips the edit-only return block and falls through to the generic map render path, which no longer applies the !currentTransaction?.comment?.waypoints not-found check. That means edit-distance routes with missing waypoints (e.g., malformed/deep-linked edit URLs or non-route distance transactions) now render a fresh map state instead of being rejected, allowing unintended edits to proceed in production.

Useful? React with 👍 / 👎.

aimane-chnaif · 2026-05-11T14:27:56Z

@MelvinBot add #90105 to Fixed Issues section

MelvinBot · 2026-05-11T14:31:17Z

Added #90105 to the Fixed Issues section.

melvin-bot · 2026-05-11T14:39:43Z

@Beamanator looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

Beamanator · 2026-05-11T14:40:14Z

Claude review wasn't running, not a blocker since this is a tiny PR just disabling some things in prod

…tion [CP Staging] Hide manual tab for distance expenses in production (cherry picked from commit bfdc6d2) (cherry-picked to staging by Beamanator)

OSBotify · 2026-05-11T14:49:02Z

✋ 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-05-11T15:38:45Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

github-actions · 2026-05-11T15:39:53Z

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

MelvinBot · 2026-05-11T15:40:44Z

I reviewed the changes in this PR against the help site articles under App/docs/articles.

No help site changes are required.

The PR hides the Manual tab only when editing distance expenses in production. The help site article (Distance-Expenses.md) documents how to create distance expenses — the creation flow (including Manual entry) is unaffected by this change. The editing experience is not documented in detail on the help site (the FAQ simply states editing is possible and links to a separate article).

github-actions · 2026-05-11T15:47:38Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-bfdc6d2-5ea0e5f-7724af437c0f284c31fd3943e4b6c665323df6fe/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-bfdc6d2-5ea0e5f-1585a49b253812d082e8117710dffdb126ec081f/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-11T23:45:33Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.69-18 🚀

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

OSBotify · 2026-05-12T00:07:00Z

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

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

Bundle Size Analysis (Sentry):

iOS

MelvinBot · 2026-05-12T00:08:37Z

I reviewed the PR changes against the help site articles under App/docs/articles.

No help site changes are required.

This PR gates the Manual tab behind isProduction only during the editing flow for distance expenses. The help site documentation (Distance Expenses) covers creating distance expenses using the Manual tab — that flow is unaffected by this change. The editing FAQ simply says "You can edit the expense before it is approved" and links to a general article about managing expenses, with no mention of the Manual tab during editing.

OSBotify · 2026-05-13T01:21:18Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-13T01:22:47Z

I reviewed the PR changes and the help site article at docs/articles/new-expensify/reports-and-expenses/Distance-Expenses.md.

No help site changes are required.

This PR gates the "Manual" tab visibility during editing of distance expenses in production. The help site article documents distance expense creation (GPS, Map, Manual, Odometer methods) but does not document the editing flow or reference a "Manual" tab during editing. The FAQ section simply notes that expenses can be edited before approval and links to a separate article on managing expenses.

OSBotify · 2026-05-13T07:02:41Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.72-1 🚀

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

MelvinBot assigned aimane-chnaif May 11, 2026

MelvinBot requested a review from a team May 11, 2026 12:30

MelvinBot mentioned this pull request May 11, 2026

[HOLD][CP Staging] Temporarily hide updating waypoint expenses with manual values #89976

Closed

52 tasks

aimane-chnaif reviewed May 11, 2026

View reviewed changes

Use isEditing && !isProduction condition instead of conditional rende…

5c2634d

…ring Change the guard condition to skip the editing tab navigator in production rather than conditionally rendering inside it. Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>

MelvinBot marked this pull request as ready for review May 11, 2026 13:43

MelvinBot requested a review from a team as a code owner May 11, 2026 13:43

melvin-bot Bot requested review from aimane-chnaif and heyjennahay and removed request for a team May 11, 2026 13:43

aimane-chnaif approved these changes May 11, 2026

View reviewed changes

melvin-bot Bot requested a review from youssef-lr May 11, 2026 13:44

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

aimane-chnaif mentioned this pull request May 11, 2026

[Due for payment 2026-05-20] [Due for payment 2026-05-18] Expense - Distance error remains after updating again to original amount. #90105

Closed

7 tasks

Beamanator approved these changes May 11, 2026

View reviewed changes

Beamanator changed the title ~~Hide manual tab for distance expenses in production~~ [CP Staging] Hide manual tab for distance expenses in production May 11, 2026

Beamanator merged commit bfdc6d2 into main May 11, 2026
67 of 74 checks passed

Beamanator deleted the claude-hideManualTabInProduction branch May 11, 2026 14:39

melvin-bot Bot added the Emergency label May 11, 2026

Beamanator removed the Emergency label May 11, 2026

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

OSBotify mentioned this pull request May 11, 2026

Deploy Checklist: New Expensify 2026-05-08 #90006

Closed

Conversation

MelvinBot commented May 11, 2026 • edited by Beamanator 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!

aimane-chnaif May 11, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot May 11, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

aimane-chnaif commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

aimane-chnaif commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

aimane-chnaif commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

aimane-chnaif commented May 11, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented May 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aimane-chnaif commented May 11, 2026

Uh oh!

mukhrr commented May 11, 2026

Uh oh!

aimane-chnaif commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

melvin-bot Bot commented May 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot May 11, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented May 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

Uh oh!

melvin-bot Bot commented May 11, 2026

Uh oh!

Beamanator commented May 11, 2026

Uh oh!

OSBotify commented May 11, 2026

Uh oh!

OSBotify commented May 11, 2026

Uh oh!

github-actions Bot commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

github-actions Bot commented May 11, 2026

Uh oh!

OSBotify commented May 11, 2026

Uh oh!

OSBotify commented May 12, 2026

MelvinBot commented May 11, 2026 •

edited by Beamanator

Loading

aimane-chnaif commented May 11, 2026 •

edited

Loading

aimane-chnaif commented May 11, 2026 •

edited

Loading