diff --git a/src/app/features/room/ThreadBrowser.tsx b/src/app/features/room/ThreadBrowser.tsx index 1622e4b15..ba48771f6 100644 --- a/src/app/features/room/ThreadBrowser.tsx +++ b/src/app/features/room/ThreadBrowser.tsx @@ -20,6 +20,7 @@ import { UnreadBadge, UnreadBadgeCenter } from '$components/unread-badge'; import * as css from './ThreadDrawer.css'; import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer'; import { isMobileOrTablet } from '$utils/platform'; +import { useDismissOnBack } from '$utils/androidBack'; import { useMatrixEvent } from '$hooks/useMatrixEvent'; type ThreadPreviewProps = { @@ -154,6 +155,7 @@ export function ThreadBrowser({ room, onOpenThread, onClose, overlay }: ThreadBr const loadingMoreRef = useRef(false); const canLoadMoreRef = useRef(false); canLoadMoreRef.current = canLoadMore; + useDismissOnBack(onClose); // On mount, set up thread event listeners, create the server-side thread // timeline sets, then fetch page 1 via paginate. The two operations are diff --git a/src/app/features/room/ThreadDrawer.tsx b/src/app/features/room/ThreadDrawer.tsx index d2db33c26..ad0bb9df0 100644 --- a/src/app/features/room/ThreadDrawer.tsx +++ b/src/app/features/room/ThreadDrawer.tsx @@ -46,6 +46,7 @@ import { RoomViewFollowing, RoomViewFollowingPlaceholder } from './RoomViewFollo import * as css from './ThreadDrawer.css'; import { SidebarResizer } from '$pages/client/sidebar/SidebarResizer'; import { isMobileOrTablet } from '$utils/platform'; +import { useDismissOnBack } from '$utils/androidBack'; import type { Persona } from '$app/persona'; type ThreadDrawerProps = { @@ -77,6 +78,7 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra [jotaiStore] ); const pushProcessor = mx.pushProcessor; + useDismissOnBack(onClose); const isInactivePanel = useIsInactivePanel(); // Shared renderer context — replaces 17+ inline useSetting calls,