From 88e1cf9dd67fafeec2c17508ed797e5d7383f7f7 Mon Sep 17 00:00:00 2001
From: talksik <patel.arjun50@gmail.com>
Date: Sun, 19 Jun 2022 07:55:20 -0500
Subject: [PATCH] showing proirity vs. inbox

---
 .vscode/settings.json                         |  2 +-
 .../desktop/src/tree/ConversationList.tsx     | 43 ++++++++++++++-----
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index abfc7e4..23131b1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,7 +8,7 @@
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "workbench.colorTheme": "Default Light+",
   "javascript.format.semicolons": "insert",
-  "window.zoomLevel": 1
+  "window.zoomLevel": 0
 
   // "eslint.workingDirectories": ["./packages/desktop"]
 }
diff --git a/packages/desktop/src/tree/ConversationList.tsx b/packages/desktop/src/tree/ConversationList.tsx
index f3a7610..1164598 100644
--- a/packages/desktop/src/tree/ConversationList.tsx
+++ b/packages/desktop/src/tree/ConversationList.tsx
@@ -96,7 +96,7 @@ export function ConversationList() {
           </ListSubheader>
         }
       >
-        {Object.values(conversationMap).map((currentConversation, index) => (
+        {masterConversations[0].map((currentConversation, index) => (
           <ConversationRow
             key={`${currentConversation._id.toString()}-priorityConvoList`}
             conversation={currentConversation}
@@ -117,7 +117,15 @@ export function ConversationList() {
             <Typography variant="subtitle2"> Inbox</Typography>
           </ListSubheader>
         }
-      ></List>
+      >
+        {masterConversations[1].map((currentConversation, index) => (
+          <ConversationRow
+            key={`${currentConversation._id.toString()}-inboxConvoList`}
+            conversation={currentConversation}
+            index={index}
+          />
+        ))}
+      </List>
     </>
   );
 }
@@ -143,14 +151,6 @@ export function ConversationRow({
   const rendersCount = useRendersCount();
   console.warn('RENDER COUNT | CONVERSATION LIST ROW | ', rendersCount);
 
-  const keyboardShortcut = useMemo(() => {
-    if (index < NirvanaRules.topXConversationsWithShortcuts) {
-      return index + 1;
-    }
-
-    return undefined;
-  }, [index]);
-
   const handleSelectConversation = useCallback(() => {
     if (onClick) {
       onClick();
@@ -159,6 +159,29 @@ export function ConversationRow({
     selectConversation(conversation._id.toString(), false);
   }, [conversation, selectConversation, onClick]);
 
+  const currentConversationMember = useMemo(() => {
+    const currentConvoMember = conversation.members.find(
+      (mem) => mem._id.toString() === user._id.toString(),
+    );
+    return currentConvoMember;
+  }, [conversation.members, user]);
+
+  const isPriority = useMemo(() => {
+    if (currentConversationMember && currentConversationMember.memberState === 'priority') {
+      return true;
+    }
+
+    return false;
+  }, [currentConversationMember]);
+
+  const keyboardShortcut = useMemo(() => {
+    if (index < NirvanaRules.topXConversationsWithShortcuts && isPriority) {
+      return index + 1;
+    }
+
+    return undefined;
+  }, [index, isPriority]);
+
   useKeyPressEvent(`${keyboardShortcut?.toString()}`, handleSelectConversation);
 
   return (