Fix inconsistency font size of amount text between report preview and split bill #30960

dukenv0307 · 2023-11-07T08:04:09Z

Details

Fix inconsistency font size of amount text between report preview and split bill

Fixed Issues

$ #30275
PROPOSAL: #30275 (comment)

Tests

Create a split bill
Go to the group report and notice the amount text of the split bill preview
Create a request money
Notice the amount text of report preview
Verify that if the width of the device is more than 410px or the amount text is short, the font size of amount text is the same between report preview and split bill

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Create a split bill
Go to the group report and notice the amount text of the split bill preview
Create a request money
Notice the amount text of report preview
Verify that if the width of the device is more than 410px or the amount text is short, the font size of amount text is the same between report preview and split bill

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2023-11-07.at.20.32.34.mov

Android: mWeb Chrome

Screen.Recording.2023-11-07.at.20.27.57.mov

iOS: Native

Screen.Recording.2023-11-07.at.14.47.03.mov

iOS: mWeb Safari

Screen.Recording.2023-11-07.at.20.24.11.mov

MacOS: Chrome / Safari

Screen.Recording.2023-11-07.at.20.22.39.mov

MacOS: Desktop

Screen.Recording.2023-11-07.at.20.35.03.mov

… split bill

melvin-bot · 2023-11-07T08:04:27Z

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

fedirjh · 2023-11-07T13:17:07Z

cc @dukenv0307 Please fix the screenshots.

fedirjh · 2023-11-07T13:17:13Z

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

dukenv0307 · 2023-11-07T13:37:45Z

@fedirjh I updated.

fedirjh · 2023-11-07T16:02:32Z

src/components/ReportActionItem/MoneyRequestPreview.js

+                                                    variables.fontSizeXLarge,
+                                                    variables.lineHeightXXLarge,


variables is already imported inside StyleUtils.ts. Let's remove these parameters and use the imported ones inside the file.

fedirjh · 2023-11-07T16:34:33Z

src/styles/StyleUtils.ts

