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

Fix label fonts #14217

Merged
merged 10 commits into from
Jan 13, 2023
Merged

Fix label fonts #14217

merged 10 commits into from
Jan 13, 2023

Conversation

luacmartins
Copy link
Contributor

@luacmartins luacmartins commented Jan 10, 2023

Details

Fixed Issues

$ #14208

Tests

  1. Navigate to the following pages and confirm that the labels style (font, text color and size) looks the same as the image below:
  • Notifications and Test Preferences in Settings > Preferences
  • Email, Preferred pronouns and Local time in Chat header > user details
  • All currencies in + > Request money > Currency symbol
  • Recents and Contacts in + > Request money > Enter amount > Select participants
  • To in + > Request money > Enter amount > Select participants > Confirm page
  • Who paid? and Who was there? in + > Split bill > Enter amount > Select participants > Confirm page

example

  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

  • 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 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 correct English and 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
    • 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 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.
  • I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

web-preferencesPage
web-detailsPage
web-currencySelection
web-recents
web-requestPage
web-split

Mobile Web - Chrome

chrome-preferences
chrome-details
chrome-currency
chrome-recents
chrome-split
chrome-request

Mobile Web - Safari

safari-preferences
safari-details
safari-currency
safari-request
safari-split

Desktop

desktop-detailsPage
desktop-currencySelection
desktop-recents
desktop-requestPage
desktop-preferencesPage
desktop-split

iOS

ios-preferences
ios-details
ios-currency
ios-request
ios-recents
ios-split

Android

android-request
android-recents
android-split
android-currency
android-details
android-preferences

@luacmartins luacmartins self-assigned this Jan 10, 2023
@luacmartins luacmartins marked this pull request as ready for review January 12, 2023 20:49
@luacmartins luacmartins requested a review from a team as a code owner January 12, 2023 20:49
@melvin-bot melvin-bot bot requested review from rushatgabhane and yuwenmemon and removed request for a team January 12, 2023 20:50
@melvin-bot
Copy link

melvin-bot bot commented Jan 12, 2023

@rushatgabhane @yuwenmemon One of you needs to 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]

@yuwenmemon
Copy link
Contributor

yuwenmemon commented Jan 12, 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 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 correct English and 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 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web Screenshot 2023-01-12 at 1 42 34 PM Screenshot 2023-01-12 at 1 43 23 PM
Mobile Web - Chrome

Screenshot 2023-01-12 at 1 50 52 PM

Mobile Web - Safari

Screenshot 2023-01-12 at 1 50 02 PM

Desktop Screenshot 2023-01-12 at 1 52 18 PM
iOS

Screenshot 2023-01-12 at 1 48 51 PM

Android

Screenshot 2023-01-12 at 1 53 18 PM

yuwenmemon
yuwenmemon previously approved these changes Jan 12, 2023
Copy link
Contributor

@yuwenmemon yuwenmemon left a comment

Choose a reason for hiding this comment

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

LGTM!

@yuwenmemon
Copy link
Contributor

Will leave to @shawnborton for final sign off (feel free to check my screenies in my comment)

@shawnborton
Copy link
Contributor

This is so great! A couple more places we can tackle while we're at it:

Label above payment methods:
image

Transfer balance page:
image

For the profile page, I know we said we'd skip fixing this until we go back to Account Settings doc but if it's easy, why not fix the "Email address" label which should be smaller when there is an email address present:
image

@luacmartins
Copy link
Contributor Author

luacmartins commented Jan 13, 2023

Updated. Here are the new screenshots:

Payment methods
web-payment

Transfer balance page
web-transfer

Profile page all states
web-email
web-resend
web-empty
Screenshot 2023-01-13 at 9 54 54 AM

pushToPageEmptyItemLabel: {
color: themeColors.textSupporting,
fontSize: variables.fontSizeNormal,
maxWidth: 240,
Copy link
Contributor Author

@luacmartins luacmartins Jan 13, 2023

Choose a reason for hiding this comment

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

Keeping this maxWidth causes this bug, so I'm removing it here too!

@luacmartins
Copy link
Contributor Author

luacmartins commented Jan 13, 2023

Chatted 1:1 with Shawn and the input value text color should be white to match the other inputs. Updated to reflect that!

Validate phone state
validatePhone

No phone state
noPhone

Validate email state
validateEmail

No email state
noEmail

@shawnborton
Copy link
Contributor

Looks great, thanks Carlos!

@yuwenmemon yuwenmemon merged commit 4a3ed07 into main Jan 13, 2023
@yuwenmemon yuwenmemon deleted the cmartins-fixLabelStyles branch January 13, 2023 20:03
@melvin-bot melvin-bot bot added the Emergency label Jan 13, 2023
@melvin-bot
Copy link

melvin-bot bot commented Jan 13, 2023

@yuwenmemon looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@yuwenmemon
Copy link
Contributor

False positive, tests were passing.

@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 @yuwenmemon in version: 1.2.55-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @AndrewGable in version: 1.2.55-0 🚀

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

@mollfpr
Copy link
Contributor

mollfpr commented Feb 10, 2023

Heyy, coming from where this issue #14743 where this PR causing the regression—addressed by @fedirjh and here the explanation. Thank you!

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.

5 participants