Fix pinned/muted chats so they're instantly shown

holium · Jun 29, 2023 · 99daac8 · 99daac8
1 parent 4c0002b
commit 99daac8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/app/src/renderer/apps/Courier/views/Inbox/InboxBody.tsx b/app/src/renderer/apps/Courier/views/Inbox/InboxBody.tsx
@@ -85,7 +85,7 @@ export const InboxBody = ({
           </Button.IconButton>
         </Flex>
       </InboxBodyHeaderContainer>
-      {isLoading && <InboxBodyLoadingHeader />}
+      {isLoading && isStandaloneChat && <InboxBodyLoadingHeader />}
       <InboxBodyList
         inboxes={filteredInboxes}
         spacePath={spacePath}

diff --git a/app/src/renderer/apps/Courier/views/Inbox/InboxBodyLoadingHeader.tsx b/app/src/renderer/apps/Courier/views/Inbox/InboxBodyLoadingHeader.tsx
@@ -19,6 +19,6 @@ export const InboxBodyLoadingHeader = () => (
     transition={{ duration: 0.2, ease: 'easeInOut' }}
   >
     <Spinner size="16px" width={1.5} color="var(--rlm-text-color)" />
-    <Text.Body>Loading new messages...</Text.Body>
+    <Text.Body>Syncing messages...</Text.Body>
   </Container>
 );
diff --git a/app/src/renderer/stores/chat.store.ts b/app/src/renderer/stores/chat.store.ts
@@ -158,14 +158,11 @@ export const ChatStore = types
       self.inboxInitLoader.set('loading');
 
       try {
-        const pinnedChats = yield ChatIPC.fetchPinnedChats();
+        const pinned = yield ChatIPC.fetchPinnedChats();
         const muted = yield ChatIPC.fetchMuted();
         self.inbox = yield ChatIPC.getChatList();
-        self.inbox.forEach((chat) => {
-          chat.setMuted(muted.includes(chat.path));
-          chat.setPinned(pinnedChats.includes(chat.path));
-        });
-        self.pinnedChats = pinnedChats;
+        self.mutedChats = muted;
+        self.pinnedChats = pinned;
       } catch (error) {
         console.error(error);
       }
@@ -185,7 +182,17 @@ export const ChatStore = types
       self.inboxLoader.set('loading');
 
       try {
-        self.inbox = yield ChatIPC.getChatList();
+        const initialInbox = yield ChatIPC.getChatList();
+        const pins = initialInbox
+          .filter((chat: any) => chat.pinned)
+          .map((chat: any) => chat.path);
+        const mutes = initialInbox
+          .filter((chat: any) => chat.muted)
+          .map((chat: any) => chat.path);
+
+        self.inbox = initialInbox;
+        self.pinnedChats = pins;
+        self.mutedChats = mutes;
       } catch (error) {
         console.error(error);
       }