[CP Staging] fix: navigation issue when reject all expenses of report by truph01 · Pull Request #77696 · Expensify/App

truph01 · 2025-12-15T19:29:05Z

Explanation of Change

Fixed Issues

$ #77598
PROPOSAL:

Tests

Precondition:

Submission frequency is set to Instantly.

Go to staging.new.expensify.com
Go to workspace chat.
Create two expenses.
Go to Reports > Reports (optional).
Open the report.
Select two expenses via checkbox.
Click More > Reject.
Enter reason and click Reject expenses.
Verify: There is no "Not here page" opens after rejecting expenses.

Verify that no errors appear in the JS console

Offline tests

QA Steps

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

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-12-16.at.02.51.33.mov

Android: mWeb Chrome

Screen.Recording.2025-12-16.at.02.55.33.mov

iOS: Native

Screen.Recording.2025-12-16.at.02.50.03.mov

iOS: mWeb Safari

Screen.Recording.2025-12-16.at.02.53.16.mov

MacOS: Chrome / Safari

Screen.Recording.2025-12-16.at.02.44.14.mov

codecov · 2025-12-15T19:40:42Z

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/pages/Search/SearchRejectReasonPage.tsx	`0.00% <0.00%> (ø)`
src/libs/actions/Search.ts	`20.60% <0.00%> (-0.76%)`	⬇️
... and 14 files with indirect coverage changes

melvin-bot · 2025-12-15T19:58:34Z

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

truph01 · 2025-12-15T20:00:54Z

@mananjadhav PR is ready for review.

@eVoloshchak Please ignore this one. Thanks!

joekaufmanexpensify

Fixing DB

lakchote · 2025-12-15T20:39:04Z

Assigning @situchan to move forward with the PR

situchan · 2025-12-15T21:05:22Z

src/pages/Search/SearchRejectReasonPage.tsx

+            Navigation.dismissModal();
+            if (urlToNavigateBack) {
+                Navigation.isNavigationReady().then(() => Navigation.goBack(urlToNavigateBack as Route));
+            }


Code looks good as just copied logic from here:

App/src/pages/iou/RejectReasonPage.tsx

Lines 32 to 38 in a430ca9

const onSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_REJECT_FORM>) => {

const urlToNavigateBack = rejectMoneyRequest(transactionID, reportID, values.comment, policy);

removeTransaction(transactionID);

Navigation.dismissModal();

if (urlToNavigateBack) {

Navigation.isNavigationReady().then(() => Navigation.goBack(urlToNavigateBack));

}

situchan · 2025-12-15T21:07:15Z

src/libs/actions/Search.ts

+            if (isUserOnSearchPage) {
+                urlToNavigateBack = undefined;
+            } else if (isUserOnSearchMoneyRequestReport) {
+                const lastRouteParams = lastRoute?.params;
+                urlToNavigateBack = lastRouteParams && 'backTo' in lastRouteParams ? lastRouteParams?.backTo : undefined;
+            } else {
+                urlToNavigateBack = ROUTES.REPORT_WITH_ID.getRoute(report?.chatReportID);
+            }


Looks good as copied logic from here:

App/src/libs/actions/IOU.ts

Lines 13616 to 13626 in a430ca9

if (isUserOnSearchPage) {

// Navigate to the existing Reports > Expense view.

urlToNavigateBack = undefined;

} else if (isUserOnSearchMoneyRequestReport) {

// Go back based on backTo param of the current route

const lastRouteParams = lastRoute?.params;

urlToNavigateBack = lastRouteParams && 'backTo' in lastRouteParams ? lastRouteParams?.backTo : undefined;

} else {

// Go back to the expense chat

urlToNavigateBack = ROUTES.REPORT_WITH_ID.getRoute(report.chatReportID);

}

situchan · 2025-12-15T21:09:48Z

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

Bug 1:

Before

before.mov

After

after.mov

Bug 2: not reproducible on both main and this branch. Maybe fixed by this revert

delete.mov

lakchote

LGTM

Jest2 test failing is unrelated (see #77698 (review)), proceeding with the merge to fix the deploy blocker.

melvin-bot · 2025-12-15T21:27:28Z

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

lakchote · 2025-12-15T21:27:34Z

Not an emergency, see #77696 (review)

[CP Staging] fix: navigation issue when reject all expenses of report (cherry picked from commit 23ccf2a) (cherry-picked to staging by lakchote)

OSBotify · 2025-12-15T21:54:43Z

✋ 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-15T22:16:59Z

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

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

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

🚀 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:53Z

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

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

OSBotify · 2025-12-17T12:27:35Z

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

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

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

🚀 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:12:15Z

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

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

fix: navigation issue when reject all expenses of report

7d3b26b

melvin-bot bot assigned truph01 Dec 15, 2025

fix: lint

ece3b8e

truph01 marked this pull request as ready for review December 15, 2025 19:58

truph01 requested review from a team as code owners December 15, 2025 19:58

melvin-bot bot requested review from eVoloshchak and joekaufmanexpensify and removed request for a team December 15, 2025 19:58

truph01 mentioned this pull request Dec 15, 2025

[Due for payment 2025-12-26] [$250] Reports - Not here page opens after rejecting expenses/deleting expense #77598

Closed

7 tasks

joekaufmanexpensify approved these changes Dec 15, 2025

View reviewed changes

lakchote changed the title ~~fix: navigation issue when reject all expenses of report~~ [CP Staging] fix: navigation issue when reject all expenses of report Dec 15, 2025

lakchote requested review from situchan and removed request for eVoloshchak December 15, 2025 20:38

situchan reviewed Dec 15, 2025

View reviewed changes

situchan approved these changes Dec 15, 2025

View reviewed changes

melvin-bot bot requested a review from lakchote December 15, 2025 21:10

lakchote approved these changes Dec 15, 2025

View reviewed changes

lakchote merged commit 23ccf2a into Expensify:main Dec 15, 2025
51 of 55 checks passed

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

lakchote removed the Emergency label Dec 15, 2025

OSBotify pushed a commit that referenced this pull request Dec 15, 2025

Merge pull request #77696 from truph01/fix/77598

dacefd6

[CP Staging] fix: navigation issue when reject all expenses of report (cherry picked from commit 23ccf2a) (cherry-picked to staging by lakchote)

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

	const onSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_REJECT_FORM>) => {
	const urlToNavigateBack = rejectMoneyRequest(transactionID, reportID, values.comment, policy);
	removeTransaction(transactionID);
	Navigation.dismissModal();
	if (urlToNavigateBack) {
	Navigation.isNavigationReady().then(() => Navigation.goBack(urlToNavigateBack));
	}

	if (isUserOnSearchPage) {
	// Navigate to the existing Reports > Expense view.
	urlToNavigateBack = undefined;
	} else if (isUserOnSearchMoneyRequestReport) {
	// Go back based on backTo param of the current route
	const lastRouteParams = lastRoute?.params;
	urlToNavigateBack = lastRouteParams && 'backTo' in lastRouteParams ? lastRouteParams?.backTo : undefined;
	} else {
	// Go back to the expense chat
	urlToNavigateBack = ROUTES.REPORT_WITH_ID.getRoute(report.chatReportID);
	}

Conversation

truph01 commented Dec 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Precondition:

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!

truph01 commented Dec 15, 2025

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

lakchote commented Dec 15, 2025

Uh oh!

situchan Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

situchan Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

situchan commented Dec 15, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

lakchote left a comment • 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!

Uh oh!

melvin-bot bot commented Dec 15, 2025

Uh oh!

lakchote commented Dec 15, 2025

Uh oh!

OSBotify commented Dec 15, 2025

Uh oh!

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

5 participants

truph01 commented Dec 15, 2025 •

edited

Loading

codecov bot commented Dec 15, 2025 •

edited by github-actions bot

Loading

lakchote left a comment •

edited

Loading