From d4bc6a078f9855361a547a8ebc125cc53ed1ea01 Mon Sep 17 00:00:00 2001
From: Danish Ahmed Mirza <danishmirza30602@gmail.com>
Date: Fri, 1 Jul 2022 02:59:20 +0530
Subject: [PATCH] Fix emoji search return type

---
 app/views/RoomView/ReactionPicker.tsx | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/views/RoomView/ReactionPicker.tsx b/app/views/RoomView/ReactionPicker.tsx
index 62a62b0e3..22c691e6d 100644
--- a/app/views/RoomView/ReactionPicker.tsx
+++ b/app/views/RoomView/ReactionPicker.tsx
@@ -5,6 +5,7 @@ import { Q } from '@nozbe/watermelondb';
 import EmojiPicker from '../../containers/EmojiPicker';
 import { useTheme } from '../../theme';
 import styles from './styles';
+import { IEmoji } from '../../definitions';
 import { EventTypes } from '../../containers/EmojiPicker/interfaces';
 import { FormTextInput } from '../../containers/TextInput/FormTextInput';
 import I18n from '../../i18n';
@@ -27,7 +28,7 @@ const MAX_EMOJIS_TO_DISPLAY = 20;
 const ReactionPicker = React.memo(({ onEmojiSelected, message, reactionClose }: IReactionPickerProps) => {
 	const { colors } = useTheme();
 	const [searchText, setSearchText] = React.useState<string>('');
-	const [searchedEmojis, setSearchedEmojis] = React.useState<any[]>([]);
+	const [searchedEmojis, setSearchedEmojis] = React.useState<(string | IEmoji)[]>([]);
 	const [searching, setSearching] = React.useState<boolean>(false);
 
 	const handleTextChange = (text: string) => {
@@ -43,8 +44,18 @@ const ReactionPicker = React.memo(({ onEmojiSelected, message, reactionClose }:
 			whereClause.push(Q.where('name', Q.like(`${likeString}%`)));
 		}
 		const db = database.active;
-		const customEmojisCollection = db.get('custom_emojis');
-		const customEmojis = await (await customEmojisCollection.query(...whereClause).fetch()).slice(0, MAX_EMOJIS_TO_DISPLAY / 2);
+		const customEmojisCollection = await (
+			await db
+				.get('custom_emojis')
+				.query(...whereClause)
+				.fetch()
+		).slice(0, MAX_EMOJIS_TO_DISPLAY / 2);
+		const customEmojis = customEmojisCollection?.map(emoji => ({
+			isCustom: true,
+			content: emoji?.name,
+			name: emoji?.name,
+			extension: emoji?.extension
+		})) as IEmoji[];
 		const filteredEmojis = emojis.filter(emoji => emoji.indexOf(keyword) !== -1).slice(0, MAX_EMOJIS_TO_DISPLAY / 2);
 		const mergedEmojis = [...customEmojis, ...filteredEmojis];
 		setSearchedEmojis(mergedEmojis);