[navigation-refactor] Fix browser history for complex navigation actions #24165

adamgrzybowski · 2023-08-04T15:14:50Z

Details

Patch for react-navigation history that allows us to use some more advanced navigation actions without messing up the browser history
Small changes for leave room action to fix this issue. This issue also needs the navigation patch.

IMPORTANT

Make sure to reinstall node_modules.

Fixed Issues

$ #20908
$ #21356
$ #23796

It's possible that this PR fixes some other issues that I can't find right now.

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

All tests are for browsers

Leaving threads

Go to any chat
Send a message and then click on reply thread on the message so that a new thread page opens up
Click on header and leave the room
Notice it shows you to Concierge page
Click on back button and check if you are redirected to the thread you just leaved

Assigning

Click + icon
Select Assign task option
Enter title and click on next button
Select Assignee and share somewhere
Click on confirm task button to finish creating the task
Press back button in the browser. You shouldn't see the assign screen.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

web.mov

Mobile Web - Chrome

webAndroid.mov

Mobile Web - Safari

webiOS.mov

Desktop

desktop.mov

iOS

ios.mov

Android

android.mov

melvin-bot · 2023-08-04T15:14:57Z

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

adamgrzybowski · 2023-08-04T15:17:15Z

I will add videos for iOS and android later. I have some problems with my setup and builds but these changes should only affect browsers (except small changes on leave room)

eVoloshchak · 2023-08-08T08:53:09Z

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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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.

Screenshots/Videos

Web

Screen.Recording.2023-08-08.at.23.48.25.mov

Mobile Web - Chrome

video_2023-08-09_00-12-06.mp4

Mobile Web - Safari

Screen.Recording.2023-08-08.at.23.55.14.mov

Desktop

Screen.Recording.2023-08-08.at.23.52.42.mov

iOS

Screen.Recording.2023-08-08.at.23.59.42.mov

Android

video_2023-08-09_00-12-01.mp4

eVoloshchak · 2023-08-08T10:17:31Z

BUG:

Go to any chat (chat A)
Send a message and then click on reply thread on the message so that a new thread page opens up
Click on header and leave the room
Notice it redirects you to Concierge page
Click on back button and check if you are redirected to the thread you just left
Go to another chat (chat B)
Click on reply thread on the message so that a new thread page opens up
Click on header and leave the room
Notice it redirects you to Concierge page
Click on back button
Notice you're incorrectly redirected to chat A instead of chat B

Screen.Recording.2023-08-08.at.13.14.14.mov

adamgrzybowski · 2023-08-08T11:37:12Z

Hey @eVoloshchak I pushed some changes that should fix that. I tested it but could you please check that again? Thanks!

adamgrzybowski · 2023-08-08T11:38:35Z

@mountiny Getting your attention! This PR is important to continue fixing other flows.

eVoloshchak · 2023-08-08T14:32:23Z

@adamgrzybowski, there's still a similar bug, but now you're navigated to the wrong chat after selecting "Leave thread". The bug isn't 100% reproducible, but it happens most of the times

https://drive.google.com/file/d/10QFuHo6aM8mrdilyCwFCtgJ9_QhwOrhL/view?usp=sharing

adamgrzybowski · 2023-08-08T14:53:12Z

@eVoloshchak is this the firefox?

EDIT:
Ok, I see that's probably chrome. Did you notice when the problem is most likely to occur? For e.g. a lot of reports opened

EDIT v2:

Have you reinstalled your node modules?

adamgrzybowski · 2023-08-08T17:14:36Z

@eVoloshchak Okay we found an edge case and fixed it. Now this should work fine 🤞 Thanks for finding it!

eVoloshchak

Tests well

mountiny

Sorry for late response, was ooo, this is a major improvement, thank you!

OSBotify · 2023-08-15T17:26:21Z

✋ 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 · 2023-08-17T02:21:19Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.55-0 🚀

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

