@pubuduth-aplicy/chat-ui 2.1.10 → 2.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pubuduth-aplicy/chat-ui",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "description": "This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.",
   "license": "ISC",
   "author": "",

package/src/components/messages/Messages.tsx

@@ -5,12 +5,16 @@ import { useEffect, useRef } from "react";
 import Message from "./Message";
 import { useChatContext } from "../../providers/ChatProvider";
 import { useMessages } from "../../hooks/queries/useChatApi";
+import useChatUIStore from "../../stores/Zustant";
 // import useListenMessages from "../../hooks/useListenMessages";
 
 const Messages = () => {
-	const { userId } = useChatContext();
-      const { data: messages } = useMessages(userId);
+	const { selectedConversation } = useChatUIStore()
+	const {userId}=useChatContext()
+	const { data: messages } = useMessages(selectedConversation?._id,userId);
 	// useListenMessages();
+	console.log(messages);
+
 	const lastMessageRef = useRef<HTMLDivElement>(null);
 
 	useEffect(() => {
@@ -35,19 +39,19 @@ const Messages = () => {
 		// 	)}
 		// </div>
 
-<div className='px-4 flex-1 overflow-auto sm:px-6 lg:px-8'>
-  {messages.length > 0 &&
-    messages.map((message:any) => (
-       <div key={message._id} ref={lastMessageRef}>
-        <Message message={message} />
-      </div> 
-     ))}
-
-  {/* {loading && [...Array(3)].map((_, idx) => <MessageSkeleton key={idx} />)} */}
-  {messages.length === 0 && (
-    <p className='text-center'>Send a message to start the conversation</p>
-  )}
-</div>
+		<div className='px-4 flex-1 overflow-auto sm:px-6 lg:px-8'>
+			{messages.length > 0 &&
+				messages.map((message: any) => (
+					<div key={message._id} ref={lastMessageRef}>
+						<Message message={message} />
+					</div>
+				))}
+
+			{/* {loading && [...Array(3)].map((_, idx) => <MessageSkeleton key={idx} />)} */}
+			{messages.length === 0 && (
+				<p className='text-center'>Send a message to start the conversation</p>
+			)}
+		</div>
 	);
 };
 export default Messages;

package/src/hooks/queries/useChatApi.ts

@@ -15,8 +15,8 @@ export const useGetConversations = (id: any) => {
   });
 };
 
-export const useMessages = (chatId: string) => {
+export const useMessages = (chatId: string,userid:string) => {
   return useQuery({
-    queryKey:['messages', chatId],
-    queryFn: () => fetchMessages(chatId)});
+    queryKey:['messages', chatId,userid],
+    queryFn: () => fetchMessages(chatId,userid)});
 };

package/src/service/messageService.ts

@@ -10,7 +10,7 @@ export const sendMessage = async ({ chatId, message }: { chatId: any; message: s
 };
 
 
-export const fetchMessages = async (chatId: string) => {
-    const response = await apiClient.get(`${Path.getconversation}/${chatId}`);
+export const fetchMessages = async (chatId: string,userid:string) => {
+    const response = await apiClient.get(`${Path.getmessage}/${chatId}/${userid}`);
     return response.data();
 };