[24321] Large amounts are no longer cut off on smaller widths. #26280

DanutGavrus · 2023-08-30T12:47:40Z

Details

Large amounts were cut off on small width devices. Reduced the fontSize depending on the device width.

Fixed Issues

$ #24321
PROPOSAL: #24321 (comment)

Tests

Same as QA Steps.

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps.

QA Steps

Choose the narrowest phone you have;
Click on + icon -> click on Split bill;
Enter a 10 digits amount(also counting those after .) such as "88888888.88";
Select at least 5 other participants -> click on Split;
Verify that the split bill preview does not have the amount cut off inside the chat which opens after clicking on "Split".

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

web2.mp4

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-08-30T12:47:44Z

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

src/components/ReportActionItem/MoneyRequestPreview.js

…n the local device.

src/components/ReportActionItem/MoneyRequestPreview.js

DanutGavrus · 2023-08-30T13:26:45Z

@eVoloshchak @Julesssss
As seen in the web video, I've tested with custom resolutions and everything looks good down to 320px. One can't manually resize browsers to be narrower than 500px, but the Desktop app on iOS may be narrowed more than 500px, and for some reason, in the interval: 350-360px, the 10 digit amounts get the last digit cropped:

Should I add more login only for the Desktop app and only for the 350-360px interval? The above screenshot is taken for the worst case at 350px width. My mobile phone, while testing on the Chrome app, prints a width of 350px and look good as in the attached PR Screenshot. Also, from the developer tools, using custom resolutions in the 350-360px interval looks good.

I would personally say to leave it as is as this is a very very edge case, happens only in the Desktop app and only in the 350-360px interval which is very low for the Desktop app. Would you agree?

EDIT: This would get fixed if we keep numberOfLines={1} prop on the Text.

Julesssss · 2023-08-30T13:28:33Z

Should I add more login only for the Desktop app and only for the 350-360px interval?

I think it's fine as is. Agree this is a mega edge case and anyway the user can tap on the preview if they really need to know the exact decimal amount 👍

src/styles/StyleUtils.js

Julesssss · 2023-08-31T08:13:37Z

Hi @eVoloshchak, I saw that you might not be working temporarily? If so could you confirm so I can reassign in the meantime?

eVoloshchak · 2023-08-31T21:18:36Z

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

Julesssss · 2023-09-04T13:12:00Z

We have a merge hold temporarily

DanutGavrus · 2023-09-04T14:41:01Z

Ok, no problem. I've updated my Screenshots/Videos with the latest version meanwhile.

Julesssss · 2023-09-05T08:50:53Z

Holding this until Monday

Julesssss · 2023-09-05T08:51:35Z

@DanutGavrus up to you whether you want to resolve conflicts now or on Monday.

DanutGavrus · 2023-09-05T14:43:40Z

@Julesssss Ok, no problem! I've fixed them now in order to have it smooth on Monday and I've also updated my function from StyleUtils to ts.

DanutGavrus · 2023-09-08T10:07:44Z

@Julesssss @pecanoro Fixed conflicts again.

OSBotify · 2023-09-11T01:49: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-09-11T03:48:12Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.67-0 🚀

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

OSBotify · 2023-09-11T23:43:55Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.67-3 🚀

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

OSBotify · 2023-09-12T00:18:37Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.68-0 🚀

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

OSBotify · 2023-09-13T08:45:04Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.68-17 🚀

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

fedirjh · 2023-11-20T14:40:57Z

src/components/ReportActionItem/MoneyRequestPreview.js

+                                        style={[
+                                            styles.moneyRequestPreviewAmount,
+                                            StyleUtils.getAmountFontSizeAndLineHeight(variables.fontSizeXLarge, variables.lineHeightXXLarge, isSmallScreenWidth, windowWidth),
+                                        ]}


This PR caused a regression in #30275. This dynamic style caused an inconsistency of the text style for amount with the money report preview in ReportPreview which has a fixed style for the amount.

DanutGavrus added 2 commits August 30, 2023 14:37

[24321] Large amounts are no longer cut off on smaller widths.

4a167a5

Small adjustments.

26768ae

DanutGavrus requested a review from a team as a code owner August 30, 2023 12:47

melvin-bot bot removed the request for review from a team August 30, 2023 12:47

melvin-bot bot requested a review from eVoloshchak August 30, 2023 12:47

DanutGavrus commented Aug 30, 2023

View reviewed changes

src/components/ReportActionItem/MoneyRequestPreview.js Outdated Show resolved Hide resolved

DanutGavrus added 2 commits August 30, 2023 15:57

Also reduced the lineHeight.

a985412

Restore settings gradle file changes which should have remaned only o…

f4f17b3

…n the local device.

DanutGavrus mentioned this pull request Aug 30, 2023

[HOLD for payment 2023-09-18] [$1000] mWeb - Split bill - 8 figure amounts cut off by avatar in split bill #24321

Closed

6 tasks

DanutGavrus added 2 commits August 30, 2023 16:04

Fix lint: useWindowDimensions is called conditionally.

11c73f0

Fixed spelling mistake.

f3b209d

Julesssss reviewed Aug 30, 2023

View reviewed changes

