Updated UIKit version to 5.0.3

Author: raj-dubey1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cometchat/chat-uikit-react",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "Ready-to-use Chat UI Components for React(Javascript/Web)",
   "author": "CometChat",
   "dependencies": {

sample-app/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [5.0.3] - 13-02-2025
+
+## New
+- None
+
+## Enhancements
+- None
+
+## Fixes
+- Fixed a visibility issue where the `Unblock` button was displayed to the logged-in user even when they were blocked by the other user.
+
 ## [5.0.2] - 30-01-2025
 
 ## New

sample-app/package.json

@@ -1,13 +1,13 @@
 {
   "name": "sample-app",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "React App made using CometChat React v5 UI Kit.",
   "author": "CometChat",
   "private": true,
   "dependencies": {
     "@cometchat/calls-sdk-javascript": "^4.0.11",
     "@cometchat/chat-sdk-javascript": "^4.0.10",
-    "@cometchat/chat-uikit-react": "~5.0.2",
+    "@cometchat/chat-uikit-react": "~5.0.3",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-router-dom": "6.14.2",

sample-app/src/components/CometChatHome/CometChatHome.tsx

@@ -675,7 +675,7 @@ function CometChatHome(props: { theme?: string }) {
         };
 
         useEffect(() => {
-            if (user.getHasBlockedMe() || user.getBlockedByMe()) {
+            if (user.getBlockedByMe()) {
                 setShowStatus(false);
             }
             const unsubscribeFromEvents = subscribeToEvents();

sample-app/src/components/CometChatMessages/CometChatMessages.tsx

@@ -26,7 +26,7 @@ export const CometChatMessages = (props: MessagesViewProps) => {
 
     useEffect(() => {
         setShowComposerState(showComposer);
-        if (user?.getHasBlockedMe?.() || user?.getBlockedByMe?.()) {
+        if (user?.getBlockedByMe?.()) {
             setShowComposerState(false);
         }
     }, [user, showComposer]);

sample-app/src/metaInfo.ts

@@ -1,6 +1,6 @@
 export const metaInfo = {
   name: "sample-app",
-  version: "5.0.2",
+  version: "5.0.3",
   type: "sample",
   platform: "React",
 };

src/CometChatUIKit/CometChatCalls.ts

@@ -10,7 +10,7 @@ var callsSDK: any = null;
 try{
     callsSDK = require('@cometchat/calls-sdk-javascript');
 }catch(e){
-    console.log(e);
+    console.warn("⚠️ Calls SDK is not installed. If you want to enable call functionality, install it using:\n\n" + "npm install @cometchat/calls-sdk-javascript\n");
 }
 
 export var CometChatUIKitCalls: any = callsSDK?.CometChatCalls;

src/CometChatUIKit/CometChatUIKit.ts

@@ -99,7 +99,7 @@ class CometChatUIKit {
         return new Promise((resolve, reject) => {
             window.CometChatUiKit = {
                 name: "@cometchat/chat-uikit-react",
-                version: "5.0.2",
+                version: "5.0.3",
             };
             CometChat.init(uiKitSettings?.appId, appSettings).then(() => {
                 CometChat.getLoggedinUser().then((user: CometChat.User | null) => {

src/components/CometChatConversations/CometChatConversations.tsx

@@ -813,7 +813,6 @@ export function CometChatConversations(props: ConversationsProps) {
   const fetchNextIdRef = useRef("");
   const errorHandler = useCometChatErrorHandler(onError);
   const attachListenerOnFetch = useRef<boolean>(false);
-  const isConnectionReestablished = useRef<boolean>(false);
   const [activeConversationState, setActiveConversationState] = useState(activeConversation);
   const customSoundForMessagesRef = useRefSync(customSoundForMessages);
 
@@ -823,7 +822,6 @@ export function CometChatConversations(props: ConversationsProps) {
       state.isFirstReload = false;
     }
   })();
-
   /**
    * Initiates a fetch request and appends the fetched conversations to the `conversationList` state
    *
@@ -833,28 +831,29 @@ export function CometChatConversations(props: ConversationsProps) {
    * @param fetchId - Fetch Id to decide if the fetched data should be appended to the `conversationList` state
    */
   const fetchNextAndAppendConversations = useCallback(
-    async (fetchId: string): Promise<void> => {
+    async (fetchId: string,isConnected:boolean = false): Promise<void> => {
       try {
         const conversationManager = conversationsManagerRef.current;
         if (!conversationManager) {
           return;
         }
-        let initialState = isConnectionReestablished.current
+        let initialState =  isConnected && !attachListenerOnFetch.current && state.conversationList.length > 0
           ? States.loaded
           : States.loading;
         dispatch({ type: "setFetchState", fetchState: initialState });
 
         const conversations = await conversationManager.fetchNext();
 
         if (conversations.length !== 0 && fetchNextIdRef.current === fetchId) {
-          let removeOldConversation = isConnectionReestablished.current
+          let removeOldConversation =  isConnected
             ? true
             : false;
           dispatch({
             type: "appendConversations",
             conversations,
             removeOldConversation,
           });
+
         }
         if (attachListenerOnFetch.current) {
           ConversationsManager.attachConnestionListener(() => {
@@ -863,18 +862,18 @@ export function CometChatConversations(props: ConversationsProps) {
               errorHandler
 
             });
-            isConnectionReestablished.current = true;
             fetchNextAndAppendConversations(
               (fetchNextIdRef.current =
-                "initialFetchNext_" + String(Date.now()))
+                "initialFetchNext_" + String(Date.now())),
+                true
             );
           });
-          attachListenerOnFetch.current = false;
         }
-        if (!isConnectionReestablished.current) {
-          dispatch({ type: "setFetchState", fetchState: States.loaded });
-        } else {
-          isConnectionReestablished.current = false;
+        if(attachListenerOnFetch.current && conversations.length == 0 && state.conversationList.length == 0){
+          dispatch({ type: "setFetchState", fetchState: States.empty });
+        }
+        if(attachListenerOnFetch.current){
+          attachListenerOnFetch.current = false
         }
       } catch (error) {
         if (state.conversationList.length <= 0) {
@@ -1797,12 +1796,8 @@ export function CometChatConversations(props: ConversationsProps) {
             )
           }
           showSectionHeader={false}
-          state={
-            state.fetchState === States.loaded &&
-              state.conversationList.length === 0
-              ? States.empty
-              : state.fetchState
-          }
+          state={state.fetchState}
+
           loadingView={getLoadingView()}
           emptyView={getEmptyView()}
           errorView={getErrorView()}

src/components/CometChatConversations/controller.ts

@@ -1,6 +1,7 @@
 import { CometChat } from '@cometchat/chat-sdk-javascript';
 import { CometChatUIKit } from "../../CometChatUIKit/CometChatUIKit";
 import { CometChatUIKitConstants } from "../../constants/CometChatUIKitConstants";
+import { CometChatMessageEvents } from '../../events/CometChatMessageEvents';
 
 type Args = {
     conversationsRequestBuilder: CometChat.ConversationsRequestBuilder | null,
@@ -154,36 +155,30 @@ export class ConversationsManager {
      */
     static attachMessageReceiptListener(callback: (receipt: CometChat.MessageReceipt, updateReadAt: boolean) => void) {
       try {
-        const messageListenerId: string = "message-receipt_" + new Date().getTime();
-
-
-        CometChat.addMessageListener(messageListenerId, new CometChat.MessageListener({
-            onMessagesRead: (messageReceipt: CometChat.MessageReceipt) => {
-               if(messageReceipt.getReceiptType() == CometChatUIKitConstants.MessageReceiverType.user){
-                callback(messageReceipt, true);
-               }
-            },
-            onMessagesDelivered: (messageReceipt: CometChat.MessageReceipt) => {
-                if(messageReceipt.getReceiptType() == CometChatUIKitConstants.MessageReceiverType.user){
+           const onMessagesDelivered = CometChatMessageEvents.onMessagesDelivered.subscribe((messageReceipt: CometChat.MessageReceipt) => {
+                  if (messageReceipt.getReceiverType() == CometChatUIKitConstants.MessageReceiverType.user) {
+                    callback(messageReceipt, false);
+                }
+                });
+                const onMessagesRead = CometChatMessageEvents.onMessagesRead.subscribe((messageReceipt: CometChat.MessageReceipt) => {
+                  if (messageReceipt.getReceiverType() == CometChatUIKitConstants.MessageReceiverType.user) {
+                    callback(messageReceipt, true);
+                }
+                });
+                const onMessagesDeliveredToAll = CometChatMessageEvents.onMessagesDeliveredToAll.subscribe((messageReceipt: CometChat.MessageReceipt) => {
                     callback(messageReceipt, false);
-                   }
-            },
-            onMessagesDeliveredToAll: (messageReceipt: CometChat.MessageReceipt) => {
-                callback(messageReceipt, false);
 
-            },
-            onMessagesReadByAll: (messageReceipt: CometChat.MessageReceipt) => {
-                callback(messageReceipt, true);
+                });
+                const onMessagesReadByAll = CometChatMessageEvents.onMessagesReadByAll.subscribe((messageReceipt: CometChat.MessageReceipt) => {
+                    callback(messageReceipt, true);
 
-            },
-            onMediaMessageReceived: (messageReceipt: CometChat.MessageReceipt) => {
-                callback(messageReceipt, false);;
-            },
-    
-          }))
+                });
 
         return () => {
-            CometChat.removeMessageListener(messageListenerId)
+            onMessagesDelivered?.unsubscribe();
+            onMessagesRead?.unsubscribe();
+            onMessagesDeliveredToAll?.unsubscribe();
+            onMessagesReadByAll?.unsubscribe();
         };
       } catch (error) {
         ConversationsManager.errorHandler(error,"attachMessageReceiptListener")