Fix styles for wallet money badge which is not center vertically #27137

ZhenjaHorbach · 2023-09-11T11:12:43Z

Details

Since the lineHeight does not work correctly on safari, it was decided to replace it with a value equal to fontSize

Fixed Issues

$ #26308
PROPOSAL: #26308 (comment)

Tests

Go to settings
Check the amount in badge

Verify that no errors appear in the JS console

Offline tests

Go to settings
Check the amount in badge

QA Steps

Go to settings
Check the amount in badge

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

Web

Chrome

Safari

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-09-11T11:12:49Z

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

ZhenjaHorbach · 2023-09-11T13:51:00Z

@robertKozik
Hello
I made a few changes.
And I noticed that if we set line height to the same as font size, then there will be problems on Android.
Therefore, I decided to add a condition specifically for safari, since there is a problem there.

But I also tested all devices without a specified line height
And everything is displayed fine.

What do you think about it ?

robertKozik · 2023-09-11T14:28:18Z

Could you please provide a description of how the issue appears on Android? This would be very helpful for me to understand the problem in detail.

ZhenjaHorbach · 2023-09-11T14:36:19Z

Could you please provide a description of how the issue appears on Android? This would be very helpful for me to understand the problem in detail.

Text shifts due to insufficient height if we use line-height equal to font-size(for Android).

ZhenjaHorbach · 2023-09-13T09:20:39Z

@robertKozik
I invite you to a code review ))

robertKozik · 2023-09-13T10:09:16Z

src/styles/styles.js

@@ -32,6 +33,8 @@ import Colors from './colors';
 // touchCallout is an iOS safari only property that controls the display of the callout information when you touch and hold a target
 const touchCalloutNone = Browser.isMobileSafari() ? {WebkitTouchCallout: 'none'} : {};

+const lineHeightBadge = getPlatform() === CONST.PLATFORM.WEB ? {lineHeight: variables.lineHeightXSmall} : {lineHeight: variables.lineHeightNormal};


Previously It was safari-specific (It causes issues on Android) as far as I remember. Why we are changing it to be web-only then? chrome has no problem with centering text 🤔

Yes
I originally made changes for safari

But then I re-watched the video in ticket
And I noticed that the tester had chrome
But chrome works fine for me though.

So I decided it would be better to set these styles for the entire web.

robertKozik · 2023-09-13T10:10:10Z

One question, as I want to be sure why it's web-only rather than safari-only 😉

robertKozik · 2023-09-13T10:50:19Z

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 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 reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

…-vertically

ZhenjaHorbach · 2023-09-14T22:21:10Z

@robertKozik
Can you please fill the gaps? )

Or if you also don't have the problem in chrome
I could remove the last changes
And leave the changes only for safari

robertKozik · 2023-09-15T09:37:07Z

Sorry for keeping you waiting - I think you won't have to change anything. I'll come back today and fill the rest of the checklist

robertKozik

Looks OK. Let's push this forward

thienlnam · 2023-09-18T06:48:56Z

src/styles/styles.js

@@ -31,6 +32,8 @@ import Colors from './colors';
 // touchCallout is an iOS safari only property that controls the display of the callout information when you touch and hold a target
 const touchCalloutNone = Browser.isMobileSafari() ? {WebkitTouchCallout: 'none'} : {};

+const lineHeightBadge = getPlatform() === CONST.PLATFORM.WEB ? {lineHeight: variables.lineHeightXSmall} : {lineHeight: variables.lineHeightNormal};


Can we add a comment here about why we are adding this line? Ideally we discourage platform specific code and so once this is fixed upstream we can ideally come back and remove these changes

@thienlnam, done .

As both @thienlnam and I agree that we should address the safari in specific (per accepted proposal) could you change this check to consist of Browser.isSafari ?

@robertKozik, done)

OSBotify · 2023-09-18T08:47:59Z

✋ 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 · 2023-09-18T10:38:42Z

🚀 Deployed to staging by https://github.com/thienlnam in version: 1.3.71-0 🚀

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

OSBotify · 2023-09-20T08:11:11Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.3.71-12 🚀

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

Fix styles for wallet money badge which is not center vertically

d9260f4

