@messenger-box/platform-mobile 10.0.3-alpha.33 → 10.0.3-alpha.36

package/lib/screens/inbox/containers/ConversationView.js

@@ -267,12 +267,33 @@ const ConversationViewComponent = (_a) => {
     }
   }, [state]);
   const safeSend = useCallback((event) => {
+    var _a3;
     try {
+      console.log("\u{1F6E0}\uFE0F Safe send event:", event.type);
       send(event);
+      if (event.type === Actions.SET_CHANNEL_MESSAGES) {
+        setTimeout(() => {
+          var _a4, _b3;
+          if (state.context.channelMessages.length === 0 && ((_b3 = (_a4 = event.data) == null ? void 0 : _a4.messages) == null ? void 0 : _b3.length) > 0) {
+            console.warn("\u{1F6E0}\uFE0F SET_CHANNEL_MESSAGES did not update state - messages still empty");
+          }
+        }, 100);
+      }
     } catch (error) {
-      console.error("Error sending event to state machine:", error, event);
+      console.error("\u{1F6E0}\uFE0F Error in safeSend:", error, "Event type:", event.type);
+      if (event.type === Actions.SET_CHANNEL_MESSAGES && ((_a3 = event.data) == null ? void 0 : _a3.messages)) {
+        console.log("\u{1F6E0}\uFE0F Attempting fallback for SET_CHANNEL_MESSAGES");
+        try {
+          send({
+            type: "DIRECT_STATE_UPDATE",
+            data: event.data
+          });
+        } catch (fallbackError) {
+          console.error("\u{1F6E0}\uFE0F Even fallback failed:", fallbackError);
+        }
+      }
     }
-  }, [send]);
+  }, [send, state.context.channelMessages.length]);
   useEffect(() => {
     if (ChannelId) {
       console.log("Setting initial channel ID on mount:", ChannelId);
@@ -354,10 +375,26 @@ const ConversationViewComponent = (_a) => {
         console.log("Raw message data from query:", JSON.stringify(queryData.messages.data).substring(0, 100) + "...");
         console.log("Message count from query:", queryData.messages.data.length);
         console.log("Total count from query:", queryData.messages.totalCount);
+        if (queryData.messages.data.length > 0) {
+          console.log("\u{1F504} IMMEDIATE STATE UPDATE with messages:", queryData.messages.data.length);
+          safeSend({
+            type: Actions.SET_CHANNEL_MESSAGES,
+            data: {
+              messages: queryData.messages.data,
+              totalCount: queryData.messages.totalCount
+            }
+          });
+        }
       }
     },
     onError: (error) => {
       console.error("MESSAGE QUERY ERROR:", error);
+      safeSend({
+        type: "ERROR",
+        data: {
+          message: String(error)
+        }
+      });
     }
   });
   const fetchMessagesDirectly = useCallback(async () => {
@@ -744,15 +781,32 @@ const ConversationViewComponent = (_a) => {
       } = data.messages;
       if (messages && messages.length > 0) {
         console.log("\u{1F4E9} QUERY DATA - Setting channel messages, count:", messages.length);
-        send({
-          type: Actions.SET_CHANNEL_MESSAGES,
-          data: {
-            messages: uniqBy([...messages, ...state.context.channelMessages], ({
-              id
-            }) => id),
-            totalCount: messageTotalCount
-          }
-        });
+        setTimeout(() => {
+          safeSend({
+            type: Actions.SET_CHANNEL_MESSAGES,
+            data: {
+              messages: uniqBy([...messages, ...state.context.channelMessages], ({
+                id
+              }) => id),
+              totalCount: messageTotalCount
+            }
+          });
+          setTimeout(() => {
+            var _a4;
+            const currentMessagesCount = ((_a4 = state.context.channelMessages) == null ? void 0 : _a4.length) || 0;
+            console.log("\u{1F4E9} STATE UPDATE VERIFICATION - Current message count:", currentMessagesCount);
+            if (currentMessagesCount === 0) {
+              console.warn("\u26A0\uFE0F STATE NOT UPDATED after message data received - triggering fallback");
+              safeSend({
+                type: Actions.SET_CHANNEL_MESSAGES,
+                data: {
+                  messages,
+                  totalCount: messageTotalCount
+                }
+              });
+            }
+          }, 500);
+        }, 0);
         if (messages[0]) {
           const sample = messages[0];
           console.log("\u{1F4E9} SAMPLE MESSAGE:", JSON.stringify({
@@ -765,15 +819,9 @@ const ConversationViewComponent = (_a) => {
             createdAt: sample.createdAt
           }));
         }
-        setTimeout(() => {
-          var _a4;
-          if (((_a4 = state.context.channelMessages) == null ? void 0 : _a4.length) === 0) {
-            console.warn("\u26A0\uFE0F STATE NOT UPDATED after message data received - may need fallback");
-          }
-        }, 500);
       }
     }
-  }, [data]);
+  }, [data, safeSend]);
   const onFetchOld = useCallback(() => {
     var _a3, _b3, _c2, _d2;
     if (fetchOldDebounceRef.current)
@@ -1281,41 +1329,50 @@ const ConversationViewComponent = (_a) => {
         updateQuery: (prev, {
           subscriptionData
         }) => {
-          var _a5, _b5, _c2;
-          if (!((_a5 = subscriptionData == null ? void 0 : subscriptionData.data) == null ? void 0 : _a5.chatMessageAdded))
-            return prev;
-          const newMessage = subscriptionData.data.chatMessageAdded;
-          const currentMessages = ((_b5 = prev == null ? void 0 : prev.messages) == null ? void 0 : _b5.data) || [];
-          if (currentMessages.some((msg) => msg.id === newMessage.id)) {
-            return prev;
-          }
-          if (lastProcessedMessageRef.current === newMessage.id) {
-            return prev;
-          }
-          lastProcessedMessageRef.current = newMessage.id;
-          queueMicrotask(() => {
-            var _a6;
-            safeSend({
-              type: Actions.SET_CHANNEL_MESSAGES,
-              data: {
-                messages: uniqBy([...state.context.channelMessages, newMessage], ({
-                  id
-                }) => id),
-                totalCount: (((_a6 = prev == null ? void 0 : prev.messages) == null ? void 0 : _a6.totalCount) || 0) + 1
+          var _a5, _b5, _c2, _d2;
+          try {
+            console.log("\u{1F514} Subscription data received for channel:", (_a5 = state == null ? void 0 : state.context) == null ? void 0 : _a5.channelId);
+            if (!((_b5 = subscriptionData == null ? void 0 : subscriptionData.data) == null ? void 0 : _b5.chatMessageAdded)) {
+              console.log("\u{1F514} No valid message in subscription data");
+              return prev;
+            }
+            const newMessage = subscriptionData.data.chatMessageAdded;
+            console.log("\u{1F514} New message received:", newMessage.id);
+            const currentMessages = ((_c2 = prev == null ? void 0 : prev.messages) == null ? void 0 : _c2.data) || [];
+            if (currentMessages.some((msg) => msg.id === newMessage.id)) {
+              console.log("\u{1F514} Message already in cache, skipping update");
+              return prev;
+            }
+            setTimeout(() => {
+              try {
+                console.log("\u{1F514} Directly updating state machine with new message");
+                safeSend({
+                  type: Actions.SET_CHANNEL_MESSAGES,
+                  data: {
+                    messages: [...state.context.channelMessages, newMessage],
+                    totalCount: (state.context.totalCount || 0) + 1
+                  }
+                });
+              } catch (error) {
+                console.error("\u{1F514} Error updating state with subscription data:", error);
               }
+            }, 0);
+            const updatedData = __spreadProps(__spreadValues({}, prev), {
+              messages: __spreadProps(__spreadValues({}, prev.messages), {
+                data: [...currentMessages, newMessage],
+                totalCount: (((_d2 = prev == null ? void 0 : prev.messages) == null ? void 0 : _d2.totalCount) || 0) + 1
+              })
             });
-          });
-          return __spreadProps(__spreadValues({}, prev), {
-            messages: __spreadProps(__spreadValues({}, prev == null ? void 0 : prev.messages), {
-              data: [...currentMessages, newMessage],
-              totalCount: (((_c2 = prev == null ? void 0 : prev.messages) == null ? void 0 : _c2.totalCount) || 0) + 1
-            })
-          });
+            console.log("\u{1F514} Returning updated query data with new messages");
+            return updatedData;
+          } catch (error) {
+            console.error("\u{1F514} Error in subscription updateQuery:", error);
+            return prev;
+          }
         }
       });
     } }));
   }, [isShowImageViewer, modalContent, (_l = state == null ? void 0 : state.context) == null ? void 0 : _l.channelId, (_m = state == null ? void 0 : state.context) == null ? void 0 : _m.channelMessages, subscribeToMore, safeSend]);
-  const lastProcessedMessageRef = useRef(null);
   const listViewProps = useMemo(() => ({
     onEndReached,
     onEndReachedThreshold: 0.5,
@@ -1436,11 +1493,19 @@ const SubscriptionHandler = ({
 }) => {
   const channelIdRef = useRef(channelId);
   useEffect(() => {
-    if (channelId && channelId !== channelIdRef.current) {
-      channelIdRef.current = channelId;
-      console.log("Setting up subscription for channel:", channelId);
-      return subscribeToNewMessages();
+    if (!channelId) {
+      console.log("\u26A0\uFE0F No channel ID for subscription");
+      return;
     }
+    console.log("\u{1F504} Setting up NEW subscription for channel:", channelId);
+    const unsubscribe = subscribeToNewMessages();
+    channelIdRef.current = channelId;
+    return () => {
+      if (unsubscribe && typeof unsubscribe === "function") {
+        console.log("\u{1F504} Cleaning up subscription for channel:", channelIdRef.current);
+        unsubscribe();
+      }
+    };
   }, [channelId, subscribeToNewMessages]);
   return null;
 };