@droppii-org/chat-mobile 0.2.63 → 0.2.65

package/lib/typescript/src/types/flows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flows.d.ts","sourceRoot":"","sources":["../../../../src/types/flows.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"flows.d.ts","sourceRoot":"","sources":["../../../../src/types/flows.ts"],"names":[],"mappings":"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"}

package/lib/typescript/src/utils/flows.d.ts

@@ -1,5 +1,5 @@
 import { type GroupChild, type IConversationFlowStep } from '../types/flows';
-export declare const getFlowInputButtonsNode: (step?: IConversationFlowStep | null) => GroupChild<"input-buttons">;
+export declare const getFlowInputButtonsNodes: (step?: IConversationFlowStep | null) => GroupChild<"input-buttons">[];
 export declare const DEFAULT_BUTTON_ID = "default-item-button";
 export declare const CONTEXT_BUTTON_PREFIX = "context:";
 export declare const isContextButton: (label: string) => boolean;

package/lib/typescript/src/utils/flows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flows.d.ts","sourceRoot":"","sources":["../../../../src/utils/flows.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,qBAAqB,EAC3B,MAAM,gBAAgB,CAAC;AAExB,eAAO,MAAM,uBAAuB,GAClC,OAAO,qBAAqB,GAAG,IAAI,gCAQpC,CAAC;AAEF,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AAEvD,eAAO,MAAM,qBAAqB,aAAa,CAAC;AAEhD,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,YAG5C,CAAC"}
+{"version":3,"file":"flows.d.ts","sourceRoot":"","sources":["../../../../src/utils/flows.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,qBAAqB,EAC3B,MAAM,gBAAgB,CAAC;AAExB,eAAO,MAAM,wBAAwB,GACnC,OAAO,qBAAqB,GAAG,IAAI,kCAOpC,CAAC;AAEF,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AAEvD,eAAO,MAAM,qBAAqB,aAAa,CAAC;AAEhD,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,YAG5C,CAAC"}

package/lib/typescript/src/utils/highlightSearch.d.ts

@@ -0,0 +1,7 @@
+export interface HighlightResult {
+    before: string;
+    match: string;
+    after: string;
+}
+export declare const highlightSearch: (text: string, keyword: string, maxLength?: number) => HighlightResult | null;
+//# sourceMappingURL=highlightSearch.d.ts.map

package/lib/typescript/src/utils/highlightSearch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"highlightSearch.d.ts","sourceRoot":"","sources":["../../../../src/utils/highlightSearch.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,eAAe,GAC1B,MAAM,MAAM,EACZ,SAAS,MAAM,EACf,kBAAc,KACb,eAAe,GAAG,IAqCpB,CAAC"}

package/lib/typescript/src/utils/messageUtils.d.ts

@@ -20,6 +20,7 @@ export interface PinnedMessagePreview {
     fileIcon?: number;
 }
 export declare const getPinnedMessagePreview: (message: MessageItem) => PinnedMessagePreview;
+export declare const getSenderName: (message: MessageItem, currentUserId?: string, conversation?: ConversationItem) => string;
 export interface GetLastMessageTextParams {
     message: MessageItem | undefined;
     currentUserId?: string;

package/lib/typescript/src/utils/messageUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/messageUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EACjB,MAAM,+BAA+B,CAAC;AAIvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,eAAO,MAAM,gBAAgB,GAAI,SAAS,WAAW,KAAG,OACL,CAAC;AAEpD,eAAO,MAAM,kBAAkB,GAAI,SAAS,WAAW,KAAG,MAYzD,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,UAAU,WAAW,KAAG,MA0EzD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,UAAU,WAAW,KACpB,SAUF,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,UAAU,WAAW,KACpB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,SAAS,CAAA;CAGrC,CAAC;AAEH,MAAM,MAAM,sBAAsB,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AAEzE,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,sBAAsB,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAmBD,eAAO,MAAM,uBAAuB,GAClC,SAAS,WAAW,KACnB,oBA0DF,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC;AAED,eAAO,MAAM,kBAAkB,GAAI,0EAKhC,wBAAwB,KAAG,MAuB7B,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,UAAU,WAAW,EACrB,gBAAgB,MAAM,EACtB,eAAe,gBAAgB,EAC/B,SAAS,OAAO,KACf,MAOF,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,KAAK,MAAM,KAAG,YAAY,GAAG,SAS7D,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,WAAW,MAAM,KAAG,MAUhE,CAAC"}
+{"version":3,"file":"messageUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/messageUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EACjB,MAAM,+BAA+B,CAAC;AAIvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,eAAO,MAAM,gBAAgB,GAAI,SAAS,WAAW,KAAG,OACL,CAAC;AAEpD,eAAO,MAAM,kBAAkB,GAAI,SAAS,WAAW,KAAG,MAYzD,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,UAAU,WAAW,KAAG,MA0EzD,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,UAAU,WAAW,KACpB,SAUF,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,UAAU,WAAW,KACpB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,SAAS,CAAA;CAGrC,CAAC;AAEH,MAAM,MAAM,sBAAsB,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AAEzE,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,sBAAsB,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAmBD,eAAO,MAAM,uBAAuB,GAClC,SAAS,WAAW,KACnB,oBA0DF,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,SAAS,WAAW,EACpB,gBAAgB,MAAM,EACtB,eAAe,gBAAgB,KAC9B,MASF,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,WAAW,GAAG,SAAS,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC;AAED,eAAO,MAAM,kBAAkB,GAAI,0EAKhC,wBAAwB,KAAG,MAiB7B,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,UAAU,WAAW,EACrB,gBAAgB,MAAM,EACtB,eAAe,gBAAgB,EAC/B,SAAS,OAAO,KACf,MAOF,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,KAAK,MAAM,KAAG,YAAY,GAAG,SAS7D,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,WAAW,MAAM,KAAG,MAUhE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@droppii-org/chat-mobile",
-  "version": "0.2.63",
+  "version": "0.2.65",
   "description": "Droppii chat mobile",
   "keywords": [
     "react-native",
@@ -69,7 +69,7 @@
     "example-legacy": "yarn workspace @droppii-org/chat-mobile-example-legacy"
   },
   "dependencies": {
-    "@droppii/openim-rn-client-sdk": "git+ssh://git@github.com/droppii/open-im-sdk-reactnative.git#v1.0.0-rc20",
+    "@droppii/openim-rn-client-sdk": "git+ssh://git@github.com/droppii/open-im-sdk-reactnative.git#v1.0.0-rc23",
     "@legendapp/list": "^3.0.6",
     "axios": "^1.16.1",
     "lodash": "^4.18.1",

package/src/components/flows/inputButtons/index.tsx

@@ -18,40 +18,47 @@ import { DEFAULT_BUTTON_ID, isContextButton } from '../../../utils/flows';
 import { trans } from '../../../translation';
 
 interface IInputButtonFlow {
-  nodeData: GroupChild<'input-buttons'> | null;
+  nodeData: GroupChild<'input-buttons'>[];
   onResetFlow: () => void;
   onRunFlow: (payload: IRunConversationFlowPayload) => void;
 }
 
+type ButtonItem = InputButtonItem & { parentId: string; nodeId: string };
+
 export const InputButtonFlow = memo((props: IInputButtonFlow) => {
   const { nodeData, onResetFlow, onRunFlow } = props || {};
 
   const buttonList = useMemo(() => {
-    return (
-      nodeData?.data?.buttons?.filter(
-        (n) => !isContextButton(n?.label || '')
-      ) || []
+    return nodeData.flatMap(
+      (item) =>
+        item.data?.buttons
+          ?.filter((n) => !isContextButton(n?.label || ''))
+          ?.map((n) => ({
+            ...n,
+            parentId: item.parentId,
+            nodeId: item.id,
+          })) || []
     );
   }, [nodeData]);
 
   const onPressItem = useCallback(
-    (item: InputButtonItem) => {
+    (item: ButtonItem) => {
       if (item.id === DEFAULT_BUTTON_ID) {
         onResetFlow?.();
       } else {
         onRunFlow?.({
           actionId: item.id,
-          groupId: nodeData?.parentId || '',
-          childId: nodeData?.id || '',
+          groupId: item.parentId || '',
+          childId: item.nodeId || '',
           plainText: item?.label || '',
         });
       }
     },
-    [onRunFlow, onResetFlow, nodeData]
+    [onRunFlow, onResetFlow]
   );
 
   const renderButtonItem = useCallback(
-    (item: InputButtonItem) => {
+    (item: ButtonItem) => {
       return (
         <KContainer.Touchable
           key={item.id}
@@ -74,7 +81,7 @@ export const InputButtonFlow = memo((props: IInputButtonFlow) => {
     [onPressItem]
   );
 
-  if (!nodeData) return null;
+  if (!nodeData || buttonList.length === 0) return null;
 
   return (
     <KContainer.View style={styles.bubble}>
@@ -93,7 +100,8 @@ const styles = StyleSheet.create({
     borderRadius: KSpacingValue['1.25rem'],
     ...messageStyles.bubbleReceived,
     marginVertical: KSpacingValue['0.5rem'],
-    width: '100%',
+    marginHorizontal: KSpacingValue['0.75rem'],
+    maxWidth: '80%',
   },
   buttonsContainer: {
     backgroundColor: KColors.white,

package/src/components/messages/linkMessage/index.tsx

@@ -11,6 +11,7 @@ import { formatMessageTime } from '../types';
 import type { BaseLegendMessageProps } from '../types';
 import { CHAT_BUBBLE_COLORS } from '../../../screens/chat-detail/constants';
 import { parseUrlMetadata } from '../../../utils/messageUtils';
+import { messageStyles } from '../styles';
 
 const renderTextWithLinks = (
   content: string,
@@ -62,6 +63,7 @@ export const LinkMessage = memo(
     isOutgoing,
     createdAtTime,
     onPressUrl,
+    isHighlighted,
   }: BaseLegendMessageProps & { onPressUrl?: (url: string) => void }) => {
     const content = message?.urlTextElem?.content;
     const urls = message?.urlTextElem?.urls ?? [];
@@ -74,6 +76,7 @@ export const LinkMessage = memo(
           style={[
             styles.bubble,
             isOutgoing ? styles.bubbleSent : styles.bubbleReceived,
+            isHighlighted && messageStyles.bubbleHighlighted,
           ]}
         >
           {!!content?.trim() && (

package/src/components/messages/quotedMessage/index.tsx

@@ -25,7 +25,7 @@ import { ChatEvent } from '../../../types/events';
 interface QuotedMessageProps extends BaseLegendMessageProps {}
 
 const QuotedMessage = memo((props: QuotedMessageProps) => {
-  const { message, isOutgoing, createdAtTime } = props || {};
+  const { message, isOutgoing, createdAtTime, isHighlighted } = props || {};
 
   const { conversation } = useChatDetailContext();
 
@@ -70,6 +70,7 @@ const QuotedMessage = memo((props: QuotedMessageProps) => {
           messageStyles.bubble,
           styles.container,
           isOutgoing ? messageStyles.bubbleSent : messageStyles.bubbleReceived,
+          isHighlighted && messageStyles.bubbleHighlighted,
         ]}
       >
         <KContainer.Touchable

package/src/components/messages/styles.ts

@@ -1,5 +1,5 @@
 import { StyleSheet } from 'react-native';
-import { KSpacingValue } from '@droppii/libs';
+import { KColors, KSpacingValue } from '@droppii/libs';
 import { CHAT_BUBBLE_COLORS } from '../../screens/chat-detail/constants';
 
 export const messageStyles = StyleSheet.create({
@@ -11,6 +11,11 @@ export const messageStyles = StyleSheet.create({
     paddingVertical: KSpacingValue['0.5rem'],
     borderRadius: KSpacingValue['1.25rem'],
   },
+  bubbleHighlighted: {
+    borderRadius: KSpacingValue['1.25rem'],
+    borderColor: KColors.primary.normal,
+    borderWidth: 1,
+  },
   bubbleReceived: {
     backgroundColor: CHAT_BUBBLE_COLORS.received,
   },

package/src/components/messages/textMessage/index.tsx

@@ -7,7 +7,12 @@ import { formatMessageTime } from '../types';
 import type { BaseLegendMessageProps } from '../types';
 import { StyleSheet } from 'react-native';
 export const TextMessage = memo(
-  ({ message, isOutgoing, createdAtTime }: BaseLegendMessageProps) => {
+  ({
+    message,
+    isOutgoing,
+    createdAtTime,
+    isHighlighted,
+  }: BaseLegendMessageProps) => {
     const messageText = getMessageText(message);
     const timeLabel = formatMessageTime(createdAtTime);
 
@@ -23,6 +28,7 @@ export const TextMessage = memo(
             isOutgoing
               ? messageStyles.bubbleSent
               : messageStyles.bubbleReceived,
+            isHighlighted && messageStyles.bubbleHighlighted,
           ]}
         >
           <KLabel.Text typo="TextMdNormal" color={CHAT_BUBBLE_COLORS.text}>

package/src/components/messages/types.ts

@@ -5,6 +5,7 @@ export interface BaseLegendMessageProps {
   message: MessageItem;
   isOutgoing: boolean;
   createdAtTime: number;
+  isHighlighted?: boolean;
   onMediaPress?: (items: MediaItem[], index?: number) => void;
 }
 

package/src/context/ChatDetailContext.tsx

@@ -6,14 +6,20 @@ import {
   useMemo,
   useState,
 } from 'react';
+import { DeviceEventEmitter } from 'react-native';
 import {
   DFlowState,
   type ChatDetailContextType,
   type ChatDetailProviderProps,
 } from '../types/chat';
 import { fechtCurrentConversationFlow } from '../hooks/flows/useCurrentConversationFlow';
+import { ChatEvent, type GroupPermissionUpdatedPayload } from '../types/events';
 import { useConversationStore } from '../store';
-import { PeerType, type MessageItem } from '@droppii/openim-rn-client-sdk';
+import OpenIMSDK, {
+  GroupPermission,
+  PeerType,
+  type MessageItem,
+} from '@droppii/openim-rn-client-sdk';
 import {
   DFlowContext,
   NodeTypes,
@@ -33,6 +39,7 @@ export const ChatDetailContext = createContext<ChatDetailContextType>({
   conversation: undefined,
   quotedMessage: undefined,
   setQuotedMessage: () => {},
+  groupPermissions: [],
 });
 
 export const useChatDetailContext = (): ChatDetailContextType => {
@@ -60,6 +67,31 @@ export const ChatDetailProvider = ({ children }: ChatDetailProviderProps) => {
     undefined
   );
 
+  const [groupPermissions, setGroupPermissions] = useState<GroupPermission[]>(
+    []
+  );
+
+  useEffect(() => {
+    const groupId = conversation?.groupID;
+    if (!groupId) {
+      setGroupPermissions([]);
+      return;
+    }
+    OpenIMSDK.getSelfUserInfo(groupId)
+      .then((info) => setGroupPermissions(info?.permissions ?? []))
+      .catch(() => setGroupPermissions([]));
+  }, [conversation?.groupID]);
+
+  useEffect(() => {
+    const sub = DeviceEventEmitter.addListener(
+      ChatEvent.GroupPermissionUpdated,
+      ({ permissions }: GroupPermissionUpdatedPayload) => {
+        setGroupPermissions(permissions);
+      }
+    );
+    return () => sub.remove();
+  }, []);
+
   const flowState = useMemo(() => {
     return conversationFlow
       ? conversationFlow?.flowCurrentStep?.data?.children?.some(
@@ -80,15 +112,24 @@ export const ChatDetailProvider = ({ children }: ChatDetailProviderProps) => {
 
   const { mutateAsync: runFlow } = useRunFlow();
 
-  const setConverationFlowStep = useCallback((step?: IConversationFlowStep) => {
-    setConverationFlow(
-      (prev) =>
-        ({
-          ...prev,
-          flowCurrentStep: step,
-        }) as IConversationFlow
-    );
-  }, []);
+  const setConverationFlowStep = useCallback(
+    (
+      step?: IConversationFlowStep,
+      isEnd?: boolean,
+      havingBotMessage?: boolean
+    ) => {
+      setConverationFlow(
+        (prev) =>
+          ({
+            ...prev,
+            flowCurrentStep: step,
+            havingBotMessage: havingBotMessage,
+            flowIsEnd: isEnd,
+          }) as IConversationFlow
+      );
+    },
+    []
+  );
 
   const getConversationFlow = useCallback(async () => {
     const res = await fechtCurrentConversationFlow(conversationId);
@@ -111,7 +152,11 @@ export const ChatDetailProvider = ({ children }: ChatDetailProviderProps) => {
           groupId: '',
           childId: '',
         });
-        setConverationFlowStep(res?.flowNextStep || undefined);
+        setConverationFlowStep(
+          res?.flowNextStep || undefined,
+          res?.isEnd,
+          res?.havingBotMessage
+        );
         return res ? true : false;
       }
       return false;
@@ -137,6 +182,7 @@ export const ChatDetailProvider = ({ children }: ChatDetailProviderProps) => {
         quotedMessage,
         setQuotedMessage,
         conversationFlowMainMenu,
+        groupPermissions,
       }}
     >
       {children}

package/src/core/useChatListener.ts

@@ -18,6 +18,8 @@ import isEmpty from 'lodash/isEmpty';
 import { markMessageRevoked, useMessageStore } from '../store/message';
 import { syncPinnedMessagesOnEvent } from '../hooks/message/usePinMessage';
 import { belongsToConversation } from '../utils/message';
+import { DeviceEventEmitter } from 'react-native';
+import { ChatEvent } from '../types/events';
 
 export const useChatListener = () => {
   const updateOneMessage = useMessageStore((state) => state.updateOneMessage);
@@ -40,20 +42,25 @@ export const useChatListener = () => {
   const onConversationChanged = useCallback(
     (conversations: ConversationItem[]) => {
       const oldMap = useConversationStore.getState().map;
-      if (isShowFLashMessage) {
-        for (const conversation of conversations) {
-          const oldConversation = oldMap[conversation.conversationID];
-          if (
-            conversation.recvMsgOpt === MessageReceiveOptType.NotNotify ||
-            isEmpty(conversation?.latestMsg) ||
-            oldConversation?.latestMsgSendTime ===
-              conversation?.latestMsgSendTime
-          ) {
-            continue;
-          }
-          const latestMsg: MessageItem = JSON.parse(
-            conversation.latestMsg || '{}'
-          );
+      const visibleConversations: ConversationItem[] = [];
+
+      for (const conversation of conversations) {
+        const latestMsg: MessageItem | null = conversation.latestMsg
+          ? JSON.parse(conversation.latestMsg)
+          : null;
+
+        if (latestMsg?.isInternal) continue;
+
+        visibleConversations.push(conversation);
+
+        if (
+          isShowFLashMessage &&
+          !isEmpty(conversation.latestMsg) &&
+          conversation.recvMsgOpt !== MessageReceiveOptType.NotNotify &&
+          latestMsg &&
+          oldMap[conversation.conversationID]?.latestMsgSendTime !==
+            conversation.latestMsgSendTime
+        ) {
           const lastMessageText = getLastMessageText({
             message: latestMsg,
             currentUserId,
@@ -73,7 +80,8 @@ export const useChatListener = () => {
           });
         }
       }
-      useConversationStore.getState().updateConversations(conversations);
+
+      useConversationStore.getState().updateConversations(visibleConversations);
     },
     [currentUserId, isShowFLashMessage, onPressFlashMessage]
   );
@@ -97,6 +105,23 @@ export const useChatListener = () => {
     });
   }, []);
 
+  const OnGroupMemberInfoChanged = useCallback(
+    (member: GroupMemberItem) => {
+      const conversation = useConversationStore
+        .getState()
+        .getCurrentConversation();
+      if (
+        member?.groupID === conversation?.groupID &&
+        member?.userID === currentUserId
+      ) {
+        DeviceEventEmitter.emit(ChatEvent.GroupPermissionUpdated, {
+          permissions: member.permissions ?? [],
+        });
+      }
+    },
+    [currentUserId]
+  );
+
   const onMessageRevoked = useCallback((revokedInfo: RevokedInfo) => {
     markMessageRevoked(revokedInfo.clientMsgID);
   }, []);
@@ -128,8 +153,10 @@ export const useChatListener = () => {
       useConversationStore.getState().currentConversationId;
     const targetUserId = useConversationStore.getState().currentUserId;
     if (!conversationId && !targetUserId) return;
-    const relevant = messages.filter((message) =>
-      belongsToConversation(message, conversationId, targetUserId)
+    const relevant = messages.filter(
+      (message) =>
+        belongsToConversation(message, conversationId, targetUserId) &&
+        !message.isInternal
     );
 
     if (!relevant.length) return;
@@ -149,6 +176,10 @@ export const useChatListener = () => {
     // Group members
     OpenIMSDK.on(OpenIMEvent.OnGroupMemberAdded, onGroupMemberAdded);
     OpenIMSDK.on(OpenIMEvent.OnGroupMemberDeleted, onGroupMemberDeleted);
+    OpenIMSDK.on(
+      OpenIMEvent.OnGroupMemberInfoChanged,
+      OnGroupMemberInfoChanged
+    );
 
     // Message status
     OpenIMSDK.on(OpenIMEvent.SendMessageProgress, onSendMessageProgress);
@@ -168,6 +199,10 @@ export const useChatListener = () => {
       // Group members
       OpenIMSDK.off(OpenIMEvent.OnGroupMemberAdded, onGroupMemberAdded);
       OpenIMSDK.off(OpenIMEvent.OnGroupMemberDeleted, onGroupMemberDeleted);
+      OpenIMSDK.on(
+        OpenIMEvent.OnGroupMemberInfoChanged,
+        OnGroupMemberInfoChanged
+      );
 
       // Message status
       OpenIMSDK.off(OpenIMEvent.SendMessageProgress, onSendMessageProgress);
@@ -189,5 +224,6 @@ export const useChatListener = () => {
     onSendMessageProgress,
     onRecvNewMessages,
     onRecvOfflineNewMessages,
+    OnGroupMemberInfoChanged,
   ]);
 };

package/src/hooks/flows/useFlow.ts

@@ -80,7 +80,11 @@ export const useRunFlow = () => {
       return res?.data?.data || undefined;
     },
     onSuccess: (data) => {
-      setConverationFlowStep(data?.flowNextStep || undefined);
+      setConverationFlowStep(
+        data?.flowNextStep || undefined,
+        data?.isEnd,
+        data?.havingBotMessage
+      );
     },
   });
 };

package/src/hooks/message/useSearchMessage.ts

@@ -10,7 +10,9 @@ import type {
 } from '../../types/chat';
 import type { BaseResponse } from '../../types/auth';
 import { PAGE_SIZE } from '../../constants';
-import { useMemo } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
+import { DeviceEventEmitter } from 'react-native';
+import { ChatEvent, type MessageRevokedPayload } from '../../types/events';
 
 interface IUseSearchMessageProps {
   query: string;
@@ -25,7 +27,7 @@ export const useSearchMessage = ({
   pageSize = PAGE_SIZE,
 }: IUseSearchMessageProps) => {
   const { data, ...rest } = useInfiniteQuery({
-    queryKey: messageQueryKeys.search(query, conversationId),
+    queryKey: [messageQueryKeys.search(query.trim(), conversationId), pageSize],
     queryFn: async ({ pageParam = 1 }) => {
       const params: ISearchMessagesRequest = {
         contentTypes: [
@@ -38,9 +40,10 @@ export const useSearchMessage = ({
         page: pageParam,
         pageSize: pageSize,
         applicationType,
-        searchTerm: query,
+        searchTerm: query.trim(),
         conversationId,
       };
+      console.log('params', params);
       const res = await apiInstance?.post<BaseResponse<ISearchMessageItem[]>>(
         ENDPOINTS.chatService.searchMessages(),
         params
@@ -56,21 +59,49 @@ export const useSearchMessage = ({
     enabled: !!query && !!applicationType,
   });
 
-  const { dataFlatten } = useMemo(() => {
-    if (!data)
-      return {
-        dataFlatten: [],
-      };
-
-    const allItems =
+  const baseItems = useMemo<ISearchMessageItem[]>(() => {
+    if (!query.trim() || !data) return [];
+    return (
       data?.pages
         ?.flatMap?.((page) => page?.data)
-        ?.filter((item) => item !== undefined) || [];
+        ?.filter((item) => item !== undefined) || []
+    );
+  }, [data, query]);
+
+  const [dataFlatten, setDataFlatten] =
+    useState<ISearchMessageItem[]>(baseItems);
+
+  // Sync khi baseItems thay đổi (query mới hoặc load more)
+  const prevBaseRef = useRef(baseItems);
+  if (prevBaseRef.current !== baseItems) {
+    prevBaseRef.current = baseItems;
+    setDataFlatten(baseItems);
+  }
 
-    return {
-      dataFlatten: allItems,
-    };
-  }, [data]);
+  useEffect(() => {
+    const sub = DeviceEventEmitter.addListener(
+      ChatEvent.MessageRevoked,
+      ({ clientMsgID }: MessageRevokedPayload) => {
+        setDataFlatten((prev) => {
+          const idx = prev.findIndex(
+            (item) => item.chatLog?.clientMsgID === clientMsgID
+          );
+          if (idx === -1) return prev;
+          const item = prev[idx]!;
+          const next = [...prev];
+          next[idx] = {
+            ...item,
+            chatLog: {
+              ...item.chatLog,
+              contentType: MessageType.RevokeMessage,
+            },
+          };
+          return next;
+        });
+      }
+    );
+    return () => sub.remove();
+  }, []);
 
   return {
     dataFlatten,

package/src/hooks/message/useSendMessage.ts

@@ -7,7 +7,12 @@ import type {
   OfflinePush,
   QuoteMsgParams,
 } from '@droppii/openim-rn-client-sdk';
-import { MessageStatus, MessageType } from '@droppii/openim-rn-client-sdk';
+import {
+  GroupPermission,
+  MessageStatus,
+  MessageType,
+  SessionType,
+} from '@droppii/openim-rn-client-sdk';
 import { extractUrls } from '../../utils/url';
 import OpenIMSDK from '@droppii/openim-rn-client-sdk';
 import {
@@ -28,6 +33,8 @@ import type { StickerItem } from '../../types/sticker';
 import { useQueryClient } from '@tanstack/react-query';
 import { stickerQueryKeys } from '../query-keys';
 import { getMessagePreview } from '../../utils/messageUtils';
+import { UIUtils } from '../../utils/UIUtils';
+import { trans } from '../../translation';
 
 const buildSendParams = (
   message: MessageItem,
@@ -45,7 +52,8 @@ export const useSendMessage = () => {
   const applicationType = useChatContext().applicationType;
   const pushNewMessage = useMessageStore((state) => state.pushNewMessage);
   const updateOneMessage = useMessageStore((state) => state.updateOneMessage);
-  const { quotedMessage, setQuotedMessage } = useChatDetailContext();
+  const { quotedMessage, setQuotedMessage, groupPermissions } =
+    useChatDetailContext();
   const queryClient = useQueryClient();
 
   const dispatchSend = useCallback(
@@ -99,6 +107,16 @@ export const useSendMessage = () => {
       const recvID = currentConversation?.userID || targetUserId;
       const groupID = currentConversation?.groupID || targetGroupId;
       if (!recvID && !groupID) return;
+      if (
+        currentConversation?.conversationType === SessionType.Group &&
+        !groupPermissions?.includes(GroupPermission.SendMessage)
+      ) {
+        UIUtils.toast.open({
+          title: trans('chat:no_send_permission'),
+          theme: 'info',
+        });
+        return;
+      }
 
       const messageList: MessageItem[] = [];
 
@@ -174,6 +192,7 @@ export const useSendMessage = () => {
       quotedMessage,
       setQuotedMessage,
       queryClient,
+      groupPermissions,
     ]
   );