@ermis-network/ermis-chat-react 2.0.0 → 2.0.1

package/src/components/UserPicker.tsx

@@ -184,19 +184,10 @@ export const UserPicker: React.FC<UserPickerProps> = ({
     const fetchUsers = async () => {
       if (!client) return;
 
-      const cacheKey = friendsOnly 
-        ? `${client.userID || 'anon'}-friends` 
-        : `${client.userID || 'anon'}-${pageSize}`;
-
-      if (globalUsersCache[cacheKey] && globalUsersCache[cacheKey].users.length > 0) {
-        const cached = globalUsersCache[cacheKey];
-        setAllUsers(cached.users);
-        setHasMore(cached.hasMore);
-        setPage(cached.page);
-        setLoading(false);
-        return;
-      }
-
+      // For friendsOnly mode, always read fresh data from activeChannels.
+      // Do NOT use globalUsersCache here — the friend list can change at any
+      // time (e.g. a new friend request was accepted) and caching would
+      // return stale results, hiding the newly added friend.
       if (friendsOnly) {
         const friends: UserPickerUser[] = [];
         const seenIds = new Set<string>();
@@ -222,19 +213,24 @@ export const UserPicker: React.FC<UserPickerProps> = ({
           setHasMore(false);
           setPage(1);
           setLoading(false);
-
-          globalUsersCache[cacheKey] = {
-            users: friends,
-            page: 1,
-            hasMore: false,
-          };
         }
         return;
       }
 
+      const cacheKey = `${client.userID || 'anon'}-${pageSize}`;
+
+      if (globalUsersCache[cacheKey] && globalUsersCache[cacheKey].users.length > 0) {
+        const cached = globalUsersCache[cacheKey];
+        setAllUsers(cached.users);
+        setHasMore(cached.hasMore);
+        setPage(cached.page);
+        setLoading(false);
+        return;
+      }
+
       try {
         setLoading(true);
-        const response = await client.queryUsers(String(pageSize), 1);
+        const response = await client.queryUsers(pageSize, 1);
         if (active && response.data) {
           setAllUsers(response.data);
           setHasMore(response.data.length >= pageSize);
@@ -254,7 +250,7 @@ export const UserPicker: React.FC<UserPickerProps> = ({
     };
     fetchUsers();
     return () => { active = false; };
-  }, [client, pageSize]);
+  }, [client, pageSize, friendsOnly]);
 
   /* ---------- 2. Load more (infinite scroll) ---------- */
   const loadMore = useCallback(async () => {
@@ -262,7 +258,7 @@ export const UserPicker: React.FC<UserPickerProps> = ({
     const nextPage = page + 1;
     setLoadingMore(true);
     try {
-      const response = await client.queryUsers(String(pageSize), nextPage);
+      const response = await client.queryUsers(pageSize, nextPage);
       if (response.data) {
         setAllUsers(prev => {
           const existingIds = new Set(prev.map(u => u.id));
@@ -294,12 +290,17 @@ export const UserPicker: React.FC<UserPickerProps> = ({
   const localFilteredUsers = useMemo(() => {
     const term = removeAccents(search.toLowerCase().trim());
     if (!term) return allUsers;
-    return allUsers.filter(u => {
+    const result: UserPickerUser[] = [];
+    for (const u of allUsers) {
       const name = removeAccents((u.name || '').toLowerCase());
       const email = removeAccents((u.email || '').toLowerCase());
       const phone = removeAccents((u.phone || '').toLowerCase());
-      return name.includes(term) || email.includes(term) || phone.includes(term);
-    });
+      if (name.startsWith(term) || email.startsWith(term) || phone.startsWith(term)) {
+        result.push(u);
+        if (result.length >= 100) break; // optimize for large room
+      }
+    }
+    return result;
   }, [search, allUsers]);
 
   /* ---------- 4. Remote search fallback ---------- */