Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Wave 8] Ideal nav #33280

Merged
merged 634 commits into from
Feb 1, 2024
Merged

Conversation

adamgrzybowski
Copy link
Contributor

@adamgrzybowski adamgrzybowski commented Dec 19, 2023

Details

Introduces the new navigation style to the App, mainly the new bottom tabs, the workspace switcher and moves several pages to the main pane navigator. For more details about the navigation patterns and design, refer to the design doc.

Fixed Issues

$ #32941

Tests

  • Verify that no errors appear in the JS console

There is obviously lots to cover in testing, we have let QA Applause team know about this big change and gave them a document with testing steps to follow.

Offline tests

Similar to the Test when it comes to the navigation patterns.

QA Steps

There is obviously lots to cover in testing, we have let QA Applause team know about this big change and gave them a document with testing steps to follow.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.

Screenshots/Videos

We are not adding specific test screenshots or videos into this sections. The PR has been tested thoroughly over the course of weeks on various platforms. You can see that progress in the comment history here, rest assured we tried our best to catch any regressions.

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@adamgrzybowski adamgrzybowski changed the title Ideal nav merge Ideal nav Dec 22, 2023
@mountiny mountiny changed the title Ideal nav [Wave 8] Ideal nav Dec 22, 2023
@mateuuszzzzz mateuuszzzzz mentioned this pull request Dec 22, 2023
50 tasks
@MaciejSWM
Copy link
Contributor

image

This comment has been minimized.

@staszekscp
Copy link
Contributor

Hey @mountiny! When would be possible to start testing the changes? 😄

@s77rt
Copy link
Contributor

s77rt commented Jan 3, 2024

@adamgrzybowski Can you please merge main / resolve conflicts? I see some changes related the LHP that should not be a part of this PR

@WojtekBoman
Copy link
Contributor

WojtekBoman commented Jan 4, 2024

Conflicts have been resolved :)

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

How is this supposed to look on Web? Not seeing much currently
Screenshot 2024-01-04 at 11 37 54 AM

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

  1. Missing icon on the bottom tabs
  2. We should not keep navigating to a page that are we are currently in
  3. Navigation direction should be different when going to Chats
Screen.Recording.2024-01-04.at.11.44.59.AM.mov

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

Question: What is the role of the Expensify top-left logo button?

Screen.Recording.2024-01-04.at.11.53.03.AM.mov

Copy link
Contributor

github-actions bot commented Jan 4, 2024

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
❌ FAILED ❌ https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/33280/index.html
The QR code can't be generated, because the android build failed iOS
Desktop 💻 Web 🕸️
❌ FAILED ❌ https://33280.pr-testing.expensify.com
The QR code can't be generated, because the Desktop build failed Web

👀 View the workflow run that generated this build 👀

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

Help and Go Expensify Classing missing the external link icon

Screenshot 2024-01-04 at 12 25 13 PM

@kosmydel
Copy link
Contributor

kosmydel commented Jan 4, 2024

Help and Go Expensify Classing missing the external link icon

The designs don't include this icon.
Do you think the icons should be visible here? cc @shawnborton

Screenshot 2024-01-04 at 12 27 36

@kosmydel
Copy link
Contributor

kosmydel commented Jan 4, 2024

How is this supposed to look on Web? Not seeing much currently <img alt="Screenshot 2024-01-04 at 11 37 54 AM"

Oh, we forgot to mention. To got everything working you have to do the following:

rm -rf node_modules
npm i

We made some changes in a patch file and simple npm i doesn't re-apply patches.

@kosmydel
Copy link
Contributor

kosmydel commented Jan 4, 2024

Question: What is the role of the Expensify top-left logo button?

We haven't implemented this part yet - the workspace switcher. We are currently working on it.

@mountiny
Copy link
Contributor

mountiny commented Jan 4, 2024

Question: What is the role of the Expensify top-left logo button?

This will be workspace switcher, where you can filter the app functionality on workspace basis

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

