From d3e7edf7c4fb51a952776e1ee862eafe607b6ad9 Mon Sep 17 00:00:00 2001
From: CatsJuice <wp1298554944@hotmail.com>
Date: Tue, 17 Dec 2024 02:54:10 +0000
Subject: [PATCH] fix(mobile): can navigate in journal conflicts (#9170)

---
 .../pages/workspace/detail/journal-conflict-block.css.ts     | 1 +
 .../mobile/pages/workspace/detail/journal-conflict-block.tsx | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/journal-conflict-block.css.ts b/packages/frontend/core/src/mobile/pages/workspace/detail/journal-conflict-block.css.ts
index c2444f54d..fc26f5303 100644
--- a/packages/frontend/core/src/mobile/pages/workspace/detail/journal-conflict-block.css.ts
+++ b/packages/frontend/core/src/mobile/pages/workspace/detail/journal-conflict-block.css.ts
@@ -38,6 +38,7 @@ export const docItem = style({
   display: 'flex',
   gap: 8,
   alignItems: 'center',
+  color: 'unset',
 });
 export const icon = style({
   fontSize: 20,
diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/journal-conflict-block.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/journal-conflict-block.tsx
index 927e20b2b..ec007e734 100644
--- a/packages/frontend/core/src/mobile/pages/workspace/detail/journal-conflict-block.tsx
+++ b/packages/frontend/core/src/mobile/pages/workspace/detail/journal-conflict-block.tsx
@@ -1,6 +1,7 @@
 import { IconButton, Menu } from '@affine/component';
 import { DocDisplayMetaService } from '@affine/core/modules/doc-display-meta';
 import { JournalService } from '@affine/core/modules/journal';
+import { WorkbenchLink } from '@affine/core/modules/workbench';
 import { useI18n } from '@affine/i18n';
 import { EditIcon, TodayIcon } from '@blocksuite/icons/rc';
 import type { DocRecord } from '@toeverything/infra';
@@ -58,7 +59,7 @@ const ConflictItem = ({ docRecord }: { docRecord: DocRecord }) => {
   const title = i18n.t(titleMeta);
 
   return (
-    <div className={styles.docItem}>
+    <WorkbenchLink className={styles.docItem} to={`/${docId}`}>
       <TodayIcon className={styles.icon} />
       <div className={styles.content}>
         <div className={styles.title}>{title}</div>
@@ -69,6 +70,6 @@ const ConflictItem = ({ docRecord }: { docRecord: DocRecord }) => {
       <Menu items={<ResolveConflictOperations docRecord={docRecord} />}>
         <IconButton className={styles.edit} icon={<EditIcon />} />
       </Menu>
-    </div>
+    </WorkbenchLink>
   );
 };