diff --git a/src/app/pages/client/ToRoomEvent.tsx b/src/app/pages/client/ToRoomEvent.tsx index a358ab1e..f81daa9d 100644 --- a/src/app/pages/client/ToRoomEvent.tsx +++ b/src/app/pages/client/ToRoomEvent.tsx @@ -1,8 +1,12 @@ -import React, { useEffect } from "react"; +/* eslint-disable camelcase */ +import { useEffect, useState, useCallback } from "react"; import { useParams } from "react-router-dom"; import { useAtomValue } from "jotai"; +import { SyncState } from "matrix-js-sdk"; + import { useRoomNavigate } from "../../hooks/useRoomNavigate"; import { useMatrixClient } from "../../hooks/useMatrixClient"; +import { useSyncState } from "../../hooks/useSyncState"; import { roomToParentsAtom } from "../../state/room/roomToParents"; import { mDirectAtom } from "../../state/mDirectList"; @@ -12,20 +16,38 @@ export function ToRoomEvent() { const mDirects = useAtomValue(mDirectAtom); const { room_id, event_id } = useParams(); const { navigateRoom } = useRoomNavigate(); + const [syncState, setSyncState] = useState( + mx?.getSyncState() ?? null + ); + + useSyncState( + mx, + useCallback((s) => setSyncState(s), []) + ); useEffect(() => { - if (!room_id || !mx) { return; } - if (!roomToParents.size || !mDirects.size) { return; } + if (!room_id || !mx) { + return; + } + if (syncState !== SyncState.Syncing) { + return; + } + if (!roomToParents.size || !mDirects.size) { + return; + } - if (window.history.length <= 2) { window.history.pushState({}, "", "/"); } + if (window.history.length <= 2) { + window.history.pushState({}, "", "/"); + } navigateRoom(room_id, event_id); }, [ mx, + syncState, roomToParents, mDirects, room_id, event_id, - navigateRoom + navigateRoom, ]); return null;