@messenger-box/platform-mobile 10.0.3-alpha.34 → 10.0.3-alpha.37

package/lib/screens/inbox/components/DialogsListItem.js

@@ -1,4 +1,4 @@
-import React__default,{useRef,useCallback,useEffect,useMemo,useState}from'react';import {Pressable,HStack,Box,AvatarGroup,Avatar,AvatarFallbackText,AvatarBadge,Text,AvatarImage}from'@admin-layout/gluestack-ui-mobile';import {isToday,isYesterday,format}from'date-fns';import {useFocusEffect}from'@react-navigation/native';import {useMessagesQuery,useOnChatMessageAddedSubscription,OnChatMessageAddedDocument}from'common/graphql';import {startCase}from'lodash-es';import colors from'tailwindcss/colors';import {Actions,BaseState}from'./workflow/dialogs-list-item-xstate.js';var __defProp = Object.defineProperty;
+import React__default,{useRef,useState,useEffect,useCallback,useMemo}from'react';import {Pressable,HStack,Box,AvatarGroup,Avatar,AvatarFallbackText,AvatarBadge,Text,AvatarImage}from'@admin-layout/gluestack-ui-mobile';import {isToday,isYesterday,format}from'date-fns';import {useFocusEffect}from'@react-navigation/native';import {useMessagesQuery,useOnChatMessageAddedSubscription,OnChatMessageAddedDocument}from'common/graphql';import {startCase}from'lodash-es';import colors from'tailwindcss/colors';var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
@@ -27,127 +27,6 @@ const createdAtText = (value) => {
     return "Yesterday";
   return format(new Date(value), "MMM dd, yyyy");
 };
