fix(fix referfch after archive): fix refetch after archiving the last…

… message
trycourier · Sep 18, 2024 · ad3744d · ad3744d
1 parent 525cc3e
commit ad3744d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/packages/react-hooks/src/inbox/reducer.ts b/packages/react-hooks/src/inbox/reducer.ts
@@ -168,12 +168,20 @@ export default (state: IInbox = initialState, action?: InboxAction): IInbox => {
         ? [...(state?.messages ?? []), ...(action.payload?.messages ?? [])]
         : action.payload?.messages;
 
+      const newMessagesFiltered = newMessages?.filter((m) => {
+        if (state?.recentlyArchiveMessageIds?.includes(m.messageId)) {
+          return false;
+        }
+
+        return true;
+      });
+
       return {
         ...state,
         isLoading: false,
         searchParams: action.meta.searchParams,
         lastMessagesFetched: new Date().getTime(),
-        messages: newMessages as IInboxMessagePreview[],
+        messages: newMessagesFiltered as IInboxMessagePreview[],
         pinned: action.payload?.appendMessages
           ? state.pinned
           : sortPinned(action.payload?.pinned, state.brand),
@@ -335,6 +343,8 @@ export default (state: IInbox = initialState, action?: InboxAction): IInbox => {
     case INBOX_MARK_MESSAGE_ARCHIVED: {
       let unreadMessageCount = state.unreadMessageCount ?? 0;
 
+      const recentlyArchiveMessageIds = state.recentlyArchiveMessageIds ?? [];
+      recentlyArchiveMessageIds.push(action.payload.messageId);
       const handleArchived = (message) => {
         const isMatching = message.messageId === action.payload.messageId;
         if (isMatching && !message.read) {
@@ -349,8 +359,9 @@ export default (state: IInbox = initialState, action?: InboxAction): IInbox => {
 
       return {
         ...state,
-        pinned: newPinned,
         messages: newMessages,
+        pinned: newPinned,
+        recentlyArchiveMessageIds,
         unreadMessageCount,
       };
     }

diff --git a/packages/react-hooks/src/inbox/types.ts b/packages/react-hooks/src/inbox/types.ts
@@ -2,7 +2,6 @@ import { IGetInboxMessagesParams } from "@trycourier/client-graphql";
 import { Brand, IInboxMessagePreview } from "@trycourier/core";
 import { OnEvent } from "@trycourier/react-provider";
 export interface IInbox<T = IInboxMessagePreview> {
-  tenantId?: string;
   brand?: Brand;
   from?: number;
   isLoading?: boolean;
@@ -11,9 +10,11 @@ export interface IInbox<T = IInboxMessagePreview> {
   lastMessagesFetched?: number;
   messages?: Array<T>;
   onEvent?: OnEvent;
-  searchParams?: IGetInboxMessagesParams;
   pinned?: Array<T>;
+  recentlyArchiveMessageIds?: Array<string>;
+  searchParams?: IGetInboxMessagesParams;
   startCursor?: string;
+  tenantId?: string;
   unreadMessageCount?: number;
   view?: string | "preferences";
 }