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.

Sign up for GitHub

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

Jump to bottom

Fix global nav styles #29428

Closed
wants to merge 34 commits into from
Closed

Fix global nav styles #29428

wants to merge 34 commits into from

Conversation

kosmydel
Copy link
Contributor

@kosmydel kosmydel commented Oct 12, 2023 •
edited
Loading

Details

Fixed issues related to global nav styling:
Update:

Fixed Issues

$ #29057
PROPOSAL: N/A

Tests

  • Verify that no errors appear in the JS console
  • Check each fixed issue from the above list if it is fixed.
  • 1. Sign in button on Global Nav is cropped (the original issue)
    • Create a public room
    • Copy link to it
    • Sign out
    • Paste the link
    • Verify the avatar design in the top left corner
  • 2. Set the status on your profile (make sure you have permissions). Check if the settings button in the top-left corner is correctly cropped.
  • 3. Traffic lights button on macOS desktop
    • Run the desktop app and log in.
    • Check if the avatar (in the top-left corner) looks good
  • 4. Check if the Settings Background for profile details is correct.
  • 5. Fixed in another PR
  • 6. [IMPORTANT] Check LHP sizing on each platform.
    • Resize the screen. Check if the LHP and RHP new widths work correctly.
    • Send money request. Check if the resizing works correctly.
    • Log out from the app. Check the sizing of the login screen.
    • Go to the report. Press + button to open the ReportActionCompose menu. Check if it is positioned correctly (left margin).
    • Go to the not found (http://localhost:8082/not-found) page. Check if the margins are set correctly.
    • Open modal RHP docked. Go to Profile settings, upload a new avatar, and check if the avatar edit photo modal is displayed correctly.
    • Make more tests related to changing the width of the LHP as it is really tricky change.
  • 7. Check if the border around avatars is the same as the background in the LHP report list.
    • Check multiple avatars background (i.g. in the room)
    • Check workspace + avatar background
  • 8. Verify colors:
    • Send an attachment. Verify background color.
    • Verify colors of activity indicator.

Offline tests

N/A

QA Steps

  • Verify that no errors appear in the JS console
  • Do the checklist from the above.
  • Focus on the new width of the LHP, as this might cause regressions. Try different screens and window widths.

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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native android - native

OLD:

Screenshot 2023-10-16 at 15 50 27
Screenshot 2023-10-16 at 15 50 22

Android: mWeb Chrome android - web

OLD:

Screenshot 2023-10-16 at 16 07 06
Screenshot 2023-10-16 at 16 07 00

iOS: Native ios - native

OLD:

Screenshot 2023-10-16 at 15 08 35 Screenshot 2023-10-16 at 15 08 31
iOS: mWeb Safari ios - web

OLD:

Screenshot 2023-10-16 at 15 45 18
Screenshot 2023-10-16 at 15 45 13

MacOS: Chrome / Safari web

OLD:

Screenshot 2023-10-16 at 14 55 59

Screenshot 2023-10-16 at 15 01 46

MacOS: Desktop desktop

@ishpaul777 ishpaul777 mentioned this pull request Oct 12, 2023
Closed
6 tasks
@kosmydel kosmydel marked this pull request as ready for review October 17, 2023 07:49
@kosmydel kosmydel requested a review from a team as a code owner October 17, 2023 07:49
@melvin-bot melvin-bot bot requested review from 0xmiros and removed request for a team October 17, 2023 07:49
@melvin-bot
Copy link

melvin-bot bot commented Oct 17, 2023

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

@hayata-suenaga
Copy link
Contributor

changing the assignment of C+ per this discussion

situchan
situchan reviewed Oct 25, 2023
View reviewed changes
src/components/HeaderGap/index.desktop.js Outdated
styles: PropTypes.arrayOf(PropTypes.object),
styles: stylePropTypes,

/** If the HeaderGap is placed in the LHP */
Copy link
Contributor

Choose a reason for hiding this comment

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

We're more familiar with LHN than LHP.

Is this correct?
Screenshot 2023-10-25 at 6 19 37 PM

Copy link
Contributor

Choose a reason for hiding this comment

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

It's rather my typo 😅

Copy link
Contributor

@stitesExpensify stitesExpensify Oct 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

FYI the terminology we have decided on has changed again since the introduction of the global nav 😅

2023-10-10_18-03-19

@robertKozik
Copy link
Contributor

Branch got merged with main and is ready for review.

@situchan
Copy link
Contributor

Can we also rename all variables? I don't see any occurrences of lhp on main

@robertKozik
Copy link
Contributor

Sure on it

@robertKozik
Copy link
Contributor

done 👌🏼 @situchan

stitesExpensify
stitesExpensify reviewed Oct 26, 2023
View reviewed changes
Copy link
Contributor

@stitesExpensify stitesExpensify left a comment

Choose a reason for hiding this comment

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

Looking good, just a couple of comments

src/components/HeaderGap/index.desktop.js Outdated
};

class HeaderGap extends PureComponent {
render() {
return <View style={[styles.headerGap, ...this.props.styles]} />;
if (!this.props.isSidebar) {
Copy link
Contributor

Choose a reason for hiding this comment

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

NAB: IMO it makes more sense to reverse this and return the sidebar if the prop is passed rather than checking if it is not passed

Copy link
Contributor

Choose a reason for hiding this comment

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

Done 👌🏼

src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js Show resolved Hide resolved
@situchan
Copy link
Contributor

@robertKozik please fix conflict when you get a chance

@robertKozik
Copy link
Contributor

@situchan main merged

@hayata-suenaga
Copy link
Contributor

asked @situchan if he can review this PR on slack

hayata-suenaga
hayata-suenaga previously approved these changes Oct 31, 2023
View reviewed changes
Copy link
Contributor

@hayata-suenaga hayata-suenaga left a comment

Choose a reason for hiding this comment

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

I was only able to glance over the code but it looks good to me as long as @situchan's test goes well 🙇

@robertKozik
Copy link
Contributor

resolved conflicts 👌🏼

@situchan
Copy link
Contributor

asked @situchan if he can review this PR on slack

Maybe you asked on C+ channel but all C+ don't have access after slack migration.
I can complete review by tomorrow

@robertKozik
Copy link
Contributor

@hayata-suenaga Can we close this PR/issue per your slack message? It's related to the PR which is going to be reverted anyways

@situchan
Copy link
Contributor

situchan commented Nov 2, 2023

@robertKozik can you please redirect that message here? I don't have any context.

@hayata-suenaga
Copy link
Contributor

@hayata-suenaga Can we close this PR/issue per your slack message? It's related to the PR which is going to be reverted anyways

Yes I'm closing this issue now 🙇

@hayata-suenaga
Copy link
Contributor

@situchan I assigned you to the issue for payment

@hayata-suenaga hayata-suenaga mentioned this pull request Nov 2, 2023
Closed
@cubuspl42 cubuspl42 mentioned this pull request Nov 7, 2023
Merged
59 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stitesExpensify stitesExpensify stitesExpensify left review comments

@robertKozik robertKozik robertKozik left review comments

@situchan situchan situchan left review comments

@hayata-suenaga hayata-suenaga hayata-suenaga left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@kosmydel @robertKozik @shawnborton @hayata-suenaga @situchan @stitesExpensify