@droppii-org/chat-mobile 0.2.78 → 0.2.80

package/lib/module/hooks/groups/useGroupAccessGuard.js

@@ -0,0 +1,145 @@
+"use strict";
+
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { DeviceEventEmitter } from 'react-native';
+import OpenIMSDK, { GroupStatus, GroupVisibility } from '@droppii/openim-rn-client-sdk';
+import { useQueryClient } from '@tanstack/react-query';
+import { UIUtils } from "../../utils/UIUtils.js";
+import { trans } from "../../translation/index.js";
+import { ChatEvent } from "../../types/events.js";
+import { conversationQueryKeys } from "../query-keys.js";
+/**
+ * Resolves whether the current user may open `groupID`, per the group-access
+ * spec: private non-members and dismissed groups are blocked outright, while
+ * public non-members drop to a read-only view.
+ */
+const evaluateAccess = async groupID => {
+  const info = (await OpenIMSDK.getSpecifiedGroupsInfo([groupID]))?.[0];
+  if (!info) return {
+    state: 'blocked'
+  };
+  if (info.status === GroupStatus.Dismissed) return {
+    state: 'blocked'
+  };
+  const isMember = await OpenIMSDK.isJoinGroup(groupID);
+  if (isMember) return {
+    state: 'allowed'
+  };
+  return info.visibility === GroupVisibility.Public ? {
+    state: 'view-only'
+  } : {
+    state: 'blocked'
+  };
+};
+export const useGroupAccessGuard = ({
+  groupID,
+  onBlocked
+}) => {
+  const queryClient = useQueryClient();
+
+  // The conversation is dropped from the store immediately before GroupRemoved
+  // is emitted, so `groupID` can fall back to empty exactly when the guard
+  // needs it. Latch the last known id; it is replaced whenever the caller
+  // supplies a different non-empty one. (A group → 1-1 switch inside a single
+  // mount would keep the stale id, but ChatDetail remounts per conversation.)
+  const groupIdRef = useRef(groupID);
+  if (groupID) groupIdRef.current = groupID;
+  const activeGroupId = groupIdRef.current;
+  const [accessState, setAccessState] = useState(() => activeGroupId ? 'checking' : 'allowed');
+
+  // OnGroupDismissed fires twice for the group owner (once on API success,
+  // once when the WS notification lands), so blocking must be idempotent.
+  const hasBlockedRef = useRef(false);
+  const onBlockedRef = useRef(onBlocked);
+  onBlockedRef.current = onBlocked;
+  const block = useCallback(() => {
+    if (hasBlockedRef.current) return;
+    hasBlockedRef.current = true;
+    setAccessState('blocked');
+    UIUtils.alert.open({
+      title: trans('group:access_blocked_title'),
+      message: trans('group:access_blocked_desc'),
+      primaryIndex: 0,
+      buttonType: 'horizontal-button',
+      // Drop any alert raised while this one is up rather than stacking it —
+      // OnGroupDismissed fires twice for the group owner.
+      ignoreStack: true,
+      // Force an acknowledgement: dismissing by tapping outside would leave the
+      // user sitting in a conversation they cannot access.
+      touchOutsideToDismiss: false,
+      buttons: [{
+        label: trans('group:access_blocked_button'),
+        kind: 'primary',
+        onPress: () => onBlockedRef.current()
+      }]
+    });
+  }, []);
+  const applyResult = useCallback(result => {
+    if (result.state === 'blocked') {
+      block();
+      return;
+    }
+    setAccessState(result.state);
+  }, [block]);
+
+  // Pre-access check.
+  useEffect(() => {
+    if (!activeGroupId) {
+      setAccessState('allowed');
+      return;
+    }
+    let cancelled = false;
+    hasBlockedRef.current = false;
+    setAccessState('checking');
+    evaluateAccess(activeGroupId).then(result => {
+      if (cancelled) return;
+      applyResult(result);
+    }).catch(error => {
+      console.error('useGroupAccessGuard: access check failed', error);
+      // A failed lookup is not proof of lost access — leave the screen open
+      // rather than ejecting the user on a transient SDK error.
+      if (!cancelled) setAccessState('allowed');
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [activeGroupId, applyResult]);
+
+  // Membership lost while the screen is open.
+  useEffect(() => {
+    if (!activeGroupId) return;
+    const sub = DeviceEventEmitter.addListener(ChatEvent.GroupRemoved, payload => {
+      if (payload.groupID !== activeGroupId) return;
+
+      // A dismissed group is gone for everyone — no need to re-check.
+      if (payload.reason === 'dismissed') {
+        block();
+        return;
+      }
+
+      // Left or kicked. `reason` cannot tell the two apart — OnJoinedGroupDeleted
+      // reports both as 'left' — so decide on visibility instead: a public group
+      // stays readable, a private one does not.
+      evaluateAccess(activeGroupId).then(applyResult).catch(() => block());
+    });
+    return () => sub.remove();
+  }, [activeGroupId, block, applyResult]);
+
+  // The composer derives membership from the joinedGroup query alone, never
+  // from this hook. Refresh that query whenever the guard's own verdict flips
+  // so the two cannot disagree.
+  const isViewOnly = accessState === 'view-only';
+  const wasViewOnlyRef = useRef(isViewOnly);
+  useEffect(() => {
+    if (wasViewOnlyRef.current === isViewOnly) return;
+    wasViewOnlyRef.current = isViewOnly;
+    if (!activeGroupId) return;
+    queryClient.invalidateQueries({
+      queryKey: conversationQueryKeys.joinedGroup(activeGroupId)
+    });
+  }, [isViewOnly, activeGroupId, queryClient]);
+  return {
+    isCheckingAccess: accessState === 'checking'
+  };
+};
+//# sourceMappingURL=useGroupAccessGuard.js.map

package/lib/module/hooks/groups/useGroupAccessGuard.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useCallback","useEffect","useRef","useState","DeviceEventEmitter","OpenIMSDK","GroupStatus","GroupVisibility","useQueryClient","UIUtils","trans","ChatEvent","conversationQueryKeys","evaluateAccess","groupID","info","getSpecifiedGroupsInfo","state","status","Dismissed","isMember","isJoinGroup","visibility","Public","useGroupAccessGuard","onBlocked","queryClient","groupIdRef","current","activeGroupId","accessState","setAccessState","hasBlockedRef","onBlockedRef","block","alert","open","title","message","primaryIndex","buttonType","ignoreStack","touchOutsideToDismiss","buttons","label","kind","onPress","applyResult","result","cancelled","then","catch","error","console","sub","addListener","GroupRemoved","payload","reason","remove","isViewOnly","wasViewOnlyRef","invalidateQueries","queryKey","joinedGroup","isCheckingAccess"],"sourceRoot":"../../../../src","sources":["hooks/groups/useGroupAccessGuard.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/screens/ChatInfo/ChatInfoDescriptionRow.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { memo, useCallback, useState } from 'react';
+import { memo, useCallback, useEffect, useState } from 'react';
 import { StyleSheet } from 'react-native';
 import { KContainer, KLabel, KColors } from '@droppii/libs';
 import { trans } from "../../translation/index.js";
@@ -30,6 +30,9 @@ const ChatInfoDescriptionRow = /*#__PURE__*/memo(({
     typo: 'TextMdMedium',
     paddingH: '0.75rem'
   };
+  useEffect(() => {
+    setDisplayedText(introduction);
+  }, [introduction]);
   if (!introduction) {
     return null;
   }

package/lib/module/screens/ChatInfo/ChatInfoDescriptionRow.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useCallback","useState","StyleSheet","KContainer","KLabel","KColors","trans","GroupDescriptionModal","useChatDetailContext","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","EXTRA_TEXT_LENGTH","MAX_LINES","ChatInfoDescriptionRow","groupName","introduction","groupInfo","modalVisible","setModalVisible","handlePressDescription","handleCloseDescription","isTruncated","setIsTruncated","displayedText","setDisplayedText","handleTextLayout","event","isTextTruncated","nativeEvent","lines","length","slice","map","line","text","join","textProps","color","gray","dark","typo","paddingH","children","View","background","white","br","marginH","marginT","paddingV","Text","style","styles","hiddenText","numberOfLines","onTextLayout","VisibleView","visible","primary","normal","onPress","onClose","create","position","opacity","zIndex"],"sourceRoot":"../../../../src","sources":["screens/ChatInfo/ChatInfoDescriptionRow.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","useCallback","useEffect","useState","StyleSheet","KContainer","KLabel","KColors","trans","GroupDescriptionModal","useChatDetailContext","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","EXTRA_TEXT_LENGTH","MAX_LINES","ChatInfoDescriptionRow","groupName","introduction","groupInfo","modalVisible","setModalVisible","handlePressDescription","handleCloseDescription","isTruncated","setIsTruncated","displayedText","setDisplayedText","handleTextLayout","event","isTextTruncated","nativeEvent","lines","length","slice","map","line","text","join","textProps","color","gray","dark","typo","paddingH","children","View","background","white","br","marginH","marginT","paddingV","Text","style","styles","hiddenText","numberOfLines","onTextLayout","VisibleView","visible","primary","normal","onPress","onClose","create","position","opacity","zIndex"],"sourceRoot":"../../../../src","sources":["screens/ChatInfo/ChatInfoDescriptionRow.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/screens/chat-detail/ChatDetail.js

@@ -23,6 +23,7 @@ import { useMessages } from "../../hooks/message/useMessages.js";
 import { ChatEvent } from "../../types/events.js";
 import { useSetIsShowFLashMessage } from "../../context/global.js";
 import { useJoinGroup } from "../../hooks/groups/useJoinGroup.js";
+import { useGroupAccessGuard } from "../../hooks/groups/useGroupAccessGuard.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const ChatDetail = /*#__PURE__*/memo(({
   targetConversationId = '',
@@ -95,13 +96,15 @@ const ChatDetail = /*#__PURE__*/memo(({
       setShowFLashMessage(true);
     };
   }, [conversationId, targetUserId, targetGroupId, setShowFLashMessage]);
-  useEffect(() => {
-    const sub = DeviceEventEmitter.addListener(ChatEvent.GroupRemoved, payload => {
-      if (payload.groupID !== targetGroupId) return;
-      (onBack ?? handleBackDefault)();
-    });
-    return () => sub.remove();
-  }, [targetGroupId, onBack, handleBackDefault]);
+  const handleAccessBlocked = useCallback(() => {
+    (onBack ?? handleBackDefault)();
+  }, [onBack, handleBackDefault]);
+  const {
+    isCheckingAccess
+  } = useGroupAccessGuard({
+    groupID: conversation?.groupID || targetGroupId,
+    onBlocked: handleAccessBlocked
+  });
   const resolvedShowAddMember = showAddMember ?? shouldShowAddMember(conversation);
   const insets = useSafeAreaInsets();
   const listRef = useRef(null);
@@ -152,8 +155,7 @@ const ChatDetail = /*#__PURE__*/memo(({
       onPressSearch: onPressSearch,
       onPressAddMember: onPressAddMember,
       onPressMenu: handlePressMenu,
-      onPressAvatar: handlePressMenu,
-      targetGroupId: targetGroupId
+      onPressAvatar: handlePressMenu
     }), /*#__PURE__*/_jsx(PinnedMessageBar, {
       messages: pinnedMessages,
       currentUserId: currentUser?.userID,
@@ -162,7 +164,7 @@ const ChatDetail = /*#__PURE__*/memo(({
       messages: messages,
       conversationId: conversationId,
       customMessageItemFactory: customMessageItemFactory,
-      isLoading: initLoading || isLoadingConversation,
+      isLoading: initLoading || isLoadingConversation || isCheckingAccess,
       onLoadMoreOld: getMoreOldMessages,
       hasMoreOld: hasMoreOld,
       moreOldLoading: moreOldLoading,

package/lib/module/screens/chat-detail/ChatDetail.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useCallback","useEffect","useRef","DeviceEventEmitter","useKeyboardScrollToEnd","useSafeAreaInsets","KContainer","useNavigation","usePinMessage","PinnedMessageBar","openPinnedMessagesSheet","MediaViewerModal","useConversation","useConversationStore","useUserStore","ChatDetailHeader","ChatListLegend","ChatComposer","shouldShowAddMember","normalizeUrl","MessageToolboxOverlay","useGetConversationDetail","useGetConversationTarget","GroupJoinSource","useMessages","ChatEvent","useSetIsShowFLashMessage","useJoinGroup","jsx","_jsx","jsxs","_jsxs","ChatDetail","targetConversationId","targetUserId","targetGroupId","targetBotId","targetMessageId","showAddMember","onBack","onPressSearch","onPressAddMember","onPressMenu","onPressUrl","customMessageItemFactory","pannelActions","groupJoinSource","navigation","mediaViewerRef","messageToolboxRef","currentUser","s","user","conversationId","isLoading","isLoadingConversation","conversation","data","target","isComposeDisabled","isActive","handleBackDefault","goBack","handleMediaPress","items","index","current","show","messages","initLoading","moreOldLoading","moreNewLoading","getMoreOldMessages","getMoreNewMessages","hasMoreOld","hasMoreNew","startClientMsgId","mutate","joinGroup","isPending","isJoiningGroup","setShowFLashMessage","pinnedMessages","pinMessage","unpinMessage","getState","setCurrentConversation","undefined","sub","addListener","GroupRemoved","payload","groupID","remove","resolvedShowAddMember","insets","listRef","freeze","scrollMessageToEnd","handlePressUrl","url","handleMessageLongPress","message","rect","handlePressPinnedMessageBar","currentUserId","userID","onPressMessage","emit","ScrollToMessage","clientMessageId","clientMsgID","handlePressMenu","handlePressJoinGroup","reqMsg","joinSource","Search","groupName","showName","Page","flex","edges","children","onPressAvatar","onPress","onLoadMoreOld","onLoadMoreNew","onMediaPress","onLongPress","keyboardOffset","bottom","isEmptyMessage","length","onPressJoinGroup","ref","onPinMessage","onUnpinMessage","displayName"],"sourceRoot":"../../../../src","sources":["screens/chat-detail/ChatDetail.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","useCallback","useEffect","useRef","DeviceEventEmitter","useKeyboardScrollToEnd","useSafeAreaInsets","KContainer","useNavigation","usePinMessage","PinnedMessageBar","openPinnedMessagesSheet","MediaViewerModal","useConversation","useConversationStore","useUserStore","ChatDetailHeader","ChatListLegend","ChatComposer","shouldShowAddMember","normalizeUrl","MessageToolboxOverlay","useGetConversationDetail","useGetConversationTarget","GroupJoinSource","useMessages","ChatEvent","useSetIsShowFLashMessage","useJoinGroup","useGroupAccessGuard","jsx","_jsx","jsxs","_jsxs","ChatDetail","targetConversationId","targetUserId","targetGroupId","targetBotId","targetMessageId","showAddMember","onBack","onPressSearch","onPressAddMember","onPressMenu","onPressUrl","customMessageItemFactory","pannelActions","groupJoinSource","navigation","mediaViewerRef","messageToolboxRef","currentUser","s","user","conversationId","isLoading","isLoadingConversation","conversation","data","target","isComposeDisabled","isActive","handleBackDefault","goBack","handleMediaPress","items","index","current","show","messages","initLoading","moreOldLoading","moreNewLoading","getMoreOldMessages","getMoreNewMessages","hasMoreOld","hasMoreNew","startClientMsgId","mutate","joinGroup","isPending","isJoiningGroup","setShowFLashMessage","pinnedMessages","pinMessage","unpinMessage","getState","setCurrentConversation","undefined","handleAccessBlocked","isCheckingAccess","groupID","onBlocked","resolvedShowAddMember","insets","listRef","freeze","scrollMessageToEnd","handlePressUrl","url","handleMessageLongPress","message","rect","handlePressPinnedMessageBar","currentUserId","userID","onPressMessage","emit","ScrollToMessage","clientMessageId","clientMsgID","handlePressMenu","handlePressJoinGroup","reqMsg","joinSource","Search","groupName","showName","Page","flex","edges","children","onPressAvatar","onPress","onLoadMoreOld","onLoadMoreNew","onMediaPress","onLongPress","keyboardOffset","bottom","isEmptyMessage","length","onPressJoinGroup","ref","onPinMessage","onUnpinMessage","displayName"],"sourceRoot":"../../../../src","sources":["screens/chat-detail/ChatDetail.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/screens/chat-detail/ChatDetailHeader.js

@@ -6,8 +6,8 @@ import { AvatarSection } from "../../components/ThreadCard/AvatarSection.js";
 import { NamePrefixIcon } from "../../components/ThreadCard/NamePrefixIcon.js";
 import { getConversationSubtitle } from "./conversationHeader.utils.js";
 import { useGetUsersInfo } from "../../hooks/users/useGetUsersInfo.js";
-import { useGetConversationDetail } from "../../hooks/conversation/useGetConversationDetail.js";
 import { useChatDetailContext } from "../../context/index.js";
+import { useConversation } from "../../store/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const ChatDetailHeader = /*#__PURE__*/memo(({
   showAddMember = false,
@@ -17,15 +17,9 @@ const ChatDetailHeader = /*#__PURE__*/memo(({
   onPressSearch,
   onPressAddMember,
   onPressMenu,
-  onPressAvatar,
-  targetGroupId
+  onPressAvatar
 }) => {
-  const {
-    conversationData: conversation
-  } = useGetConversationDetail({
-    targetGroupId,
-    targetUserId: targetUserId
-  });
+  const conversation = useConversation(conversationId);
   const {
     data: usersInfo
   } = useGetUsersInfo(targetUserId ? [targetUserId] : []);

package/lib/module/screens/chat-detail/ChatDetailHeader.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useMemo","KNavigation","KContainer","KImage","KLabel","KColors","AvatarSection","NamePrefixIcon","getConversationSubtitle","useGetUsersInfo","useGetConversationDetail","useChatDetailContext","jsx","_jsx","jsxs","_jsxs","ChatDetailHeader","showAddMember","conversationId","targetUserId","onBack","onPressSearch","onPressAddMember","onPressMenu","onPressAvatar","targetGroupId","conversationData","conversation","data","usersInfo","memberCount","groupInfo","faceURL","showName","userInfo","resolvedFaceURL","resolvedShowName","nickname","rightButtons","buttons","id","index","icon","vectorName","onPress","undefined","splice","leftNode","View","row","alignItems","flex","marginR","children","Touchable","height","width","center","VectorIcons","name","size","color","primary","normal","activeOpacity","avatar","fullName","peerType","members","marginL","Text","typo","gray","dark","numberOfLines","palette","w500","Header","theme","alignment","disableCenterSpace","initRightButtons","shadow","displayName"],"sourceRoot":"../../../../src","sources":["screens/chat-detail/ChatDetailHeader.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","useMemo","KNavigation","KContainer","KImage","KLabel","KColors","AvatarSection","NamePrefixIcon","getConversationSubtitle","useGetUsersInfo","useChatDetailContext","useConversation","jsx","_jsx","jsxs","_jsxs","ChatDetailHeader","showAddMember","conversationId","targetUserId","onBack","onPressSearch","onPressAddMember","onPressMenu","onPressAvatar","conversation","data","usersInfo","memberCount","groupInfo","faceURL","showName","userInfo","resolvedFaceURL","resolvedShowName","nickname","rightButtons","buttons","id","index","icon","vectorName","onPress","undefined","splice","leftNode","View","row","alignItems","flex","marginR","children","Touchable","height","width","center","VectorIcons","name","size","color","primary","normal","activeOpacity","avatar","fullName","peerType","members","marginL","Text","typo","gray","dark","numberOfLines","palette","w500","Header","theme","alignment","disableCenterSpace","initRightButtons","shadow","displayName"],"sourceRoot":"../../../../src","sources":["screens/chat-detail/ChatDetailHeader.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/screens/chat-detail/ChatListLegend.js

@@ -7,6 +7,7 @@ import { KeyboardAwareLegendList } from '@legendapp/list/keyboard';
 import { LegendList } from '@legendapp/list/react-native';
 import { KContainer, KColors, KSpacingValue, KLabel, KRadiusValue, KImage } from '@droppii/libs';
 import { precomputeLegendListData } from "../../utils/legendListMessage.js";
+import { getMessageRenderId } from "../../utils/message.js";
 import { LegendChatMessage } from "./legend/LegendChatMessage.js";
 import { LegendChatDay } from "./legend/LegendChatDay.js";
 import { LegendChatLoadEarlier } from "./legend/LegendChatLoadEarlier.js";
@@ -19,18 +20,23 @@ import { ChatEvent } from "../../types/events.js";
 import { useMessageStore } from "../../store/message.js";
 import { useChatContext } from "../../context/index.js";
 import { messageStyles } from "./legend/messageTypes.js";
-import { MessageType } from '@droppii/openim-rn-client-sdk';
+import { MessageType, PeerType } from '@droppii/openim-rn-client-sdk';
 import { useUserStore } from "../../store/index.js";
 import { ChatMessageAPI } from "../../services/index.js";
 import { resolveImageDisplayDims } from "../../components/messages/imageMessage/index.js";
 import { STICKER_SIZE } from "../../components/messages/stickerMessage/index.js";
 import ChatImageDimens, { CHAT_IMAGE_VIEW_SOURCE } from "../../utils/chatImageDimens.js";
 
-// Row wrapper (`messageRowLeft`/`messageRowRight` in `components/messages/styles.ts`)
-// adds only a bottom margin — no vertical padding — so a fixed-size item's true
-// rendered height is `content height + this margin`.
+// Cluster spacing: a wide gap after the message that closes a cluster, a tight
+// one between messages inside it. These override the flat margin on the row
+// wrapper (`messageRowLeft`/`messageRowRight` in `components/messages/styles.ts`),
+// which adds only a bottom margin and no vertical padding — so a fixed-size
+// item's true rendered height stays `content height + this margin`, and
+// getFixedItemSize can keep folding it in.
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-const ROW_MARGIN_BOTTOM = KSpacingValue['0.25rem'];
+const ROW_MARGIN_CLUSTER_END = KSpacingValue['0.5rem'];
+const ROW_MARGIN_IN_CLUSTER = KSpacingValue['0.25rem'];
+const getRowMarginBottom = position => position === 'last' || position === 'solo' ? ROW_MARGIN_CLUSTER_END : ROW_MARGIN_IN_CLUSTER;
 
 // KeyboardAwareLegendList auto scroll when modal opened
 // TODO: Convert toolbox to absolute view
@@ -57,11 +63,19 @@ export const ChatListLegend = /*#__PURE__*/memo(({
   const currentUserId = useUserStore(s => s.user?.userID);
   const windowWidth = useWindowDimensions().width;
   // Precompute all message data in single pass (O(n))
-  const messageDataMap = useMemo(() => precomputeLegendListData(messages), [messages]);
   const {
     isBotConversation,
-    conversationFlow
+    conversationFlow,
+    conversation
   } = useChatDetailContext();
+
+  // Avatar and sender name only appear in real group chats — a bot thread is
+  // a Group session too, but reads as a single counterpart.
+  const isGroupConversation = conversation?.peerType === PeerType.Group && !isBotConversation;
+  const messageDataMap = useMemo(() => precomputeLegendListData(messages, {
+    isBotConversation,
+    currentUserId
+  }), [messages, isBotConversation, currentUserId]);
   const {
     retryMessage
   } = useSendMessage();
@@ -114,27 +128,35 @@ export const ChatListLegend = /*#__PURE__*/memo(({
       const isOutgoing = message.sendID === currentUserId;
       const isLastMessage = (message.clientMsgID || message.serverMsgID) === lastMessageId;
       const isLastIncoming = !isOutgoing && isLastMessage;
-      const messageId = message.clientMsgID || message.serverMsgID || `temp-${message.sendTime || message.createTime}-${index}`;
+      const messageId = getMessageRenderId(message, index);
       const messageData = messageDataMap.get(messageId);
       if (!messageData) {
         return null;
       }
       const {
         dayStart,
-        createdAt
+        timeBreak,
+        createdAt,
+        groupPosition
       } = messageData;
+      const showSenderGutter = isGroupConversation && !isOutgoing;
+      const showName = showSenderGutter && (groupPosition === 'first' || groupPosition === 'solo');
+      const showAvatar = showSenderGutter && (groupPosition === 'last' || groupPosition === 'solo');
       let flowInputButtonsNodes = [];
       if ((isLastMessage && conversationFlow?.havingBotMessage === false || isLastIncoming) && isBotConversation) {
         flowInputButtonsNodes = getFlowInputButtonsNodes(conversationFlow?.flowCurrentStep);
       }
       return /*#__PURE__*/_jsxs(_Fragment, {
-        children: [dayStart && /*#__PURE__*/_jsx(LegendChatDay, {
-          createdAt: createdAt
+        children: [(dayStart || timeBreak) && /*#__PURE__*/_jsx(LegendChatDay, {
+          createdAt: createdAt,
+          timeOnly: !dayStart
         }), /*#__PURE__*/_jsx(KContainer.View, {
           ref: node => {
             if (node) rowRefsMap.current.set(messageId, node);else rowRefsMap.current.delete(messageId);
           },
-          style: isOutgoing ? messageStyles.messageRowRight : messageStyles.messageRowLeft,
+          style: [isOutgoing ? messageStyles.messageRowRight : messageStyles.messageRowLeft, {
+            marginBottom: getRowMarginBottom(groupPosition)
+          }],
           collapsable: false,
           children: /*#__PURE__*/_jsx(LegendChatMessage, {
             message: message,
@@ -145,7 +167,11 @@ export const ChatListLegend = /*#__PURE__*/memo(({
             onRetry: retryMessage,
             onLongPress: onLongPress ? () => handleMessageLongPress(messageId, message) : undefined,
             customMessageItemFactory: customMessageItemFactory,
-            isHighlighted: highlightedId === messageId
+            isHighlighted: highlightedId === messageId,
+            showName: showName,
+            showAvatar: showAvatar,
+            showSenderGutter: showSenderGutter,
+            groupPosition: groupPosition
           })
         }), flowInputButtonsNodes && flowInputButtonsNodes.length > 0 && /*#__PURE__*/_jsx(InputButtonFlow, {
           nodeData: flowInputButtonsNodes,
@@ -163,7 +189,7 @@ export const ChatListLegend = /*#__PURE__*/memo(({
         })
       });
     }
-  }, [currentUserId, lastMessageId, messageDataMap, isBotConversation, onMediaPress, onPressUrl, onLongPress, handleMessageLongPress, customMessageItemFactory, onResetFlow, onRunFlow, conversationFlow?.flowCurrentStep, conversationFlow?.havingBotMessage, retryMessage, highlightedId]);
+  }, [currentUserId, lastMessageId, messageDataMap, isGroupConversation, isBotConversation, onMediaPress, onPressUrl, onLongPress, handleMessageLongPress, customMessageItemFactory, onResetFlow, onRunFlow, conversationFlow?.flowCurrentStep, conversationFlow?.havingBotMessage, retryMessage, highlightedId]);
 
   // const maintainScrollConfig = useMemo(
   //   () => ({
@@ -209,8 +235,18 @@ export const ChatListLegend = /*#__PURE__*/memo(({
   // guessing wrong here is a permanent regression, not just an approximation.
   const getFixedItemSize = useCallback((item, index) => {
     const message = item;
-    const messageId = message.clientMsgID || message.serverMsgID || `temp-${message.sendTime || message.createTime}-${index}`;
-    if (messageDataMap.get(messageId)?.dayStart) return undefined;
+    const messageId = getMessageRenderId(message, index);
+    const messageData = messageDataMap.get(messageId);
+    // Both separators add chrome above the row that this function does not
+    // account for, and a resolved size is never re-measured.
+    if (messageData?.dayStart || messageData?.timeBreak) return undefined;
+
+    // Incoming rows in a group chat carry an avatar column and a sender
+    // name whose height this function cannot predict — measure them.
+    if (isGroupConversation && message.sendID !== currentUserId) {
+      return undefined;
+    }
+    const rowMargin = getRowMarginBottom(messageData?.groupPosition ?? 'solo');
 
     // Resolve the content-type candidate FIRST — for every type other
     // than these three the result is `undefined` regardless of anything
@@ -220,13 +256,13 @@ export const ChatListLegend = /*#__PURE__*/memo(({
     let candidateSize;
     switch (message.contentType) {
       case MessageType.PictureMessage:
-        candidateSize = resolveImageDisplayDims(message, windowWidth).height + ROW_MARGIN_BOTTOM;
+        candidateSize = resolveImageDisplayDims(message, windowWidth).height + rowMargin;
         break;
       case MessageType.VideoMessage:
-        candidateSize = ChatImageDimens.getDimensions(CHAT_IMAGE_VIEW_SOURCE.MessageListThumbnail).height + ROW_MARGIN_BOTTOM;
+        candidateSize = ChatImageDimens.getDimensions(CHAT_IMAGE_VIEW_SOURCE.MessageListThumbnail).height + rowMargin;
         break;
       case MessageType.StickerMessage:
-        candidateSize = STICKER_SIZE + ROW_MARGIN_BOTTOM;
+        candidateSize = STICKER_SIZE + rowMargin;
         break;
       default:
         return undefined;
@@ -245,7 +281,21 @@ export const ChatListLegend = /*#__PURE__*/memo(({
       return undefined;
     }
     return candidateSize;
-  }, [messageDataMap, customMessageItemFactory, currentUserId, lastMessageId, isBotConversation, conversationFlow?.flowCurrentStep, windowWidth]);
+  }, [messageDataMap, customMessageItemFactory, currentUserId, isGroupConversation, lastMessageId, isBotConversation, conversationFlow?.flowCurrentStep, windowWidth]);
+
+  // LegendList memoises each rendered item on [itemKey, item, extraData], so
+  // an item whose own object is unchanged will not re-render. Cluster
+  // position depends on a message's NEIGHBOURS, which can change while the
+  // message itself does not — prepending older history is enough to turn a
+  // 'first' into a 'middle'. messageDataMap is memoised on exactly the inputs
+  // that can move those boundaries, so including it here is what keeps a
+  // stale tail from being left behind.
+  const listExtraData = useMemo(() => ({
+    messageDataMap,
+    flowStepId: conversationFlow?.flowCurrentStep?.id ?? '',
+    lastMessageId,
+    highlightedId
+  }), [messageDataMap, conversationFlow?.flowCurrentStep?.id, lastMessageId, highlightedId]);
   const handleStartReached = useCallback(() => {
     if (__DEV__) {
       console.log('[LegendList] onStartReached triggered', {
@@ -379,7 +429,7 @@ export const ChatListLegend = /*#__PURE__*/memo(({
       getFixedItemSize: getFixedItemSize,
       keyExtractor: item => String(item.clientMsgID || item.serverMsgID),
       recycleItems: false,
-      extraData: `${conversationFlow?.flowCurrentStep?.id ?? ''}-${lastMessageId ?? ''}-${highlightedId ?? ''}`,
+      extraData: listExtraData,
       alignItemsAtEnd: true,
       maintainVisibleContentPosition: maintainVisiblePositionConfig,
       freeze: freeze,