fix: pop all reports after screen resize by WoLewicki · Pull Request #21312 · Expensify/App

WoLewicki · 2023-06-22T13:19:41Z

Details

After the screen resizes to small, and we already navigated through some reports, we still want the back button of report's header to go to LHN, so we pop all of the chats in order to do it. We also don't want to replicate that after user starts navigating deeper while stying on the small-sized screen.

Fixed Issues

$ #20370

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Start with wide screen and navigate through some reports on wide screen
Resize it to a small one and click report's back button
Confirm you are on LHN and there is a last visited report visible when you resize to a big screen

Start with small screen and go through some reports
Press report's back button
Confirm you pop only one report

Start with small screen and go through some reports
Resize the screen to wide and back to small
Press report's back button
Confirm you are on LHN and there is a last visited report visible when you resize to a big screen

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

nav1.mp4

nav2.mp4

nav3.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-06-22T13:19:46Z

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

WoLewicki · 2023-06-22T13:20:09Z

                // If already signed in, do not show the validate code if not on web,
                // because we don't want to block the user with the interstitial page.
-                Navigation.goBack(false);
+                Navigation.goBack();


This false was here for no reason also so I removed it.

It's added for a reason, to unset the fallback and call navigationRef.current.goBack() instead of navigate(fallbackRoute, 'UP')

But it doesn't work that way, the first argument is the route to go back to:

App/src/libs/Navigation/Navigation.js

Line 88 in 6183609

