add batch number to inbox items

daostack · Oct 30, 2023 · df853d6 · df853d6
1 parent 8808629
commit df853d6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/src/pages/inbox/BaseInbox.tsx b/src/pages/inbox/BaseInbox.tsx
@@ -88,6 +88,7 @@ const InboxPage: FC<InboxPageProps> = (props) => {
     loading: areInboxItemsLoading,
     hasMore: hasMoreInboxItems,
     fetch: fetchInboxItems,
+    batchNumber,
   } = useInboxItems(feedItemIdsForNotListening, {
     unread: queryParams.unread === "true",
   });
@@ -257,6 +258,7 @@ const InboxPage: FC<InboxPageProps> = (props) => {
         feedItems={inboxItems}
         loading={areInboxItemsLoading || !user}
         shouldHideContent={!user}
+        batchNumber={batchNumber}
         onFetchNext={fetchMoreInboxItems}
         renderFeedItemBaseContent={renderFeedItemBaseContent}
         renderChatChannelItem={renderChatChannelItem}

diff --git a/src/shared/hooks/useCases/useInboxItems.ts b/src/shared/hooks/useCases/useInboxItems.ts
@@ -13,7 +13,8 @@ import { FeedLayoutItemWithFollowData } from "@/shared/interfaces";
 import { FeedItemFollow, FeedItemFollowWithMetadata } from "@/shared/models";
 import { inboxActions, InboxItems, selectInboxItems } from "@/store/states";
 
-interface Return extends Pick<InboxItems, "data" | "loading" | "hasMore"> {
+interface Return
+  extends Pick<InboxItems, "data" | "loading" | "hasMore" | "batchNumber"> {
   fetch: () => void;
 }
 

diff --git a/src/store/states/inbox/actions.ts b/src/store/states/inbox/actions.ts
@@ -16,7 +16,7 @@ export const getInboxItems = createAsyncAction(
     limit?: number;
     unread?: boolean;
   },
-  Omit<InboxItems, "loading">,
+  Omit<InboxItems, "loading" | "batchNumber">,
   Error,
   string
 >();

diff --git a/src/store/states/inbox/reducer.ts b/src/store/states/inbox/reducer.ts
@@ -20,6 +20,7 @@ const initialInboxItems: InboxItems = {
   hasMore: false,
   firstDocTimestamp: null,
   lastDocTimestamp: null,
+  batchNumber: 0,
 };
 
 const initialState: InboxState = {
@@ -432,6 +433,7 @@ export const reducer = createReducer<InboxState, Action>(initialState)
         ...payload,
         data: payloadData && (nextState.items.data || []).concat(payloadData),
         loading: false,
+        batchNumber: nextState.items.batchNumber + 1,
       };
     }),
   )

diff --git a/src/store/states/inbox/types.ts b/src/store/states/inbox/types.ts
@@ -10,6 +10,7 @@ export interface InboxItems {
   hasMore: boolean;
   firstDocTimestamp: Timestamp | null;
   lastDocTimestamp: Timestamp | null;
+  batchNumber: number;
 }
 
 export interface InboxState {