Pujan92 · 2023-08-21T09:53:38Z

@adamgrzybowski Seems this also causes the issue https://expensify.slack.com/archives/C049HHMV9SM/p1692600279076409

mountiny · 2023-08-21T13:32:54Z

I have made revert of this PR but it did not fix this, or this

OSBotify · 2023-08-21T22:28:01Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.56-0 🚀

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

adamgrzybowski · 2023-08-22T16:49:41Z

@adamgrzybowski Seems this also causes the issue https://expensify.slack.com/archives/C049HHMV9SM/p1692600279076409

Yeah I need to find a better way to fix the problem

OSBotify · 2023-08-24T03:11:02Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.56-24 🚀

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

fedirjh · 2023-10-14T19:14:47Z

src/pages/home/report/withReportOrNotFound.js

+        // If the content was shown but it's not anymore that means the report was deleted and we are probably navigating out of this screen.
+        // Return null for this case to avoid rendering FullScreenLoadingIndicator or NotFoundPage when animating transition.
+        if (shouldShowNotFoundPage && contentShown.current) {
+            return null;
+        }


@adamgrzybowski Could please help me understand which use case this code has fixed? I would assume it fixed the Leaving thread from the RHP modal?

we are probably navigating out of this screen.

FWIW This code caused this bug #28183 where an empty view is displayed inside the report details page without navigating out of that screen.

The leave thread action was moved from that screen, so if you could confirm that this is the only use case it addressed, can we remove it?

if the user leaves the thread, the not found page will appear briefly in closing RHP. This is supposed to fix it. But it has some problems. If I remember correctly it was the only use case

adamgrzybowski added 3 commits August 4, 2023 15:24

use popToLHN after leaving chat

7fe49a7

patch react-navigation native

ed1f565

patch react-navigation native v2

b20ef64

adamgrzybowski requested a review from a team as a code owner August 4, 2023 15:14

melvin-bot bot removed the request for review from a team August 4, 2023 15:14

melvin-bot bot requested a review from eVoloshchak August 4, 2023 15:14

adamgrzybowski added 3 commits August 8, 2023 12:37

fix glitching animation of NotFoundPage on transition

b2426a2

Merge branch 'main' into @swm/browser-back-button-fix

d574df7

remove popToLHN

50eba7f

adamgrzybowski added 2 commits August 8, 2023 14:28

use ref instead of state

9fb902b

add navigating in leaveRoom to make it work for deeplinks

213329a

adamgrzybowski added 2 commits August 8, 2023 17:28

change pop to goBack

7cb8726

fix patch v3

2624a1a

eVoloshchak approved these changes Aug 8, 2023

View reviewed changes

melvin-bot bot requested a review from mountiny August 8, 2023 21:16

Merge branch 'main' into @swm/browser-back-button-fix

0edb264

mountiny assigned adamgrzybowski Aug 15, 2023

mountiny approved these changes Aug 15, 2023

View reviewed changes

mountiny merged commit c419a10 into Expensify:main Aug 15, 2023
11 checks passed

OSBotify mentioned this pull request Aug 17, 2023

Deploy Checklist: New Expensify 2023-08-17 #25160

Closed

75 tasks

ShogunFire mentioned this pull request Aug 20, 2023

[$1000] Web - Settings - Unwanted behaviour when click on browser back button after clicking the report a bug #25412

Closed

6 tasks

shubham1206agra mentioned this pull request Aug 21, 2023

[HOLD for payment 2023-09-11] [HOLD for payment 2023-09-08] [$1000] CTRL+K, CTRL+SHIFT+K and CTRL+K again closes everything #25527

Closed

6 tasks

mountiny mentioned this pull request Aug 21, 2023

Revert "[navigation-refactor] Fix browser history for complex navigation actions" #25572

Closed

OSBotify mentioned this pull request Aug 21, 2023

Deploy Checklist: New Expensify 2023-08-21 #25625