function goBack(fallbackRoute = ROUTES.HOME, shouldEnforceFallback = false) {

, or am I missing something?

Yes, but the fallback is not necessary. In this line we used to disable the fallback so the second condition won't be true (not to call navigate(fallbackRoute, 'UP')) and continue with the third option (navigationRef.current.goBack()).

Ok, I get it now, thanks!

WoLewicki · 2023-06-22T13:20:44Z

+ * @param {Bool} shouldPopToTop - Should we navigate to LHN on back press
 */
-function goBack(fallbackRoute = ROUTES.HOME, shouldEnforceFallback = false) {
+function goBack(fallbackRoute = ROUTES.HOME, shouldPopToTop = false) {


We did not use the shouldEnforceFallback anywhere so I just changed it to a new prop

We do use shouldEnforceFallback e.g. here

App/src/pages/iou/MoneyRequestDescriptionPage.js

Line 60 in 2669f79

Navigation.goBack(ROUTES.getMoneyRequestRoute(this.iouType, this.reportID), true);

. Can you add this prop back?

mountiny

Thanks, @s77rt thanks for testing in advance

mountiny · 2023-06-22T13:32:36Z

+let shouldPopAllStateOnUP = false;
+
+function setShouldPopAllStateOnUP() {
+    shouldPopAllStateOnUP = true;
+}


I think we might want to add some comment here too

s77rt · 2023-06-22T15:00:56Z

Limited availability today but will get to this asap

s77rt · 2023-06-22T21:10:51Z

+ * @param {Bool} shouldPopToTop - Should we navigate to LHN on back press
 */
-function goBack(fallbackRoute = ROUTES.HOME, shouldEnforceFallback = false) {
+function goBack(fallbackRoute = ROUTES.HOME, shouldPopToTop = false) {


We do use shouldEnforceFallback e.g. here

App/src/pages/iou/MoneyRequestDescriptionPage.js

Line 60 in 2669f79

Navigation.goBack(ROUTES.getMoneyRequestRoute(this.iouType, this.reportID), true);

. Can you add this prop back?

s77rt · 2023-06-22T21:14:26Z

                // If already signed in, do not show the validate code if not on web,
                // because we don't want to block the user with the interstitial page.
-                Navigation.goBack(false);
+                Navigation.goBack();


It's added for a reason, to unset the fallback and call navigationRef.current.goBack() instead of navigate(fallbackRoute, 'UP')

s77rt · 2023-06-24T09:53:07Z

                            <HeaderView
                                reportID={reportID}
-                                onNavigationMenuButtonClicked={() => Navigation.goBack(ROUTES.HOME)}
+                                onNavigationMenuButtonClicked={() => Navigation.goBack(ROUTES.HOME, false, true)}


The ReportScreen may return HeaderView or MoneyRequestHeader. We need to apply same logic for MoneyRequestHeader

App/src/components/MoneyRequestHeader.js

Line 112 in 820fa93

onBackButtonPress={() => Navigation.goBack(ROUTES.HOME)}

s77rt · 2023-06-24T21:41:14Z

Using device's back button or browser back button does not work as expected. Should we handle this here? cc @mountiny

This is similar to this reported bug #21356

Kooha-2023-06-24-22-38-25.mp4

WoLewicki · 2023-06-26T09:53:45Z

@s77rt as mentioned here: #20370 (comment), the browser back button will work like this and I would be very hesitant from trying to change that behavior, but cc @parasharrajat since @mountiny is ooo iirc.

s77rt · 2023-06-26T16:02:52Z

Discussing https://expensify.slack.com/archives/C01GTK53T8Q/p1687794457811099

s77rt · 2023-06-27T09:38:04Z

Looks we are okay to move with this. @WoLewicki Can you please resolve the conflicts?

WoLewicki · 2023-06-27T10:16:04Z

@s77rt done, thanks.

s77rt · 2023-06-27T11:34:12Z

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

web.mp4

Mobile Web - Chrome

Mobile Web - Safari

Desktop

desktop.mp4

iOS

Android

s77rt

LGTM! 🚀

🎀 👀 🎀 C+ reviewed

mountiny

Thanks everyone for patience when I was ooo and working on this!

Julesssss · 2023-07-04T15:12:54Z

Merge failed FYI: https://github.com/Expensify/App/actions/runs/5456221852/jobs/9928745935

mountiny · 2023-07-04T15:34:57Z

+            firstRenderRef.current = false;
+            return;
+        }
+        if (!props.isSmallScreenWidth) {


This props have been deprecated since we are using the windows hook now to get the value so we need to update this

Follow up is here #22191

OSBotify · 2023-07-05T17:31:29Z

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

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

OSBotify · 2023-07-07T10:36:55Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.37-7 🚀

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

WoLewicki added 2 commits June 22, 2023 14:56

fix: pop all reports after screen resize

0075ef2

fix: dont set it on first render

7f92d0a

WoLewicki requested a review from a team as a code owner June 22, 2023 13:19

melvin-bot Bot requested review from s77rt and removed request for a team June 22, 2023 13:19

WoLewicki commented Jun 22, 2023

View reviewed changes

mountiny assigned WoLewicki Jun 22, 2023

mountiny reviewed Jun 22, 2023

View reviewed changes

feat: add one more comment

6bb600d

s77rt suggested changes Jun 22, 2023

View reviewed changes

WoLewicki added 3 commits June 23, 2023 16:38

Merge branch 'main' into @swm/navigation-refactor-pop-on-resize

0c153cf

fix: apply changes from review

fcc4ecf

fix: revert removing false

e5fa6f9

s77rt suggested changes Jun 24, 2023

View reviewed changes

fix: apply changes from review

0f5878e

chore: merge current main

4518114

s77rt approved these changes Jun 27, 2023

View reviewed changes

melvin-bot Bot requested a review from mountiny June 27, 2023 11:34

mountiny approved these changes Jul 4, 2023

View reviewed changes

mountiny merged commit 3e0d7dd into Expensify:main Jul 4, 2023

mountiny reviewed Jul 4, 2023

View reviewed changes

mountiny mentioned this pull request Jul 4, 2023

[NoQA] Use the variable from hook rather then props #22191

Merged

57 tasks

OSBotify mentioned this pull request Jul 5, 2023

Deploy Checklist: New Expensify 2023-07-05 #22282

Closed

58 tasks

melvin-bot Bot mentioned this pull request Jul 7, 2023

[HOLD for payment 2023-07-14] Up button does not redirect to LHN when other chats are opened previously and window was resized to mobile #20370

Closed

6 tasks

Conversation

WoLewicki commented Jun 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jun 22, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

s77rt commented Jun 22, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

s77rt commented Jun 24, 2023

Uh oh!

WoLewicki commented Jun 26, 2023

Uh oh!

s77rt commented Jun 26, 2023

Uh oh!

s77rt commented Jun 27, 2023

Uh oh!

WoLewicki commented Jun 27, 2023

Uh oh!

s77rt commented Jun 27, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

s77rt left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Julesssss commented Jul 4, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jul 5, 2023

Uh oh!

OSBotify commented Jul 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

WoLewicki commented Jun 22, 2023 •

edited

Loading