@droppii-org/chat-mobile 0.2.86 → 0.2.88

package/src/screens/SearchConversation/SearchContactsResult.tsx

@@ -18,6 +18,7 @@ import { SearchConversationTabResultType } from './types';
 interface ISearchContactsResultProps {
   searchTerm: string;
   onPressSearchContact?: (item: IContactSearchItem) => void;
+  isActive?: boolean;
 }
 
 const FILTER_ITEMS: KTagsChoiceSlideBarItemProps[] = [
@@ -44,7 +45,11 @@ const FILTER_ITEMS: KTagsChoiceSlideBarItemProps[] = [
 ];
 
 const SearchContactsResult = memo(
-  ({ searchTerm, onPressSearchContact }: ISearchContactsResultProps) => {
+  ({
+    searchTerm,
+    onPressSearchContact,
+    isActive = true,
+  }: ISearchContactsResultProps) => {
     const { applicationType } = useChatContext();
     const [contactType, setContactType] = useState<
       ContactCategory | undefined
@@ -62,6 +67,7 @@ const SearchContactsResult = memo(
       query: searchTerm,
       applicationType,
       type: contactType,
+      enabled: isActive,
     });
 
     const onFilterChanged = useCallback(

package/src/screens/SearchConversation/SearchMessagesResult.tsx

@@ -11,9 +11,14 @@ import { SearchEmpty } from './SearchEmpty';
 interface ISearchMessagesResultProps {
   searchTerm: string;
   onPressItem?: (item: ISearchMessageItem) => void;
+  isActive?: boolean;
 }
 const SearchMessagesResult = memo(
-  ({ searchTerm, onPressItem }: ISearchMessagesResultProps) => {
+  ({
+    searchTerm,
+    onPressItem,
+    isActive = true,
+  }: ISearchMessagesResultProps) => {
     const { applicationType } = useChatContext();
     const {
       dataFlatten,
@@ -26,6 +31,7 @@ const SearchMessagesResult = memo(
     } = useSearchMessage({
       query: searchTerm,
       applicationType,
+      enabled: isActive,
     });
 
     const renderItem = useCallback(

package/src/screens/SearchConversation/TabResult.tsx

@@ -87,6 +87,7 @@ const SearchConversationTabResult = memo(
 
     const renderScene = useCallback(
       ({ route }: { route: TabRoute }) => {
+        const isActive = route.key === routes[index]?.key;
         switch (route.key) {
           case SearchConversationTabResultType.All:
             return (
@@ -95,6 +96,7 @@ const SearchConversationTabResult = memo(
                 handleChangeTab={handleChangeTab}
                 onPressItem={onPressItem}
                 onPressSearchContact={onPressSearchContact}
+                isActive={isActive}
               />
             );
           case SearchConversationTabResultType.Conversations:
@@ -102,6 +104,7 @@ const SearchConversationTabResult = memo(
               <SearchContactsResult
                 searchTerm={searchTerm}
                 onPressSearchContact={onPressSearchContact}
+                isActive={isActive}
               />
             );
           case SearchConversationTabResultType.Messages:
@@ -109,6 +112,7 @@ const SearchConversationTabResult = memo(
               <SearchMessagesResult
                 searchTerm={searchTerm}
                 onPressItem={onPressItem}
+                isActive={isActive}
               />
             );
           case SearchConversationTabResultType.Community:
@@ -116,6 +120,7 @@ const SearchConversationTabResult = memo(
               <SearchCommunityResult
                 searchTerm={searchTerm}
                 onPressGroup={onPressGroup}
+                isActive={isActive}
               />
             );
           default:
@@ -128,6 +133,8 @@ const SearchConversationTabResult = memo(
         onPressItem,
         onPressSearchContact,
         onPressGroup,
+        index,
+        routes,
       ]
     );
 

package/src/utils/groupExit.ts

@@ -0,0 +1,26 @@
+/**
+ * Groups this user deliberately left or dismissed.
+ *
+ * Leaving fires the same SDK callbacks as being removed by someone else, and
+ * the `reason` on ChatEvent.GroupRemoved cannot tell them apart —
+ * OnJoinedGroupDeleted reports a self-initiated quit and a kick identically.
+ * The access guard needs the distinction: losing access is worth a modal, but
+ * walking out is not — the screen that asked for it is already navigating away,
+ * so a modal would land on the inbox the user just arrived at.
+ *
+ * Cleared on rejoin, so a later involuntary removal of the same group is
+ * treated as one. Deliberately not time-based: a timer would make correctness
+ * depend on how fast the SDK round-trips.
+ */
+const selfExitedGroups = new Set<string>();
+
+export const markSelfExitedGroup = (groupID: string): void => {
+  if (groupID) selfExitedGroups.add(groupID);
+};
+
+export const clearSelfExitedGroup = (groupID: string): void => {
+  selfExitedGroups.delete(groupID);
+};
+
+export const wasSelfExitedGroup = (groupID: string): boolean =>
+  selfExitedGroups.has(groupID);