[CP Staging] Revert "Merge pull request #75886 from software-mansion-labs/swrhp-v2" by WojtekBoman · Pull Request #77649 · Expensify/App

WojtekBoman · 2025-12-15T09:38:35Z

This reverts commit 50f5b59, reversing changes made to 8df157e and fixes the conflict appeared in SEARCH_TO_RHP.ts. Conflict appeared due to the added SCREENS.SEARCH.MONEY_REQUEST_REPORT route to this file along with two routes that have been removed after merging the PR:

SCREENS.SEARCH.CHANGE_APPROVER.ROOT,
SCREENS.SEARCH.CHANGE_APPROVER.ADD_APPROVER

Explanation of Change

Fixed Issues

fixes #77583
fixes #77586
fixes #77587
fixes #77594
fixes #77595
fixes #77600
fixes #77601
fixes #77608
fixes #77610
fixes #77612
fixes #77613
fixes #77616
fixes #77589
fixes #77602
fixes #77605
fixes #77675
fixes #77611

Tests

Verify that no errors appear in the JS console

Verify if the issues mentioned above do not occur.

Offline tests

QA Steps

Verify that no errors appear in the JS console

Verify if the issues mentioned above do not occur.

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…/swrhp-v2" This reverts commit 50f5b59, reversing changes made to 8df157e.

codecov · 2025-12-15T09:46:53Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/ROUTES.ts	`13.14% <ø> (-0.07%)`	⬇️
src/SCREENS.ts	`100.00% <ø> (ø)`
...stReportView/MoneyRequestReportTransactionItem.tsx	`7.14% <ø> (ø)`
...portActionItem/MoneyRequestReportPreview/index.tsx	`92.85% <ø> (+3.20%)`	⬆️
src/components/Search/index.tsx	`32.37% <ø> (+0.14%)`	⬆️
...onents/TransactionItemRow/ReceiptPreview/index.tsx	`0.00% <ø> (ø)`
...components/WideRHPContextProvider/index.native.tsx	`100.00% <100.00%> (ø)`
src/libs/Navigation/helpers/isReportOpenInRHP.ts	`87.50% <100.00%> (ø)`
...avigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`75.00% <ø> (ø)`
... and 31 more
... and 3 files with indirect coverage changes

melvin-bot · 2025-12-15T09:51:21Z

@youssef-lr 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]

melvin-bot · 2025-12-15T10:55:03Z

❗ Please, do not use Github auto-linking keywords such as these: close, closes, closed, fix, fixes, fixed, resolve, resolves or resolved.

For more details, see the Contributing Guidelines, specifically Submit your pull request for a final review 📖.

mountiny · 2025-12-15T10:55:08Z

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

MacOS: Desktop

mountiny

Thanks for the revert! @WojtekBoman

mountiny · 2025-12-15T10:56:04Z

src/libs/Navigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts

        SCREENS.SEARCH.SAVED_SEARCH_RENAME_RHP,
-        SCREENS.SEARCH.MONEY_REQUEST_REPORT,


This conflict resolution looks right to me

melvin-bot · 2025-12-15T10:57:57Z

❗ Please, do not use Github auto-linking keywords such as these: close, closes, closed, fix, fixes, fixed, resolve, resolves or resolved.

For more details, see the Contributing Guidelines, specifically Submit your pull request for a final review 📖.

melvin-bot · 2025-12-15T10:58:04Z

@mountiny 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.

mountiny · 2025-12-15T11:00:06Z

The react complier is failing as we are reverting code

Revert "Merge pull request #75886 from software-mansion-labs/swrhp-v2" (cherry picked from commit 1a72783) (cherry-picked to staging by mountiny)

OSBotify · 2025-12-15T11:24:59Z

✋ 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-12-15T11:42:26Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.2.78-1 🚀

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

melvin-bot · 2025-12-15T16:46:18Z

❗ Please, do not use Github auto-linking keywords such as these: close, closes, closed, fix, fixes, fixed, resolve, resolves or resolved.

For more details, see the Contributing Guidelines, specifically Submit your pull request for a final review 📖.

melvin-bot · 2025-12-15T18:52:47Z

