From 8307e4a17ee4af1bd67a19f61d64725ee234f741 Mon Sep 17 00:00:00 2001
From: Shea Duma <nu@she-a.eu>
Date: Tue, 28 Apr 2026 05:46:16 +0300
Subject: [PATCH] DEV - Room Search Fix

---
 .../editor/autocomplete/RoomMentionAutocomplete.tsx       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
index 90789525c..36279710a 100644
--- a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
+++ b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx
@@ -1,5 +1,5 @@
 import type { KeyboardEvent as ReactKeyboardEvent } from 'react';
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useMemo } from 'react';
 import type { Editor } from 'slate';
 import { ReactEditor } from 'slate-react';
 import { Avatar, Icon, Icons, MenuItem, Text } from 'folds';
@@ -83,7 +83,11 @@ export function RoomMentionAutocomplete({
   const mx = useMatrixClient();
   const mDirects = useAtomValue(mDirectAtom);
 
-  const allRooms = useAtomValue(allRoomsAtom).toSorted(factoryRoomIdByActivity(mx));
+  const allRoomsFromAtom = useAtomValue(allRoomsAtom);
+  const allRooms = useMemo(
+    () => allRoomsFromAtom.toSorted(factoryRoomIdByActivity(mx)),
+    [allRoomsFromAtom, mx]
+  );
 
   const [result, search, resetSearch] = useAsyncSearch(
     allRooms,