I love the new web design <3

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

  1. Going to Profile does not have the Profile highlighted
  2. Going to AllSettings does not have the Workspace highlighted (and it can't be highlighted on a second click)
  3. There is a back button in the Workspace that should not be there (at least for Web)
Screen.Recording.2024-01-04.at.12.45.47.PM.mov

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

Delete popover is misplaced

Screenshot 2024-01-04 at 12 53 05 PM

Same with workspace avatar change button

Screenshot 2024-01-04 at 12 55 39 PM

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

Bug / By design? The settings in the workspace do not take full width

Screenshot 2024-01-04 at 1 03 21 PM

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

Starting VBBA process messes with the flow: the central screen have a chat while the sidebar is on workspace settings. Also browser back button do not work

Screen.Recording.2024-01-04.at.1.07.46.PM.mov

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

Not a bug: Now that the workspace name field is pushed on it's own page we should auto focus the input

Screenshot 2024-01-04 at 1 18 10 PM

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

Crash when trying to view a workspace avatar

Screen.Recording.2024-01-04.at.1.26.02.PM.mov

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

(similar to #33280 (comment)) If you refresh the page while RHP is open the highlighted item in Settings list is lost

Screen.Recording.2024-01-04.at.2.19.37.PM.mov

@s77rt
Copy link
Contributor

s77rt commented Jan 4, 2024

Workspace links all redirects to the overview and you can't refresh a page that you are currently in

Screen.Recording.2024-01-04.at.2.23.26.PM.mov

@jayeshmangwani
Copy link
Contributor

Coming from #37982. We missed updating a goBack here:

Navigation.goBack(ROUTES.SETTINGS_WALLET);

onLinkPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)}

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

SCREENS.SETTINGS.WALLET.CARDS_DIGITAL_DETAILS_UPDATE_ADDRESS,
],
[SCREENS.SETTINGS.SECURITY]: [SCREENS.SETTINGS.TWO_FACTOR_AUTH, SCREENS.SETTINGS.CLOSE],
[SCREENS.SETTINGS.ABOUT]: [SCREENS.SETTINGS.APP_DOWNLOAD_LINKS, SCREENS.KEYBOARD_SHORTCUTS],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coming from #35887, we shouldn’t add SCREENS.KEYBOARD_SHORTCUTS to this mapping. The page can be opened independently with a keyboard shortcut, so it shouldn't navigate from the current page.

@@ -99,9 +186,54 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
// 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) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opening new workspace from workspace list is not creating new workspace, ref: #38420

}

return Object.values(policies)
.filter((policy) => PolicyUtils.shouldShowPolicy(policy, !!isOffline))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should filter unapproved workspaces as well. #40679

shouldShowBackButton={isSmallScreenWidth}
onBackButtonPress={() => Navigation.goBack()}
>
<Button
Copy link
Member

@parasharrajat parasharrajat Jul 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This button was causing the header title to wrap in two lines. #44210

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you for letting us know 😄

policy?.isPolicyExpenseChatEnabled &&
policy?.role === CONST.POLICY.ROLE.ADMIN &&
(isOffline || policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || Object.keys(policy.errors ?? {}).length > 0)
!!policy && policy?.isPolicyExpenseChatEnabled && (isOffline || policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || Object.keys(policy.errors ?? {}).length > 0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👋 Hey folks, coming from #44811
This PR has deleted policy?.role === CONST.POLICY.ROLE.ADMIN check, which resulted in workspaces being displayed in workspace list even if user has no role in them
We've resolved this by adding a !!policy?.role check to filter out all of the workspaces in which the user has no role

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We didn't take into account the case where a user is removed from the selected workspace. In such case we should switch to "Expensify". (Coming from #43981)

const policyID = isAnonymous ? undefined : extractPolicyIDFromPath(path);

const state = getStateFromPath(pathWithoutPolicyID, options) as PartialState<NavigationState<RootStackParamList>>;
replacePathInNestedState(state, path);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coming from #49854.
We replaced path with normalizedPath to ensure it also have a prefix /, just like the path in useLinking of react-navigation, to prevent the URL from becoming incorrect when using the browser's back button. :)

}

return Object.values(reports).reduce<ChatPolicyType>((result, report) => {
if (!report?.reportID || !report.policyID) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey folks👋
This has caused a regression in #51820, user is navigated to thread message when going to #announce/admins room
Since all reports in announce room have chatType === policyAnnounce (even the thread reports), we were mistakenly identifying any report with chatType === policyAnnounce as the announce room in the switch statement below
This was resolved by returning early here is a report has parentReportID

Comment on lines +98 to +118
const selectPolicy = useCallback(
(option?: SimpleWorkspaceItem) => {
if (!option) {
return;
}

const {policyID, isPolicyAdmin} = option;

if (policyID) {
setSelectedOption(option);
} else {
setSelectedOption(undefined);
}
setActiveWorkspaceID(policyID);
Navigation.goBack();
if (policyID !== activeWorkspaceID) {
Navigation.navigateWithSwitchPolicyID({policyID, isPolicyAdmin});
}
},
[activeWorkspaceID, setActiveWorkspaceID],
);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On double click this callback is called twice. After the first click (and after callingsetActiveWorkspaceID), the order of the workspaces change making the second click hit a different workspace. Resulting in unexpected workspace selection (user lands on the previous selected workspace).

First click:
Screenshot 2024-10-29 at 9 11 53 AM

Second click:
Screenshot 2024-10-29 at 9 11 55 AM

Coming from #51402

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.