@droppii-org/chat-mobile 0.2.62 → 0.2.64

package/src/screens/SearchConversation/SearchEmpty.tsx

@@ -2,23 +2,47 @@ import { KContainer, KImage, KLabel, KSpacingValue } from '@droppii/libs';
 import { StyleSheet } from 'react-native';
 import Images from '../../assets/images';
 import { trans } from '../../translation';
+import { memo, useMemo } from 'react';
+import { isEmpty } from 'lodash';
+import { SearchConversationTabResultType } from './types';
 
-export const SearchEmpty = () => {
-  return (
-    <KContainer.View style={styles.container}>
-      <KImage.Base
-        uri={Images.SEARCH_EMPTY}
-        width={100}
-        height={100}
-        resizeMode="contain"
-      />
-      <KLabel.Text typo="TextMdNormal" textAlign="center">
-        {trans('search:empty_description')}
-      </KLabel.Text>
-    </KContainer.View>
-  );
+type SearchEmptyProps = {
+  searchTerm?: string;
+  searchType?: SearchConversationTabResultType;
 };
 
+export const SearchEmpty = memo(
+  ({ searchTerm, searchType }: SearchEmptyProps) => {
+    const emptyHint = useMemo(() => {
+      if (!isEmpty(searchTerm?.trim())) {
+        return 'search:empty_description';
+      }
+      switch (searchType) {
+        case SearchConversationTabResultType.Messages:
+          return 'search_message:empty_hint';
+        case SearchConversationTabResultType.Conversations:
+          return 'search_conversation:empty_hint';
+        default:
+          return 'search:empty_hint';
+      }
+    }, [searchTerm, searchType]);
+
+    return (
+      <KContainer.View style={styles.container}>
+        <KImage.Base
+          uri={Images.SEARCH_EMPTY}
+          width={100}
+          height={100}
+          resizeMode="contain"
+        />
+        <KLabel.Text typo="TextMdNormal" textAlign="center">
+          {trans(emptyHint)}
+        </KLabel.Text>
+      </KContainer.View>
+    );
+  }
+);
+
 const styles = StyleSheet.create({
   container: {
     paddingHorizontal: KSpacingValue['2rem'],

package/src/screens/SearchConversation/SearchMessagesResult.tsx

@@ -1,8 +1,8 @@
-import { KContainer, KDivider, KSpacingValue } from '@droppii/libs';
+import { KColors, KContainer, KDivider, KSpacingValue } from '@droppii/libs';
 import { memo, useCallback } from 'react';
 import { useSearchMessage } from '../../hooks/message/useSearchMessage';
 import { useChatContext } from '../../context';
-import { FlatList, StyleSheet } from 'react-native';
+import { FlatList, StyleSheet, ActivityIndicator } from 'react-native';
 import type { ISearchMessageItem } from '../../types/chat';
 import SearchResultItem from './SearchResultItem';
 import { SearchConversationTabResultType } from './types';
@@ -15,11 +15,18 @@ interface ISearchMessagesResultProps {
 const SearchMessagesResult = memo(
   ({ searchTerm, onPressItem }: ISearchMessagesResultProps) => {
     const { applicationType } = useChatContext();
-    const { dataFlatten, hasNextPage, fetchNextPage, isFetchingNextPage } =
-      useSearchMessage({
-        query: searchTerm,
-        applicationType,
-      });
+    const {
+      dataFlatten,
+      hasNextPage,
+      fetchNextPage,
+      isFetchingNextPage,
+      isFetching,
+      isRefetching,
+      refetch,
+    } = useSearchMessage({
+      query: searchTerm,
+      applicationType,
+    });
 
     const renderItem = useCallback(
       ({ item }: { item: ISearchMessageItem }) => {
@@ -28,10 +35,11 @@ const SearchMessagesResult = memo(
             item={item}
             tabResultType={SearchConversationTabResultType.Messages}
             onPressItem={onPressItem}
+            searchTerm={searchTerm}
           />
         );
       },
-      [onPressItem]
+      [onPressItem, searchTerm]
     );
 
     const keyExtractor = useCallback((item: ISearchMessageItem) => {
@@ -50,16 +58,29 @@ const SearchMessagesResult = memo(
 
     return (
       <KContainer.View flex>
-        <FlatList
-          data={dataFlatten}
-          renderItem={renderItem}
-          keyExtractor={keyExtractor}
-          contentContainerStyle={styles.container}
-          showsVerticalScrollIndicator={false}
-          onEndReached={onEndReached}
-          ItemSeparatorComponent={ItemSeparatorComponent}
-          ListEmptyComponent={<SearchEmpty />}
-        />
+        {isFetching && !isFetchingNextPage && !isRefetching ? (
+          <KContainer.View flex center>
+            <ActivityIndicator color={KColors.primary.normal} size={'small'} />
+          </KContainer.View>
+        ) : (
+          <FlatList
+            data={dataFlatten}
+            renderItem={renderItem}
+            keyExtractor={keyExtractor}
+            contentContainerStyle={styles.container}
+            showsVerticalScrollIndicator={false}
+            onEndReached={onEndReached}
+            ItemSeparatorComponent={ItemSeparatorComponent}
+            ListEmptyComponent={
+              <SearchEmpty
+                searchTerm={searchTerm}
+                searchType={SearchConversationTabResultType.Messages}
+              />
+            }
+            refreshing={isFetching}
+            onRefresh={refetch}
+          />
+        )}
       </KContainer.View>
     );
   }

package/src/screens/SearchConversation/SearchResultItem.tsx

@@ -5,32 +5,65 @@ import {
   KLabel,
   KSpacingValue,
 } from '@droppii/libs';
-import { memo, useCallback } from 'react';
+import { memo, useCallback, useMemo } from 'react';
 import type { ISearchMessageItem } from '../../types/chat';
 import { StyleSheet } from 'react-native';
 import { SearchConversationTabResultType } from './types';
 import { AvatarSection, NamePrefixIcon } from '../../components/ThreadCard';
-import { getLastMessageText } from '../../utils/messageUtils';
+import { getMessagePreview, getSenderName } from '../../utils/messageUtils';
 import { useUserStore } from '../../store';
 import { formatTimestamp } from '../../utils/dateTimeUtils';
+import {
+  highlightSearch,
+  type HighlightResult,
+} from '../../utils/highlightSearch';
+import isEmpty from 'lodash/isEmpty';
+import { MessageType } from '@droppii/openim-rn-client-sdk';
+import { UIUtils } from '../../utils/UIUtils';
+import { trans } from '../../translation';
 
 interface ISearchResultItemProps {
   item: ISearchMessageItem;
   tabResultType: SearchConversationTabResultType;
   onPressItem?: (item: ISearchMessageItem) => void;
+  searchTerm?: string;
 }
 const SearchResultItem = memo((props: ISearchResultItemProps) => {
-  const { item, tabResultType, onPressItem } = props || {};
+  const { item, tabResultType, onPressItem, searchTerm } = props || {};
   const currentUserId = useUserStore((s) => s.user?.userID);
 
   const timestamp = formatTimestamp(item?.chatLog?.sendTime ?? null);
-  const lastMessageText = getLastMessageText({
-    message: item?.chatLog,
+  const senderName = getSenderName(
+    item?.chatLog,
     currentUserId,
-    conversation: item?.conversation,
-  });
+    item?.conversation
+  );
+  const lastMessageText = getMessagePreview(item?.chatLog);
+
+  const highlightResult: HighlightResult | null = useMemo(() => {
+    if (isEmpty(searchTerm?.trim())) return null;
+    if (tabResultType === SearchConversationTabResultType.Conversations) {
+      return highlightSearch(
+        item?.conversation?.showName || '',
+        searchTerm || ''
+      );
+    }
+    return highlightSearch(lastMessageText, searchTerm || '');
+  }, [
+    lastMessageText,
+    searchTerm,
+    tabResultType,
+    item?.conversation?.showName,
+  ]);
 
   const handlePressItem = useCallback(() => {
+    const isRevoked = item?.chatLog?.contentType === MessageType.RevokeMessage;
+    if (isRevoked) {
+      UIUtils.toast.open({
+        title: trans('search_message:revoked_message'),
+      });
+      return;
+    }
     onPressItem?.({ conversation: item?.conversation, chatLog: item?.chatLog });
   }, [onPressItem, item?.conversation, item?.chatLog]);
 
@@ -46,16 +79,42 @@ const SearchResultItem = memo((props: ISearchResultItemProps) => {
         <KContainer.View style={styles.contentContainer}>
           <KContainer.View style={styles.messageContainer}>
             <NamePrefixIcon peerType={item?.conversation?.peerType} />
-            <KLabel.Text typo="TextMdMedium" numberOfLines={1} flex>
-              {item?.conversation?.showName}
-            </KLabel.Text>
+            {!!highlightResult &&
+            tabResultType === SearchConversationTabResultType.Conversations ? (
+              <KLabel.Text typo="TextMdMedium" numberOfLines={1} flex>
+                {highlightResult?.before || ''}
+                <KLabel.Text typo="TextMdMedium" color={KColors.primary.normal}>
+                  {highlightResult?.match || ''}
+                </KLabel.Text>
+                <KLabel.Text typo="TextMdMedium">
+                  {highlightResult?.after || ''}
+                </KLabel.Text>
+              </KLabel.Text>
+            ) : (
+              <KLabel.Text typo="TextMdMedium" numberOfLines={1} flex>
+                {item?.conversation?.showName || ''}
+              </KLabel.Text>
+            )}
             <KLabel.Text typo="TextXsNormal" color={KColors.gray.light}>
               {timestamp}
             </KLabel.Text>
           </KContainer.View>
-          <KLabel.Text typo="TextNmNormal" numberOfLines={1} flex>
-            {lastMessageText}
-          </KLabel.Text>
+          {!!highlightResult &&
+          tabResultType === SearchConversationTabResultType.Messages ? (
+            <KLabel.Text typo="TextNmNormal" numberOfLines={1} flex>
+              {`${senderName}: ${highlightResult?.before || ''}`}
+              <KLabel.Text typo="TextNmNormal" color={KColors.primary.normal}>
+                {highlightResult?.match || ''}
+              </KLabel.Text>
+              <KLabel.Text typo="TextNmNormal">
+                {highlightResult?.after || ''}
+              </KLabel.Text>
+            </KLabel.Text>
+          ) : (
+            <KLabel.Text typo="TextNmNormal" numberOfLines={1} flex>
+              {`${senderName}: ${lastMessageText}`}
+            </KLabel.Text>
+          )}
         </KContainer.View>
       </KContainer.View>
       <KContainer.VisibleView

package/src/screens/SearchMessage/SearchMessageResult.tsx

@@ -1,11 +1,12 @@
-import { KContainer, KDivider, KSpacingValue } from '@droppii/libs';
+import { KColors, KContainer, KDivider, KSpacingValue } from '@droppii/libs';
 import { memo, useCallback } from 'react';
 import { useSearchMessage } from '../../hooks/message/useSearchMessage';
 import { useChatContext } from '../../context';
-import { FlatList, StyleSheet } from 'react-native';
+import { ActivityIndicator, FlatList, StyleSheet } from 'react-native';
 import type { ISearchMessageItem } from '../../types/chat';
 import { SearchEmpty } from '../SearchConversation/SearchEmpty';
 import SearchResultItem from './SearchResultItem';
+import { SearchConversationTabResultType } from '../SearchConversation/types';
 
 interface ISearchMessagesResultProps {
   searchTerm: string;
@@ -15,18 +16,31 @@ interface ISearchMessagesResultProps {
 const SearchMessagesResult = memo(
   ({ searchTerm, onPressItem, conversationId }: ISearchMessagesResultProps) => {
     const { applicationType } = useChatContext();
-    const { dataFlatten, hasNextPage, fetchNextPage, isFetchingNextPage } =
-      useSearchMessage({
-        query: searchTerm,
-        applicationType,
-        conversationId,
-      });
+    const {
+      dataFlatten,
+      hasNextPage,
+      fetchNextPage,
+      isFetchingNextPage,
+      isFetching,
+      isRefetching,
+      refetch,
+    } = useSearchMessage({
+      query: searchTerm,
+      applicationType,
+      conversationId,
+    });
 
     const renderItem = useCallback(
       ({ item }: { item: ISearchMessageItem }) => {
-        return <SearchResultItem item={item} onPressItem={onPressItem} />;
+        return (
+          <SearchResultItem
+            item={item}
+            onPressItem={onPressItem}
+            searchTerm={searchTerm}
+          />
+        );
       },
-      [onPressItem]
+      [onPressItem, searchTerm]
     );
 
     const keyExtractor = useCallback((item: ISearchMessageItem) => {
@@ -45,16 +59,29 @@ const SearchMessagesResult = memo(
 
     return (
       <KContainer.View flex>
-        <FlatList
-          data={dataFlatten}
-          renderItem={renderItem}
-          keyExtractor={keyExtractor}
-          contentContainerStyle={styles.container}
-          showsVerticalScrollIndicator={false}
-          onEndReached={onEndReached}
-          ItemSeparatorComponent={ItemSeparatorComponent}
-          ListEmptyComponent={<SearchEmpty />}
-        />
+        {isFetching && !isFetchingNextPage && !isRefetching ? (
+          <KContainer.View flex center>
+            <ActivityIndicator color={KColors.primary.normal} size={'small'} />
+          </KContainer.View>
+        ) : (
+          <FlatList
+            data={dataFlatten}
+            renderItem={renderItem}
+            keyExtractor={keyExtractor}
+            contentContainerStyle={styles.container}
+            showsVerticalScrollIndicator={false}
+            onEndReached={onEndReached}
+            ItemSeparatorComponent={ItemSeparatorComponent}
+            ListEmptyComponent={
+              <SearchEmpty
+                searchTerm={searchTerm}
+                searchType={SearchConversationTabResultType.Messages}
+              />
+            }
+            refreshing={isFetching}
+            onRefresh={refetch}
+          />
+        )}
       </KContainer.View>
     );
   }

package/src/screens/SearchMessage/SearchResultItem.tsx

@@ -5,14 +5,22 @@ import { StyleSheet } from 'react-native';
 import { AvatarSection, NamePrefixIcon } from '../../components/ThreadCard';
 import { getMessagePreview } from '../../utils/messageUtils';
 import { formatTimestamp } from '../../utils/dateTimeUtils';
-import { PeerType } from '@droppii/openim-rn-client-sdk';
+import { MessageType, PeerType } from '@droppii/openim-rn-client-sdk';
+import {
+  highlightSearch,
+  type HighlightResult,
+} from '../../utils/highlightSearch';
+import isEmpty from 'lodash/isEmpty';
+import { UIUtils } from '../../utils/UIUtils';
+import { trans } from '../../translation';
 
 interface ISearchResultItemProps {
   item: ISearchMessageItem;
   onPressItem?: (item: ISearchMessageItem) => void;
+  searchTerm?: string;
 }
 const SearchResultItem = memo((props: ISearchResultItemProps) => {
-  const { item, onPressItem } = props || {};
+  const { item, onPressItem, searchTerm } = props || {};
 
   const isBotConversation = useMemo(() => {
     return item?.conversation?.peerType === PeerType.Bot;
@@ -28,7 +36,19 @@ const SearchResultItem = memo((props: ISearchResultItemProps) => {
     ? item?.conversation?.showName
     : item?.chatLog?.senderNickname;
 
+  const highlightResult: HighlightResult | null = useMemo(() => {
+    if (isEmpty(searchTerm?.trim())) return null;
+    return highlightSearch(lastMessageText, searchTerm || '');
+  }, [lastMessageText, searchTerm]);
+
   const handlePressItem = useCallback(() => {
+    const isRevoked = item?.chatLog?.contentType === MessageType.RevokeMessage;
+    if (isRevoked) {
+      UIUtils.toast.open({
+        title: trans('search_message:revoked_message'),
+      });
+      return;
+    }
     onPressItem?.({ conversation: item?.conversation, chatLog: item?.chatLog });
   }, [onPressItem, item?.conversation, item?.chatLog]);
 
@@ -51,9 +71,21 @@ const SearchResultItem = memo((props: ISearchResultItemProps) => {
               {timestamp}
             </KLabel.Text>
           </KContainer.View>
-          <KLabel.Text typo="TextNmNormal" numberOfLines={1} flex>
-            {lastMessageText}
-          </KLabel.Text>
+          {highlightResult ? (
+            <KLabel.Text typo="TextNmNormal" numberOfLines={1} flex>
+              {highlightResult?.before || ''}
+              <KLabel.Text typo="TextNmNormal" color={KColors.primary.normal}>
+                {highlightResult?.match || ''}
+              </KLabel.Text>
+              <KLabel.Text typo="TextNmNormal">
+                {highlightResult?.after || ''}
+              </KLabel.Text>
+            </KLabel.Text>
+          ) : (
+            <KLabel.Text typo="TextNmNormal" numberOfLines={1} flex>
+              {lastMessageText}
+            </KLabel.Text>
+          )}
         </KContainer.View>
       </KContainer.View>
     </KContainer.Touchable>

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

@@ -29,10 +29,13 @@ import { LegendChatMessage } from './legend/LegendChatMessage';
 import { LegendChatDay } from './legend/LegendChatDay';
 import { LegendChatLoadEarlier } from './legend/LegendChatLoadEarlier';
 import { useChatDetailContext } from '../../context/ChatDetailContext';
-import { getFlowInputButtonsNode } from '../../utils/flows';
+import { getFlowInputButtonsNodes } from '../../utils/flows';
 import { InputButtonFlow } from '../../components/flows/inputButtons';
 import { useResetFlow, useRunFlow } from '../../hooks/flows/useFlow';
-import type { IRunConversationFlowPayload } from '../../types/flows';
+import type {
+  GroupChild,
+  IRunConversationFlowPayload,
+} from '../../types/flows';
 import { useSendMessage } from '../../hooks/message/useSendMessage';
 import { ChatEvent, type ScrollToMessagePayload } from '../../types/events';
 import { useMessageStore } from '../../store/message';
@@ -110,6 +113,10 @@ export const ChatListLegend = memo(
     const scrollDebounceRef = useRef<NodeJS.Timeout | undefined>(undefined);
     const rowRefsMap = useRef<Map<string, View | null>>(new Map());
     const [showBadge, setShowBadge] = useState(false);
+    const [highlightedId, setHighlightedId] = useState<string | null>(null);
+    const highlightTimerRef = useRef<ReturnType<typeof setTimeout> | null>(
+      null
+    );
 
     const { applicationType } = useChatContext();
     const searchMessages = useMessageStore((s) => s.searchMessages);
@@ -143,9 +150,9 @@ export const ChatListLegend = memo(
 
           const message = item as MessageItem;
           const isOutgoing = message.sendID === currentUserId;
-          const isLastIncoming =
-            !isOutgoing &&
+          const isLastMessage =
             (message.clientMsgID || message.serverMsgID) === lastMessageId;
+          const isLastIncoming = !isOutgoing && isLastMessage;
           const messageId =
             message.clientMsgID ||
             message.serverMsgID ||
@@ -158,9 +165,13 @@ export const ChatListLegend = memo(
 
           const { dayStart, createdAt } = messageData;
 
-          let flowInputButtonsNode = null;
-          if (isLastIncoming && isBotConversation) {
-            flowInputButtonsNode = getFlowInputButtonsNode(
+          let flowInputButtonsNodes: GroupChild<'input-buttons'>[] = [];
+          if (
+            ((isLastMessage && conversationFlow?.havingBotMessage === false) ||
+              isLastIncoming) &&
+            isBotConversation
+          ) {
+            flowInputButtonsNodes = getFlowInputButtonsNodes(
               conversationFlow?.flowCurrentStep
             );
           }
@@ -193,15 +204,16 @@ export const ChatListLegend = memo(
                       : undefined
                   }
                   customMessageItemFactory={customMessageItemFactory}
+                  isHighlighted={highlightedId === messageId}
                 />
-                {!!flowInputButtonsNode && (
-                  <InputButtonFlow
-                    nodeData={flowInputButtonsNode}
-                    onResetFlow={onResetFlow}
-                    onRunFlow={onRunFlow}
-                  />
-                )}
               </KContainer.View>
+              {flowInputButtonsNodes && flowInputButtonsNodes.length > 0 && (
+                <InputButtonFlow
+                  nodeData={flowInputButtonsNodes}
+                  onResetFlow={onResetFlow}
+                  onRunFlow={onRunFlow}
+                />
+              )}
             </>
           );
         } catch (error) {
@@ -229,7 +241,9 @@ export const ChatListLegend = memo(
         onResetFlow,
         onRunFlow,
         conversationFlow?.flowCurrentStep,
+        conversationFlow?.havingBotMessage,
         retryMessage,
+        highlightedId,
       ]
     );
 
@@ -320,10 +334,13 @@ export const ChatListLegend = memo(
 
         const isOutgoing = message.sendID === currentUserId;
         const isLastIncoming = !isOutgoing && messageId === lastMessageId;
+        const flowInputButtonsNodes = getFlowInputButtonsNodes(
+          conversationFlow?.flowCurrentStep
+        );
         if (
           isLastIncoming &&
           isBotConversation &&
-          getFlowInputButtonsNode(conversationFlow?.flowCurrentStep)
+          flowInputButtonsNodes.length > 0
         ) {
           return undefined;
         }
@@ -427,11 +444,21 @@ export const ChatListLegend = memo(
 
           if (index >= 0) {
             try {
-              listRef.current?.scrollToIndex({
-                index,
-                animated: true,
-                viewPosition: 0.5,
-              });
+              listRef.current
+                ?.scrollToIndex({
+                  index,
+                  animated: true,
+                  viewPosition: 0.5,
+                })
+                .finally(() => {
+                  if (highlightTimerRef.current)
+                    clearTimeout(highlightTimerRef.current);
+                  setHighlightedId(clientMessageId);
+                  highlightTimerRef.current = setTimeout(
+                    () => setHighlightedId(null),
+                    5000
+                  );
+                });
             } catch {
               // scrollToIndex throws if item not rendered yet — force refetch messages
               searchMessages({
@@ -487,7 +514,7 @@ export const ChatListLegend = memo(
           getFixedItemSize={getFixedItemSize}
           keyExtractor={(item) => String(item.clientMsgID || item.serverMsgID)}
           recycleItems={false}
-          extraData={`${conversationFlow?.flowCurrentStep?.id ?? ''}-${lastMessageId ?? ''}`}
+          extraData={`${conversationFlow?.flowCurrentStep?.id ?? ''}-${lastMessageId ?? ''}-${highlightedId ?? ''}`}
           alignItemsAtEnd
           maintainVisibleContentPosition={maintainVisiblePositionConfig}
           maintainScrollAtEnd={true}

package/src/screens/chat-detail/legend/LegendChatMessage.tsx

@@ -35,6 +35,7 @@ interface LegendChatMessageProps {
   onPress?: (message: MessageItem) => void;
   onLongPress?: () => void;
   customMessageItemFactory?: (m: MessageItem) => ReactNode;
+  isHighlighted?: boolean;
 }
 
 const messageComponentMap: Partial<
@@ -69,6 +70,7 @@ export const LegendChatMessage = memo(
     onPress,
     onLongPress,
     customMessageItemFactory,
+    isHighlighted,
   }: LegendChatMessageProps) => {
     const handlePress = useCallback(() => {
       onPress?.(message);
@@ -107,6 +109,7 @@ export const LegendChatMessage = memo(
               createdAtTime={createdAtTime}
               onMediaPress={hasMediaPress ? onMediaPress : undefined}
               onPressUrl={hasUrlPress ? onPressUrl : undefined}
+              isHighlighted={isHighlighted}
             />
           </LongPressWrapper>
 

package/src/store/message.ts

@@ -224,6 +224,8 @@ export const markMessageRevoked = (clientMsgID: string) => {
     .getState()
     .updateOneMessage({ clientMsgID, contentType: MessageType.RevokeMessage });
 
+  DeviceEventEmitter.emit(ChatEvent.MessageRevoked, { clientMsgID });
+
   revokeQuotedReferences(clientMsgID);
 };
 

package/src/translation/resources/i18n.ts

@@ -122,9 +122,13 @@ const i18nKey: Record<string, string> = {
   'all': 'Tất cả',
   'contacts': 'Liên hệ',
   'messages': 'Tin nhắn',
-  'search:empty_description':
-    'Không tìm thấy kết quả nào\nHãy thử lại với cách viết hoặc kết hợp cụm từ khác phù hợp hơn.',
+  'search:empty_description': 'Không tìm thấy kết quả nào',
+  'search:empty_hint':
+    'Bạn có thể tìm kiếm theo liên hệ hoặc nội dung tin nhắn',
+  'search_message:empty_hint': 'Bạn có thể tìm kiếm theo nội dung tin nhắn',
+  'search_conversation:empty_hint': 'Bạn có thể tìm kiếm theo liên hệ',
   'view_all': 'Xem tất cả',
+  'search_message:revoked_message': 'Tin nhắn đã được thu hồi',
 };
 
 export default {

package/src/types/chat.ts

@@ -205,7 +205,11 @@ export interface MessageStore {
 export interface ChatDetailContextType {
   conversationFlow?: IConversationFlow;
   isBotConversation: boolean;
-  setConverationFlowStep: (step?: IConversationFlowStep) => void;
+  setConverationFlowStep: (
+    step?: IConversationFlowStep,
+    isEnd?: boolean,
+    havingBotMessage?: boolean
+  ) => void;
   flowState?: DFlowState;
   runButtonContext: (stringContext: DFlowContext) => Promise<boolean>;
   conversation?: ConversationItem;

package/src/types/events.ts

@@ -1,8 +1,13 @@
 export enum ChatEvent {
   ScrollToMessage = 'chat:scroll_to_message',
   ScrollToBottom = 'chat:scroll_to_bottom',
+  MessageRevoked = 'chat:message_revoked',
 }
 
 export interface ScrollToMessagePayload {
   clientMessageId: string;
 }
+
+export interface MessageRevokedPayload {
+  clientMsgID: string;
+}

package/src/types/flows.ts

@@ -91,10 +91,14 @@ export interface IConversationFlow {
   chatType: PeerType;
   applicationType: DChatApplicationType;
   flowCurrentStep: IConversationFlowStep | null;
+  havingBotMessage: boolean;
+  flowIsEnd: boolean;
 }
 
 export interface IRunConversationFlowResponse {
   flowNextStep: IConversationFlowStep | null;
+  isEnd: boolean;
+  havingBotMessage: boolean;
 }
 
 export interface IRunConversationFlowPayload {