Fix broken emoji (Safari, Firefox) #9551

thesahindia · 2022-06-23T19:07:49Z

Details

This PR fixes two issues -

Broken emoji ui at default skin tone selector (safari)

Black outlined emoji in Firefox (ubuntu/windows)

Fixed Issues

$ #9123

Tests

Open Expensify at Safari
Open emoji picker menu
Select a skin tone (other than default yellow)
Verify the hand emoji isn't broken

Open Expensify at FireFox (windows/Ubuntu)
Open emoji picker menu
Verify the hand emoji is colored (not black and white)

Open Expensify at FireFox (windows/Ubuntu)
Add hand emoji (🖐) to the message composer
Add hand emoji to the edit comment composer
Verify the hand emoji is colored (not black and white)

Open Expensify at FireFox (windows/Ubuntu)
Send hand emoji (🖐)
Send hand emoji with some text
Send hand emoji with some link
Verify the hand emoji is colored (not black and white) in all the messages

Verify that no errors appear in the JS console

PR Review Checklist

Contributor (PR Author) Checklist

PR Reviewer Checklist

QA Steps

Open Expensify at Safari
Open emoji picker menu
Select a skin tone (other than default yellow)
Verify the hand emoji isn't broken

Open Expensify at FireFox (windows/Ubuntu)
Open emoji picker menu
Verify the hand emoji is colored (not black and white)

Open Expensify at FireFox (windows/Ubuntu)
Add hand emoji (🖐) to the message composer
Add hand emoji to the edit comment composer
Verify the hand emoji is colored (not black and white)

Open Expensify at FireFox (windows/Ubuntu)
Send hand emoji (🖐)
Send hand emoji with some text
Send hand emoji with some link
Verify the hand emoji is colored (not black and white) in all the messages

Verify that no errors appear in the JS console

Screenshots

Web

Mobile Web

Desktop

iOS

Android

…x-broken-emoji merge main

src/styles/emojiFont/index.js

src/styles/emojiFont/index.ios.js

src/styles/emojiFont/index.js

thesahindia · 2022-07-01T18:01:44Z

Made the requested changes.
cc: @parasharrajat

parasharrajat

The big issue: Emojis are different on messages than the picker.

try these emojies.

Picker

thesahindia · 2022-07-01T18:36:39Z

Will look into it.

thesahindia · 2022-07-07T08:23:14Z

We can see this issue on composer too and to fix that we will have to use the fallback fonts.
For the messages we can add the font here -

App/src/pages/home/report/ReportActionItemFragment.js

Line 109 in eb54f23

    
           style={EmojiUtils.containsOnlyEmojis(props.fragment.text) ? styles.onlyEmojisText : undefined}

And for composer here -

App/src/styles/styles.js

Line 1379 in eb54f23

fontFamily: fontFamily.GTA,

But we have one case where it doesn't work.
We use RenderHTML for messages that contain link or code blocks, If I am not wrong for styles we pass baseFontStyle here

App/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js

Line 53 in eb54f23

baseStyle={styles.webViewStyles.baseFontStyle}

App/src/styles/styles.js

