Skip to content

Reports - User should redirect to Search Money Report instead of chat after merging expenses on "Reports" - #74361

Merged
mjasikowski merged 12 commits into
Expensify:mainfrom
paulnjs:paulnjs-fix/73057
Dec 9, 2025
Merged

mjasikowski merged 12 commits into
Expensify:mainfrom
paulnjs:paulnjs-fix/73057

Conversation

@paulnjs

@paulnjs paulnjs commented Nov 5, 2025 •

Copy link
Copy Markdown
Contributor

Explanation of Change

We always navigate to the report screen after merging expenses.

Navigation.dismissModalWithReport({reportID: reportIDToDismiss});

Add condition to check if we're on Report we should navigate to search money report screen instead. This can be checked by function isSearchTopmostFullScreenRoute

Fixed Issues

$#73057
PROPOSAL:#73057 (comment)

Tests

Prerequisite: Account has at least one workspace.

  1. Open the Expensify app.
  2. Open any workspace chat.
  3. Create two manual expenses on two different reports.
  4. Navigate to "Reports"
  5. Open any of the just created expenses.
  6. Tap on "More" and select "Merge"
  7. Keep all the details of the expense that wasn´t opened.
  8. Verify app return to "Reports"
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Prerequisite: Account has at least one workspace.

  1. Open the Expensify app.
  2. Open any workspace chat.
  3. Create two manual expenses on two different reports.
  4. Navigate to "Reports"
  5. Open any of the just created expenses.
  6. Tap on "More" and select "Merge"
  7. Keep all the details of the expense that wasn´t opened.
  8. Verify app return to "Reports"
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
android.mov
Android: mWeb Chrome
android_chorme.mov
iOS: Native
iOS: mWeb Safari
ios_sfr.mov
MacOS: Chrome / Safari
Screen_Recording_2025-11-08_at_09.45.09.mov
MacOS: Desktop
desktop.mov

@codecov

codecov Bot commented Nov 5, 2025 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/pages/TransactionMerge/ConfirmationPage.tsx 0.00% <0.00%> (ø)
... and 8 files with indirect coverage changes

@paulnjs
paulnjs marked this pull request as ready for review November 10, 2025 11:31
@paulnjs
paulnjs requested review from a team as code owners November 10, 2025 11:31
@melvin-bot
melvin-bot Bot requested review from parasharrajat and trjExpensify and removed request for a team November 10, 2025 11:31
@melvin-bot

melvin-bot Bot commented Nov 10, 2025

Copy link
Copy Markdown

@parasharrajat 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
melvin-bot Bot requested review from a team and mjasikowski and removed request for a team November 10, 2025 11:31
@melvin-bot

melvin-bot Bot commented Nov 10, 2025

Copy link
Copy Markdown

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

@github-actions

Copy link
Copy Markdown
Contributor

✅ Code Review Complete

I've reviewed all changes in this PR and found no code quality issues or performance violations.

Changes Summary:

  • Added navigation helper import isSearchTopmostFullScreenRoute
  • Added conditional navigation logic to handle the case when merging expenses from the Reports page
  • When the search route is topmost, properly dismisses modal and navigates to the search money request report

Code Quality:

  • Follows existing codebase patterns
  • Proper use of navigation utilities
  • TypeScript correctness maintained
  • No performance concerns introduced

The implementation looks good and properly addresses the navigation flow when merging expenses from the Reports page.

@paulnjs

paulnjs commented Nov 10, 2025

Copy link
Copy Markdown
Contributor Author

I have problem with ios build. Will add it later

trjExpensify
trjExpensify previously approved these changes Nov 10, 2025

@trjExpensify trjExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to fix this. 👍

P.S Can you try to make your PR titles more reflective of what code changes the PR is making / fill out the explanation of changes section? Thanks!

@paulnjs paulnjs changed the title Reports - User is redirected to chat after merging expenses on "Reports" Reports - User should redirect to Search Money Report instead of chat after merging expenses on "Reports" Nov 11, 2025
@paulnjs

paulnjs commented Nov 11, 2025

