@pubuduth-aplicy/chat-ui 2.2.7 → 2.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pubuduth-aplicy/chat-ui",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "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/sidebar/Conversation.tsx

@@ -25,7 +25,7 @@ const Conversation = ({ conversation }: ConversationProps) => {
     //   "Selected Conversation Data:",
     //   JSON.stringify(conversation, null, 2)
     // );
-    setSelectedConversation(conversation);
+    setSelectedConversation(conversation as any)
     const unreadMessageIds = conversation.unreadMessageIds || [];
     if (unreadMessageIds.length > 0 && socket?.readyState === WebSocket.OPEN) {
       // console.log("unread messages", unreadMessageIds);
@@ -79,18 +79,7 @@ const Conversation = ({ conversation }: ConversationProps) => {
       : participant?.name || "Conversation";
 
   const formatLastMessageTime = (dateString: string) => {
-    // Validate date input
-    if (!dateString) {
-      return "";
-    }
-
     const date = new Date(dateString);
-    
-    // Check if date is valid
-    if (isNaN(date.getTime())) {
-      return "";
-    }
-
     const now = new Date();
 
     const isToday = date.toDateString() === now.toDateString();
@@ -141,8 +130,8 @@ const Conversation = ({ conversation }: ConversationProps) => {
             <img
               className="w-10 h-10 rounded-full"
               src={
-                participant?.profilePic
-                  ? participant?.profilePic
+                participant?.profilePicture
+                  ? participant?.profilePicture
                   : defaultProfilePicture
               }
               alt="User Avatar"
@@ -183,4 +172,4 @@ const Conversation = ({ conversation }: ConversationProps) => {
   );
 };
 
-export default memo(Conversation);
+export default memo(Conversation);

package/src/components/sidebar/Conversations.tsx

@@ -134,18 +134,7 @@ const Conversations = () => {
     };
 
     const handleNewMessage = (newMessage: any) => {
-      // Logic to handle inconsistent message structure
-      const conversationId = newMessage?.conversationId || newMessage?.chatId;
-      
-      if (!conversationId) return;
-      
-      // Ensure we have a valid message object
-      const messageData = {
-        ...newMessage,
-        conversationId: conversationId, // Normalize to conversationId
-        createdAt: newMessage.createdAt || new Date().toISOString(),
-        updatedAt: newMessage.updatedAt || new Date().toISOString()
-      };
+      if (!newMessage?.conversationId) return;
 
       setConversations((prev) => {
         const personalChats = [...prev.personalChats];
@@ -153,20 +142,20 @@ const Conversations = () => {
 
         const updateConversation = (convo: ConversationType) => ({
           ...convo,
-          lastMessage: messageData,
+          lastMessage: newMessage,
           updatedAt: new Date().toISOString(),
           unreadMessageIds:
-            userId !== messageData.senderId
-              ? [...(convo.unreadMessageIds || []), messageData._id]
+            userId !== newMessage.senderId
+              ? [...(convo.unreadMessageIds || []), newMessage._id]
               : convo.unreadMessageIds || [],
           unreadMessageCount:
-            userId !== messageData.senderId
+            userId !== newMessage.senderId
               ? (convo.unreadMessageCount || 0) + 1
               : convo.unreadMessageCount || 0,
         });
 
         const personalIndex = personalChats.findIndex(
-          (c) => c._id === conversationId
+          (c) => c._id === newMessage.conversationId
         );
         if (personalIndex >= 0) {
           personalChats[personalIndex] = updateConversation(
@@ -178,7 +167,7 @@ const Conversations = () => {
         for (const serviceId in groupedServiceChats) {
           const serviceIndex = groupedServiceChats[
             serviceId
-          ].conversations.findIndex((c) => c._id === conversationId);
+          ].conversations.findIndex((c) => c._id === newMessage.conversationId);
           if (serviceIndex >= 0) {
             const updatedConversations = [
               ...groupedServiceChats[serviceId].conversations,
@@ -194,14 +183,10 @@ const Conversations = () => {
           }
         }
 
-        // Only add new conversation if we have enough info
-        // This part usually requires fetching full conversation details if it doesn't exist
-        // For now we just skip if not found to avoid ghost chats
-        /*
         personalChats.push({
-          _id: conversationId,
+          _id: newMessage.conversationId,
           participants: [newMessage.senderId, newMessage.receiverId],
-          lastMessage: messageData,
+          lastMessage: newMessage,
           updatedAt: new Date().toISOString(),
           unreadMessageIds:
             userId !== newMessage.senderId ? [newMessage._id] : [],
@@ -209,9 +194,7 @@ const Conversations = () => {
           type: "personal",
           readReceipts: [],
           createdAt: new Date().toISOString(),
-           participantDetails: [] // Missing details
         });
-        */
 
         return { personalChats, groupedServiceChats };
       });
@@ -221,7 +204,6 @@ const Conversations = () => {
       try {
         const data = JSON.parse(event.data);
         if (data.event === "newMessage") {
-          // data.data is the message object
           handleNewMessage(data.data);
         } else if (
           data.event === "messageStatusUpdated" &&
@@ -293,8 +275,8 @@ const Conversations = () => {
   );
 
   const serviceUnreadCount = Object.values(conversations.groupedServiceChats)
-    .flatMap((group: any) => group.conversations)
-    .reduce((total: any, convo: any) => total + (convo.unreadMessageCount || 0), 0);
+    .flatMap((group) => group.conversations)
+    .reduce((total, convo) => total + (convo.unreadMessageCount || 0), 0);
 
   return (
    <div className="chatSidebarConversations">
@@ -378,4 +360,4 @@ const Conversations = () => {
   );
 };
 
-export default Conversations;
+export default Conversations;

package/src/stores/Zustant.ts

@@ -11,7 +11,7 @@ interface ChatUIState {
       profilePic: string;
       firstname: string;
       idpic: string;
-    } | any; // Allow array or object until fully refactored
+    };
     unreadMessageIds?: string[];
     _id: string;
     type?: 'personal' | 'service';

package/src/types/type.ts

@@ -6,19 +6,16 @@ export interface ChatWindowProps {
 export interface ParticipantDetails {
   _id: string;
   username: string;
-  password?: string;
-  acctype?: string;
-  contactno?: string;
-  country?: string;
-  email?: string;
-  verified?: string;
-  profilePic?: string;
-  firstname?: string;
-  name?: string;
-  idpic?: string;
-  createdAt?: string;
-  updatedAt?: string;
-  __v?: number;
+  password: string;
+  acctype: string;
+  contactno: string;
+  country: string;
+  email: string;
+  verified: string;
+  profilePic: string;
+  createdAt: string;
+  updatedAt: string;
+  __v: number;
 }
 
 export interface Conversation {
@@ -35,15 +32,14 @@ export interface Conversation {
     createdAt: string;
     updatedAt: string;
     __v: number;
-    conversationId?: string;
   };
   updatedAt: string;
   __v: number;
-  participantDetails: ParticipantDetails[];
+  participantDetails: ParticipantDetails;
   participants?: string[];
   // readReceipts?: string[] | [];
   unreadMessageIds: string[];
-  type?: 'personal' | 'service' | undefined;
+  type?: string | undefined;
   bookingId?: string;
   serviceId?: string;
   unreadMessageCount?: number