fix: User navigated to incorrect section when opening notification and tapping back button by truph01 · Pull Request #57871 · Expensify/App

truph01 · 2025-03-05T17:39:43Z

Explanation of Change

Fixed Issues

$ #57091
PROPOSAL: #57091 (comment)

Tests

Android/IOS Native

Open the Expensify app.
Tap on "Reports" on the bottom of the screen.
Switch to user B account.
Send a message to User A.
Tap on the notification received.
When redirected to chat, tap on the arrow on the top left corner.
Verify: When tapping on the back button on chat, the user should land on the section that was opened before interacting with the message notification.

Other platforms (This PR only applied to Android/IOS native device, so with other platforms, just need to make sure the back button in top left still works properly):

Open Expensify app
Click on any report in LHN
Click on back button in top left
Verify the LHN is shown

Verify that no errors appear in the JS console

Offline tests

QA Steps

Android/IOS Native

Open the Expensify app.
Tap on "Reports" on the bottom of the screen.
Switch to user B account.
Send a message to User A.
Tap on the notification received.
When redirected to chat, tap on the arrow on the top left corner.
Verify: When tapping on the back button on chat, the user should land on the section that was opened before interacting with the message notification.

Other platforms (This PR only applied to Android/IOS native device, so with other platforms, just need to make sure the back button in top left still works properly):

Open Expensify app
Click on any report in LHN
Click on back button in top left
Verify the LHN is shown

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-03-06.at.00.28.39.mov

Android: mWeb Chrome

Screen.Recording.2025-03-06.at.00.32.15.mov

iOS: Native

iOS: mWeb Safari

Screen.Recording.2025-03-06.at.00.33.49.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-06.at.00.30.11.mov

MacOS: Desktop

Screen.Recording.2025-03-06.at.00.32.49.mov

…d tapping back button

melvin-bot · 2025-03-05T17:39:48Z

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

allroundexperts · 2025-03-10T06:04:54Z

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: 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 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: Native

Screen.Recording.2025-04-03.at.2.50.22.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-04-03.at.2.55.25.PM.mov

iOS: Native

Screen.Recording.2025-04-03.at.3.06.02.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-04-03.at.2.56.29.PM.mov

MacOS: Chrome / Safari

MacOS: Desktop

allroundexperts · 2025-03-10T06:05:22Z

@truph01 Why are you missing the iOS recording?

truph01 · 2025-03-10T06:09:03Z

@truph01 Why are you missing the iOS recording?

@allroundexperts I already asked about how to receive push notifications in IOS here.

So, I cannot add the test video in IOS native, and I will update it later if I can test PR on this platform.

allroundexperts · 2025-03-23T21:16:34Z

@truph01 Can you please resolve the conflicts?

truph01 · 2025-03-24T10:22:27Z

@allroundexperts I resolved conflicts

allroundexperts · 2025-04-01T23:03:26Z

@truph01 Can you please resolve again?

truph01 · 2025-04-02T17:14:28Z

@allroundexperts I just merged main again.

allroundexperts · 2025-04-03T07:52:44Z

@truph01 I am not able to receive notifications on Android simulator. Did you do any special setting to get those?

truph01 · 2025-04-03T09:28:54Z

@allroundexperts I follow this section: https://github.com/Expensify/App/blob/main/README.md#receiving-notifications

Did you try it?

allroundexperts · 2025-04-03T10:01:42Z

@allroundexperts I follow this section: https://github.com/Expensify/App/blob/main/README.md#receiving-notifications

Did you try it?

Nops, didn't saw that. I tried it now and it works good on Android.

allroundexperts · 2025-04-03T10:02:01Z

I won't be able to test on iOS as I don't have the certificates / credentials.

allroundexperts · 2025-04-03T10:02:12Z

I think android test should be good enough.

allroundexperts

Works good!

madmax330 · 2025-04-04T11:29:46Z

There's conflicts on the branch

truph01 · 2025-04-08T10:17:02Z

@allroundexperts I just merged main and resolved the conflicts.

madmax330 · 2025-04-10T07:57:53Z

More conflicts 🙃

allroundexperts · 2025-04-10T21:48:25Z

@madmax330 I don't see them.

madmax330 · 2025-04-11T07:22:52Z

Oh I hand't refreshed my page 🤦🏽

OSBotify · 2025-04-11T07:51:24Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-04-14T23:16:19Z

🚀 Deployed to staging by https://github.com/madmax330 in version: 9.1.28-0 🚀

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

This reverts commit 6a156ab, reversing changes made to 3381045.

github-actions · 2025-04-16T22:11:55Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.28-15 🚀

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

suneox · 2025-07-16T14:32:28Z

