From 8d03444ea2da54e8dcbbeea940e8d30def181608 Mon Sep 17 00:00:00 2001
From: Khushal Agarwal <khushal.agarwal987@gmail.com>
Date: Wed, 1 Oct 2025 14:34:05 +0530
Subject: [PATCH] fix: re-render issue in the useFetchReactions hook

---
 .../MessageMenu/MessageUserReactions.tsx      | 22 ++++----
 .../MessageMenu/hooks/useFetchReactions.ts    | 51 ++++++++++---------
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/package/src/components/MessageMenu/MessageUserReactions.tsx b/package/src/components/MessageMenu/MessageUserReactions.tsx
index e8d17fd485..ee7dfe5da7 100644
--- a/package/src/components/MessageMenu/MessageUserReactions.tsx
+++ b/package/src/components/MessageMenu/MessageUserReactions.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 import { FlatList } from 'react-native-gesture-handler';
 
@@ -138,16 +138,20 @@ export const MessageUserReactions = (props: MessageUserReactionsProps) => {
     [propReactions, fetchedReactions],
   );
 
-  const renderItem = ({ item }: { item: Reaction }) => (
-    <MessageUserReactionsItem
-      MessageUserReactionsAvatar={MessageUserReactionsAvatar}
-      reaction={item}
-      supportedReactions={supportedReactions ?? []}
-    />
+  const renderItem = useCallback(
+    ({ item }: { item: Reaction }) => (
+      <MessageUserReactionsItem
+        MessageUserReactionsAvatar={MessageUserReactionsAvatar}
+        reaction={item}
+        supportedReactions={supportedReactions ?? []}
+      />
+    ),
+    [MessageUserReactionsAvatar, MessageUserReactionsItem, supportedReactions],
   );
 
-  const renderHeader = () => (
-    <Text style={[styles.reactionsText, reactionsText]}>{t('Message Reactions')}</Text>
+  const renderHeader = useCallback(
+    () => <Text style={[styles.reactionsText, reactionsText]}>{t('Message Reactions')}</Text>,
+    [t, reactionsText],
   );
 
   const selectorReactions: ReactionSelectorItemType[] = messageReactions.map((reaction) => ({
diff --git a/package/src/components/MessageMenu/hooks/useFetchReactions.ts b/package/src/components/MessageMenu/hooks/useFetchReactions.ts
index b7f068847b..f67630a758 100644
--- a/package/src/components/MessageMenu/hooks/useFetchReactions.ts
+++ b/package/src/components/MessageMenu/hooks/useFetchReactions.ts
@@ -22,44 +22,47 @@ export const useFetchReactions = ({
   const [next, setNext] = useState<string | undefined>(undefined);
   const messageId = message?.id;
 
-  const { client, enableOfflineSupport } = useChatContext();
+  const { client } = useChatContext();
 
   const sortString = useMemo(() => JSON.stringify(sort), [sort]);
 
-  const fetchReactions = useCallback(async () => {
-    if (!messageId) {
-      return;
-    }
-    try {
-      const response = await client.queryReactions(
-        messageId,
-        reactionType ? { type: reactionType } : {},
-        sort,
-        { limit, next },
-      );
-      if (response) {
-        setReactions((prevReactions) =>
-          next ? [...prevReactions, ...response.reactions] : response.reactions,
+  const fetchReactions = useCallback(
+    async (next: string | undefined) => {
+      if (!messageId) {
+        return;
+      }
+      try {
+        const response = await client.queryReactions(
+          messageId,
+          reactionType ? { type: reactionType } : {},
+          sort,
+          { limit, next },
         );
-        setNext(response.next);
-        setLoading(false);
+        if (response) {
+          setNext(response.next);
+
+          setReactions((prevReactions) =>
+            next ? [...prevReactions, ...response.reactions] : response.reactions,
+          );
+          setLoading(false);
+        }
+      } catch (error) {
+        console.log('Error fetching reactions: ', error);
       }
-    } catch (error) {
-      console.log('Error fetching reactions: ', error);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [client, messageId, reactionType, sortString, next, limit, enableOfflineSupport]);
+    },
+    [messageId, client, reactionType, sort, limit],
+  );
 
   const loadNextPage = useCallback(async () => {
     if (next) {
-      await fetchReactions();
+      await fetchReactions(next);
     }
   }, [fetchReactions, next]);
 
   useEffect(() => {
     setReactions([]);
     setNext(undefined);
-    fetchReactions();
+    fetchReactions(undefined);
   }, [fetchReactions, messageId, reactionType, sortString]);
 
   useEffect(() => {