fix: another review fixes

Author: szuperaz

examples/SampleApp/src/components/ListItem.tsx

@@ -53,7 +53,7 @@ jest.mock('../../components/members/AddMemberSearchResultItem', () => {
       mockRowProbe.push(props);
       return ReactLib.createElement(
         Text,
-        { onPress: props.onPress, testID: `add-member-row-${props.user.id}` },
+        { onPress: () => props.onPress(props.user), testID: `add-member-row-${props.user.id}` },
         props.user.id,
       );
     },
@@ -68,6 +68,7 @@ const channel = {
 const baseHookResult = (): UseChannelAddMembersResult => ({
   clearSearch: jest.fn(),
   hasMore: true,
+  isAlreadyMember: jest.fn(() => false),
   isSelected: jest.fn(() => false),
   loading: false,
   loadingMore: false,
@@ -138,13 +139,12 @@ describe('ChannelAddMembers', () => {
     const userA = generateUser({ id: 'u-1' });
     const userB = generateUser({ id: 'u-2' });
     const isSelected = jest.fn((id: string) => id === 'u-2');
+    const isAlreadyMember = jest.fn((id: string) => id === 'u-1');
     const toggleUser = jest.fn();
     mockHook({
+      isAlreadyMember,
       isSelected,
-      results: [
-        { ...userA, isAlreadyMember: true },
-        { ...userB, isAlreadyMember: false },
-      ],
+      results: [userA, userB],
       toggleUser,
     });
 

package/src/components/ChannelDetailsScreen/__tests__/members/ChannelAddMembers.test.tsx

@@ -196,18 +196,18 @@ describe('useChannelAddMembers', () => {
     expect(result.current.results.map((u) => u.id)).toEqual(['fresh-0']);
   });
 
-  it('decorates results with isAlreadyMember from the channel member state', async () => {
+  it('reports membership via isAlreadyMember from the channel member state', async () => {
     (useChannelMembersState as jest.Mock).mockReturnValue({ 'u-0': { user_id: 'u-0' } });
     const queryUsers: QueryUsersMock = jest.fn().mockResolvedValue({ users: buildUsers(2) });
 
     const { result } = renderUseChannelAddMembers(queryUsers);
 
     await waitFor(() => expect(result.current.results).toHaveLength(2));
-    expect(result.current.results.find((u) => u.id === 'u-0')?.isAlreadyMember).toBe(true);
-    expect(result.current.results.find((u) => u.id === 'u-1')?.isAlreadyMember).toBe(false);
+    expect(result.current.isAlreadyMember('u-0')).toBe(true);
+    expect(result.current.isAlreadyMember('u-1')).toBe(false);
   });
 
-  it('toggleUser adds/removes selection, strips isAlreadyMember, and isSelected reflects it', async () => {
+  it('toggleUser adds/removes selection and isSelected reflects it', async () => {
     const queryUsers: QueryUsersMock = jest.fn().mockResolvedValue({ users: buildUsers(1) });
 
     const { result } = renderUseChannelAddMembers(queryUsers);
@@ -218,21 +218,19 @@ describe('useChannelAddMembers', () => {
     act(() => result.current.toggleUser(user));
     expect(result.current.isSelected('u-0')).toBe(true);
     expect(result.current.selectedUsers).toHaveLength(1);
-    expect(result.current.selectedUsers[0]).not.toHaveProperty('isAlreadyMember');
 
     act(() => result.current.toggleUser(user));
     expect(result.current.isSelected('u-0')).toBe(false);
     expect(result.current.selectedUsers).toHaveLength(0);
   });
 
-  it('toggleUser ignores already-member rows and rows without an id', async () => {
+  it('toggleUser ignores rows without an id', async () => {
     const queryUsers: QueryUsersMock = jest.fn().mockResolvedValue({ users: [] });
 
     const { result } = renderUseChannelAddMembers(queryUsers);
     await waitFor(() => expect(result.current.loading).toBe(false));
 
-    act(() => result.current.toggleUser({ id: 'm-1', isAlreadyMember: true } as never));
-    act(() => result.current.toggleUser({ isAlreadyMember: false } as never));
+    act(() => result.current.toggleUser({} as never));
 
     expect(result.current.selectedUsers).toHaveLength(0);
   });

package/src/components/ChannelDetailsScreen/__tests__/members/useChannelAddMembers.test.tsx

@@ -11,7 +11,7 @@ import { SelectionCircle } from '../../../UIComponents/SelectionCircle';
 
 export type AddMemberSearchResultItemProps = {
   isAlreadyMember: boolean;
-  onPress: () => void;
+  onPress: (user: UserResponse) => void;
   selected: boolean;
   user: UserResponse;
 };
@@ -86,7 +86,7 @@ const AddMemberSearchResultItemInner = ({
       accessibilityLabel={accessibilityLabel}
       accessibilityRole='button'
       accessibilityState={{ disabled: false, selected }}
-      onPress={onPress}
+      onPress={() => onPress(user)}
       style={[styles.userRow, userRowOverride]}
       testID={`channel-add-members-row-${user.id}`}
     >

package/src/components/ChannelDetailsScreen/components/members/AddMemberSearchResultItem.tsx

@@ -13,10 +13,7 @@ import { Search } from '../../../../icons/search';
 import { primitives } from '../../../../theme';
 import { EmptySearchResult } from '../../../UIComponents/EmptySearchResult';
 import { SearchInput } from '../../../UIComponents/SearchInput';
-import {
-  type AddMemberSearchResult,
-  useChannelAddMembers,
-} from '../../hooks/members/useChannelAddMembers';
+import { useChannelAddMembers } from '../../hooks/members/useChannelAddMembers';
 
 export type ChannelAddMembersProps = {
   /**
@@ -31,10 +28,10 @@ export type ChannelAddMembersProps = {
    *
    * See https://reactnative.dev/docs/flatlist#props for the full list.
    */
-  additionalFlatListProps?: Partial<FlatListProps<AddMemberSearchResult>>;
+  additionalFlatListProps?: Partial<FlatListProps<UserResponse>>;
 };
 
-const keyExtractor = (user: AddMemberSearchResult) => user.id;
+const keyExtractor = (user: UserResponse) => user.id;
 
 /**
  * @experimental This component is experimental and is subject to change.
@@ -52,6 +49,7 @@ export const ChannelAddMembers = ({
 
   const {
     clearSearch,
+    isAlreadyMember,
     isSelected,
     loading,
     loadingMore,
@@ -70,15 +68,15 @@ export const ChannelAddMembers = ({
   }, [onSelectionChange, selectedUsers]);
 
   const renderItem = useCallback(
-    ({ item }: { item: AddMemberSearchResult }) => (
+    ({ item }: { item: UserResponse }) => (
       <AddMemberSearchResultItem
-        isAlreadyMember={item.isAlreadyMember}
-        onPress={() => toggleUser(item)}
+        isAlreadyMember={isAlreadyMember(item.id)}
+        onPress={toggleUser}
         selected={isSelected(item.id)}
         user={item}
       />
     ),
-    [isSelected, toggleUser],
+    [isAlreadyMember, isSelected, toggleUser],
   );
 
   const emptyState = loading ? (

package/src/components/ChannelDetailsScreen/components/members/ChannelAddMembers.tsx

@@ -11,19 +11,18 @@ import { useNotificationApi } from '../../../Notifications/hooks/useNotification
 const PAGE_SIZE = 25;
 const DEBOUNCE_MS = 200;
 
-export type AddMemberSearchResult = UserResponse & { isAlreadyMember: boolean };
-
 export type UseChannelAddMembersResult = {
   clearSearch: () => void;
   hasMore: boolean;
+  isAlreadyMember: (userId: string) => boolean;
   isSelected: (userId: string) => boolean;
   loading: boolean;
   loadingMore: boolean;
   loadMore: () => void;
   onChangeSearchText: (text: string) => void;
-  results: AddMemberSearchResult[];
+  results: UserResponse[];
   selectedUsers: UserResponse[];
-  toggleUser: (user: AddMemberSearchResult) => void;
+  toggleUser: (user: UserResponse) => void;
 };
 
 /**
@@ -38,7 +37,7 @@ export const useChannelAddMembers = ({
   const { addNotification } = useNotificationApi();
   const { t } = useTranslationContext();
 
-  const [rawResults, setRawResults] = useState<UserResponse[]>([]);
+  const [results, setResults] = useState<UserResponse[]>([]);
   const [selectedUsers, setSelectedUsers] = useState<UserResponse[]>([]);
   const [loading, setLoading] = useState(true);
   const [loadingMore, setLoadingMore] = useState(false);
@@ -80,7 +79,7 @@ export const useChannelAddMembers = ({
 
         const fetched = response.users ?? [];
 
-        setRawResults((prev) => {
+        setResults((prev) => {
           if (!append) return fetched;
           const seen = new Set(prev.map((u) => u.id));
           const deduped = fetched.filter((u) => u.id && !seen.has(u.id));
@@ -150,33 +149,25 @@ export const useChannelAddMembers = ({
     fetchPageRef.current({ append: true, query: queryRef.current });
   }, [hasMore, loading]);
 
-  const toggleUser = useCallback((user: AddMemberSearchResult) => {
-    if (!user.id || user.isAlreadyMember) return;
+  const toggleUser = useCallback((user: UserResponse) => {
+    if (!user.id) return;
     setSelectedUsers((prev) => {
       const exists = prev.some((u) => u.id === user.id);
       if (exists) return prev.filter((u) => u.id !== user.id);
-      const userResponse: UserResponse = { ...user };
-      delete (userResponse as Partial<AddMemberSearchResult>).isAlreadyMember;
-      return [...prev, userResponse];
+      return [...prev, user];
     });
   }, []);
 
   const selectedIds = useMemo(() => new Set(selectedUsers.map((u) => u.id)), [selectedUsers]);
 
   const isSelected = useCallback((userId: string) => selectedIds.has(userId), [selectedIds]);
 
-  const results = useMemo<AddMemberSearchResult[]>(
-    () =>
-      rawResults.map((user) => ({
-        ...user,
-        isAlreadyMember: !!user.id && memberIds.has(user.id),
-      })),
-    [rawResults, memberIds],
-  );
+  const isAlreadyMember = useCallback((userId: string) => memberIds.has(userId), [memberIds]);
 
   return {
     clearSearch,
     hasMore,
+    isAlreadyMember,
     isSelected,
     loading,
     loadingMore,

package/src/components/ChannelDetailsScreen/hooks/members/useChannelAddMembers.ts

@@ -9,7 +9,7 @@ const keys: EventTypes[] = ['health.check', 'notification.mutes_updated'];
 export function useMutedUsers(): Array<Mute>;
 /**
  *
- * @param @deprecated _channel - This parameter is deprecated because it is no longer necessary. It is kept for backwards compatibility only..
+ * @param @deprecated _channel - This parameter is deprecated because it is no longer necessary. It is kept for backwards compatibility only.
  * @returns
  */
 export function useMutedUsers(_channel: Channel): Array<Mute> | undefined;