showing proirity vs. inbox

This commit is contained in:
talksik
2022-06-19 07:55:20 -05:00
parent bc9725bfe0
commit 88e1cf9dd6
2 changed files with 34 additions and 11 deletions
+1 -1
View File
@@ -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"]
}
+33 -10
View File
@@ -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 (