-function useSafeMachine(machine) {
-  const [state, setState] = useState({
-    context: {
-      channelId: null,
-      currentUser: null,
-      messages: [],
-      loading: false,
-      error: null,
-      title: "",
-      channelMembers: [],
-      lastMessage: null
-    },
-    value: BaseState.Idle,
-    matches: (stateValue) => stateValue === BaseState.Idle
-  });
-  const send = useCallback((event) => {
-    try {
-      if (event.type === Actions.INITIAL_CONTEXT) {
-        setState((prev) => {
-          var _a, _b;
-          return __spreadProps(__spreadValues({}, prev), {
-            context: __spreadProps(__spreadValues({}, prev.context), {
-              channelId: ((_a = event.data) == null ? void 0 : _a.channelId) || null,
-              currentUser: ((_b = event.data) == null ? void 0 : _b.currentUser) || null,
-              loading: true
-            }),
-            value: BaseState.FetchingMessages
-          });
-        });
-      } else if (event.type === Actions.UPDATE_MESSAGES) {
-        setState((prev) => {
-          var _a, _b, _c, _d, _e, _f;
-          if ((_a = event.data) == null ? void 0 : _a.messages) {
-            const messages = event.data.messages;
-            if ((_b = event.data) == null ? void 0 : _b.directLastMessage) {
-              console.log("Using direct last message from event:", {
-                id: event.data.directLastMessage.id,
-                message: ((_c = event.data.directLastMessage.message) == null ? void 0 : _c.substring(0, 20)) + "..."
-              });
-              return __spreadProps(__spreadValues({}, prev), {
-                context: __spreadProps(__spreadValues({}, prev.context), {
-                  messages,
-                  lastMessage: event.data.directLastMessage,
-                  loading: false
-                })
-              });
-            }
-            const sortedMessages = [...messages].sort((a, b) => new Date((b == null ? void 0 : b.updatedAt) || (b == null ? void 0 : b.createdAt)).getTime() - new Date((a == null ? void 0 : a.updatedAt) || (a == null ? void 0 : a.createdAt)).getTime());
-            const newLastMessage = sortedMessages.length > 0 ? sortedMessages[0] : null;
-            if (newLastMessage) {
-              console.log("Setting last message from bulk update:", {
-                id: newLastMessage.id,
-                message: ((_d = newLastMessage.message) == null ? void 0 : _d.substring(0, 20)) + "...",
-                date: newLastMessage.updatedAt || newLastMessage.createdAt
-              });
-            }
-            return __spreadProps(__spreadValues({}, prev), {
-              context: __spreadProps(__spreadValues({}, prev.context), {
-                messages,
-                lastMessage: newLastMessage,
-                loading: false
-              })
-            });
-          } else if ((_e = event.data) == null ? void 0 : _e.message) {
-            const newMessage = event.data.message;
-            const updatedMessages = [...prev.context.messages, newMessage];
-            console.log("Setting new message as lastMessage from subscription:", {
-              id: newMessage.id,
-              message: ((_f = newMessage.message) == null ? void 0 : _f.substring(0, 20)) + "...",
-              date: newMessage.createdAt || newMessage.updatedAt
-            });
-            return __spreadProps(__spreadValues({}, prev), {
-              context: __spreadProps(__spreadValues({}, prev.context), {
-                messages: updatedMessages,
-                lastMessage: newMessage,
-                loading: false
-              })
-            });
-          }
-          return prev;
-        });
-      } else if (event.type === Actions.SET_TITLE) {
-        setState((prev) => {
-          var _a;
-          return __spreadProps(__spreadValues({}, prev), {
-            context: __spreadProps(__spreadValues({}, prev.context), {
-              title: ((_a = event.data) == null ? void 0 : _a.title) || ""
-            })
-          });
-        });
-      } else if (event.type === Actions.START_LOADING) {
-        setState((prev) => __spreadProps(__spreadValues({}, prev), {
-          context: __spreadProps(__spreadValues({}, prev.context), {
-            loading: true
-          })
-        }));
-      } else if (event.type === Actions.STOP_LOADING) {
-        setState((prev) => __spreadProps(__spreadValues({}, prev), {
-          context: __spreadProps(__spreadValues({}, prev.context), {
-            loading: false
-          })
-        }));
-      }
-    } catch (error) {
-      console.error("Error sending event to state machine:", error);
-    }
-  }, []);
-  const stateWithMatches = useMemo(() => {
-    return __spreadProps(__spreadValues({}, state), {
-      matches: (stateValue) => {
-        try {
-          return state.value === stateValue;
-        } catch (error) {
-          console.error(`Error in matches function:`, error);
-          return false;
-        }
-      }
-    });
-  }, [state]);
-  return [stateWithMatches, send];
-}
 const LastMessageComponent = ({
   subscribeToNewMessages,
   title,
@@ -195,34 +74,13 @@ const DialogsListItemComponent = function DialogsListItem2({
   onOpen,
   forceRefresh
 }) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   const isMountedRef = useRef(true);
   const parentId = null;
-  const [state, send] = useSafeMachine();
-  useCallback(() => {
-    try {
-      return (state == null ? void 0 : state.context) || {};
-    } catch (error) {
-      console.error("Error accessing state.context:", error);
-      return {};
-    }
-  }, [state]);
-  const safeContextProperty = useCallback((property, defaultValue = null) => {
-    var _a2, _b2;
-    try {
-      return (_b2 = (_a2 = state == null ? void 0 : state.context) == null ? void 0 : _a2[property]) != null ? _b2 : defaultValue;
-    } catch (error) {
-      console.error(`Error accessing state.context.${property}:`, error);
-      return defaultValue;
-    }
-  }, [state]);
-  const safeSend = useCallback((event) => {
-    try {
-      send(event);
-    } catch (error) {
-      console.error("Error sending event to state machine:", error, event);
-    }
-  }, [send]);
+  const [loading, setLoading] = useState(false);
+  const [title, setTitle] = useState("");
+  const [messages, setMessages] = useState([]);
+  const [lastMessage, setLastMessage] = useState(null);
   const {
     data: messagesQuery,
     loading: messageLoading,
@@ -238,8 +96,15 @@ const DialogsListItemComponent = function DialogsListItem2({
     refetchWritePolicy: "overwrite",
     nextFetchPolicy: "network-only",
     onCompleted: (data) => {
-      var _a2, _b2;
+      var _a2, _b2, _c2;
       console.log(`Completed message query for channel ${channel == null ? void 0 : channel.id}:`, ((_b2 = (_a2 = data == null ? void 0 : data.messages) == null ? void 0 : _a2.data) == null ? void 0 : _b2.length) ? "Has messages" : "No messages");
+      if ((_c2 = data == null ? void 0 : data.messages) == null ? void 0 : _c2.data) {
+        setMessages(data.messages.data);
+        const sortedMessages = [...data.messages.data].sort((a, b) => new Date((b == null ? void 0 : b.updatedAt) || (b == null ? void 0 : b.createdAt)).getTime() - new Date((a == null ? void 0 : a.updatedAt) || (a == null ? void 0 : a.createdAt)).getTime());
+        if (sortedMessages.length > 0) {
+          setLastMessage(sortedMessages[0]);
+        }
+      }
     },
     onError: (error) => {
       console.error(`Error fetching messages for channel ${channel == null ? void 0 : channel.id}:`, error);
@@ -255,26 +120,16 @@ const DialogsListItemComponent = function DialogsListItem2({
     }
   });
   useEffect(() => {
-    if (channel == null ? void 0 : channel.id) {
-      safeSend({
-        type: Actions.INITIAL_CONTEXT,
-        data: {
-          channelId: channel.id,
-          currentUser
-        }
-      });
-    }
+    isMountedRef.current = true;
     return () => {
       isMountedRef.current = false;
     };
-  }, [channel == null ? void 0 : channel.id, currentUser, safeSend]);
+  }, []);
   const refreshDialogState = useCallback(() => {
     var _a2;
     if ((channel == null ? void 0 : channel.id) && isMountedRef.current) {
       console.log("Forcing dialog state refresh for channel:", channel == null ? void 0 : channel.id);
-      safeSend({
-        type: Actions.START_LOADING
-      });
+      setLoading(true);
       const options = {
         channelId: (_a2 = channel == null ? void 0 : channel.id) == null ? void 0 : _a2.toString(),
         parentId,
@@ -293,26 +148,17 @@ const DialogsListItemComponent = function DialogsListItem2({
               date: latestMessage.createdAt || latestMessage.updatedAt
             });
           }
-          safeSend({
-            type: Actions.UPDATE_MESSAGES,
-            data: {
-              messages: result.data.messages.data
-            }
-          });
+          setMessages(result.data.messages.data);
+          setLastMessage(latestMessage);
         }
-        safeSend({
-          type: Actions.STOP_LOADING
-        });
+        setLoading(false);
       }).catch((err) => {
         console.error("Error refreshing dialog state:", err);
-        safeSend({
-          type: Actions.STOP_LOADING
-        });
+        setLoading(false);
       });
     }
-  }, [channel == null ? void 0 : channel.id, refetchMessages, safeSend, isMountedRef, parentId]);
+  }, [channel == null ? void 0 : channel.id, refetchMessages, isMountedRef, parentId]);
   const firstRenderRef = useRef(true);