src/components/ReportActionItem/MoneyRequestPreview.js Outdated Show resolved Hide resolved

Julesssss assigned DanutGavrus Aug 30, 2023

DanutGavrus added 3 commits August 30, 2023 17:45

Moved method to StyleUtils for future use.

eba1a8c

Run prettier.

ff2551d

Make sure the amount can not overlap the avatar icons.

0a95938

DanutGavrus requested a review from Julesssss August 30, 2023 15:22

pecanoro requested changes Aug 30, 2023

View reviewed changes

src/styles/StyleUtils.js Outdated Show resolved Hide resolved

src/styles/StyleUtils.js Outdated Show resolved Hide resolved

DanutGavrus added 2 commits August 30, 2023 19:04

Replaced if conditions with a range switch.

a013406

Moved condition higer in order to make it more clear.

c87eb08

DanutGavrus requested a review from pecanoro August 30, 2023 16:11

Fix lint error.

c56712a

Julesssss reviewed Aug 30, 2023

View reviewed changes

src/styles/StyleUtils.js Outdated Show resolved Hide resolved

Merge branch 'main' into fix/24321-large-amounts-cut-off

67e8d2e

pecanoro previously approved these changes Aug 31, 2023

View reviewed changes

melvin-bot bot requested a review from Julesssss September 4, 2023 13:08

Julesssss previously approved these changes Sep 4, 2023

View reviewed changes

Julesssss changed the title ~~[24321] Large amounts are no longer cut off on smaller widths.~~ [HOLD] [24321] Large amounts are no longer cut off on smaller widths. Sep 4, 2023

Fixed merge conflicts.

0b0d30c

DanutGavrus dismissed Julesssss’s stale review via 0b0d30c September 5, 2023 14:34

updated to ts

fe584b8

Julesssss previously approved these changes Sep 5, 2023

View reviewed changes

pecanoro previously approved these changes Sep 7, 2023

View reviewed changes

Fixed conflicts.

bc0527f

DanutGavrus dismissed stale reviews from pecanoro and Julesssss via bc0527f September 8, 2023 10:07

Julesssss approved these changes Sep 11, 2023

View reviewed changes

Julesssss changed the title ~~[HOLD] [24321] Large amounts are no longer cut off on smaller widths.~~ [24321] Large amounts are no longer cut off on smaller widths. Sep 11, 2023

Julesssss merged commit a4225a7 into Expensify:main Sep 11, 2023
15 checks passed

OSBotify mentioned this pull request Sep 11, 2023

Deploy Checklist: New Expensify 2023-09-11 #27120

Closed

31 tasks

OSBotify mentioned this pull request Sep 12, 2023

Deploy Checklist: New Expensify 2023-09-12 #27210

Closed

youssef-lr mentioned this pull request Oct 28, 2023

[HOLD for payment 2023-11-22] [$500] Inconsistency in the request money preview text size #30275

Closed

6 tasks

fedirjh reviewed Nov 20, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[24321] Large amounts are no longer cut off on smaller widths. #26280

[24321] Large amounts are no longer cut off on smaller widths. #26280

DanutGavrus commented Aug 30, 2023 •

edited

Loading

melvin-bot bot commented Aug 30, 2023

DanutGavrus commented Aug 30, 2023 •

edited

Loading

Julesssss commented Aug 30, 2023

Julesssss commented Aug 31, 2023

eVoloshchak commented Aug 31, 2023 •

edited

Loading

Julesssss commented Sep 4, 2023

DanutGavrus commented Sep 4, 2023 •

edited

Loading

Julesssss commented Sep 5, 2023

Julesssss commented Sep 5, 2023

DanutGavrus commented Sep 5, 2023

DanutGavrus commented Sep 8, 2023

OSBotify commented Sep 11, 2023

OSBotify commented Sep 11, 2023

OSBotify commented Sep 11, 2023

OSBotify commented Sep 12, 2023

OSBotify commented Sep 13, 2023

fedirjh Nov 20, 2023

[24321] Large amounts are no longer cut off on smaller widths. #26280

[24321] Large amounts are no longer cut off on smaller widths. #26280

Conversation

DanutGavrus commented Aug 30, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 30, 2023

DanutGavrus commented Aug 30, 2023 • edited Loading

Julesssss commented Aug 30, 2023

Julesssss commented Aug 31, 2023

eVoloshchak commented Aug 31, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

Julesssss commented Sep 4, 2023

DanutGavrus commented Sep 4, 2023 • edited Loading

Julesssss commented Sep 5, 2023

Julesssss commented Sep 5, 2023

DanutGavrus commented Sep 5, 2023

DanutGavrus commented Sep 8, 2023

OSBotify commented Sep 11, 2023

OSBotify commented Sep 11, 2023

OSBotify commented Sep 11, 2023

OSBotify commented Sep 12, 2023

OSBotify commented Sep 13, 2023

fedirjh Nov 20, 2023

Choose a reason for hiding this comment

DanutGavrus commented Aug 30, 2023 •

edited

Loading

DanutGavrus commented Aug 30, 2023 •

edited

Loading

eVoloshchak commented Aug 31, 2023 •

edited

Loading

DanutGavrus commented Sep 4, 2023 •

edited

Loading