diff --git a/apps/readest-app/src/app/reader/components/FoliateViewer.tsx b/apps/readest-app/src/app/reader/components/FoliateViewer.tsx index 9ac175c3..6a87d903 100644 --- a/apps/readest-app/src/app/reader/components/FoliateViewer.tsx +++ b/apps/readest-app/src/app/reader/components/FoliateViewer.tsx @@ -46,7 +46,7 @@ import { useTextTranslation } from '../hooks/useTextTranslation'; import { manageSyntaxHighlighting } from '@/utils/highlightjs'; import { getViewInsets } from '@/utils/insets'; import Spinner from '@/components/Spinner'; -import ConfirmSyncDialog from './ConfirmSyncDialog'; +import KOSyncConflictResolver from './KOSyncResolver'; declare global { interface Window { @@ -86,8 +86,7 @@ const FoliateViewer: React.FC<{ useUICSS(bookKey); useProgressSync(bookKey); useProgressAutoSave(bookKey); - const { syncState, conflictDetails, resolveConflictWithLocal, resolveConflictWithRemote } = - useKOSync(bookKey); + const { syncState, conflictDetails, resolveWithLocal, resolveWithRemote } = useKOSync(bookKey); useTextTranslation(bookKey, viewRef.current); const progressRelocateHandler = (event: Event) => { @@ -392,11 +391,11 @@ const FoliateViewer: React.FC<{ /> {!docLoaded.current && loading && } {syncState === 'conflict' && conflictDetails && ( - )} diff --git a/apps/readest-app/src/app/reader/components/ConfirmSyncDialog.tsx b/apps/readest-app/src/app/reader/components/KOSyncResolver.tsx similarity index 72% rename from apps/readest-app/src/app/reader/components/ConfirmSyncDialog.tsx rename to apps/readest-app/src/app/reader/components/KOSyncResolver.tsx index 0f8e25e3..52f7f455 100644 --- a/apps/readest-app/src/app/reader/components/ConfirmSyncDialog.tsx +++ b/apps/readest-app/src/app/reader/components/KOSyncResolver.tsx @@ -3,17 +3,17 @@ import Dialog from '@/components/Dialog'; import { useTranslation } from '@/hooks/useTranslation'; import { SyncDetails } from '../hooks/useKOSync'; -interface ConfirmSyncDialogProps { +interface KOSyncConflictResolverProps { details: SyncDetails | null; - onConfirmLocal: () => void; - onConfirmRemote: () => void; + onResolveWithLocal: () => void; + onResolveWithRemote: () => void; onClose: () => void; } -const ConfirmSyncDialog: React.FC = ({ +const KOSyncConflictResolver: React.FC = ({ details, - onConfirmLocal, - onConfirmRemote, + onResolveWithLocal, + onResolveWithRemote, onClose, }) => { const _ = useTranslation(); @@ -28,7 +28,10 @@ const ConfirmSyncDialog: React.FC = ({ })}

-