From c50aa3a2431cc1cda16a571349e8484848ac7fa0 Mon Sep 17 00:00:00 2001 From: Gigi Date: Thu, 16 Oct 2025 09:53:20 +0200 Subject: [PATCH] fix: resolve TypeScript errors from merge - Remove unused readingPositions and markedAsReadIds from useBookmarksData - Remove eventStore parameter from useBookmarksData call - Add reads and links fields to MeCache interface --- src/components/Bookmarks.tsx | 9 ++------- src/services/meCache.ts | 3 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/Bookmarks.tsx b/src/components/Bookmarks.tsx index eb56f1c7..21ab6dbf 100644 --- a/src/components/Bookmarks.tsx +++ b/src/components/Bookmarks.tsx @@ -162,9 +162,7 @@ const Bookmarks: React.FC = ({ relayPool, onLogout }) => { isRefreshing, lastFetchTime, handleFetchHighlights, - handleRefreshAll, - readingPositions, - markedAsReadIds + handleRefreshAll } = useBookmarksData({ relayPool, activeAccount, @@ -173,8 +171,7 @@ const Bookmarks: React.FC = ({ relayPool, onLogout }) => { externalUrl, currentArticleCoordinate, currentArticleEventId, - settings, - eventStore + settings }) const { @@ -316,8 +313,6 @@ const Bookmarks: React.FC = ({ relayPool, onLogout }) => { highlightButtonRef={highlightButtonRef} onCreateHighlight={handleCreateHighlight} hasActiveAccount={!!(activeAccount && relayPool)} - readingPositions={readingPositions} - markedAsReadIds={markedAsReadIds} explore={showExplore ? ( relayPool ? : null ) : undefined} diff --git a/src/services/meCache.ts b/src/services/meCache.ts index 53b59a6a..e703ace9 100644 --- a/src/services/meCache.ts +++ b/src/services/meCache.ts @@ -1,11 +1,14 @@ import { Highlight } from '../types/highlights' import { Bookmark } from '../types/bookmarks' import { BlogPostPreview } from './exploreService' +import { ReadItem } from './readsService' export interface MeCache { highlights: Highlight[] bookmarks: Bookmark[] readArticles: BlogPostPreview[] + reads?: ReadItem[] + links?: ReadItem[] timestamp: number }