@droppii-org/chat-mobile 0.2.35 → 0.2.38

package/src/screens/chat-detail/messageToolbox/MessageToolboxMenu.tsx

@@ -11,12 +11,16 @@ interface MessageToolboxMenuProps {
   showUnpinMessage?: boolean;
   showRetryMessage?: boolean;
   showRevokeMessage?: boolean;
-  onCopyMessage: () => void;
-  onCopyMessageLink: () => void;
-  onPinMessage: () => void;
-  onUnpinMessage: () => void;
-  onRetryMessage: () => void;
-  onRevokeMessage: () => void;
+  showViewOriginalMessage?: boolean;
+  onPinMessage?: () => void;
+  onUnpinMessage?: () => void;
+  onViewOriginalMessage?: () => void;
+  showQuoteMessage?: boolean;
+  onCopyMessage?: () => void;
+  onCopyMessageLink?: () => void;
+  onRetryMessage?: () => void;
+  onRevokeMessage?: () => void;
+  onQuoteMessage?: () => void;
 }
 
 export const MessageToolboxMenu = memo(
@@ -27,15 +31,27 @@ export const MessageToolboxMenu = memo(
     showUnpinMessage,
     showRetryMessage,
     showRevokeMessage,
+    showViewOriginalMessage,
+    showQuoteMessage,
     onCopyMessage,
     onCopyMessageLink,
     onPinMessage,
     onUnpinMessage,
     onRetryMessage,
     onRevokeMessage,
+    onViewOriginalMessage,
+    onQuoteMessage,
   }: MessageToolboxMenuProps) => {
     return (
       <KContainer.View style={styles.card}>
+        <MessageToolboxItem
+          icon="arrow-reply-o"
+          color={KColors.gray.dark}
+          label={trans('chat:reply_message')}
+          visible={showQuoteMessage}
+          onPress={onQuoteMessage}
+        />
+
         <MessageToolboxItem
           icon="copy-o"
           color={KColors.gray.dark}
@@ -68,6 +84,14 @@ export const MessageToolboxMenu = memo(
           onPress={onUnpinMessage}
         />
 
+        <MessageToolboxItem
+          icon="chat-square-o"
+          color={KColors.gray.dark}
+          label={trans('chat:view_original_message')}
+          visible={showViewOriginalMessage}
+          onPress={onViewOriginalMessage}
+        />
+
         <MessageToolboxItem
           icon="arrow-reload-o"
           color={KColors.danger.normal}

package/src/screens/chat-detail/messageToolbox/MessageToolboxOverlay.tsx

@@ -15,17 +15,18 @@ import {
   getCopyableMessageText,
   getMessageToolboxItems,
 } from './messageToolbox.utils';
-import type { DMessageItem } from '../../../types/chat';
 import type { MeasuredRect, MessageToolboxRef } from './types';
 import { MessageToolboxWrapper } from './MessageToolboxWrapper';
 import type { ReactNode } from 'react';
 import { useSendMessage } from '../../../hooks/message/useSendMessage';
+import { useChatDetailContext } from '../../../context';
+import type { MessageItem } from '@droppii/openim-rn-client-sdk';
 
 interface MessageToolboxOverlayProps {
   currentUserId?: string;
-  customMessageItemFactory?: (item: DMessageItem) => ReactNode;
-  onPinMessage?: (message: DMessageItem) => void;
-  onUnpinMessage?: (message: DMessageItem) => void;
+  customMessageItemFactory?: (item: MessageItem) => ReactNode;
+  onPinMessage?: (message: MessageItem) => void;
+  onUnpinMessage?: (message: MessageItem) => void;
 }
 
 export const MessageToolboxOverlay = forwardRef<
@@ -41,8 +42,9 @@ export const MessageToolboxOverlay = forwardRef<
     },
     ref
   ) => {
+    const { setQuotedMessage } = useChatDetailContext();
     const [visible, setVisible] = useState(false);
-    const [message, setMessage] = useState<DMessageItem | undefined>(undefined);
+    const [message, setMessage] = useState<MessageItem | undefined>(undefined);
     const [rect, setRect] = useState<MeasuredRect | null>(null);
     const toolboxItems = useMemo(
       () => getMessageToolboxItems(message, currentUserId),
@@ -57,7 +59,7 @@ export const MessageToolboxOverlay = forwardRef<
     }, []);
 
     const show = useCallback(
-      (msg: DMessageItem, msgRect: MeasuredRect) => {
+      (msg: MessageItem, msgRect: MeasuredRect) => {
         const toolboxNotAvailable =
           Object.values(getMessageToolboxItems(msg, currentUserId)).filter(
             Boolean
@@ -135,6 +137,12 @@ export const MessageToolboxOverlay = forwardRef<
       onUnpinMessage?.(message);
     }, [message, hide, onUnpinMessage]);
 
+    const handleQuoteMessage = useCallback(() => {
+      if (!message) return;
+      setQuotedMessage(message);
+      hide();
+    }, [message, hide, setQuotedMessage]);
+
     if (!visible || !message || !rect) {
       return null;
     }
@@ -171,6 +179,7 @@ export const MessageToolboxOverlay = forwardRef<
               onUnpinMessage={handleUnpinMessage}
               onRetryMessage={handleRetryMessage}
               onRevokeMessage={handleRevokeMessage}
+              onQuoteMessage={handleQuoteMessage}
             />
           }
         />

package/src/screens/chat-detail/messageToolbox/MessageToolboxWrapper.tsx

@@ -74,6 +74,7 @@ export const MessageToolboxWrapper = memo(
     const containerStyles = useAnimatedStyle(() => ({
       top: Math.max(rect.y, insets.top) + topOffset,
       left: rect.x,
+      width: rect.width,
       gap: MENU_GAP,
       transform: [{ translateY: translateY.value }],
     }));

package/src/screens/chat-detail/messageToolbox/messageToolbox.utils.ts

@@ -1,5 +1,8 @@
-import { MessageStatus, MessageType } from '@droppii/openim-rn-client-sdk';
-import type { DMessageItem } from '../../../types/chat';
+import {
+  MessageStatus,
+  MessageType,
+  type MessageItem,
+} from '@droppii/openim-rn-client-sdk';
 import { getMessageText } from '../../../utils/legendListMessage';
 import { isMessageRevoked } from '../../../utils/messageUtils';
 
@@ -22,46 +25,50 @@ const PIN_SUPPORTED_TYPES: number[] = [
   MessageType.FileMessage,
 ];
 
-const isMessageSucceeded = (message: DMessageItem): boolean =>
+const isMessageSucceeded = (message: MessageItem): boolean =>
   message.status !== MessageStatus.Failed &&
   message.status !== MessageStatus.Sending;
 
 // Failed or revoked messages never offer either copy action.
-const isEligibleForToolbox = (message: DMessageItem): boolean =>
+const isEligibleForToolbox = (message: MessageItem): boolean =>
   isMessageSucceeded(message) && !isMessageRevoked(message);
 
-const isCopyMessageSupported = (message: DMessageItem): boolean =>
+const isCopyMessageSupported = (message: MessageItem): boolean =>
   isEligibleForToolbox(message) &&
   COPYABLE_TEXT_TYPES.includes(message.contentType);
 
 // All message types are supported, as long as the message is eligible.
-// const isCopyMessageLinkSupported = (message: DMessageItem): boolean =>
+// const isCopyMessageLinkSupported = (message: MessageItem): boolean =>
 //   isEligibleForToolbox(message);
 
-const isRetrySupported = (message: DMessageItem): boolean =>
+const isRetrySupported = (message: MessageItem): boolean =>
   message.status === MessageStatus.Failed;
 
 // Merged/album messages (grouped photos) count as "image" for pinning
 // purposes, mirroring the preview logic in utils/messageUtils.ts.
-const isMergedImageMessage = (message: DMessageItem): boolean =>
+const isMergedImageMessage = (message: MessageItem): boolean =>
   message.contentType === MessageType.MergeMessage &&
   !!message.mergeElem?.multiMessage?.some(
     (msg) => msg.contentType === MessageType.PictureMessage
   );
 
 // BR-002: Pin message supports only successfully sent messages.
-const isPinMessageSupported = (message: DMessageItem): boolean =>
+const isPinMessageSupported = (message: MessageItem): boolean =>
   isEligibleForToolbox(message) &&
   (PIN_SUPPORTED_TYPES.includes(message.contentType) ||
     isMergedImageMessage(message));
 
+const isQuoteMessageSupported = (message: MessageItem): boolean =>
+  isMessageSucceeded(message) &&
+  message?.contentType !== MessageType.RevokeMessage;
+
 // Revoke is only available within 24h of a successful send.
 const REVOKE_WINDOW_MS = 24 * 60 * 60 * 1000;
 
 // Revoke is only available for messages sent by the current user.
 // And not limited by message content type.
 const isRevokeMessageSupported = (
-  message: DMessageItem,
+  message: MessageItem,
   currentUserId?: string
 ): boolean =>
   isEligibleForToolbox(message) &&
@@ -69,7 +76,7 @@ const isRevokeMessageSupported = (
   message.sendID === currentUserId &&
   Date.now() - (message.sendTime || message.createTime || 0) < REVOKE_WINDOW_MS;
 
-export const getCopyableMessageText = (message: DMessageItem): string => {
+export const getCopyableMessageText = (message: MessageItem): string => {
   if (message.contentType === MessageType.UrlTextMessage) {
     return message.urlTextElem?.content ?? '';
   }
@@ -77,7 +84,7 @@ export const getCopyableMessageText = (message: DMessageItem): string => {
 };
 
 export const getMessageToolboxItems = (
-  message?: DMessageItem,
+  message?: MessageItem,
   currentUserId?: string
 ) => {
   if (message == null) {
@@ -88,6 +95,7 @@ export const getMessageToolboxItems = (
   // const showCopyMessageLink = isCopyMessageLinkSupported(message);
   const showRetryMessage = isRetrySupported(message);
   const showRevokeMessage = isRevokeMessageSupported(message, currentUserId);
+  const showQuoteMessage = isQuoteMessageSupported(message);
 
   const isPinSupported = isPinMessageSupported(message);
   const showPinMessage = isPinSupported && !message.isPinned;
@@ -100,5 +108,6 @@ export const getMessageToolboxItems = (
     showRevokeMessage,
     showPinMessage,
     showUnpinMessage,
+    showQuoteMessage,
   };
 };

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

@@ -1,4 +1,4 @@
-import type { DMessageItem } from '../../../types/chat';
+import type { MessageItem } from '@droppii/openim-rn-client-sdk';
 
 export interface MeasuredRect {
   x: number;
@@ -8,6 +8,6 @@ export interface MeasuredRect {
 }
 
 export interface MessageToolboxRef {
-  show: (message: DMessageItem, rect: MeasuredRect) => void;
+  show: (message: MessageItem, rect: MeasuredRect) => void;
   hide: () => void;
 }

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

@@ -1,7 +1,7 @@
 import type { ReactNode } from 'react';
 import type { MediaItem } from '../../hooks/useMediaViewer';
-import type { DMessageItem } from '../../types/chat';
 import type { MeasuredRect } from './messageToolbox/types';
+import type { MessageItem } from '@droppii/openim-rn-client-sdk';
 
 export type DChatActionIconProvider = 'MaterialCommunityIcons' | 'DroppiiNew';
 
@@ -70,9 +70,9 @@ export interface ChatComposerProps {
 }
 
 export interface ChatListProps {
-  messages?: DMessageItem[];
+  messages?: MessageItem[];
   currentUserId?: string;
-  customMessageItemFactory?: (item: DMessageItem) => ReactNode;
+  customMessageItemFactory?: (item: MessageItem) => ReactNode;
   onLoadEarlier?: () => void;
   isLoading?: boolean;
   isLoadingEarlier?: boolean;
@@ -82,7 +82,7 @@ export interface ChatListProps {
   hasMoreNewer?: boolean;
   onMediaPress?: (items: MediaItem[], index?: number) => void;
   onPressUrl?: (url: string) => void;
-  onLongPress?: (message: DMessageItem, rect: MeasuredRect) => void;
+  onLongPress?: (message: MessageItem, rect: MeasuredRect) => void;
 }
 
 export interface ChatDetailProps extends Omit<
@@ -96,6 +96,6 @@ export interface ChatDetailProps extends Omit<
   enabled?: boolean;
   showAddMember?: boolean;
   onPressUrl?: (url: string) => void;
-  customMessageItemFactory?: (item: DMessageItem) => ReactNode;
+  customMessageItemFactory?: (item: MessageItem) => ReactNode;
   pannelActions?: DChatPannelAction[];
 }

package/src/screens/inbox/Inbox.tsx

@@ -3,8 +3,6 @@ import { StyleSheet } from 'react-native';
 import { TabView } from 'react-native-tab-view';
 import { KContainer, KImage, KLabel, KColors } from '@droppii/libs';
 import { MessagesTab } from './MessagesTab';
-import { useUserStore } from '../../store';
-import { LoginStatus } from '@droppii/openim-rn-client-sdk';
 
 interface InboxProps {
   onPressThread?: (item: string) => void;
@@ -17,7 +15,6 @@ type TabRoute = { key: string; title: string };
 
 const Inbox = memo(
   ({ onPressThread, onPressSearch, onPressEdit, onPressGroup }: InboxProps) => {
-    const connectStatus = useUserStore((state) => state.connectStatus);
     const [index, setIndex] = useState(0);
     const [routes] = useState<TabRoute[]>([
       { key: 'messages', title: 'Tin nhắn' },
@@ -25,13 +22,12 @@ const Inbox = memo(
 
     const renderScene = useCallback(
       ({ route }: { route: TabRoute }) => {
-        if (connectStatus !== LoginStatus.Logged) return null;
         if (route.key === 'messages') {
           return <MessagesTab onPressThread={onPressThread} />;
         }
         return null;
       },
-      [onPressThread, connectStatus]
+      [onPressThread]
     );
 
     const renderTabBar = useCallback(

package/src/services/apis.ts

@@ -17,8 +17,4 @@ export namespace ChatAPI {
     useConversationStore.getState().reset();
     return OpenIMSDK.logout(operationID);
   };
-
-  export const getUser = async (operationID?: string | undefined) => {
-    return OpenIMSDK.getSelfUserInfo(operationID);
-  };
 }

package/src/services/message.ts

@@ -3,7 +3,6 @@ import OpenIMSDK, {
   type AdvancedGetMessageResult,
   type MessageItem,
 } from '@droppii/openim-rn-client-sdk';
-import type { DMessageItem } from '../types/chat';
 import { useConversationStore } from '../store';
 import { getReceiverId } from '../utils/message';
 
@@ -34,7 +33,7 @@ export namespace ChatMessageAPI {
 
   export async function sendTextMessage(params: {
     text: string;
-  }): Promise<DMessageItem> {
+  }): Promise<MessageItem> {
     const currentConversation = useConversationStore
       .getState()
       .getCurrentConversation();

package/src/store/message.ts

@@ -1,7 +1,7 @@
 import { create } from 'zustand';
 import { MessageType } from '@droppii/openim-rn-client-sdk';
 import type { MessageItem } from '@droppii/openim-rn-client-sdk';
-import type { DMessageItem, MessageStore } from '../types/chat';
+import type { MessageStore } from '../types/chat';
 import { mergeMessages } from '../utils/message';
 
 export const useMessageStore = create<MessageStore>()((set, get) => ({
@@ -15,7 +15,7 @@ export const useMessageStore = create<MessageStore>()((set, get) => ({
 
   pushNewMessage: (message: MessageItem) => {
     set((state) => ({
-      messages: mergeMessages(state.messages, [message as DMessageItem]),
+      messages: mergeMessages(state.messages, [message]),
     }));
   },
 
@@ -25,7 +25,7 @@ export const useMessageStore = create<MessageStore>()((set, get) => ({
       (msg) => msg.clientMsgID === message.clientMsgID
     );
     if (idx < 0) return;
-    tmpList[idx] = { ...tmpList[idx]!, ...message } as DMessageItem;
+    tmpList[idx] = { ...tmpList[idx]!, ...message };
     set({ messages: tmpList });
   },
 

package/src/store/pinnedMessage.ts

@@ -1,11 +1,11 @@
+import type { MessageItem } from '@droppii/openim-rn-client-sdk';
 import { create } from 'zustand';
-import type { DMessageItem } from '../types/chat';
 
 export interface PinnedMessageStore {
-  messages: DMessageItem[];
+  messages: MessageItem[];
   totalCount: number;
-  setMessages: (messages: DMessageItem[], totalCount: number) => void;
-  addMessage: (message: DMessageItem) => void;
+  setMessages: (messages: MessageItem[], totalCount: number) => void;
+  addMessage: (message: MessageItem) => void;
   removeMessage: (clientMsgID: string) => void;
   reset: () => void;
 }

package/src/store/user.ts

@@ -1,18 +1,18 @@
 import { create } from 'zustand';
-import { LoginStatus, type SelfUserInfo } from '@droppii/openim-rn-client-sdk';
-import { SyncStatus } from '../types/auth';
+import { type SelfUserInfo } from '@droppii/openim-rn-client-sdk';
+import { ConnectStatus, SyncStatus } from '../types/chat';
 
 export interface UserStore {
   user?: SelfUserInfo;
   setUser: (user: SelfUserInfo) => void;
-  connectStatus: LoginStatus;
-  updateConnectStatus: (status: LoginStatus) => void;
+  connectStatus: ConnectStatus;
+  updateConnectStatus: (status: ConnectStatus) => void;
   syncStatus: SyncStatus;
   updateSyncStatus: (status: SyncStatus) => void;
 }
 
 export const useUserStore = create<UserStore>()((set) => ({
-  connectStatus: LoginStatus.Logout,
+  connectStatus: ConnectStatus.Disconnected,
   syncStatus: SyncStatus.Loading,
   setUser(user) {
     set({ user });

package/src/translation/resources/i18n.ts

@@ -1,7 +1,8 @@
 const i18nKey: Record<string, string> = {
   'thread_card_bot_crm_name': 'Droppii Hỗ Trợ',
   'thread_card_fallback_name': 'Người dùng',
-  'chat:file_too_large': 'Tệp quá lớn. Tối đa 10MB',
+  'chat:file_too_large':
+    'Tệp tải lên không hợp lệ. Kích thước tệp không được vượt quá {{maxSize}}MB',
   'chat:file_max_count': 'Chỉ có thể đính kèm tối đa 3 tệp',
   'chat:file_pick_failed': 'Không thể chọn tệp',
   'chat:file_upload_failed': 'Lỗi tải tệp lên',
@@ -47,6 +48,10 @@ const i18nKey: Record<string, string> = {
   'chat:pin_limit_desc':
     'Chỉ được ghim tối đa 5 tin nhắn. Vui lòng bỏ ghim một tin nhắn hiện có trước khi ghim tin nhắn mới.',
   'chat:pin_limit_primary': 'Đã hiểu',
+  'chat:pinned_messages_title': 'Tin nhắn đã ghim',
+  'chat:pinned_messages_hint':
+    'Nhấn giữ tin nhắn để chọn "Bỏ Ghim" hoặc "Xem tin nhắn gốc"',
+  'chat:view_original_message': 'Xem tin nhắn gốc',
   'msg_type_image': '[Hình ảnh]',
   'msg_type_voice': '[Tin nhắn thoại]',
   'msg_type_video': '[Video]',
@@ -71,6 +76,10 @@ const i18nKey: Record<string, string> = {
   'send_order': 'Gửi đơn hàng',
   'send_product': 'Gửi sản phẩm',
   'create_appointment': 'Tạo lịch hẹn',
+  'chat:reply_message': 'Trả lời',
+  'chat:reply_to': 'Trả lời {{name}}',
+  'yourself': 'chính mình',
+  'you': 'Bạn',
 };
 
 export default {

package/src/types/auth.ts

@@ -18,9 +18,3 @@ export type GetOpenIMTokenResponse = {
   token: string;
   expiresIn: number;
 };
-
-export enum SyncStatus {
-  Loading = 0,
-  Success = 1,
-  Failed = 2,
-}

package/src/types/chat.ts

@@ -28,6 +28,7 @@ export interface ChatUIAdapter {
   toast?: { open: (params: any) => void };
   alert?: { open: (params: any) => void };
   popup?: { open: (params: any) => void };
+  bottomSheet?: { open: (params: any) => void };
 }
 
 export interface ChatContextType {
@@ -36,6 +37,7 @@ export interface ChatContextType {
   onPressFlashMessage?: (message: ConversationItem) => void;
   isShowFLashMessage: boolean;
   setIsShowFLashMessage: (value: boolean) => void;
+  handleLoginSdk: () => void;
 }
 
 export type ChatProviderProps = PropsWithChildren<{
@@ -97,6 +99,18 @@ export interface DBotStatus {
   botSupportPlatform: unknown | null;
 }
 
+export enum SyncStatus {
+  Loading = 0,
+  Success = 1,
+  Failed = 2,
+}
+
+export enum ConnectStatus {
+  Disconnected = 0,
+  Connected = 1,
+  Connecting = 2,
+}
+
 export interface DConversationPeerUser {
   id: string;
   username?: string;
@@ -118,42 +132,6 @@ export interface DConversationQueryParams {
   pageSize: number;
 }
 
-export interface DMessageItem extends MessageItem {
-  isInternal?: boolean;
-  atUserIDList?: unknown;
-  attachedInfo?: 'null';
-  options?: DMessageOption;
-  isPinned?: boolean;
-  pinnedByUserID?: string;
-  pinnedTime?: number;
-}
-
-export interface DMessageOption {
-  conversationUpdate: boolean;
-  offlinePush: boolean;
-  senderConversationUpdate: boolean;
-  unreadCount: boolean;
-}
-
-export interface DMessagePushInfo {
-  title: string;
-  desc: string;
-  /**
-   * @instance DMessagePushInfoEx
-   */
-  ex: string;
-  signalInfo: string;
-  iospushSound: 'default';
-  iosbadgeCount: boolean;
-}
-
-export interface DMessagePushInfoEx {
-  icon: string; // url
-  conversationId: string;
-  title: string;
-  desc: string;
-}
-
 export interface IMessageItemEx {
   applicationType: DChatApplicationType;
   sessionId?: string;
@@ -167,13 +145,13 @@ export interface IMessageItemEx {
 }
 
 export interface MessageStore {
-  messages: DMessageItem[];
+  messages: MessageItem[];
   hasMoreEarlier: boolean;
   hasMoreNewer: boolean;
-  setMessages: (messages: DMessageItem[], hasMore: boolean) => void;
+  setMessages: (messages: MessageItem[], hasMore: boolean) => void;
   pushNewMessage: (message: MessageItem) => void;
   updateOneMessage: (
-    message: Partial<DMessageItem> & Pick<MessageItem, 'clientMsgID'>
+    message: Partial<MessageItem> & Pick<MessageItem, 'clientMsgID'>
   ) => void;
   deleteOneMessage: (clientMsgID: string) => void;
   reset: () => void;
@@ -181,12 +159,13 @@ export interface MessageStore {
 
 export interface ChatDetailContextType {
   conversationFlow?: IConversationFlow;
-  refetchConversationFlow: () => void;
   isBotConversation: boolean;
   setConverationFlowStep: (step?: IConversationFlowStep) => void;
   flowState?: DFlowState;
   runButtonContext: (stringContext: DFlowContext) => Promise<boolean>;
   conversation?: ConversationItem;
+  quotedMessage?: MessageItem;
+  setQuotedMessage: (item?: MessageItem) => void;
 }
 
 export interface ChatDetailProviderProps extends PropsWithChildren {}

package/src/utils/UIUtils.ts

@@ -10,6 +10,7 @@ const defaultAdapter: Required<ChatUIAdapter> = {
   toast: { open: openWithAlert },
   alert: { open: openWithAlert },
   popup: { open: openWithAlert },
+  bottomSheet: { open: openWithAlert },
 };
 
 let _adapter: ChatUIAdapter = {};
@@ -28,4 +29,8 @@ export const UIUtils: Required<ChatUIAdapter> = {
   popup: {
     open: (params) => (_adapter.popup ?? defaultAdapter.popup).open(params),
   },
+  bottomSheet: {
+    open: (params) =>
+      (_adapter.bottomSheet ?? defaultAdapter.bottomSheet).open(params),
+  },
 };

package/src/utils/legendListMessage.ts

@@ -1,10 +1,9 @@
-import { MessageType } from '@droppii/openim-rn-client-sdk';
-import type { DMessageItem } from '../types/chat';
+import { MessageType, type MessageItem } from '@droppii/openim-rn-client-sdk';
 
 /**
  * Extract message text based on content type
  */
-export const getMessageText = (message: DMessageItem): string => {
+export const getMessageText = (message: MessageItem): string => {
   switch (message.contentType) {
     case MessageType.TextMessage:
       return message.textElem?.content ?? message.content;
@@ -49,7 +48,7 @@ export interface PrecomputedMessageData {
  * Returns: Map of messageId -> {dayStart, messageType, createdAt}
  */
 export const precomputeLegendListData = (
-  messages: DMessageItem[]
+  messages: MessageItem[]
 ): Map<string, PrecomputedMessageData> => {
   const dataMap = new Map<string, PrecomputedMessageData>();
   let lastDay: number | null = null;
@@ -81,7 +80,7 @@ export const precomputeLegendListData = (
  * Kept for backward compatibility
  */
 export const computeDayStarts = (
-  messages: DMessageItem[]
+  messages: MessageItem[]
 ): Map<string, boolean> => {
   const dayStartMap = new Map<string, boolean>();
   let lastDay: number | null = null;

package/src/utils/message.ts

@@ -4,20 +4,19 @@ import {
   type ConversationItem,
   type MessageItem,
 } from '@droppii/openim-rn-client-sdk';
-import { type DMessageItem } from '../types/chat';
 import { getConversationID } from './conversation';
 
-const getMessageTime = (message: DMessageItem) =>
+const getMessageTime = (message: MessageItem) =>
   message.sendTime || message.createTime || 0;
 
-const getMessageKey = (message: DMessageItem) =>
+const getMessageKey = (message: MessageItem) =>
   message.clientMsgID || message.serverMsgID;
 
 export const mergeMessages = (
-  current: DMessageItem[],
-  incoming: DMessageItem[]
-): DMessageItem[] => {
-  const map = new Map<string, DMessageItem>();
+  current: MessageItem[],
+  incoming: MessageItem[]
+): MessageItem[] => {
+  const map = new Map<string, MessageItem>();
 
   for (const message of [...current, ...incoming]) {
     const key = getMessageKey(message);
@@ -54,7 +53,7 @@ export type HistoryPaginationAnchor = {
 
 export const resolveHistoryLastMinSeq = (
   history: { lastMinSeq?: number },
-  fallbackMessage?: DMessageItem
+  fallbackMessage?: MessageItem
 ): number => {
   if (history.lastMinSeq != null) {
     return history.lastMinSeq;
@@ -64,7 +63,7 @@ export const resolveHistoryLastMinSeq = (
 };
 
 export const getHistoryPaginationAnchor = (
-  messages: DMessageItem[]
+  messages: MessageItem[]
 ): HistoryPaginationAnchor | null => {
   if (!messages.length) {
     return null;
@@ -86,8 +85,8 @@ export const getHistoryPaginationAnchor = (
 };
 
 export const hasNewHistoryMessages = (
-  current: DMessageItem[],
-  incoming: DMessageItem[]
+  current: MessageItem[],
+  incoming: MessageItem[]
 ): boolean => {
   const currentKeys = new Set(
     current.map((message) => getMessageKey(message)).filter(Boolean)