diff --git a/src/components/Composer/implementation/index.tsx b/src/components/Composer/implementation/index.tsx index 653b78a84bd83..8be8329b3d602 100755 --- a/src/components/Composer/implementation/index.tsx +++ b/src/components/Composer/implementation/index.tsx @@ -53,7 +53,13 @@ function Composer({ ref, ...props }: ComposerProps) { - const textContainsOnlyEmojis = useMemo(() => containsOnlyEmojis(Parser.htmlToText(Parser.replace(value ?? ''))), [value]); + const textContainsOnlyEmojis = useMemo(() => { + if (!value) { + return false; + } + return containsOnlyEmojis(Parser.htmlToText(Parser.replace(value))); + }, [value]); + const theme = useTheme(); const styles = useThemeStyles(); const session = useSession(); diff --git a/src/libs/EmojiUtils.tsx b/src/libs/EmojiUtils.tsx index 8c17bd8279b0e..daa7f099cb3d0 100644 --- a/src/libs/EmojiUtils.tsx +++ b/src/libs/EmojiUtils.tsx @@ -220,6 +220,10 @@ function isFirstLetterEmoji(message: string): boolean { * Validates that this message contains only emojis */ function containsOnlyEmojis(message: string): boolean { + if (!message) { + return false; + } + const trimmedMessage = Str.replaceAll(message.replaceAll(' ', ''), '\n', ''); const match = trimmedMessage.match(CONST.REGEX.ALL_EMOJIS);