-  useRef(0);
   useFocusEffect(React__default.useCallback(() => {
     if (!(channel == null ? void 0 : channel.id))
       return;
@@ -323,11 +169,9 @@ const DialogsListItemComponent = function DialogsListItem2({
       return;
     }
     console.log("FOCUS EFFECT: Force refetching messages on navigation back for channel:", channel == null ? void 0 : channel.id);
-    safeSend({
-      type: Actions.START_LOADING
-    });
+    setLoading(true);
     const fetchFreshData = async () => {
-      var _a2, _b2, _c2, _d2, _e2, _f;
+      var _a2, _b2, _c2, _d2, _e, _f;
       try {
         const options = {
           channelId: (_a2 = channel == null ? void 0 : channel.id) == null ? void 0 : _a2.toString(),
@@ -336,60 +180,31 @@ const DialogsListItemComponent = function DialogsListItem2({
         };
         const result = await refetchMessages(options);
         console.log(`FOCUS EFFECT: Refetched ${((_d2 = (_c2 = (_b2 = result == null ? void 0 : result.data) == null ? void 0 : _b2.messages) == null ? void 0 : _c2.data) == null ? void 0 : _d2.length) || 0} messages for channel ${channel == null ? void 0 : channel.id}`);
-        if (((_f = (_e2 = result == null ? void 0 : result.data) == null ? void 0 : _e2.messages) == null ? void 0 : _f.data) && isMountedRef.current) {
-          const currentMessages = safeContextProperty("messages", []);
+        if (((_f = (_e = result == null ? void 0 : result.data) == null ? void 0 : _e.messages) == null ? void 0 : _f.data) && isMountedRef.current) {
+          const currentMessages = messages;
           const fetchedMessages = result.data.messages.data;
           console.log("Data comparison:", {
             currentCount: currentMessages.length,
             fetchedCount: fetchedMessages.length,
             isDifferent: JSON.stringify(currentMessages) !== JSON.stringify(fetchedMessages)
           });
-          safeSend({
-            type: Actions.UPDATE_MESSAGES,
-            data: {
-              messages: fetchedMessages
-            }
-          });
+          const sortedMessages = [...fetchedMessages].sort((a, b) => new Date((b == null ? void 0 : b.updatedAt) || (b == null ? void 0 : b.createdAt)).getTime() - new Date((a == null ? void 0 : a.updatedAt) || (a == null ? void 0 : a.createdAt)).getTime());
+          const latestMessage = sortedMessages.length > 0 ? sortedMessages[0] : null;
+          setMessages(fetchedMessages);
+          setLastMessage(latestMessage);
         }
       } catch (error) {
         console.error("Error refetching messages on focus:", error);
       } finally {
         if (isMountedRef.current) {
-          safeSend({
-            type: Actions.STOP_LOADING
-          });
+          setLoading(false);
         }
       }
     };
     fetchFreshData();
     return () => {
     };
-  }, [channel == null ? void 0 : channel.id, refetchMessages, safeSend, parentId, isMountedRef]));
-  React__default.useEffect(() => {
-    var _a2, _b2, _c2, _d2, _e2;
-    if (((_a2 = messagesQuery == null ? void 0 : messagesQuery.messages) == null ? void 0 : _a2.data) && isMountedRef.current) {
-      const messages = messagesQuery.messages.data;
-      const messagesWithFiles = messages.filter((msg) => {
-        var _a3, _b3;
-        return ((_b3 = (_a3 = msg == null ? void 0 : msg.files) == null ? void 0 : _a3.data) == null ? void 0 : _b3.length) > 0;
-      });
-      console.log(`Updating messages for channel ${channel == null ? void 0 : channel.id}, count:`, messages.length, `(${messagesWithFiles.length} with files)`);
-      if (messages.length > 0) {
-        console.log("First message sample:", {
-          id: messages[0].id,
-          message: ((_b2 = messages[0].message) == null ? void 0 : _b2.substring(0, 20)) + "...",
-          createdAt: messages[0].createdAt,
-          hasFiles: ((_e2 = (_d2 = (_c2 = messages[0]) == null ? void 0 : _c2.files) == null ? void 0 : _d2.data) == null ? void 0 : _e2.length) > 0
-        });
-      }
-      safeSend({
-        type: Actions.UPDATE_MESSAGES,
-        data: {
-          messages
-        }
-      });
-    }
-  }, [messagesQuery, safeSend, channel == null ? void 0 : channel.id, isMountedRef]);
+  }, [channel == null ? void 0 : channel.id, refetchMessages, messages, isMountedRef, parentId]));
   useEffect(() => {
     if ((channel == null ? void 0 : channel.id) && isMountedRef.current) {
       const timer = setTimeout(() => {
@@ -417,12 +232,10 @@ const DialogsListItemComponent = function DialogsListItem2({
             var _a3, _b2;
             if (((_b2 = (_a3 = result == null ? void 0 : result.data) == null ? void 0 : _a3.messages) == null ? void 0 : _b2.data) && isMountedRef.current) {
               console.log(`Force refresh completed for channel ${channel == null ? void 0 : channel.id} with ${result.data.messages.data.length} messages`);
-              safeSend({
-                type: Actions.UPDATE_MESSAGES,
-                data: {
-                  messages: result.data.messages.data
-                }
-              });
+              const sortedMessages = [...result.data.messages.data].sort((a, b) => new Date((b == null ? void 0 : b.updatedAt) || (b == null ? void 0 : b.createdAt)).getTime() - new Date((a == null ? void 0 : a.updatedAt) || (a == null ? void 0 : a.createdAt)).getTime());
+              const latestMessage = sortedMessages.length > 0 ? sortedMessages[0] : null;
+              setMessages(result.data.messages.data);
+              setLastMessage(latestMessage);
             }
           }).catch((error) => {
             console.error(`Error force refreshing channel ${channel == null ? void 0 : channel.id}:`, error);
@@ -431,7 +244,7 @@ const DialogsListItemComponent = function DialogsListItem2({
       }, 50);
       return () => clearTimeout(timer);
     }
-  }, [channel == null ? void 0 : channel.id, forceRefresh, isMountedRef, refetchMessages, safeSend, parentId]);
+  }, [channel == null ? void 0 : channel.id, forceRefresh, isMountedRef, refetchMessages, parentId]);
   const channelMembers = useMemo(() => {
     var _a2, _b2, _c2;
     return (_c2 = (_b2 = (_a2 = channel == null ? void 0 : channel.members) == null ? void 0 : _a2.filter((ch) => {
@@ -446,37 +259,54 @@ const DialogsListItemComponent = function DialogsListItem2({
         var _a3;
         return (u == null ? void 0 : u.givenName) + " " + ((_a3 = u == null ? void 0 : u.familyName) != null ? _a3 : "");
       })) == null ? void 0 : _a2.filter((mu) => mu)) == null ? void 0 : _b2.join(", ")) != null ? _c2 : "";
-      safeSend({
-        type: Actions.SET_TITLE,
-        data: {
-          title: titleString
-        }
-      });
+      setTitle(titleString);
     }
-  }, [channelMembers, safeSend, isMountedRef]);
-  const title = useMemo(() => {
-    const titleString = safeContextProperty("title", "");
+  }, [channelMembers, isMountedRef]);
+  const displayTitle = useMemo(() => {
     const length = 30;
-    return titleString.length > length ? titleString.substring(0, length - 3) + "..." : titleString;
-  }, [safeContextProperty]);
-  const lastMessage = useMemo(() => {
-    const message = safeContextProperty("lastMessage", null);
-    return message;
-  }, [safeContextProperty, (_d = (_c = state.context) == null ? void 0 : _c.messages) == null ? void 0 : _d.length]);
+    return title.length > length ? title.substring(0, length - 3) + "..." : title;
+  }, [title]);
   useEffect(() => {
     var _a2, _b2;
     console.log(`DialogsListItem for channel ${channel == null ? void 0 : channel.id}: `, {
       hasLastMessage: !!lastMessage,
       message: ((_a2 = lastMessage == null ? void 0 : lastMessage.message) == null ? void 0 : _a2.substring(0, 20)) + (((_b2 = lastMessage == null ? void 0 : lastMessage.message) == null ? void 0 : _b2.length) > 20 ? "..." : ""),
-      messagesCount: safeContextProperty("messages", []).length
+      messagesCount: messages.length
     });
-  }, [channel == null ? void 0 : channel.id, lastMessage, safeContextProperty]);
-  return /* @__PURE__ */ React__default.createElement(Pressable, { onPress: () => onOpen(channel == null ? void 0 : channel.id, title), className: "flex-1 border-gray-200 rounded-md dark:border-gray-600 dark:bg-gray-700", style: {
+  }, [channel == null ? void 0 : channel.id, lastMessage, messages.length]);
+  useEffect(() => {
+    var _a2;
+    if ((newMessage == null ? void 0 : newMessage.chatMessageAdded) && (channel == null ? void 0 : channel.id)) {
+      const incomingMessage = newMessage.chatMessageAdded;
+      if (messages.some((msg) => msg.id === incomingMessage.id)) {
+        console.log("Message already in local state, skipping update:", incomingMessage.id);
+        return;
+      }
+      console.log("New message received from subscription:", {
+        channelId: channel.id,
+        messageId: incomingMessage.id,
+        message: ((_a2 = incomingMessage.message) == null ? void 0 : _a2.substring(0, 20)) + "...",
+        timestamp: incomingMessage.createdAt
+      });
+      setMessages((prevMessages) => [...prevMessages, incomingMessage]);
+      setLastMessage(incomingMessage);
+    }
+  }, [newMessage, channel == null ? void 0 : channel.id, messages]);
+  useEffect(() => {
+    if ((channel == null ? void 0 : channel.lastMessage) && channel.lastMessage.id) {
+      console.log("Channel has lastMessage property:", channel.lastMessage.id);
+      if (!messages.some((msg) => msg.id === channel.lastMessage.id)) {
+        setMessages((prevMessages) => [...prevMessages, channel.lastMessage]);
+        setLastMessage(channel.lastMessage);
+      }
+    }
+  }, [(_c = channel == null ? void 0 : channel.lastMessage) == null ? void 0 : _c.id, messages]);
+  return /* @__PURE__ */ React__default.createElement(Pressable, { onPress: () => onOpen(channel == null ? void 0 : channel.id, displayTitle), className: "flex-1 border-gray-200 rounded-md dark:border-gray-600 dark:bg-gray-700", style: {
     borderBottomWidth: 1,
     borderColor: "#e5e7eb",
     marginVertical: 0,
     paddingHorizontal: 10
-  } }, /* @__PURE__ */ React__default.createElement(HStack, { space: "md", className: "flex-1 w-[100%]  py-3  items-center" }, /* @__PURE__ */ React__default.createElement(Box, { className: "flex-[0.1] items-start pl-3" }, /* @__PURE__ */ React__default.createElement(AvatarGroup, null, channelMembers && (channelMembers == null ? void 0 : channelMembers.length) > 0 && ((_e = channelMembers == null ? void 0 : channelMembers.slice(0, 1)) == null ? void 0 : _e.map((ch, i) => {
+  } }, /* @__PURE__ */ React__default.createElement(HStack, { space: "md", className: "flex-1 w-[100%]  py-3  items-center" }, /* @__PURE__ */ React__default.createElement(Box, { className: "flex-[0.1] items-start pl-3" }, /* @__PURE__ */ React__default.createElement(AvatarGroup, null, channelMembers && (channelMembers == null ? void 0 : channelMembers.length) > 0 && ((_d = channelMembers == null ? void 0 : channelMembers.slice(0, 1)) == null ? void 0 : _d.map((ch, i) => {
     var _a2;
     return /* @__PURE__ */ React__default.createElement(Avatar, { key: "dialogs-list-" + i, size: "sm", className: `bg-transparent top-[${i == 1 ? "4" : "0"}] right-[${i == 1 ? "-2" : "0"}] z-[${i == 1 ? 5 : 1}]` }, /* @__PURE__ */ React__default.createElement(AvatarFallbackText, null, startCase((_a2 = ch == null ? void 0 : ch.username) == null ? void 0 : _a2.charAt(0))), (channelMembers == null ? void 0 : channelMembers.length) > 1 && /* @__PURE__ */ React__default.createElement(AvatarBadge, { style: {
       width: "100%",
@@ -497,7 +327,7 @@ const DialogsListItemComponent = function DialogsListItem2({
       width: 10,
       height: 10
     } })));
-  })))), /* @__PURE__ */ React__default.createElement(Box, { className: "flex-1" }, /* @__PURE__ */ React__default.createElement(LastMessageComponent, { key: `last-msg-${(lastMessage == null ? void 0 : lastMessage.id) || "none"}-${safeContextProperty("messages", []).length}`, title, lastMessage, channelId: channel == null ? void 0 : channel.id, subscribeToNewMessages: () => {
+  })))), /* @__PURE__ */ React__default.createElement(Box, { className: "flex-1" }, /* @__PURE__ */ React__default.createElement(LastMessageComponent, { key: `last-msg-${(lastMessage == null ? void 0 : lastMessage.id) || "none"}-${messages.length}`, title: displayTitle, lastMessage, channelId: channel == null ? void 0 : channel.id, subscribeToNewMessages: () => {
     var _a2;
     return subscribeToMore({
       document: OnChatMessageAddedDocument,
@@ -507,7 +337,7 @@ const DialogsListItemComponent = function DialogsListItem2({
       updateQuery: (prev, {
         subscriptionData
       }) => {
-        var _a3, _b2, _c2, _d2, _e2, _f;
+        var _a3, _b2, _c2, _d2, _e, _f;
         if (!subscriptionData.data)
           return prev;
         const newMessage2 = (_a3 = subscriptionData == null ? void 0 : subscriptionData.data) == null ? void 0 : _a3.chatMessageAdded;
@@ -516,20 +346,14 @@ const DialogsListItemComponent = function DialogsListItem2({
           messageId: newMessage2.id,
           message: ((_b2 = newMessage2.message) == null ? void 0 : _b2.substring(0, 20)) + "...",
           hasFiles: ((_d2 = (_c2 = newMessage2 == null ? void 0 : newMessage2.files) == null ? void 0 : _c2.data) == null ? void 0 : _d2.length) > 0,
-          filesCount: ((_f = (_e2 = newMessage2 == null ? void 0 : newMessage2.files) == null ? void 0 : _e2.data) == null ? void 0 : _f.length) || 0,
+          filesCount: ((_f = (_e = newMessage2 == null ? void 0 : newMessage2.files) == null ? void 0 : _e.data) == null ? void 0 : _f.length) || 0,
           timestamp: newMessage2.createdAt || newMessage2.updatedAt
         });
         if (isMountedRef.current) {
-          console.log("Updating messages with new subscription message");
-          const currentMessages = safeContextProperty("messages", []);
-          const updatedMessages = [...currentMessages, newMessage2];
-          safeSend({
-            type: Actions.UPDATE_MESSAGES,
-            data: {
-              messages: updatedMessages,
-              directLastMessage: newMessage2
-            }
-          });
+          if (!messages.some((msg) => msg.id === newMessage2.id)) {
+            setMessages((prevMessages) => [...prevMessages, newMessage2]);
+            setLastMessage(newMessage2);
+          }
         }
         const existingMessages = prev == null ? void 0 : prev.messages;
         const previousData = (existingMessages == null ? void 0 : existingMessages.data) ? [...existingMessages.data, newMessage2] : [];