From 71a0c61dfb5bf773b26372f4fcbafcd0801b4bba Mon Sep 17 00:00:00 2001
From: Bojan Mojsilovic <bmojsilovic@itekako.com>
Date: Mon, 14 Oct 2024 11:57:07 +0200
Subject: [PATCH] Fix Bookmarks paging

---
 src/components/SelectionBox/SelectionBox.tsx | 1 -
 src/pages/Bookmarks.tsx                      | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/SelectionBox/SelectionBox.tsx b/src/components/SelectionBox/SelectionBox.tsx
index 23604145..a0dad4d6 100644
--- a/src/components/SelectionBox/SelectionBox.tsx
+++ b/src/components/SelectionBox/SelectionBox.tsx
@@ -69,7 +69,6 @@ const SelectionBox: Component<{
           <div class={styles.title}>
             Note Feeds:
           </div>
-          <A href='/settings/feeds'>Edit Feeds</A>
         </div>
         <Select.Listbox class={styles.listbox}/>
       </Select.Content>
diff --git a/src/pages/Bookmarks.tsx b/src/pages/Bookmarks.tsx
index dd5cab89..21a4e181 100644
--- a/src/pages/Bookmarks.tsx
+++ b/src/pages/Bookmarks.tsx
@@ -71,6 +71,7 @@ const Bookmarks: Component = () => {
   createEffect(on(() => account?.isKeyLookupDone, (v) => {
     if (v && account?.publicKey) {
       updateStore(() => ({ ...emptyStore }));
+      updateStore('fetchingInProgress', () => true);
       fetchBookmarks(account.publicKey);
     }
   }));
@@ -82,7 +83,7 @@ const Bookmarks: Component = () => {
   const kind = () => store.kind || 'notes';
 
   const fetchBookmarks = (pubkey: string | undefined, until = 0) => {
-    if (store.fetchingInProgress || !pubkey) return;
+    if (!pubkey) return;
 
     const subId = `bookmark_feed_${until}_${APP_ID}`;
 
@@ -112,7 +113,6 @@ const Bookmarks: Component = () => {
 
     const k = kind() === 'reads' ? Kind.LongForm : Kind.Text;
 
-    updateStore('fetchingInProgress', () => true);
     getUserFeed(pubkey, pubkey, subId, 'bookmarks', k, until, pageSize, store.offset);
   }