❗ Please, do not use Github auto-linking keywords such as these: close, closes, closed, fix, fixes, fixed, resolve, resolves or resolved.

For more details, see the Contributing Guidelines, specifically Submit your pull request for a final review 📖.

melvin-bot · 2025-12-15T18:54:27Z

❗ Please, do not use Github auto-linking keywords such as these: close, closes, closed, fix, fixes, fixed, resolve, resolves or resolved.

For more details, see the Contributing Guidelines, specifically Submit your pull request for a final review 📖.

melvin-bot · 2025-12-15T19:31:35Z

❗ Please, do not use Github auto-linking keywords such as these: close, closes, closed, fix, fixes, fixed, resolve, resolves or resolved.

For more details, see the Contributing Guidelines, specifically Submit your pull request for a final review 📖.

OSBotify · 2025-12-16T22:27:42Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.78-8 🚀

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

OSBotify · 2025-12-16T22:49:07Z

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

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

OSBotify · 2025-12-17T12:26:49Z

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

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

OSBotify · 2025-12-18T18:48:18Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.81-5 🚀

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

OSBotify · 2025-12-18T21:11:42Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.81-5 🚀

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

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

e386d63

…/swrhp-v2" This reverts commit 50f5b59, reversing changes made to 8df157e.

melvin-bot bot assigned WojtekBoman Dec 15, 2025

WojtekBoman marked this pull request as ready for review December 15, 2025 09:50

WojtekBoman requested review from a team as code owners December 15, 2025 09:50

melvin-bot bot requested review from trjExpensify and youssef-lr and removed request for a team December 15, 2025 09:50

mountiny approved these changes Dec 15, 2025

View reviewed changes

mountiny changed the title ~~Revert "Merge pull request #75886 from software-mansion-labs/swrhp-v2"~~ [CP Staging] Revert "Merge pull request #75886 from software-mansion-labs/swrhp-v2" Dec 15, 2025

mountiny merged commit 1a72783 into Expensify:main Dec 15, 2025
38 of 40 checks passed

melvin-bot bot added the Emergency label Dec 15, 2025

mountiny removed the Emergency label Dec 15, 2025

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Dec 15, 2025

OSBotify mentioned this pull request Dec 15, 2025

Deploy Checklist: New Expensify 2025-12-12 #77578

Closed

situchan mentioned this pull request Dec 15, 2025

[CP Staging] fix: navigation issue when reject all expenses of report #77696

Merged

53 tasks

OSBotify mentioned this pull request Jan 15, 2026

[Due for payment 2026-02-17] IOU - "It´s not here" page displayed after deleting IOU from individual chat. #79732

Closed

7 tasks

		SCREENS.SEARCH.SAVED_SEARCH_RENAME_RHP,
		SCREENS.SEARCH.MONEY_REQUEST_REPORT,

Conversation

WojtekBoman commented Dec 15, 2025 • edited by mountiny 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 Dec 15, 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 Dec 15, 2025

Uh oh!

melvin-bot bot commented Dec 15, 2025

Uh oh!

mountiny commented Dec 15, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot bot commented Dec 15, 2025

Uh oh!

melvin-bot bot commented Dec 15, 2025

Uh oh!

mountiny commented Dec 15, 2025

Uh oh!

OSBotify commented Dec 15, 2025

Uh oh!

OSBotify commented Dec 15, 2025

Uh oh!

melvin-bot bot commented Dec 15, 2025

Uh oh!

melvin-bot bot commented Dec 15, 2025

Uh oh!

melvin-bot bot commented Dec 15, 2025

Uh oh!

melvin-bot bot commented Dec 15, 2025

Uh oh!

OSBotify commented Dec 16, 2025

Uh oh!

OSBotify commented Dec 16, 2025

Uh oh!

OSBotify commented Dec 17, 2025

Uh oh!

OSBotify commented Dec 18, 2025

Uh oh!

OSBotify commented Dec 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

WojtekBoman commented Dec 15, 2025 •

edited by mountiny

Loading

codecov bot commented Dec 15, 2025 •

edited by github-actions bot

Loading