diff --git a/src/components/Bookmarks.tsx b/src/components/Bookmarks.tsx index fb7eda08..35fa0468 100644 --- a/src/components/Bookmarks.tsx +++ b/src/components/Bookmarks.tsx @@ -28,7 +28,6 @@ const RELAY_URLS = [ const Bookmarks: React.FC = ({ relayPool, onLogout }) => { const [bookmarks, setBookmarks] = useState([]) - const [loading, setLoading] = useState(true) const [highlights, setHighlights] = useState([]) const [highlightsLoading, setHighlightsLoading] = useState(true) const [selectedUrl, setSelectedUrl] = useState(undefined) @@ -69,9 +68,8 @@ const Bookmarks: React.FC = ({ relayPool, onLogout }) => { const handleFetchBookmarks = async () => { if (!relayPool || !activeAccount) return - const timeoutId = setTimeout(() => setLoading(false), 15000) const fullAccount = accountManager.getActive() - await fetchBookmarks(relayPool, fullAccount || activeAccount, setBookmarks, setLoading, timeoutId) + await fetchBookmarks(relayPool, fullAccount || activeAccount, setBookmarks) } const handleFetchHighlights = async () => { @@ -132,14 +130,6 @@ const Bookmarks: React.FC = ({ relayPool, onLogout }) => { } } - if (loading) { - return ( -
-
Loading bookmarks...
-
- ) - } - return ( <>
diff --git a/src/services/bookmarkService.ts b/src/services/bookmarkService.ts index 20873b0f..f22f6659 100644 --- a/src/services/bookmarkService.ts +++ b/src/services/bookmarkService.ts @@ -20,12 +20,9 @@ import { collectBookmarksFromEvents } from './bookmarkProcessing.ts' export const fetchBookmarks = async ( relayPool: RelayPool, activeAccount: unknown, // Full account object with extension capabilities - setBookmarks: (bookmarks: Bookmark[]) => void, - setLoading: (loading: boolean) => void, - timeoutId: number + setBookmarks: (bookmarks: Bookmark[]) => void ) => { try { - setLoading(true) if (!isAccountWithExtension(activeAccount)) { throw new Error('Invalid account object provided') @@ -62,7 +59,6 @@ export const fetchBookmarks = async ( console.log('📋 After deduplication:', bookmarkListEvents.length, 'bookmark events') if (bookmarkListEvents.length === 0) { setBookmarks([]) - setLoading(false) return } // Aggregate across events @@ -139,12 +135,8 @@ export const fetchBookmarks = async ( } setBookmarks([bookmark]) - clearTimeout(timeoutId) - setLoading(false) } catch (error) { console.error('Failed to fetch bookmarks:', error) - clearTimeout(timeoutId) - setLoading(false) } } \ No newline at end of file