Fix Audit Reports navigation and prioritize report routes#87778
Fix Audit Reports navigation and prioritize report routes#87778marufsharifi wants to merge 31 commits into
Conversation
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.
|
melvin-bot
Bot
requested review from
sobitneupane
and removed request for
a team
|
@sobitneupane 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
Bot
requested review from
heyjennahay
and removed request for
a team
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: ce0b3268b8
ℹ️ About Codex in GitHub
Your team has set up Codex to 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 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
@sobitneupane, I've addressed AI feedback. all yours. thanks. |
|
@sobitneupane, kindly bump. thanks. |
|
@sobitneupane, friendly bump. Thanks. |
|
Reviewing the PR. |
sobitneupane
left a comment
sobitneupane
left a comment
There was a problem hiding this comment.
@marufsharifi Instead of dismissing the modal, could we take user back to the previous task page after they update title, description or assignee?
Screen.Recording.2026-04-23.at.13.03.43.mov
I can still reproduce the issue on leaving group and leaving thread.
Screen.Recording.2026-04-23.at.13.10.31.mov
| ].map(normalizeRoute); | ||
|
|
||
| return currentReportRoutes.some((currentReportRoute) => normalizedRoute === currentReportRoute || normalizedRoute.startsWith(`${currentReportRoute}/`)); | ||
| } |
There was a problem hiding this comment.
I don't think we have discussed this before. Could you please help me understand why we need this change and what we are trying to achieve with it?
There was a problem hiding this comment.
This helper is needed because backTo is not always safe to use directly in the leave flow. In some cases it points back to the current report, while in Search flows it represents the user’s original Search context. The helper makes that distinction so we preserve the Search return path when appropriate without changing the existing non-Search behavior
sobitneupane
left a comment
sobitneupane
left a comment
There was a problem hiding this comment.
Screenshots/Videos
MacOS: Chrome / Safari
Screen.Recording.2026-04-23.at.13.00.33.mov
Screen.Recording.2026-04-23.at.13.05.39.mov
Screen.Recording.2026-04-23.at.13.09.05.mov
Screen.Recording.2026-04-23.at.13.10.31.mov
Screen.Recording.2026-04-23.at.13.12.23.mov
Screen.Recording.2026-04-23.at.13.13.00.mov
Screen.Recording.2026-04-23.at.13.16.10.mov
|
Hi @sobitneupane — is the following behavior expected?
The user is redirected to the Inbox. REC-20260424115855.AM.mp4cc @heyjennahay |
@marufsharifi I don't think so. Shouldn't the user remain on the Search page even after deleting the task? |
|
Hi @sobitneupane — is the following behavior expected? Repro:
Current result: It navigates to Inbox. Screen.Recording.2026-05-14.at.11.37.00.AM.movcc @heyjennahay |
|
@sobitneupane, could you have a chance to check this comment? Thanks. |
@marufsharifi I think it is expected behavior |
|
@sobitneupane, I checked all the possible cases, and during testing, I found an additional edge case. I’ve added the related test cases to the PR OP, including separate records for all platforms.
Could you please take another look when you have a chance? |
|
@sobitneupane, could you please take a look at this when you get a chance? thanks. |
sobitneupane
left a comment
sobitneupane
left a comment
There was a problem hiding this comment.
Screenshots/Videos
Android: HybridApp
Screen.Recording.2026-05-21.at.17.17.17.mov
Screen.Recording.2026-05-21.at.17.19.43.mov
Android: mWeb Chrome
Screen.Recording.2026-05-21.at.17.24.58.mov
Screen.Recording.2026-05-21.at.17.26.27.mov
iOS: HybridApp
Screen.Recording.2026-05-21.at.16.23.29.mov
Screen.Recording.2026-05-21.at.16.25.38.mov
Screen.Recording.2026-05-21.at.16.27.32.mov
Screen.Recording.2026-05-21.at.16.27.52.mov
Screen.Recording.2026-05-21.at.16.29.52.mov
iOS: mWeb Safari
Screen.Recording.2026-05-21.at.16.41.38.mov
MacOS: Chrome / Safari
Screen.Recording.2026-05-21.at.16.03.38.mov
Screen.Recording.2026-05-21.at.16.05.01.mov
Screen.Recording.2026-05-21.at.16.06.20.mov
Screen.Recording.2026-05-21.at.16.07.29.mov
Screen.Recording.2026-05-21.at.16.08.20.mov
Screen.Recording.2026-05-21.at.16.09.08.mov
sobitneupane
left a comment
sobitneupane
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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
- 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.
toggleReportand notonIconClick). - 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
- 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.
- 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 usingAvatarhave 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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
Designlabel and/or tagged@Expensify/designso the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent 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
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
|
@WojtekBoman @sumo-slonik would you be able to review this PR since it involves navigation logic? |
Sure! We'll check it out today 🫡 |
|
Still re-testing all cases thoroughly. Please don’t merge yet, thanks. |
|
Hey, I checked this code and found some things worth reconsidering: Things that look good and I'd keep as-is:
Things I'd rethink:
One thing worth flagging: Also, could we split this PR into smaller ones? Right now it bundles 5 distinct user-visible fixes, and breaking them up (open report from Search, task edit dismissal, leave-report, delete-task, deleted-report fallback) would make each one much easier to review and safer to bisect if anything regresses later. I understand this may add work, but I believe it's worth it :) |
|
Thanks for the thoughtful review @WojtekBoman! @marufsharifi can you please address the comments above? |
|
@luacmartins, thanks, that makes sense. I’ll split this into smaller PRs and open them ASAP. |
|
Sounds good |
|
@marufsharifi what's the next step here? |
|
@luacmartins, the first pr merged #91508. We are working on the second one. thanks. |
|
@marufsharifi do you have a draft PR for the 2nd change? |
|
@marufsharifi any updates here? |
|
@luacmartins, sorry for not closing this. We have splitted this pr into multiple ones; the first pr deployed to production; the second pr is under review; I am working on the third pr. thanks. |
5 participants
Explanation of Change
This update fixes several cases where users started in
Reports/Searchbut were unexpectedly redirected intoInbox.The change makes report-opening behavior context-aware, so direct opens from Search now use Search-owned routes instead of Inbox routes. It also fixes Search-based task create/edit flows by returning users to their existing Search stack after dismissing modals, rather than reconstructing an Inbox report route.
For leave-chat flows, the exact
backToroute from report details is now preserved and used first, which keeps users in the same Search context they came from. Finally, the deleted-report fallback after leaving was updated to be Search-aware as well, so once a report disappears, users are no longer bounced into Inbox as a fallback.Fixed Issues
$ #85560
PROPOSAL: #85560 (comment)
Tests
Open a task from Reports > Chats search results and stay in Search context
Edit task description from Search and dismiss back to the same Search stack
Leave-chat or deleted-report fallback preserves Search context
Edit expense description from Search and return to the same Search flow
Create or edit a second task description from Search without losing Search context
Edit task title from Search and dismiss back correctly
Leave a group and leave a thread
Leave a thread
Open a self-DM expense preview from Reports > Chats and stay in Search context
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Screen.Recording.2026-04-14.at.12.13.18.AM.mov
REC-2026041924207.PM.mp4
REC-2026041924307.PM.mp4
REC-2026041924753.PM.mp4
REC-2026041925021.PM.mp4
REC-2026041925056.PM.mp4
Screen.Recording.2026-04-30.at.3.24.47.PM.mov
Screen.Recording.2026-05-19.at.7.32.45.PM.mov
Android: mWeb Chrome
Screen.Recording.2026-04-13.at.11.59.29.PM.mov
REC-2026041641057.PM.mp4
REC-2026041641135.PM.mp4
REC-2026041641215.PM.mp4
REC-2026041641342.PM.mp4
REC-2026041641716.PM.mp4
Screen.Recording.2026-04-30.at.2.34.06.PM.mov
Recording_20260519_232555.mp4
iOS: Native
Screen.Recording.2026-04-13.at.10.52.13.PM.mov
REC-20260416101416.AM.mp4
REC-20260416101950.AM.mp4
REC-20260416102051.AM.mp4
REC-20260416102647.AM.mp4
REC-20260416102821.AM.mp4
Screen.Recording.2026-04-30.at.2.08.26.PM.mov
Screen.Recording.2026-05-19.at.11.19.33.PM.mov
iOS: mWeb Safari
Screen.Recording.2026-04-13.at.10.55.14.PM.mov
REC-2026041662705.PM.mp4
REC-2026041662858.PM.mp4
Screen.Recording.2026-04-30.at.2.17.25.PM.mov
Screen.Recording.2026-05-19.at.11.30.45.PM.mov
MacOS: Chrome / Safari
assign.task.mp4
REC-20260424112020.AM.mp4
concierge.mp4
expense.description.mp4
Screen.Recording.2026-04-13.at.10.35.44.PM.mov
task.title.edit.mov
REC-20260424114111.AM.mp4
REC-20260424115151.AM.mp4
Screen.Recording.2026-04-30.at.2.06.10.PM.mov
Screen.Recording.2026-05-19.at.7.26.21.PM.mov