From 593b08d4289e3f1fc94a49be2b88dc91c8a553ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Thu, 12 Mar 2026 20:48:29 +0100
Subject: [PATCH] nicolium: fix reacting with remote custom emojis
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 .../statuses/use-status-interactions.ts       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/nicolium/src/queries/statuses/use-status-interactions.ts b/packages/nicolium/src/queries/statuses/use-status-interactions.ts
index 08f5f55c9..02923207e 100644
--- a/packages/nicolium/src/queries/statuses/use-status-interactions.ts
+++ b/packages/nicolium/src/queries/statuses/use-status-interactions.ts
@@ -124,16 +124,20 @@ const useEmojiReactMutation = (statusId: string) => {
       importEntities({ statuses: [status] });
     },
     onMutate: (emoji) => {
-      const customEmoji = queryClient
-        .getQueryData(queryKeys.instance.customEmojis)
-        ?.find((e) => e.shortcode === emoji);
-
       return updateStatus(
         statusId,
-        (status) => ({
-          ...status,
-          emoji_reactions: simulateEmojiReact(status.emoji_reactions, emoji, customEmoji?.url),
-        }),
+        (status) => {
+          const customEmoji =
+            queryClient
+              .getQueryData(queryKeys.instance.customEmojis)
+              ?.find((e) => e.shortcode === emoji) ||
+            status.emoji_reactions?.find((r) => r.name === emoji);
+
+          return {
+            ...status,
+            emoji_reactions: simulateEmojiReact(status.emoji_reactions, emoji, customEmoji?.url),
+          };
+        },
         queryClient,
       );
     },