Fix opening FullScreenNavigator from the Home page by WojtekBoman · Pull Request #38734 · Expensify/App

WojtekBoman · 2024-03-21T09:15:35Z

Details

This PR fixes the flow of opening FullScreenNavigator from the Home page. Now when FullScreenNavigator is opened, SETTINGS.ROOT and SETTINGS.WORKSPACES pages will be pushed to the navigation state if they haven't been added yet.

Fixed Issues

$ #38420
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console

Open NewDot app and login.
Click the workspace icon (Expensify icon if no workspace is currently selected) in the upper left corner of the screen and click the + button to create a new workspace.
Click the button to edit the workspace name.
Verify that the workspace list hasn't been opened in the background.

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-03-21.at.10.28.43.mov

Android: mWeb Chrome

Screen.Recording.2024-03-21.at.12.00.09.mov

iOS: Native

Screen.Recording.2024-03-21.at.11.49.10.mov

iOS: mWeb Safari

Screen.Recording.2024-03-21.at.11.51.20.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-21.at.11.54.01.mov

MacOS: Desktop

Screen.Recording.2024-03-21.at.11.52.08.mov

adamgrzybowski · 2024-03-21T10:36:20Z

src/libs/Navigation/linkTo.ts

@@ -182,12 +180,11 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
            action.type = CONST.NAVIGATION.ACTION_TYPE.REPLACE;

            // If this action is navigating to the ModalNavigator and the last route on the root navigator is not already opened ModalNavigator then push


I think we need to adjust this comment as well. And probably can move action.type = CONST.NAVIGATION.ACTION_TYPE.PUSH; after the return in the line 199. It's only for Modal navigators

adamgrzybowski

LGTM 🎸

melvin-bot · 2024-03-21T11:30:08Z

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

alitoshmatov · 2024-03-26T11:44:37Z

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.

Screenshots/Videos

Android: Native

workspace-android.mov

Android: mWeb Chrome

workspace-mweb.mov

iOS: Native

https://github.com/Expensify/App/assets/59907218/ef8d25c3-1500-4d15-a573-838996d0f455

iOS: mWeb Safari

workspace-safari.mp4

MacOS: Chrome / Safari

workspace-web.mov

MacOS: Desktop

workspace-desktop.mov

alitoshmatov

Sorry for late review, small changes. LGTM!

mountiny

thank you @WojtekBoman @adamgrzybowski @alitoshmatov

mountiny · 2024-03-27T17:37:51Z

Rerunning the tests

OSBotify · 2024-03-27T18:08:56Z

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

bernhardoj · 2024-03-28T06:00:28Z

src/libs/Navigation/linkTo.ts

-            // If this action is navigating to the ModalNavigator and the last route on the root navigator is not already opened ModalNavigator then push
-        } else if (isModalNavigator(action.payload.name) && !isTargetNavigatorOnTop) {
+            // If this action is navigating to ModalNavigator or FullScreenNavigator and the last route on the root navigator is not already opened Navigator then push
+        } else if ((action.payload.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR || isModalNavigator(action.payload.name)) && !isTargetNavigatorOnTop) {


Hi, after this change, I can't open the workspace page on native and mWeb.

Screen.Recording.2024-03-28.at.13.57.46.mov

Hi! Thanks for noticing that. I see that 2 days ago this PR was merged #38977. It has introduced some changes to the navigation logic. When I was working on this PR, these changes weren't merged yet. I'll try to adjust my fix :)

Came here to point out the same issue

WojtekBoman · 2024-03-28T10:51:12Z

@mountiny I've prepared the PR with a quick fix to this problem, but it's a more complex topic than I initially thought. This PR fixed the issue with navigating between screens, but introduced an inconsistency in the navigation state:

Issue with resizing, RHP doesn't match the opened bottom tab screen

Screen.Recording.2024-03-28.at.11.35.46.mov

Issue with going back to the previous screen. As far as I know, we should go back to the Preferences screen, shouldn't we?

Screen.Recording.2024-03-28.at.11.36.27.mov

So, I believe we should quickly fix the bug with navigating to the workspace settings on small screens, and then consider how to fix these issues mentioned above. The change that caused these problems may also affect other places.

cc: @adamgrzybowski

WojtekBoman · 2024-03-28T17:57:25Z

@mountiny I've made this PR ready for review, it will fix that issue

OSBotify · 2024-03-29T02:27:29Z

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

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

OSBotify · 2024-04-02T11:03:45Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.58-8 🚀

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

WojtekBoman added 2 commits March 20, 2024 17:41

Add checking diff in fullscreen navigator

a832c3e

Handle navigating to fullscreen navigator in comparing diffs

fb61247

adamgrzybowski reviewed Mar 21, 2024

View reviewed changes

adamgrzybowski approved these changes Mar 21, 2024

View reviewed changes

Adjust linkTo to using getPartialStateDiff for FullScreenNavigator

83fa85a

WojtekBoman marked this pull request as ready for review March 21, 2024 11:30

WojtekBoman requested a review from a team as a code owner March 21, 2024 11:30

melvin-bot bot requested review from alitoshmatov and removed request for a team March 21, 2024 11:30

WojtekBoman mentioned this pull request Mar 21, 2024

Fix showing not found page after deleting a workspace #38488

Merged

49 tasks

alitoshmatov approved these changes Mar 26, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny March 26, 2024 11:45

mountiny assigned WojtekBoman Mar 27, 2024

mountiny approved these changes Mar 27, 2024

View reviewed changes

Merge branch 'main' into fix/opening-rhp-in-fullscreen

703c27e

mountiny merged commit fecb709 into Expensify:main Mar 27, 2024

bernhardoj reviewed Mar 28, 2024

View reviewed changes

WojtekBoman mentioned this pull request Mar 28, 2024

Fix opening workspace settings on small screen #39150

Merged

50 tasks

luacmartins mentioned this pull request Mar 28, 2024

#39005 - Polish items for Transfer owner flow #39035

Merged

50 tasks

github-actions bot mentioned this pull request Mar 29, 2024

Deploy Checklist: New Expensify 2024-03-29 #39222

Closed

burczu mentioned this pull request Mar 29, 2024

#39057 - Members list does not update to show the new admin and owner #39159

Merged

50 tasks

melvin-bot bot mentioned this pull request Apr 2, 2024

[HOLD for payment 2024-04-09] [$500] Workspace - New Workspace button doesn't create WS and shows no default name #38420

Closed

6 tasks

		@@ -182,12 +180,11 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
		action.type = CONST.NAVIGATION.ACTION_TYPE.REPLACE;

		// If this action is navigating to the ModalNavigator and the last route on the root navigator is not already opened ModalNavigator then push

Conversation

WojtekBoman commented Mar 21, 2024 • 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!

adamgrzybowski Mar 21, 2024

Choose a reason for hiding this comment

Uh oh!

adamgrzybowski left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 21, 2024

Uh oh!

alitoshmatov commented Mar 26, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

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

mountiny commented Mar 27, 2024

Uh oh!

OSBotify commented Mar 27, 2024

Uh oh!

bernhardoj Mar 28, 2024

Choose a reason for hiding this comment

Uh oh!

WojtekBoman Mar 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

luacmartins Mar 28, 2024

Choose a reason for hiding this comment

Uh oh!

WojtekBoman commented Mar 28, 2024

Uh oh!

WojtekBoman commented Mar 28, 2024

Uh oh!

OSBotify commented Mar 29, 2024

Uh oh!

OSBotify commented Apr 2, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

WojtekBoman commented Mar 21, 2024 •

edited

Loading

WojtekBoman Mar 28, 2024 •

edited

Loading