diff --git a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx index 48737029e2..23e1ccff8a 100644 --- a/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx +++ b/packages/frontend/core/src/desktop/pages/workspace/detail-page/tabs/journal/index.tsx @@ -442,7 +442,7 @@ const ConflictList = ({ ...attrs }: ConflictListProps) => { const t = useI18n(); - const currentDoc = useService(DocService).doc; + const currentDocId = useServiceOptional(DocService)?.doc.id; const journalService = useService(JournalService); const { openConfirmModal } = useConfirmModal(); @@ -479,7 +479,7 @@ const ConflictList = ({ {...attrs} > {docRecords.map(docRecord => { - const isCurrent = docRecord.id === currentDoc.id; + const isCurrent = currentDocId ? docRecord.id === currentDocId : false; return (