[Fix 20678] Values cropped on terms and fees page. #21015

DanutGavrus · 2023-06-19T08:17:08Z

Details

Some values were cropped in On Terms and Fees page. Created a new style to be used here.

Fixed Issues

$ #20678
PROPOSAL: #20678 (comment)

Tests

Make these change locally:
Send this message in any chat: "new.expensify.com/enable-payments";
From each platform you test, open that chat, and click on that link in order to see the page from this issue;
Check the value fields mentioned.

Verify that no errors appear in the JS console

Offline tests

Same as Tests Steps.

QA Steps

You need to test from an account which has wallet enbled;
Send this message in any chat: "new.expensify.com/enable-payments";
From each platform you test, open that chat, and click on that link;
Complete the step until you reach the Terms and Fees Page;
Check the value fields mentioned.

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

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-06-19T08:35:51Z

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

DanutGavrus · 2023-06-19T08:46:08Z

NOTE: (Future concern)

The style textXXXLarge is currently used in the 5 places which were fixed by this PR and in CurrentWalletBalance where lineHeight is set by another style.
I think if someone will use the style textXXXLarge without setting any lineHeight, the default one is not sufficient enough, and the text will be cropped.(Hopefully they'll see this before pushing the changes, and update the lineHeight accordingly.)
My suggestion for the future would be to add the lineHeightXXXLarge inside textXXXLarge style as I think it depends on this.

As of now, this PR fixes only our issue, but I thought it's worth pointing this out.

DanutGavrus · 2023-06-19T12:52:56Z

@allroundexperts
Done adding Screenshots for all platforms. These are done with lineHeightXXXLarge: getValueUsingPixelRatio(32, 37) and seem to look good. Let me know if you think we should increase the lineHeight even more.

allroundexperts · 2023-06-19T20:15:14Z

src/pages/EnablePayments/TermsPage/ShortTermsForm.js

@@ -18,7 +20,9 @@ function ShortTermsForm() {
                            <Text style={styles.textLarge}>{Localize.translateLocal('termsStep.monthlyFee')}</Text>
                        </View>
                        <View style={styles.flexRow}>
-                            <Text style={[styles.textHeadline, styles.textXXXLarge]}>{Localize.translateLocal('termsStep.feeAmountZero')}</Text>
+                            <Text style={[styles.textHeadline, styles.textXXXLarge, StyleUtils.getLineHeightStyle(variables.lineHeightXXXLarge)]}>


Can we create a new style that can be used throughout this component? This is to make sure that we're not repeating ourselves.

I did that initially, you may check it here, but I changed it after I read these checkboxes:

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

Should I go back to using that new style?(if yes, was the naming ok?)

I think this means that you shouldn't create a new style if:

Similar style exists (which is not the case here clearly)

The can't be created with an existing StyleUtils function (I don't think you can create this particular combination using StyleUtils)

The commit that you shared above is not exactly what I meant. Instead of over-riding the font size of textHeadline style, can we create a new style that:

Has the correct font size in it.

Has correct line height.

Has correct font family, colour etc.

Is named in such a way that its easy to understand and re-use.

Could you please check again? The commit does not override the font size of textHeadline, or anything else.

textXXXLargeWLineHeight is actually a new style which has the correct fontSize & lineHeight in it.

textXXXLargeWLineHeight is over-riding the line height defined inside textHeadline. This is what I meant.

textXXXLarge was already over-riding the line height, so I was thinking you were referring directly to my changes, sorry, my bad. Did another commit & also merged main with this occasion. Are current changes the desired ones?

Yes. Looks good now!

allroundexperts · 2023-06-19T20:17:14Z

cc @shawnborton Can you please confirm if the line height is correct in the attached screenshots?

allroundexperts · 2023-06-19T20:17:45Z

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

allroundexperts · 2023-06-19T21:48:25Z

@DanutGavrus How are you viewing the enablePayments page? The link leads me to Additional Details step which throws an error when I try to proceed.

DanutGavrus · 2023-06-19T21:56:05Z

@allroundexperts I tested it with these changes locally:

Then, open any chat, send this message: "new.expensify.com/enable-payments", and click on if from any platform in order to open that page.

allroundexperts · 2023-06-19T21:59:26Z

@allroundexperts I tested it with these changes locally: Then, open any chat, send this message: "new.expensify.com/enable-payments", and click on if from any platform in order to open that page.

Can you update the test steps and mention that we need an account with wallet enabled in order to test this?

DanutGavrus · 2023-06-19T22:08:56Z

@allroundexperts

Can you update the test steps and mention that we need an account with wallet enabled in order to test this?

Both Tests & QA Steps updated accordingly.

allroundexperts

Looks good to me!

Waiting on @shawnborton to verify if line height is correct in the screenshots.

shawnborton · 2023-06-20T13:15:31Z

This generally looks good, but for this:

Can we add some margin in between the in-network and out-of-network? Maybe just add like 12-16px so there is a bit of a gap.

DanutGavrus · 2023-06-20T13:29:27Z

A - 8px

B - 12px

C - 16px

D - 32px

@shawnborton A, B, C, D, or other?

shawnborton · 2023-06-20T13:39:44Z

C - 16px looks good to me!

DanutGavrus · 2023-06-20T13:46:37Z

@shawnborton Done
@allroundexperts I think we are good to go now, I've also merged main again

allroundexperts · 2023-06-20T13:49:09Z

All yours @deetergp!

DanutGavrus · 2023-06-20T20:31:57Z

@deetergp bump for final review 👀

deetergp

Looks good, thanks for the PR!

OSBotify · 2023-06-21T16:15:46Z

✋ 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-06-22T17:21:41Z

🚀 Deployed to staging by https://github.com/deetergp in version: 1.3.31-0 🚀

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

OSBotify · 2023-06-23T21:06:37Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.31-3 🚀

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

OSBotify · 2023-06-23T21:26:22Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.31-3 🚀

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

DanutGavrus added 4 commits June 16, 2023 16:02

[FIX 20678] Some values were cropped in On Terms and Fees page.

f76ae1e

Removed custom style and used StyleUtils.

873ee78

Merge branch 'main' into fix/20678-values-cropped-on-terms-and-fees-page

70a3c11

Run prettier.

7e53f66

DanutGavrus marked this pull request as ready for review June 19, 2023 08:35

DanutGavrus requested a review from a team as a code owner June 19, 2023 08:35

melvin-bot bot requested review from allroundexperts and removed request for a team June 19, 2023 08:35

DanutGavrus mentioned this pull request Jun 19, 2023

[HOLD for payment 2023-06-30] [$1000] On Terms and Fees Page Monthly Fee, Purchase Fee, ATM Withdrawal fee values are cropped. #20678

Closed

6 tasks

allroundexperts reviewed Jun 19, 2023

View reviewed changes

DanutGavrus added 2 commits June 20, 2023 00:14

Replaced with custom style.

be08629

Merge branch 'main' into fix/20678-values-cropped-on-terms-and-fees-page

30b3da2

allroundexperts approved these changes Jun 19, 2023

View reviewed changes

melvin-bot bot requested a review from deetergp June 19, 2023 23:01

DanutGavrus added 2 commits June 20, 2023 16:43

Merge branch 'main' into fix/20678-values-cropped-on-terms-and-fees-page

d3a63de

Increased margin top to 16px for outOfNetwork.

5273039

allroundexperts approved these changes Jun 20, 2023

View reviewed changes

deetergp approved these changes Jun 21, 2023

View reviewed changes

deetergp merged commit 8a6fc7a into Expensify:main Jun 21, 2023

OSBotify mentioned this pull request Jun 22, 2023

Deploy Checklist: New Expensify 2023-06-22 #21330

Closed

39 tasks

DanutGavrus deleted the fix/20678-values-cropped-on-terms-and-fees-page branch July 3, 2023 10:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Fix 20678] Values cropped on terms and fees page. #21015

