Skip to content

Commit 51e7a98

Browse files
authored
Merge pull request Expensify#60658 from gijoe0295/gijoe/59610
fix: emoji font mismatch in system messages on windows
2 parents cbc41ee + e216587 commit 51e7a98

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

src/pages/home/report/comment/TextCommentFragment.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
1111
import convertToLTR from '@libs/convertToLTR';
1212
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
1313
import {containsOnlyEmojis as containsOnlyEmojisUtil, splitTextWithEmojis} from '@libs/EmojiUtils';
14+
import Parser from '@libs/Parser';
1415
import Performance from '@libs/Performance';
1516
import {getHtmlWithAttachmentID, getTextFromHtml} from '@libs/ReportActionsUtils';
1617
import variables from '@styles/variables';
@@ -78,7 +79,11 @@ function TextCommentFragment({fragment, styleAsDeleted, reportActionID, styleAsM
7879
if (containsOnlyEmojis) {
7980
htmlContent = Str.replaceAll(htmlContent, '<emoji>', '<emoji islarge>');
8081
} else if (containsEmojis) {
81-
htmlContent = Str.replaceAll(htmlWithDeletedTag, '<emoji>', '<emoji ismedium>');
82+
htmlContent = htmlWithDeletedTag;
83+
if (!htmlContent.includes('<emoji>')) {
84+
htmlContent = Parser.replace(htmlContent, {filterRules: ['emoji'], shouldEscapeText: false});
85+
}
86+
htmlContent = Str.replaceAll(htmlContent, '<emoji>', '<emoji ismedium>');
8287
}
8388

8489
let htmlWithTag = editedTag ? `${htmlContent}${editedTag}` : htmlContent;

0 commit comments

Comments
 (0)