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

#20709: Use windowHeight in getNavigationModalCardStyles #23222

Merged
merged 6 commits into from
Jul 21, 2023

Conversation

jscardona12
Copy link
Contributor

@jscardona12 jscardona12 commented Jul 19, 2023

Details

pass the windowHeight to the new navigationModalCard implementation in App/src/styles
/styles.js. , and apply it to the height property.

This would be re-applying the fix on this PR with previous fix
to the new implementation.

Fixed Issues

$ #20709
PROPOSAL: #20709 (comment)

Tests

First Scenario

  1. Download the New Expensify app for the Smart Banner to appear.
  2. Open in safari iOS the and navigate to newDot home.
  3. Open settings clicking on profiles avatar
  4. Scroll down
  5. Sign out option should be visible and easily clickable.

Second Scenario

  1. Download the New Expensify app for the Smart Banner to appear.
  2. Open in safari iOS the and navigate to newDot home.
  3. Open settings clicking on profiles avatar
  4. Click on Workspaces
  5. New workspace button should be fully visible and easily clickable
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

First Scenario

  1. Download the New Expensify app for the Smart Banner to appear.
  2. Open in safari iOS the and navigate to newDot home.
  3. Open settings clicking on profiles avatar
  4. Scroll down
  5. Sign out option should be visible and easily clickable.

Second Scenario

  1. Download the New Expensify app for the Smart Banner to appear.
  2. Open in safari iOS the and navigate to newDot home.
  3. Open settings clicking on profiles avatar
  4. Click on Workspaces
  5. New workspace button should be fully visible and easily clickable
  • 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 / Chrome
    • iOS / native
    • iOS / 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
      • [ x] 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 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

This just happens in Mobile Web - Safari

Web
Screen.Recording.2023-07-20.at.6.29.26.AM.mov
Mobile Web - Chrome
Screen.Recording.2023-07-20.at.6.57.21.AM.mov
Mobile Web - Safari
withSolution.mp4
Desktop
Screen.Recording.2023-07-20.at.7.01.44.AM.mov
iOS
WhatsApp.Video.2023-07-20.at.6.41.12.AM.mp4
Android
Screen.Recording.2023-07-20.at.6.52.30.AM.mov

@jscardona12 jscardona12 requested a review from a team as a code owner July 19, 2023 23:57
@melvin-bot melvin-bot bot removed the request for review from a team July 19, 2023 23:57
@melvin-bot
Copy link

melvin-bot bot commented Jul 19, 2023

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

@melvin-bot melvin-bot bot requested a review from s77rt July 19, 2023 23:57
@github-actions
Copy link
Contributor

github-actions bot commented Jul 19, 2023

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

src/libs/Navigation/AppNavigator/AuthScreens.js Outdated Show resolved Hide resolved
src/libs/Navigation/AppNavigator/AuthScreens.js Outdated Show resolved Hide resolved
src/styles/styles.js Outdated Show resolved Hide resolved
@s77rt
Copy link
Contributor

s77rt commented Jul 20, 2023

@jscardona12 Please consider the following:

  • Clear up the Details section
  • Add Tests
  • Add screenshots/videos for all platforms
  • Recheck the checklist (it's seems a bit messed up)

@s77rt
Copy link
Contributor

s77rt commented Jul 20, 2023

Also please change the title to be more explanatory. It's a bit unclear.

@jscardona12 jscardona12 changed the title #20709: Add windowHeight to height and min-height property #20709: Add windowHeight to height and min-height property in navigationCard to fix signOut and Mew Worspace button being hide out when Smart Banner is visible Jul 20, 2023
@jscardona12 jscardona12 changed the title #20709: Add windowHeight to height and min-height property in navigationCard to fix signOut and Mew Worspace button being hide out when Smart Banner is visible #20709: Add windowHeight to height and min-height property in navigationCard to fix signOut and New Worspace button being hide out when Smart Banner is visible Jul 20, 2023
@jscardona12 jscardona12 changed the title #20709: Add windowHeight to height and min-height property in navigationCard to fix signOut and New Worspace button being hide out when Smart Banner is visible #20709: Add windowHeight to height and min-height property in navigationModalCard to fix signOut and New Worspace button being hide out when Smart Banner is visible Jul 20, 2023
@jscardona12 jscardona12 changed the title #20709: Add windowHeight to height and min-height property in navigationModalCard to fix signOut and New Worspace button being hide out when Smart Banner is visible #20709: Add windowHeight to height and min-height property in navigationModalCard to fix signOut and New workspace button being hide out when Smart Banner is visible Jul 20, 2023
@jscardona12
Copy link
Contributor Author

Hi @s77rt, code changes made and tested. and PR description comments applied as well.

@@ -8,4 +8,5 @@ export default ({windowHeight, isSmallScreenWidth}) => ({
// https://github.com/Expensify/App/issues/12005
// https://github.com/Expensify/App/issues/17824
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add a link to the issue we are fixing as well

@s77rt
Copy link
Contributor

s77rt commented Jul 20, 2023

Can you change the title to: Use windowHeight in getNavigationModalCardStyles

@jscardona12 jscardona12 changed the title #20709: Add windowHeight to height and min-height property in navigationModalCard to fix signOut and New workspace button being hide out when Smart Banner is visible #20709: Use windowHeight in getNavigationModalCardStyles Jul 20, 2023
@jscardona12
Copy link
Contributor Author

@s77rt done

@jscardona12
Copy link
Contributor Author

@s77rt index.js added

@jscardona12
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@s77rt
Copy link
Contributor

s77rt commented Jul 20, 2023

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

Mobile Web - Chrome

mweb-chrome

Mobile Web - Safari

mweb-safari

Desktop

desktop

iOS

ios

Android

android

Copy link
Contributor

@s77rt s77rt left a comment

Choose a reason for hiding this comment

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

LGTM! 🚀

@melvin-bot melvin-bot bot requested a review from johnmlee101 July 20, 2023 18:32
johnmlee101
johnmlee101 previously approved these changes Jul 20, 2023
@s77rt
Copy link
Contributor

s77rt commented Jul 20, 2023

@jscardona12 Oops, we have a lint issue, please run prettier and commit changes

@jscardona12
Copy link
Contributor Author

Hi @johnmlee101 @s77rt, prettier run is up now.

@jscardona12 jscardona12 requested a review from johnmlee101 July 21, 2023 14:37
@johnmlee101 johnmlee101 merged commit c225999 into Expensify:main Jul 21, 2023
@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to staging by https://github.com/johnmlee101 in version: 1.3.44-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 1.3.44-2 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/johnmlee101 in version: 1.3.45-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.45-7 🚀

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

Comment on lines 12 to +13
height: `${windowHeight}px`,
minHeight: `${windowHeight}px`,
Copy link
Contributor

Choose a reason for hiding this comment

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

This caused a regression on Safari where the window height is not reliable.

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

Successfully merging this pull request may close these issues.

4 participants