search subscription using fname field too

RocketChat · Sep 21, 2023 · 51b2c65 · 51b2c65
1 parent 306761e
commit 51b2c65
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...eor/client/components/UserAndRoomAutoCompleteMultiple/UserAndRoomAutoCompleteMultiple.tsx b/...eor/client/components/UserAndRoomAutoCompleteMultiple/UserAndRoomAutoCompleteMultiple.tsx
@@ -18,7 +18,13 @@ const UserAndRoomAutoCompleteMultiple = ({ value, onChange, ...props }: UserAndR
 	const debouncedFilter = useDebouncedValue(filter, 1000);
 
 	const rooms = useUserSubscriptions(
-		useMemo(() => ({ open: { $ne: false }, lowerCaseName: new RegExp(escapeRegExp(debouncedFilter), 'i') }), [debouncedFilter]),
+		useMemo(
+			() => ({
+				open: { $ne: false },
+				$or: [{ lowerCaseName: new RegExp(escapeRegExp(debouncedFilter), 'i') }, { fname: new RegExp(escapeRegExp(debouncedFilter), 'i') }],
+			}),
+			[debouncedFilter],
+		),
 	).filter((room) => {
 		if (!user) {
 			return;