Merge pull request Expensify#76576 from bernhardoj/fix/76242-md-not-applied-if-there-is-custom-emoji

Author: iwiznia

src/components/EmojiWithTooltip/index.ios.tsx

@@ -5,15 +5,16 @@ import type EmojiWithTooltipProps from './types';
 
 function EmojiWithTooltip({emojiCode, style = {}, isMedium = false}: EmojiWithTooltipProps) {
     const styles = useThemeStyles();
+    const isCustomEmoji = emojiCode === '\uE100';
 
     return isMedium ? (
         <Text style={style}>
             <View>
-                <Text style={styles.emojisWithTextFontSizeAligned}>{emojiCode}</Text>
+                <Text style={[styles.emojisWithTextFontSizeAligned, isCustomEmoji && styles.customEmojiFontAlignment]}>{emojiCode}</Text>
             </View>
         </Text>
     ) : (
-        <Text style={style}>{emojiCode}</Text>
+        <Text style={[style, isCustomEmoji && styles.customEmojiFontAlignment]}>{emojiCode}</Text>
     );
 }
 

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

@@ -11,7 +11,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import convertToLTR from '@libs/convertToLTR';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
-import {containsCustomEmoji, containsOnlyCustomEmoji as containsOnlyCustomEmojiUtil, containsOnlyEmojis as containsOnlyEmojisUtil, splitTextWithEmojis} from '@libs/EmojiUtils';
+import {containsOnlyCustomEmoji as containsOnlyCustomEmojiUtil, containsOnlyEmojis as containsOnlyEmojisUtil, splitTextWithEmojis} from '@libs/EmojiUtils';
 import Parser from '@libs/Parser';
 import Performance from '@libs/Performance';
 import {getHtmlWithAttachmentID, getTextFromHtml} from '@libs/ReportActionsUtils';
@@ -76,7 +76,7 @@ function TextCommentFragment({fragment, styleAsDeleted, reportActionID, styleAsM
     const containsOnlyEmojis = containsOnlyEmojisUtil(text ?? '');
     const containsOnlyCustomEmoji = useMemo(() => containsOnlyCustomEmojiUtil(text), [text]);
     const containsEmojis = CONST.REGEX.ALL_EMOJIS.test(text ?? '');
-    if (!shouldRenderAsText(html, text ?? '') && !(containsOnlyEmojis && styleAsDeleted) && (containsOnlyEmojis || !containsCustomEmoji(text))) {
+    if (!shouldRenderAsText(html, text ?? '') && !(containsOnlyEmojis && styleAsDeleted)) {
         const editedTag = fragment?.isEdited ? `<edited ${styleAsDeleted ? 'deleted' : ''}></edited>` : '';
         // We need to replace the space at the beginning of each line with &nbsp;
         const escapedHtml = html.replaceAll(/(^|<br \/>)[ ]+/gm, (match: string, p1: string) => p1 + '&nbsp;'.repeat(match.length - p1.length));