From e209754a3a819930afa8844eeb358bc309c30755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hanno=20J=2E=20G=C3=B6decke?= <die.drei99@yahoo.de>
Date: Tue, 15 Aug 2023 16:54:10 +0200
Subject: [PATCH] reset emoji index, fix crash

---
 src/pages/home/report/ReportActionCompose.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index b1874183453d..6b5518ab5139 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -301,7 +301,7 @@ function ReportActionCompose({
     const isEmojiSuggestionsMenuVisible = !_.isEmpty(suggestionValues.suggestedEmojis) && suggestionValues.shouldShowEmojiSuggestionMenu;
     const isMentionSuggestionsMenuVisible = !_.isEmpty(suggestionValues.suggestedMentions) && suggestionValues.shouldShowMentionSuggestionMenu;
 
-    const [highlightedEmojiIndex] = useArrowKeyFocusManager({
+    const [highlightedEmojiIndex, setHighlightedEmojiIndex] = useArrowKeyFocusManager({
         isActive: isEmojiSuggestionsMenuVisible,
         maxIndex: getMaxArrowIndex(suggestionValues.suggestedEmojis.length, suggestionValues.isAutoSuggestionPickerLarge),
         shouldExcludeTextAreaNodes: false,
@@ -532,8 +532,9 @@ function ReportActionCompose({
             }
 
             setSuggestionValues((prevState) => ({...prevState, ...nextState}));
+            setHighlightedEmojiIndex(0);
         },
-        [value, windowHeight, isSmallScreenWidth, preferredLocale, composerHeight],
+        [value, windowHeight, composerHeight, isSmallScreenWidth, preferredLocale, setHighlightedEmojiIndex],
     );
 
     const getMentionOptions = useCallback(