Copy link
Copy Markdown
Contributor Author

@trjExpensify I updated

@parasharrajat

Copy link
Copy Markdown
Member

@paulnjs What about this Hmm not found page that shows up in ios Safari?

@paulnjs

paulnjs commented Nov 11, 2025

Copy link
Copy Markdown
Contributor Author

@parasharrajat I think it's expected because the previous report is deleted. You can reproduce similar on main now if you press back button of browser

@parasharrajat

parasharrajat commented Nov 11, 2025 •

Copy link
Copy Markdown
Member

We should fix that issue too, unless we already have a GH issue created somewhere. That bug does not show up in native iOS.

@parasharrajat

Copy link
Copy Markdown
Member

@paulnjs When can we expect the update here?

@parasharrajat

Copy link
Copy Markdown
Member

@paulnjs Merge main so that I can provide you with a video.

@parasharrajat

parasharrajat commented Nov 30, 2025 •

Copy link
Copy Markdown
Member

iOS: I am seeing different behaviours on different attempts.

Here in both videos.

  1. First one, the Filters on reports page is not preserved.
  2. Second, the user does not land on reports page at all.
30.11.2025_14.02.11_REC.mp4
30.11.2025_14.06.25_REC.mp4

@parasharrajat

Copy link
Copy Markdown
Member

@paulnjs Can you test this thoroughly?

@paulnjs

paulnjs commented Dec 2, 2025

Copy link
Copy Markdown
Contributor Author

Okay lemme check it again

@paulnjs

paulnjs commented Dec 4, 2025

Copy link
Copy Markdown
Contributor Author

Yesterday, I got error to crash app on latest main so not able to test this. Will merge main and check again today.

@mjasikowski

mjasikowski commented Dec 5, 2025 •

Copy link
Copy Markdown
Contributor

@paulnjs this PR is already taking a month, so I would appreciate if you could fully focus on this to deliver as soon as you can. If there's anything on our side that we can do to help you here, let us know.

@paulnjs

paulnjs commented Dec 5, 2025

Copy link
Copy Markdown
Contributor Author

@mjasikowski Okay, i'm investigating. Will try to complete it in the next 1 or 2 days. We only have one edge case for ios native now.

@paulnjs

paulnjs commented Dec 5, 2025

Copy link
Copy Markdown
Contributor Author

@parasharrajat Root cause is the Hmm not found page was removed after merge 2 expense. This is fixed on latest main at the time we test so after call forceReplace it remove the current report route leads to land to chat screen if press back button. We can reuse the initial solution since Hmm not found page was removed. This is what i got for ios native and ios safari. Could you help to check it again?

Screen.Recording.2025-12-05.at.18.40.08.mov
Screen.Recording.2025-12-05.at.18.42.23.mov

@parasharrajat

Copy link
Copy Markdown
Member

Have you reverted the code? Is this ready for me to test @paulnjs?

@paulnjs

paulnjs commented Dec 5, 2025

Copy link
Copy Markdown
Contributor Author

@parasharrajat yes please help to test it. Thanks

@parasharrajat

Copy link
Copy Markdown
Member

Screenshots

🔲 iOS / native

07.12.2025_19.01.23_REC.mp4

🔲 iOS / Safari

07.12.2025_19.06.19_REC.mp4

🔲 MacOS / Chrome

07.12.2025_18.53.48_REC.mp4

🔲 Android / Chrome

07.12.2025_18.59.28_REC.mp4

🔲 Android / native

07.12.2025_18.39.56_REC.mp4

@parasharrajat parasharrajat left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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.js 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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.
  • 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.

🎀 👀 🎀 C+ reviewed

@mjasikowski
mjasikowski merged commit 88b1ce4 into Expensify:main Dec 9, 2025
31 checks passed
@OSBotify

OSBotify commented Dec 9, 2025

Copy link
Copy Markdown
Contributor

✋ 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

OSBotify commented Dec 9, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.2.74-0 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.74-12 🚀

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

1 similar comment
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.74-12 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.74-12 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants