Merge pull request #628 from smritidoneria/starredmodelfix

Starred Model fix
RocketChat · Sep 27, 2024 · cbae92a · cbae92a
2 parents 2d158a9 + a197eb3
commit cbae92a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/react/src/views/MessageAggregators/common/MessageAggregator.js b/packages/react/src/views/MessageAggregators/common/MessageAggregator.js
@@ -26,9 +26,11 @@ export const MessageAggregator = ({
   const styles = getMessageAggregatorStyles(theme);
   const setExclusiveState = useSetExclusiveState();
   const messages = useMessageStore((state) => state.messages);
+  const threadMessages = useMessageStore((state) => state.threadMessages) || [];
+  const allMessages = [...messages, ...threadMessages];
   const [messageRendered, setMessageRendered] = useState(false);
   const { loading, messageList } = useSetMessageList(
-    searchFiltered || messages,
+    searchFiltered || allMessages,
     shouldRender
   );