ZhenjaHorbach requested a review from a team as a code owner September 11, 2023 11:12

melvin-bot bot requested review from robertKozik and removed request for a team September 11, 2023 11:12

Update styles for safari

72ade3d

ZhenjaHorbach added 2 commits September 13, 2023 09:20

Refactor styles

7908688

Revert changes

d755595

robertKozik reviewed Sep 13, 2023

View reviewed changes

ZhenjaHorbach and others added 2 commits September 14, 2023 22:15

Merge branch 'main' into fix/money-text-in-wallet-badge-is-not-center…

28ace49

…-vertically

Fix conflicts

b662396

robertKozik approved these changes Sep 18, 2023

View reviewed changes

melvin-bot bot requested a review from thienlnam September 18, 2023 06:35

thienlnam requested changes Sep 18, 2023

View reviewed changes

ZhenjaHorbach added 3 commits September 18, 2023 09:05

Add comment

a524c89

Make changes only for Safari

5305a7b

Make changes only for Safari x2

8f6dd92

thienlnam approved these changes Sep 18, 2023

View reviewed changes

thienlnam merged commit 099fac6 into Expensify:main Sep 18, 2023
12 checks passed

OSBotify mentioned this pull request Sep 18, 2023

Deploy Checklist: New Expensify 2023-09-18 #27654

Closed

91 tasks

melvin-bot bot mentioned this pull request Sep 20, 2023

[HOLD for payment 2023-09-27] [$500] Money in wallet badge is not center vertically #26308

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix styles for wallet money badge which is not center vertically #27137

Fix styles for wallet money badge which is not center vertically #27137

ZhenjaHorbach commented Sep 11, 2023 •

edited

Loading

melvin-bot bot commented Sep 11, 2023

ZhenjaHorbach commented Sep 11, 2023 •

edited

Loading

robertKozik commented Sep 11, 2023

ZhenjaHorbach commented Sep 11, 2023 •

edited

Loading

ZhenjaHorbach commented Sep 13, 2023

robertKozik Sep 13, 2023

ZhenjaHorbach Sep 13, 2023

robertKozik commented Sep 13, 2023

robertKozik commented Sep 13, 2023 •

edited

Loading

ZhenjaHorbach commented Sep 14, 2023

robertKozik commented Sep 15, 2023

robertKozik left a comment

thienlnam Sep 18, 2023

ZhenjaHorbach Sep 18, 2023

robertKozik Sep 18, 2023

ZhenjaHorbach Sep 18, 2023

OSBotify commented Sep 18, 2023

OSBotify commented Sep 18, 2023

OSBotify commented Sep 20, 2023

Fix styles for wallet money badge which is not center vertically #27137

Fix styles for wallet money badge which is not center vertically #27137

Conversation

ZhenjaHorbach commented Sep 11, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 11, 2023

ZhenjaHorbach commented Sep 11, 2023 • edited Loading

robertKozik commented Sep 11, 2023

ZhenjaHorbach commented Sep 11, 2023 • edited Loading

ZhenjaHorbach commented Sep 13, 2023

robertKozik Sep 13, 2023

Choose a reason for hiding this comment

ZhenjaHorbach Sep 13, 2023

Choose a reason for hiding this comment

robertKozik commented Sep 13, 2023

robertKozik commented Sep 13, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

ZhenjaHorbach commented Sep 14, 2023

robertKozik commented Sep 15, 2023

robertKozik left a comment

Choose a reason for hiding this comment

thienlnam Sep 18, 2023

Choose a reason for hiding this comment

ZhenjaHorbach Sep 18, 2023

Choose a reason for hiding this comment

robertKozik Sep 18, 2023

Choose a reason for hiding this comment

ZhenjaHorbach Sep 18, 2023

Choose a reason for hiding this comment

OSBotify commented Sep 18, 2023

OSBotify commented Sep 18, 2023

OSBotify commented Sep 20, 2023

ZhenjaHorbach commented Sep 11, 2023 •

edited

Loading

ZhenjaHorbach commented Sep 11, 2023 •

edited

Loading

ZhenjaHorbach commented Sep 11, 2023 •

edited

Loading

robertKozik commented Sep 13, 2023 •

edited

Loading