Emoji overlaps the word above #54207

dominictb · 2024-12-16T16:04:06Z

Explanation of Change

Fixed Issues

$ #53451
PROPOSAL: #53451 (comment)

Tests

Open the Expensify app.
Open any chat.
Compose a message with several lines and place an emoji in the last line.
Send the message.
Verify that the message is correctly displayed and that the emoji is not mixed with another line´s words.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open the Expensify app.
Open any chat.
Compose a message with several lines and place an emoji in the last line.
Send the message.
Verify that the message is correctly displayed and that the emoji is not mixed with another line´s words.

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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.ts 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 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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 added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-12-16T16:58:50Z

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

shawnborton · 2024-12-16T19:59:29Z

src/styles/index.ts

@@ -1748,7 +1748,7 @@ const styles = (theme: ThemeColors) =>

        emojisWithTextFontSizeAligned: {
            fontSize: variables.fontSizeEmojisWithinText,
-            marginVertical: -7,
+            marginBottom: -7,


Can you show a before/after of this change in terms of how it affects a non-Android platform? Just want to make sure we're still getting expected behavior.

dominictb · 2024-12-17T09:25:16Z

iOS:

Before

After

Android:

Before

After

It looks good on Android native, but on iOS it's quite further from emoji to the top than bottom (for some cases)

dominictb · 2024-12-17T10:19:00Z

This issue is pointed out somewhere, for example here and here.

So we have to use margin to align the emoji.

If we use marginVertical: -7 the emoji can be too close to top (like what we mentioned in the OP).

I also tried to use marginVertical: -4 (or bigger value): The emoji is not in center

So we can use marginBottom: -7 only.

dominictb · 2024-12-17T10:23:45Z

We can do the trade off here, it should be fine to be not center for some weird icons instead of overlapping the text

dominictb · 2024-12-17T10:59:51Z

@shawnborton @getusha @VickyStash Please tell me what you think. Thanks

VickyStash · 2024-12-17T11:59:11Z

I see the difference in the space between the name and the message, if the message starts with emoji.

Before:

After

VickyStash · 2024-12-17T12:00:32Z

@dominictb have you considered making your updates only for android?

shawnborton · 2024-12-17T14:14:18Z

Okay, I think the solution is not viable then. We want this to behave basically exactly like it currently does on the non-Android platforms.

dominictb · 2024-12-18T05:01:59Z

@VickyStash

I see our target in the PR is to enlarge the emoji (17), but still keep the size of text is 15, so the line height can be too big

but If we use marginVertical: -7, 2 emojis can be overlapped because their size are big while the distance between them is too small.

dominictb · 2024-12-18T06:37:17Z

@VickyStash @shawnborton @getusha I updated the PR to fix this issue on Android and iOS

Summary: remove marginVertical: -7

For iOS use lineHeight: 24 to fix the overlap issue:

Result:

VickyStash · 2024-12-18T07:29:46Z

For iOS use lineHeight: 24 to fix the overlap issue

One of the requirement from @shawnborton during PR implementation was not to change lineHeight (the first PR, which was reverted, had it). But let's wait for his thoughts.

shawnborton · 2024-12-18T13:42:50Z

We definitely do not want to change the line height of normal blocks of paragraph text.

dominictb · 2024-12-18T16:06:32Z

have you considered making your updates only for android?

Alright, I think the scope of this issue is to fix the issue on Android so I'll handle the fix for Android only. What do you think @VickyStash @getusha?

dominictb · 2024-12-21T08:05:54Z

@getusha @shawnborton Can you please take a look? We just need to test the issue on Android only. I keep other platform behavior as before.

have you considered making your updates only for android?

Before:

After:

shawnborton · 2024-12-24T15:40:12Z

I think that looks pretty good to me. Curious what others think too.

dannymcclain · 2024-12-29T16:36:20Z

Seems pretty good to me?

shawnborton · 2025-01-03T08:52:23Z

What's the latest on this one? Are we good to get this merged soon? Thanks!

dubielzyk-expensify · 2025-01-06T05:07:54Z

Yeah I think this looks good to me too

getusha · 2025-01-06T20:12:39Z

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 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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.ts 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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

dominictb · 2025-02-03T15:33:07Z

Seems like the unit test is not fixed

pecanoro · 2025-02-03T18:08:23Z

@getusha, Can you take a look at the recent changes? 🙏

pecanoro · 2025-02-04T19:21:40Z

@getusha Friendly bump!

dominictb · 2025-02-05T15:52:42Z

The list issue is fixed after merging main

pecanoro · 2025-02-06T19:14:08Z

@getusha Friendly bump!

getusha · 2025-02-09T09:49:19Z

The changes are the same as the moment of this comment: #54207 (comment)
Testing anyway if anything changed.

getusha · 2025-02-09T09:56:19Z

Ok, i think it looks better now. what do you think @pecanoro?

dubielzyk-expensify · 2025-02-10T05:34:16Z

cc @shawnborton

pecanoro · 2025-02-11T04:32:46Z

@shawnborton Can you check #54207 (comment)?

shawnborton · 2025-02-11T13:21:11Z

Oh I could have sworn I left a comment on this. I see the comment above, but can we see it side-by-side with web? I feel like the screenshot above feels slightly squished.

dannymcclain · 2025-02-11T14:25:30Z

I feel like the screenshot above feels slightly squished.

+1

dominictb · 2025-02-11T15:41:29Z

@shawnborton I think it's the current behavior on iOS, and based on this comment, we just need to fix on Android. For iOS issue we should handle separately since it has the different root cause. cc @getusha

shawnborton · 2025-02-11T15:44:22Z

Hmm I am a bit lost I suppose. But sure, if we think we want to handle that separately, we can.

@pecanoro I'm starting to think that we might want to ask one of our expert agencies to tackle all of these emoji issues holistically. I feel like we keep doing these patches that just lead to more regressions, it might be nice to tackle this all together once and for all.

We can still get this PR over the finish line, but I think we're just going to keep running into these little issues.

pecanoro · 2025-02-11T16:39:13Z

@shawnborton Sounds good

@getusha @dominictb Let's update the screenshots in all platforms for the current behaviour to make sure we didn't cause any further issues and once we are sure it's fine, let's merge the PR.

dominictb · 2025-02-12T02:41:21Z

@pecanoro Sure, will update soon

dominictb · 2025-02-12T06:50:50Z

Updated all screenshots

pecanoro · 2025-02-12T15:25:56Z

@getusha All yours now, can we have a final round of testing?

getusha · 2025-02-14T11:36:20Z

Having trouble building for android, my connection isn't working properly today (too slow) 😢

pecanoro · 2025-02-14T14:54:57Z

@getusha Did you test the rest of the platforms and update the screenshots?

getusha · 2025-02-14T16:56:42Z

Updated screenshots in other platforms
#54207 (comment)

OSBotify · 2025-02-14T20:15:40Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-02-17T09:23:31Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 9.0.99-0 🚀

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

github-actions · 2025-02-18T06:15:34Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.99-2 🚀

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

emoji overlaps the word above

1ebc928

dominictb marked this pull request as ready for review December 16, 2024 16:58

dominictb requested review from a team as code owners December 16, 2024 16:58

melvin-bot bot requested a review from getusha December 16, 2024 16:58

melvin-bot bot removed the request for review from a team December 16, 2024 16:58

shawnborton reviewed Dec 16, 2024

View reviewed changes

update emoji style

cd03f1d

dominictb added 2 commits December 21, 2024 14:43

merge main

bce60a4

change native file to ios only

a92fbf2

pecanoro self-requested a review January 9, 2025 12:57

Merge branch 'main' into fix/53451

75bb9ab

Merge branch 'main' into fix/53451

637c55a

rohit9625 mentioned this pull request Feb 13, 2025

Android - Chat - Text and emojis are overlapped. #56741

Closed

8 tasks

pecanoro approved these changes Feb 14, 2025

View reviewed changes

pecanoro merged commit 69daa70 into Expensify:main Feb 14, 2025
18 checks passed

github-actions bot mentioned this pull request Feb 17, 2025

Deploy Checklist: New Expensify 2025-02-17 #56922

Closed

46 tasks

melvin-bot bot mentioned this pull request Feb 18, 2025

[Due for payment 2025-02-25] [$250] Android - Chat - Emoji sent at the bottom of multiline message, overlaps the word above #53451

Closed

8 tasks

Emoji overlaps the word above #54207

Emoji overlaps the word above #54207

Conversation

dominictb commented Dec 16, 2024 • edited by pecanoro Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 16, 2024

shawnborton Dec 16, 2024

Choose a reason for hiding this comment

dominictb commented Dec 17, 2024 • edited Loading

dominictb commented Dec 17, 2024 • edited Loading

dominictb commented Dec 17, 2024

dominictb commented Dec 17, 2024

VickyStash commented Dec 17, 2024

VickyStash commented Dec 17, 2024

shawnborton commented Dec 17, 2024

dominictb commented Dec 18, 2024

dominictb commented Dec 18, 2024 • edited Loading

VickyStash commented Dec 18, 2024

shawnborton commented Dec 18, 2024

dominictb commented Dec 18, 2024

dominictb commented Dec 21, 2024

shawnborton commented Dec 24, 2024

dannymcclain commented Dec 29, 2024

shawnborton commented Jan 3, 2025

dubielzyk-expensify commented Jan 6, 2025

getusha commented Jan 6, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

dominictb commented Feb 3, 2025

pecanoro commented Feb 3, 2025

pecanoro commented Feb 4, 2025

dominictb commented Feb 5, 2025

pecanoro commented Feb 6, 2025

getusha commented Feb 9, 2025

getusha commented Feb 9, 2025

dubielzyk-expensify commented Feb 10, 2025

pecanoro commented Feb 11, 2025

shawnborton commented Feb 11, 2025

dannymcclain commented Feb 11, 2025

dominictb commented Feb 11, 2025 • edited Loading

shawnborton commented Feb 11, 2025

pecanoro commented Feb 11, 2025

dominictb commented Feb 12, 2025

dominictb commented Feb 12, 2025

pecanoro commented Feb 12, 2025

getusha commented Feb 14, 2025 • edited Loading

pecanoro commented Feb 14, 2025

getusha commented Feb 14, 2025

OSBotify commented Feb 14, 2025

github-actions bot commented Feb 17, 2025

github-actions bot commented Feb 18, 2025

dominictb commented Dec 16, 2024 •

edited by pecanoro

Loading

dominictb commented Dec 17, 2024 •

edited

Loading

dominictb commented Dec 17, 2024 •

edited

Loading

dominictb commented Dec 18, 2024 •

edited

Loading

getusha commented Jan 6, 2025 •

edited

Loading

dominictb commented Feb 11, 2025 •

edited

Loading

getusha commented Feb 14, 2025 •

edited

Loading