@droppii-org/chat-mobile 0.2.69 → 0.2.71

package/src/hooks/message/useSendMessage.ts

@@ -6,6 +6,7 @@ import type {
   MessageItem,
   OfflinePush,
   QuoteMsgParams,
+  SendMsgParams,
 } from '@droppii/openim-rn-client-sdk';
 import {
   GroupPermission,
@@ -38,15 +39,21 @@ import { useGuardedAction } from '../useGroupPermission';
 
 const buildSendParams = (
   message: MessageItem,
-  recvID: string,
-  groupID: string,
-  extendMessageInfo: IMessageItemEx
-) => ({
-  groupID,
-  recvID,
-  message: { ...message, ex: JSON.stringify(extendMessageInfo) || '{}' },
-  offlinePushInfo: generateOfflinePushInfo(message),
-});
+  recvID?: string,
+  groupID?: string,
+  extendMessageInfo?: IMessageItemEx
+) =>
+  groupID
+    ? ({
+        groupID,
+        message: { ...message, ex: JSON.stringify(extendMessageInfo) || '{}' },
+        offlinePushInfo: generateOfflinePushInfo(message),
+      } as SendMsgParams)
+    : ({
+        recvID,
+        message: { ...message, ex: JSON.stringify(extendMessageInfo) || '{}' },
+        offlinePushInfo: generateOfflinePushInfo(message),
+      } as SendMsgParams);
 
 export const useSendMessage = () => {
   const applicationType = useChatContext().applicationType;

package/src/screens/chat-detail/ChatComposer.tsx

@@ -64,7 +64,10 @@ import { useSendMessage } from '../../hooks/message/useSendMessage';
 import { openBotMenuSheet } from './BotMenuSheet';
 import { UIUtils } from '../../utils/UIUtils';
 import { GroupPermission, PeerType } from '@droppii/openim-rn-client-sdk';
-import { useGuardedAction } from '../../hooks/useGroupPermission';
+import {
+  useGuardedAction,
+  useHasGroupPermission,
+} from '../../hooks/useGroupPermission';
 import { useIsJoinedGroup } from '../../hooks/useIsJoinedGroup';
 
 interface ChatComposerInternalProps {
@@ -104,6 +107,9 @@ export const ChatComposer = memo(
     const { mutateAsync: closeSupportSession } = useCloseSupportSession();
     const { sendMessage } = useSendMessage();
     const compose = useChatCompose();
+    const isSendMessageAllowed = useHasGroupPermission(
+      GroupPermission.SendMessage
+    );
 
     const { data: isJoinedGroup } = useIsJoinedGroup(conversation?.groupID);
 
@@ -414,7 +420,7 @@ export const ChatComposer = memo(
       conversationFlow?.flowCurrentStep?.type === ReactFlowsNodeTypes.Start &&
       isEmptyMessage;
 
-    if (isDisableCompose && !isGroupConversation) {
+    if ((isDisableCompose && !isGroupConversation) || !isSendMessageAllowed) {
       content = (
         <KContainer.View row alignItems justifyContent>
           <KContainer.View marginR="0.25rem">
@@ -425,7 +431,9 @@ export const ChatComposer = memo(
             />
           </KContainer.View>
           <KLabel.Text typo="TextXsNormal">
-            {trans('chat:compose_disabled_seller_inactive')}
+            {!isSendMessageAllowed
+              ? trans('group:cannot_send_message')
+              : trans('chat:compose_disabled_seller_inactive')}
           </KLabel.Text>
         </KContainer.View>
       );

package/src/screens/chat-detail/ChatDetail.tsx

@@ -197,6 +197,7 @@ const ChatDetail = memo(
           onPressAddMember={onPressAddMember}
           onPressMenu={handlePressMenu}
           onPressAvatar={handlePressMenu}
+          targetGroupId={targetGroupId}
         />
 
         <PinnedMessageBar

package/src/screens/chat-detail/ChatDetailHeader.tsx

@@ -9,11 +9,11 @@ import {
 import { AvatarSection } from '../../components/ThreadCard/AvatarSection';
 import { NamePrefixIcon } from '../../components/ThreadCard/NamePrefixIcon';
 import type { ChatDetailHeaderProps } from './types';
-import { useConversation } from '../../store';
 import { getConversationSubtitle } from './conversationHeader.utils';
 import { useGetUsersInfo } from '../../hooks/users/useGetUsersInfo';
 import { useGetGroupInfo } from '../../hooks/conversation/useGetGroupInfo';
 import { isGroupConversation } from '../../utils/conversation';
+import { useGetConversationDetail } from '../../hooks/conversation/useGetConversationDetail';
 
 const ChatDetailHeader = memo(
   ({
@@ -25,15 +25,21 @@ const ChatDetailHeader = memo(
     onPressAddMember,
     onPressMenu,
     onPressAvatar,
+    targetGroupId,
   }: ChatDetailHeaderProps) => {
-    const conversation = useConversation(conversationId);
+    const { conversationData: conversation } = useGetConversationDetail({
+      targetGroupId,
+      targetUserId: targetUserId,
+    });
     const { data: usersInfo } = useGetUsersInfo(
       targetUserId ? [targetUserId] : []
     );
+
     const isGroup = isGroupConversation(conversation);
     const { data: groupInfo } = useGetGroupInfo(
       isGroup ? conversation?.groupID : undefined
     );
+
     const { faceURL, showName } = useMemo(() => {
       const userInfo = usersInfo?.[0];
       const resolvedFaceURL = conversation?.faceURL || userInfo?.faceURL;

package/src/screens/chat-detail/ChatListLegend.tsx

@@ -8,6 +8,7 @@ import {
   type RefObject,
 } from 'react';
 import {
+  ActivityIndicator,
   DeviceEventEmitter,
   Platform,
   StyleSheet,
@@ -89,6 +90,7 @@ export const ChatListLegend = memo(
     freeze,
     scrollMessageToEnd,
     keyboardOffset,
+    isLoading,
   }: ChatListLegendInternalProps) => {
     const currentUserId = useUserStore((s) => s.user?.userID);
     const windowWidth = useWindowDimensions().width;
@@ -492,16 +494,13 @@ export const ChatListLegend = memo(
       listRef,
     ]);
 
-    // if (isLoading) {
-    //   return (
-    //     <KContainer.View flex center background={KColors.white}>
-    //       <ActivityIndicator
-    //         color={KColors.palette.primary.w400}
-    //         size="small"
-    //       />
-    //     </KContainer.View>
-    //   );
-    // }
+    if (isLoading) {
+      return (
+        <KContainer.View flex center background={KColors.white}>
+          <ActivityIndicator color={KColors.primary.normal} size="small" />
+        </KContainer.View>
+      );
+    }
 
     return (
       <KContainer.View flex background={KColors.white} style={styles.container}>
@@ -509,7 +508,7 @@ export const ChatListLegend = memo(
           ref={listRef}
           data={messages}
           renderItem={renderItem}
-          estimatedItemSize={100}
+          estimatedItemSize={200}
           getItemType={getItemType}
           getFixedItemSize={getFixedItemSize}
           keyExtractor={(item) => String(item.clientMsgID || item.serverMsgID)}
@@ -517,7 +516,6 @@ export const ChatListLegend = memo(
           extraData={`${conversationFlow?.flowCurrentStep?.id ?? ''}-${lastMessageId ?? ''}-${highlightedId ?? ''}`}
           alignItemsAtEnd
           maintainVisibleContentPosition={maintainVisiblePositionConfig}
-          maintainScrollAtEnd={true}
           freeze={freeze}
           keyboardOffset={keyboardOffset}
           scrollEventThrottle={16}
@@ -532,7 +530,7 @@ export const ChatListLegend = memo(
           onEndReached={handleEndReached}
           onEndReachedThreshold={0.2}
           showsVerticalScrollIndicator={false}
-          initialScrollAtEnd
+          initialScrollIndex={messages.length - 1}
         />
         <Animated.View
           style={[styles.scrollToBottomButton, animatedButtonStyle]}

package/src/screens/chat-detail/types.ts

@@ -49,6 +49,7 @@ export interface ChatDetailHeaderProps {
   onPressAvatar?: () => void;
   conversationId: string;
   targetUserId?: string;
+  targetGroupId?: string;
 }
 
 export interface ChatQuickActionsRenderParams {

package/src/screens/inbox/Inbox.tsx

@@ -10,11 +10,12 @@ import {
   KSpacingValue,
 } from '@droppii/libs';
 import { MessagesTab } from './MessagesTab';
+import type { ConversationItem } from '@droppii/openim-rn-client-sdk';
 import { trans } from '../../translation';
 import { CommunityTab } from './CommunityTab';
 
 interface InboxProps {
-  onPressThread?: (item: string) => void;
+  onPressThread?: (item?: ConversationItem) => void;
   onPressSearch?: () => void;
   onPressEdit?: () => void;
   onPressContact?: () => void;

package/src/screens/inbox/MessagesTab.tsx

@@ -5,9 +5,10 @@ import { useConversationList } from '../../hooks/useConversationList';
 import { ThreadCard } from '../../components/ThreadCard';
 import { useConversationStore } from '../../store';
 import { useChatContext } from '../../context';
+import type { ConversationItem } from '@droppii/openim-rn-client-sdk';
 
 interface MessagesTabProps {
-  onPressThread?: (item: string) => void;
+  onPressThread?: (item?: ConversationItem) => void;
 }
 
 const Separator = () => <KDivider type="line" size="hairline" />;
@@ -23,7 +24,7 @@ export const MessagesTab = memo(({ onPressThread }: MessagesTabProps) => {
   });
 
   const handleThreadPress = useCallback(
-    (params: { item: string; event: GestureResponderEvent }) => {
+    (params: { item?: ConversationItem; event: GestureResponderEvent }) => {
       onPressThread?.(params.item);
     },
     [onPressThread]

package/src/translation/resources/i18n.ts

@@ -172,6 +172,8 @@ const i18nKey: Record<string, string> = {
   'group:not_in_group': 'Bạn cần tham gia nhóm để gửi tin nhắn',
   'group:cannot_send_message': 'Bạn không thể gửi tin nhắn vào nhóm này',
   'group:joined_group': 'Đã tham gia nhóm {{groupName}}',
+  'group:public_group': 'Nhóm công khai',
+  'group:private_group': 'Nhóm riêng tư',
 };
 
 export default {