src/libs/Notification/PushNotification/subscribeToPushNotifications.ts


                Log.info('[PushNotification] onSelected() - Navigation is ready. Navigating...', false, {reportID});
-                Navigation.navigateToReportWithPolicyCheck({reportID: String(reportID), policyIDToCheck: policyID});
+                Navigation.navigateToReportWithPolicyCheck({reportID: String(reportID), policyIDToCheck: policyID, backTo: Navigation.getActiveRoute()});


Coming from the #62261 checklist: We missed handling the case where opening a notification on the same active route leads to a duplicated navigation stack.

fix: User navigated to incorrect section when opening notification an…

f971aa1

…d tapping back button

truph01 requested a review from a team as a code owner March 5, 2025 17:39

melvin-bot bot requested review from allroundexperts and removed request for a team March 5, 2025 17:39

truph01 mentioned this pull request Mar 5, 2025

[Due for payment 2025-04-23] [$250] Android - Chat - User navigated to incorrect section when opening notification and tapping back button #57091

Closed

8 tasks

truph01 added 2 commits March 24, 2025 17:19

fix: conflict

9a5614e

fix: conflict

364f5e7

truph01 added 2 commits April 2, 2025 23:50

fix: merge main and fix conflicts

6c9d974

fix: lint

083e098

allroundexperts approved these changes Apr 3, 2025

View reviewed changes

melvin-bot bot requested a review from madmax330 April 3, 2025 10:02

madmax330 previously approved these changes Apr 4, 2025

View reviewed changes

fix: merged main and resolved conflicts

16f5601

truph01 dismissed madmax330’s stale review via 16f5601 April 8, 2025 10:03

fix: merge main and fix conflict

a1f64db

madmax330 approved these changes Apr 11, 2025

View reviewed changes

madmax330 merged commit 6a156ab into Expensify:main Apr 11, 2025
16 checks passed

github-actions bot mentioned this pull request Apr 15, 2025

Deploy Checklist: New Expensify 2025-04-15 #60222

Closed

grgia mentioned this pull request Apr 15, 2025

[Due for payment 2025-06-02] Hybrid - Android - User is not navigated to hybrid app after finishing 2 minute tour #60255

Closed

8 tasks

grgia added a commit that referenced this pull request Apr 15, 2025

Revert "Merge pull request #57871 from truph01/fix/57091"

d217427

This reverts commit 6a156ab, reversing changes made to 3381045.

grgia mentioned this pull request Apr 15, 2025

[Cp Staging] revert 57871 #60304

Closed

50 tasks

huult mentioned this pull request May 14, 2025

[Due for payment 2025-06-09] [$250] Search-Navigation back from the chat details page in Search leads to the "It's not here" page #61124

Closed

8 tasks

suneox reviewed Jul 16, 2025

View reviewed changes

Conversation

truph01 commented Mar 5, 2025

Explanation of Change

Fixed Issues

Tests

Android/IOS Native

Other platforms (This PR only applied to Android/IOS native device, so with other platforms, just need to make sure the back button in top left still works properly):

Offline tests

QA Steps

Android/IOS Native

Other platforms (This PR only applied to Android/IOS native device, so with other platforms, just need to make sure the back button in top left still works properly):

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 5, 2025

Uh oh!

allroundexperts commented Mar 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allroundexperts commented Mar 10, 2025

Uh oh!

truph01 commented Mar 10, 2025

Uh oh!

allroundexperts commented Mar 23, 2025

Uh oh!

truph01 commented Mar 24, 2025

Uh oh!

allroundexperts commented Apr 1, 2025

Uh oh!

truph01 commented Apr 2, 2025

Uh oh!

allroundexperts commented Apr 3, 2025

Uh oh!

truph01 commented Apr 3, 2025

Uh oh!

allroundexperts commented Apr 3, 2025

Uh oh!

allroundexperts commented Apr 3, 2025

Uh oh!

allroundexperts commented Apr 3, 2025

Uh oh!

allroundexperts left a comment

Choose a reason for hiding this comment

Uh oh!

madmax330 commented Apr 4, 2025

Uh oh!

truph01 commented Apr 8, 2025

Uh oh!

madmax330 commented Apr 10, 2025

Uh oh!

allroundexperts commented Apr 10, 2025

Uh oh!

madmax330 commented Apr 11, 2025

Uh oh!

Uh oh!

OSBotify commented Apr 11, 2025

Uh oh!

github-actions bot commented Apr 14, 2025

Uh oh!

github-actions bot commented Apr 16, 2025

Uh oh!

suneox Jul 16, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

allroundexperts commented Mar 10, 2025 •

edited

Loading