[Fix 20678] Values cropped on terms and fees page. #21015

DanutGavrus commented Jun 19, 2023 •

edited

Loading

melvin-bot bot commented Jun 19, 2023

DanutGavrus commented Jun 19, 2023

DanutGavrus commented Jun 19, 2023 •

edited

Loading

allroundexperts Jun 19, 2023

DanutGavrus Jun 19, 2023

allroundexperts Jun 19, 2023

DanutGavrus Jun 19, 2023

allroundexperts Jun 19, 2023

DanutGavrus Jun 19, 2023 •

edited

Loading

allroundexperts Jun 19, 2023

allroundexperts commented Jun 19, 2023

allroundexperts commented Jun 19, 2023 •

edited

Loading

allroundexperts commented Jun 19, 2023

DanutGavrus commented Jun 19, 2023

allroundexperts commented Jun 19, 2023

DanutGavrus commented Jun 19, 2023 •

edited

Loading

allroundexperts left a comment

shawnborton commented Jun 20, 2023

DanutGavrus commented Jun 20, 2023

shawnborton commented Jun 20, 2023

DanutGavrus commented Jun 20, 2023

allroundexperts commented Jun 20, 2023

DanutGavrus commented Jun 20, 2023

deetergp left a comment

OSBotify commented Jun 21, 2023

OSBotify commented Jun 22, 2023

OSBotify commented Jun 23, 2023

OSBotify commented Jun 23, 2023

[Fix 20678] Values cropped on terms and fees page. #21015

[Fix 20678] Values cropped on terms and fees page. #21015

Conversation

DanutGavrus commented Jun 19, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 19, 2023

DanutGavrus commented Jun 19, 2023

DanutGavrus commented Jun 19, 2023 • edited Loading

allroundexperts Jun 19, 2023

Choose a reason for hiding this comment

DanutGavrus Jun 19, 2023

Choose a reason for hiding this comment

allroundexperts Jun 19, 2023

Choose a reason for hiding this comment

DanutGavrus Jun 19, 2023

Choose a reason for hiding this comment

allroundexperts Jun 19, 2023

Choose a reason for hiding this comment

DanutGavrus Jun 19, 2023 • edited Loading

Choose a reason for hiding this comment

allroundexperts Jun 19, 2023

Choose a reason for hiding this comment

allroundexperts commented Jun 19, 2023

allroundexperts commented Jun 19, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

allroundexperts commented Jun 19, 2023

DanutGavrus commented Jun 19, 2023

allroundexperts commented Jun 19, 2023

DanutGavrus commented Jun 19, 2023 • edited Loading

allroundexperts left a comment

Choose a reason for hiding this comment

shawnborton commented Jun 20, 2023

DanutGavrus commented Jun 20, 2023

shawnborton commented Jun 20, 2023

DanutGavrus commented Jun 20, 2023

allroundexperts commented Jun 20, 2023

DanutGavrus commented Jun 20, 2023

deetergp left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 21, 2023

OSBotify commented Jun 22, 2023

OSBotify commented Jun 23, 2023

OSBotify commented Jun 23, 2023

DanutGavrus commented Jun 19, 2023 •

edited

Loading

DanutGavrus commented Jun 19, 2023 •

edited

Loading

DanutGavrus Jun 19, 2023 •

edited

Loading

allroundexperts commented Jun 19, 2023 •

edited

Loading

DanutGavrus commented Jun 19, 2023 •

edited

Loading