-        const widthDifference = variables.mobileResponsiveWidthBreakpoint - windowWidth;
+    const numberOfAvatar = numberOfParticipant < 4 ? numberOfParticipant : 4;
+    if (isSmallScreenWidth && windowWidth <= 410) {
+        const widthDifferent = 410 - windowWidth;
        switch (true) {


Can we add a comment here explaining how the calculation is done ?

fedirjh · 2023-11-07T16:38:40Z

src/styles/StyleUtils.ts

-        const widthDifference = variables.mobileResponsiveWidthBreakpoint - windowWidth;
+    const numberOfAvatar = numberOfParticipant < 4 ? numberOfParticipant : 4;
+    if (isSmallScreenWidth && windowWidth <= 410) {
+        const widthDifferent = 410 - windowWidth;


Suggested change

const widthDifferent = 410 - windowWidth;

const widthDifference = 410 - windowWidth;

dukenv0307 · 2023-11-08T08:28:46Z

@fedirjh I updated.

fedirjh

@dukenv0307 The font-size calculation is not working as expected. When comparing two split previews with different amounts, the current result shows that both are responsive in the same way. The expected result for the small amount is to display the text with the static font size.

CleanShot.2023-11-08.at.14.06.32.mp4

fedirjh · 2023-11-08T13:14:04Z

src/styles/StyleUtils.ts

+            case widthDifference > 60:
+                if (18 - numberOfAvatar * 2 < displayAmountLength) {
+                    toSubtract = numberOfAvatar * 2;
+                }
+                break;
+            case widthDifference > 50:
+                if (18 - numberOfAvatar * 2 < displayAmountLength) {
+                    toSubtract = (numberOfAvatar - 1) * 2 + 1;
+                }
+                break;
+            case widthDifference > 40:
+                if (20 - numberOfAvatar * 2 < displayAmountLength) {
+                    toSubtract = (numberOfAvatar - 1) * 2;
+                }
+                break;
+            case widthDifference > 30:
+                if (20 - numberOfAvatar * 2 < displayAmountLength) {
+                    toSubtract = (numberOfAvatar - 1) * 2 - 1;
+                }
                break;
-            case widthDifference > 350:
-                toSubtract = 4;
+            case widthDifference > 20:
+                if (20 - numberOfAvatar * 2 < displayAmountLength) {
+                    toSubtract = (numberOfAvatar - 2) * 2;
+                }


Let's add a comment explaining the calculation logic.

dukenv0307 · 2023-11-08T14:46:12Z

@fedirjh I just updated.

fedirjh

Looks good and tests well.

OSBotify · 2023-11-13T16:05:15Z

✋ 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-11-14T22:10:27Z

🚀 Deployed to staging by https://github.com/nkuoch in version: 1.3.99-0 🚀

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

OSBotify · 2023-11-15T20:53:43Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.99-0 🚀

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

OSBotify · 2023-11-15T21:09:09Z

🚀 Deployed to staging by https://github.com/nkuoch in version: 1.4.0-0 🚀

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

fix inconsistency font size of amount text between report preview and…

aa629d5

… split bill

dukenv0307 marked this pull request as ready for review November 7, 2023 08:04

dukenv0307 requested a review from a team as a code owner November 7, 2023 08:04

melvin-bot bot requested review from fedirjh and removed request for a team November 7, 2023 08:04

fedirjh reviewed Nov 7, 2023

View reviewed changes

dukenv0307 added 4 commits November 8, 2023 15:08

Merge branch 'main' into fix/30275

2e27297

clean function

c536053

Merge branch 'main' into fix/30275

339a733

merge main

c5a61a3

dukenv0307 added 2 commits November 8, 2023 16:02

fix test

d8b0301

fix lint

2c5de70

fedirjh reviewed Nov 8, 2023

View reviewed changes

caculate base on amount text length

521492e

fedirjh approved these changes Nov 9, 2023

View reviewed changes

melvin-bot bot requested a review from nkuoch November 9, 2023 14:14

nkuoch approved these changes Nov 13, 2023

View reviewed changes

nkuoch merged commit 0d04831 into Expensify:main Nov 13, 2023
14 checks passed

OSBotify mentioned this pull request Nov 14, 2023

Deploy Checklist: New Expensify 2023-11-14 #31324

Closed

OSBotify mentioned this pull request Nov 15, 2023

Deploy Checklist: New Expensify 2023-11-15 #31404

Closed

37 tasks

melvin-bot bot mentioned this pull request Nov 15, 2023

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

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix inconsistency font size of amount text between report preview and split bill #30960

Fix inconsistency font size of amount text between report preview and split bill #30960

dukenv0307 commented Nov 7, 2023 •

edited

Loading

melvin-bot bot commented Nov 7, 2023

fedirjh commented Nov 7, 2023

fedirjh commented Nov 7, 2023 •

edited

Loading

dukenv0307 commented Nov 7, 2023 •

edited

Loading

fedirjh Nov 7, 2023

fedirjh Nov 7, 2023

fedirjh Nov 7, 2023

dukenv0307 commented Nov 8, 2023

fedirjh left a comment

fedirjh Nov 8, 2023

dukenv0307 commented Nov 8, 2023

fedirjh left a comment •

edited

Loading

OSBotify commented Nov 13, 2023

OSBotify commented Nov 14, 2023

OSBotify commented Nov 15, 2023

OSBotify commented Nov 15, 2023

	const widthDifferent = 410 - windowWidth;
	const widthDifference = 410 - windowWidth;

Fix inconsistency font size of amount text between report preview and split bill #30960

Fix inconsistency font size of amount text between report preview and split bill #30960

Conversation

dukenv0307 commented Nov 7, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 7, 2023

fedirjh commented Nov 7, 2023

fedirjh commented Nov 7, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

dukenv0307 commented Nov 7, 2023 • edited Loading

fedirjh Nov 7, 2023

Choose a reason for hiding this comment

fedirjh Nov 7, 2023

Choose a reason for hiding this comment

fedirjh Nov 7, 2023

Choose a reason for hiding this comment

dukenv0307 commented Nov 8, 2023

fedirjh left a comment

Choose a reason for hiding this comment

fedirjh Nov 8, 2023

Choose a reason for hiding this comment

dukenv0307 commented Nov 8, 2023

fedirjh left a comment • edited Loading

Choose a reason for hiding this comment

OSBotify commented Nov 13, 2023

OSBotify commented Nov 14, 2023

OSBotify commented Nov 15, 2023

OSBotify commented Nov 15, 2023

dukenv0307 commented Nov 7, 2023 •

edited

Loading

fedirjh commented Nov 7, 2023 •

edited

Loading

dukenv0307 commented Nov 7, 2023 •

edited

Loading

fedirjh left a comment •

edited

Loading