Lines 133 to 136 in eb54f23

    
           baseFontStyle: { 
        
               color: themeColors.text, 
        
               fontSize: variables.fontSizeNormal, 
        
               fontFamily: fontFamily.GTA,

If we try to add the fallback fonts in baseFontStyle it doesn't work.

parasharrajat · 2022-07-07T22:46:29Z

How are you passing the fallback fonts?

thesahindia · 2022-07-09T18:28:38Z

@parasharrajat, I tried using ${fontFamily.GTA}, ${fontFamily.EMOJI_TEXT_FONT} on line 136

App/src/styles/styles.js

Lines 133 to 136 in eb54f23

    
           baseFontStyle: { 
        
               color: themeColors.text, 
        
               fontSize: variables.fontSizeNormal, 
        
               fontFamily: fontFamily.GTA,

but it didn't work. I also tried applying only fontFamily.EMOJI_TEXT_FONT ( contains two fonts ) and it also failed.
It only works when only one font is used.

parasharrajat · 2022-07-11T11:45:28Z

Which platform has issues? Could you please share some videos of where it worked including the fix and before the fix?

thesahindia · 2022-07-11T18:13:35Z

It isn't platform specific. The issue is that if we use two fonts at line 136, only the first font gets applied.

App/src/styles/styles.js

Lines 133 to 136 in eb54f23

    
           baseFontStyle: { 
        
               color: themeColors.text, 
        
               fontSize: variables.fontSizeNormal, 
        
               fontFamily: fontFamily.GTA,

For example if you try using ${fontFamily.MONOSPACE}, ${fontFamily.GTA}, only MONOSPACE font will get applied.
To check this try sending a link with some message, the font will be GTAmericaExpMono-Rg

Screen.Recording.2022-07-11.at.11.40.50.PM.mov

thesahindia · 2022-07-19T11:56:11Z

Asked for the help on slack. Here's the thread.

…x-broken-emoji merge main

…with markdown

src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js

parasharrajat

Will test it soon.

Beamanator · 2022-08-11T11:38:17Z

Bump?

parasharrajat

Good work, it is working great.
The only difference is that emoji rendered on each platform has different styles which are expected as we are using native Unicode chars that depend on the platform.

src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js

Beamanator

A few little comments, overall looking fantastic

src/styles/fontFamily/emoji/index.js

src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js

thesahindia · 2022-08-12T19:22:05Z

A few little comments, overall looking fantastic

Will make the changes in 2-3 days.
Visiting family :)

…x-broken-emoji merge main

Beamanator · 2022-08-23T15:40:45Z

@thesahindia thanks for making the requested changes 7 days ago, would you please tag us when this is ready for review again so we don't delay so long? :D

Also since it has been 7 days since your last commit, would you please merge main & test again to make sure there's no regressions?

parasharrajat · 2022-08-23T16:56:22Z

Also, it is now mandatory to complete the checklist even though things don't apply. Thus just check the non-applicable items off.

…x-broken-emoji merge main

thesahindia · 2022-08-24T17:28:16Z

Done 🚀
cc: @parasharrajat @Beamanator

parasharrajat

Just a small suggestion.

cc: @Beamanator

PR 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 verified tests pass on all platforms & I tested again on:
- iOS / native
- Android / native
- iOS / Safari
- Android / Chrome
- MacOS / Chrome
- 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 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 was added in all src/languages/* files
- I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 */
- Any functional components have the displayName property
- 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 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 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

🎀 👀 🎀 C+ reviewed

src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js

Co-authored-by: Rajat Parashar <[email protected]>

thesahindia · 2022-08-25T05:25:27Z

@Beamanator It's ready for the review now.

Beamanator

Let's get this merged :D

melvin-bot · 2022-08-25T08:00:18Z

@Beamanator looks like this was merged without passing tests. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

OSBotify · 2022-08-25T08:04:03Z

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

Beamanator · 2022-08-25T08:04:50Z

Uhh not emergency, all tests were passing 🤔 I don't believe there were any failing tests when this was merged

OSBotify · 2022-08-25T17:55:59Z

🚀 Deployed to staging by @Beamanator in version: 1.1.90-0 🚀

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

thesahindia added 2 commits June 21, 2022 23:49

fix the broken skin tone emoji for safari

127e137

fix black & white emoji for windows/ubuntu

aceb186

thesahindia changed the title ~~Thesahindia/fix broken emoji~~ Fix broken emoji (Safari, Firefox) Jun 23, 2022

thesahindia added 2 commits June 28, 2022 19:20

Merge branch 'main' of github.com:thesahindia/App into thesahindia/fi…

0bd7048

…x-broken-emoji merge main

add emojiFont for emojis

fc273c6

thesahindia marked this pull request as ready for review June 28, 2022 15:00

thesahindia requested a review from a team as a code owner June 28, 2022 15:00

melvin-bot bot requested review from Beamanator and parasharrajat and removed request for a team June 28, 2022 15:00

parasharrajat suggested changes Jun 30, 2022

View reviewed changes

src/styles/emojiFont/index.js Outdated Show resolved Hide resolved

src/styles/emojiFont/index.ios.js Outdated Show resolved Hide resolved

src/styles/emojiFont/index.ios.js Outdated Show resolved Hide resolved

src/styles/emojiFont/index.js Outdated Show resolved Hide resolved

thesahindia added 2 commits July 1, 2022 23:29

some renaming

355a2f3

add comment

9232edc

parasharrajat suggested changes Jul 1, 2022

View reviewed changes

stitesExpensify assigned thesahindia Jul 5, 2022

thesahindia added 4 commits July 28, 2022 00:18

Merge branch 'main' of github.com:thesahindia/App into thesahindia/fi…

e312984

…x-broken-emoji merge main

use EMOJI_TEXT_FONT at the composer

1816505

use EMOJI_TEXT_FONT for the comments

fbfea53

add fallbackFonts so that EMOJI_TEXT_FONT can be applied to comments …

d2a2673

…with markdown

thesahindia mentioned this pull request Jul 28, 2022

[HOLD for payment 2022-09-02] [$250] Web - Emoji- First skin tone option is broken in FireFox & Safari Web - reported by @parasharrajat & @Tushu17 #9123

Closed

parasharrajat reviewed Jul 29, 2022

View reviewed changes

src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js Outdated Show resolved Hide resolved

parasharrajat reviewed Jul 29, 2022

View reviewed changes

parasharrajat suggested changes Aug 11, 2022

View reviewed changes

src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js Outdated Show resolved Hide resolved

Beamanator requested changes Aug 11, 2022

View reviewed changes

src/styles/fontFamily/emoji/index.js Outdated Show resolved Hide resolved

src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js Outdated Show resolved Hide resolved

parasharrajat mentioned this pull request Aug 11, 2022

[HOLD for payment 2022-11-11] [$1500] some emojis are not displayed correctly as they should be - reported by Karim mostafa #10356

Closed

thesahindia added 3 commits August 16, 2022 21:53

add comment

6eb31df

name change

e7ce194

Merge branch 'main' of github.com:thesahindia/App into thesahindia/fi…

aa513e8

…x-broken-emoji merge main

Merge branch 'main' of github.com:thesahindia/App into thesahindia/fi…

91726ec

…x-broken-emoji merge main

parasharrajat previously approved these changes Aug 24, 2022

View reviewed changes

src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js Outdated Show resolved Hide resolved

update comment

f9b9753

Co-authored-by: Rajat Parashar <[email protected]>

thesahindia dismissed parasharrajat’s stale review via f9b9753 August 25, 2022 05:22

remove extra space

ca46228

Beamanator approved these changes Aug 25, 2022

View reviewed changes

Beamanator merged commit a076572 into Expensify:main Aug 25, 2022

melvin-bot bot added the Emergency label Aug 25, 2022

Beamanator removed the Emergency label Aug 25, 2022

OSBotify mentioned this pull request Aug 25, 2022

Deploy Checklist: New Expensify 2022-08-25 #10575

Closed

25 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix broken emoji (Safari, Firefox) #9551

Fix broken emoji (Safari, Firefox) #9551

thesahindia commented Jun 23, 2022 •

edited

Loading

thesahindia commented Jul 1, 2022

parasharrajat left a comment

thesahindia commented Jul 1, 2022

thesahindia commented Jul 7, 2022 •

edited

Loading

parasharrajat commented Jul 7, 2022

thesahindia commented Jul 9, 2022

parasharrajat commented Jul 11, 2022

thesahindia commented Jul 11, 2022 •

edited

Loading

thesahindia commented Jul 19, 2022

parasharrajat left a comment

Beamanator commented Aug 11, 2022

parasharrajat left a comment

Beamanator left a comment

thesahindia commented Aug 12, 2022

Beamanator commented Aug 23, 2022

parasharrajat commented Aug 23, 2022

thesahindia commented Aug 24, 2022

parasharrajat left a comment •

edited

Loading

thesahindia commented Aug 25, 2022

Beamanator left a comment

melvin-bot bot commented Aug 25, 2022

OSBotify commented Aug 25, 2022

Beamanator commented Aug 25, 2022

OSBotify commented Aug 25, 2022

Fix broken emoji (Safari, Firefox) #9551

Fix broken emoji (Safari, Firefox) #9551

Conversation

thesahindia commented Jun 23, 2022 • edited Loading

Details

Fixed Issues

Tests

PR Review Checklist

Contributor (PR Author) Checklist

PR Reviewer Checklist

QA Steps

Screenshots

Web

Mobile Web

Desktop

iOS

Android

thesahindia commented Jul 1, 2022

parasharrajat left a comment

Choose a reason for hiding this comment

thesahindia commented Jul 1, 2022

thesahindia commented Jul 7, 2022 • edited Loading

parasharrajat commented Jul 7, 2022

thesahindia commented Jul 9, 2022

parasharrajat commented Jul 11, 2022

thesahindia commented Jul 11, 2022 • edited Loading

thesahindia commented Jul 19, 2022

parasharrajat left a comment

Choose a reason for hiding this comment

Beamanator commented Aug 11, 2022

parasharrajat left a comment

Choose a reason for hiding this comment

Beamanator left a comment

Choose a reason for hiding this comment

thesahindia commented Aug 12, 2022

Beamanator commented Aug 23, 2022

parasharrajat commented Aug 23, 2022

thesahindia commented Aug 24, 2022

parasharrajat left a comment • edited Loading

Choose a reason for hiding this comment

PR Reviewer Checklist

thesahindia commented Aug 25, 2022

Beamanator left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Aug 25, 2022

OSBotify commented Aug 25, 2022

Beamanator commented Aug 25, 2022

OSBotify commented Aug 25, 2022

thesahindia commented Jun 23, 2022 •

edited

Loading

thesahindia commented Jul 7, 2022 •

edited

Loading

thesahindia commented Jul 11, 2022 •

edited

Loading

parasharrajat left a comment •

edited

Loading