From 7f9705289f4d44b0689075e620def2971918d78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Tue, 3 Mar 2026 16:31:02 +0100
Subject: [PATCH] nicolium: custom emoji reactions fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 .../src/components/statuses/status-action-bar.tsx  |  5 +----
 .../queries/statuses/use-status-interactions.ts    | 14 +++++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/nicolium/src/components/statuses/status-action-bar.tsx b/packages/nicolium/src/components/statuses/status-action-bar.tsx
index 09d8dc2a6..d5e219831 100644
--- a/packages/nicolium/src/components/statuses/status-action-bar.tsx
+++ b/packages/nicolium/src/components/statuses/status-action-bar.tsx
@@ -697,10 +697,7 @@ const EmojiPickerButton: React.FC<Omit<IActionButton, 'onOpenUnauthorizedModal'>
   const { mutate: emojiReact } = useEmojiReactMutation(status.id);
 
   const handlePickEmoji = (emoji: EmojiType) => {
-    emojiReact(
-      emoji.custom ? emoji.id : emoji.native,
-      // emoji.custom ? emoji.imageUrl : undefined,
-    );
+    emojiReact(emoji.custom ? emoji.id : emoji.native);
   };
 
   return (
diff --git a/packages/nicolium/src/queries/statuses/use-status-interactions.ts b/packages/nicolium/src/queries/statuses/use-status-interactions.ts
index b9b457dcf..48a6fecb6 100644
--- a/packages/nicolium/src/queries/statuses/use-status-interactions.ts
+++ b/packages/nicolium/src/queries/statuses/use-status-interactions.ts
@@ -125,16 +125,20 @@ const useEmojiReactMutation = (statusId: string) => {
 
       importEntities({ statuses: [status] });
     },
-    onMutate: (emoji) =>
-      updateStatus(
+    onMutate: (emoji) => {
+      const customEmoji = queryClient
+        .getQueryData(queryKeys.instance.customEmojis)
+        ?.find((e) => e.shortcode === emoji);
+
+      return updateStatus(
         statusId,
         (status) => ({
           ...status,
-          // TODO: provide emoji url for custom emojis
-          emoji_reactions: simulateEmojiReact(status.emoji_reactions, emoji),
+          emoji_reactions: simulateEmojiReact(status.emoji_reactions, emoji, customEmoji?.url),
         }),
         queryClient,
-      ),
+      );
+    },
     onError: (_, __, context) => restorePreviousStatus(statusId, context, queryClient),
   });
 };