Merge pull request #31072 from allroundexperts/fix-31027

fix: add null check to emoji suggestions
Expensify · Nov 8, 2023 · 05586ea · 05586ea
2 parents 0cb9969 + ebff8c8
commit 05586ea
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/pages/home/report/ReportActionCompose/Suggestions.js b/src/pages/home/report/ReportActionCompose/Suggestions.js
@@ -46,7 +46,23 @@ function Suggestions({
     const suggestionEmojiRef = useRef(null);
     const suggestionMentionRef = useRef(null);
 
-    const getSuggestions = useCallback(() => suggestionEmojiRef.current.getSuggestions() || suggestionMentionRef.current.getSuggestions(), []);
+    const getSuggestions = useCallback(() => {
+        if (suggestionEmojiRef.current && suggestionEmojiRef.current.getSuggestions) {
+            const emojiSuggestions = suggestionEmojiRef.current.getSuggestions();
+            if (emojiSuggestions.length > 0) {
+                return emojiSuggestions;
+            }
+        }
+
+        if (suggestionMentionRef.current && suggestionMentionRef.current.getSuggestions) {
+            const mentionSuggestions = suggestionMentionRef.current.getSuggestions();
+            if (mentionSuggestions.length > 0) {
+                return mentionSuggestions;
+            }
+        }
+
+        return [];
+    }, []);
 
     /**
      * Clean data related to EmojiSuggestions