From b4a57b32eba0ee4672c92865ac940ecd7bdbbb4b Mon Sep 17 00:00:00 2001
From: koray-eren <koray.eren@outlook.com>
Date: Mon, 4 Apr 2022 16:01:02 +1000
Subject: [PATCH 1/3] changed emoji trigger to exclude non-alphanumeric
 characters

---
 ts/components/conversation/composition/CompositionBox.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index 70f09a1fa..bc8a2182e 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -423,7 +423,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
     const { isKickedFromGroup, left, isPrivate, isBlocked } = this.props.selectedConversation;
     const messagePlaceHolder = makeMessagePlaceHolderText();
     const { typingEnabled } = this.props;
-    const neverMatchingRegex = /($a)/;
+    const neverMatchingRegex = /(\W)$/;
 
     return (
       <MentionsInput

From ebe1ae8f12b6c6f5db3f7300452d88a7cef657d5 Mon Sep 17 00:00:00 2001
From: koray-eren <koray.eren@outlook.com>
Date: Wed, 6 Apr 2022 11:06:19 +1000
Subject: [PATCH 2/3] fix emoticon search for emoji picker, typo

---
 .../conversation/composition/CompositionBox.tsx        |  2 +-
 .../conversation/composition/EmojiQuickResult.tsx      | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index bc8a2182e..70f09a1fa 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -423,7 +423,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
     const { isKickedFromGroup, left, isPrivate, isBlocked } = this.props.selectedConversation;
     const messagePlaceHolder = makeMessagePlaceHolderText();
     const { typingEnabled } = this.props;
-    const neverMatchingRegex = /(\W)$/;
+    const neverMatchingRegex = /($a)/;
 
     return (
       <MentionsInput
diff --git a/ts/components/conversation/composition/EmojiQuickResult.tsx b/ts/components/conversation/composition/EmojiQuickResult.tsx
index 5e945974f..8239213d5 100644
--- a/ts/components/conversation/composition/EmojiQuickResult.tsx
+++ b/ts/components/conversation/composition/EmojiQuickResult.tsx
@@ -28,16 +28,18 @@ export const searchEmojiForQuery = (query: string): Array<SuggestionDataItem> =>
   if (query.length === 0 || !emojiIndex) {
     return [];
   }
-  const results = emojiIndex.search(query);
+  const results1 = emojiIndex.search(":"+query) || [];
+  const results2 = emojiIndex.search(query) || [];
+  const results = [...new Set(results1.concat(results2))];
   if (!results || !results.length) {
     return [];
   }
   return results
     .map(o => {
-      const onlyBaseEmokji = o as BaseEmoji;
+      const onlyBaseEmoji = o as BaseEmoji;
       return {
-        id: onlyBaseEmokji.native,
-        display: onlyBaseEmokji.colons,
+        id: onlyBaseEmoji.native,
+        display: onlyBaseEmoji.colons,
       };
     })
     .slice(0, 8);

From d78056618c90e93efde345abe53d255de34f832c Mon Sep 17 00:00:00 2001
From: koray-eren <koray.eren@outlook.com>
Date: Wed, 6 Apr 2022 11:15:23 +1000
Subject: [PATCH 3/3] fix linter issue

---
 ts/components/conversation/composition/EmojiQuickResult.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/components/conversation/composition/EmojiQuickResult.tsx b/ts/components/conversation/composition/EmojiQuickResult.tsx
index 8239213d5..a8e60074f 100644
--- a/ts/components/conversation/composition/EmojiQuickResult.tsx
+++ b/ts/components/conversation/composition/EmojiQuickResult.tsx
@@ -28,7 +28,7 @@ export const searchEmojiForQuery = (query: string): Array<SuggestionDataItem> =>
   if (query.length === 0 || !emojiIndex) {
     return [];
   }
-  const results1 = emojiIndex.search(":"+query) || [];
+  const results1 = emojiIndex.search(`:${query}`) || [];
   const results2 = emojiIndex.search(query) || [];
   const results = [...new Set(results1.concat(results2))];
   if (!results || !results.length) {