Closed

mallenexpensify mentioned this pull request Aug 30, 2023

Android- Faulty back button- first shows hmm, it's not here page, then goes forward to concierge, then goes blank #24053

Closed

6 tasks

s77rt mentioned this pull request Aug 31, 2023

[HOLD for @0xmiroslav payment] [$2000] Request Money modal closed when selecting currency for new request or edit #25626

Closed

6 tasks

bernhardoj mentioned this pull request Sep 5, 2023

[$2000] Split bill - Split bill is displayed twice if swipe back from split bill chat #22313

Closed

6 tasks

hayata-suenaga mentioned this pull request Sep 5, 2023

DEV: After deleting request money on Workspace, navigate to Concierge #24123

Closed

6 tasks

misgana96 mentioned this pull request Sep 26, 2023

[$1000] Web - Workspaces - Page goes to wrong page when clicking go to #admin rooms #25393

Closed

6 tasks

fedirjh reviewed Oct 14, 2023

View reviewed changes

s-alves10 mentioned this pull request Oct 17, 2023

[$1000] Blank page appears instead of Hmm... it's not here page #28183

Closed

6 tasks

VickyStash mentioned this pull request May 28, 2024

[$250] mWeb/safari - Invoice - App shows confirmation page when swiping right after sending invoice #41940

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[navigation-refactor] Fix browser history for complex navigation actions #24165

[navigation-refactor] Fix browser history for complex navigation actions #24165

adamgrzybowski commented Aug 4, 2023 •

edited

Loading

melvin-bot bot commented Aug 4, 2023

adamgrzybowski commented Aug 4, 2023

eVoloshchak commented Aug 8, 2023 •

edited

Loading

eVoloshchak commented Aug 8, 2023

adamgrzybowski commented Aug 8, 2023

adamgrzybowski commented Aug 8, 2023

eVoloshchak commented Aug 8, 2023

adamgrzybowski commented Aug 8, 2023 •

edited

Loading

adamgrzybowski commented Aug 8, 2023

eVoloshchak left a comment

mountiny left a comment

OSBotify commented Aug 15, 2023

OSBotify commented Aug 17, 2023

Pujan92 commented Aug 21, 2023

mountiny commented Aug 21, 2023

OSBotify commented Aug 21, 2023

adamgrzybowski commented Aug 22, 2023

OSBotify commented Aug 24, 2023

fedirjh Oct 14, 2023

adamgrzybowski Oct 16, 2023

[navigation-refactor] Fix browser history for complex navigation actions #24165

[navigation-refactor] Fix browser history for complex navigation actions #24165

Conversation

adamgrzybowski commented Aug 4, 2023 • edited Loading

Details

IMPORTANT

Fixed Issues

Tests

Offline tests

QA Steps

Leaving threads

Assigning

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 4, 2023

adamgrzybowski commented Aug 4, 2023

eVoloshchak commented Aug 8, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

eVoloshchak commented Aug 8, 2023

adamgrzybowski commented Aug 8, 2023

adamgrzybowski commented Aug 8, 2023

eVoloshchak commented Aug 8, 2023

adamgrzybowski commented Aug 8, 2023 • edited Loading

adamgrzybowski commented Aug 8, 2023

eVoloshchak left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 15, 2023

OSBotify commented Aug 17, 2023

Pujan92 commented Aug 21, 2023

mountiny commented Aug 21, 2023

OSBotify commented Aug 21, 2023

adamgrzybowski commented Aug 22, 2023

OSBotify commented Aug 24, 2023

fedirjh Oct 14, 2023

Choose a reason for hiding this comment

adamgrzybowski Oct 16, 2023

Choose a reason for hiding this comment

adamgrzybowski commented Aug 4, 2023 •

edited

Loading

eVoloshchak commented Aug 8, 2023 •

edited

Loading

adamgrzybowski commented Aug 8, 2023 •

edited

Loading