From e7faad4ad35c62737eed4a1d1c4e4217575e7e89 Mon Sep 17 00:00:00 2001 From: talksik Date: Sat, 18 Jun 2022 08:15:53 -0500 Subject: [PATCH] adding initial priority and making sure to not untune from priority ones --- .../desktop/src/providers/ConversationProvider.tsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/desktop/src/providers/ConversationProvider.tsx b/packages/desktop/src/providers/ConversationProvider.tsx index 3ea4efb..2502b3c 100644 --- a/packages/desktop/src/providers/ConversationProvider.tsx +++ b/packages/desktop/src/providers/ConversationProvider.tsx @@ -204,8 +204,16 @@ export function ConversationProvider({ children }: { children: React.ReactNode } } setSelectedConversation((prevConversation) => { + // only untune if it was an inbox conversation + if (prevConversation) { - handleUntuneFromLine(prevConversation._id.toString()); + const currMemberForConversation = prevConversation.members.find( + (mem) => mem.email === user.email, + ); + + if (currMemberForConversation && currMemberForConversation.memberState === 'inbox') { + handleUntuneFromLine(prevConversation._id.toString()); + } } handleTuneIntoLine(conversationToSelect._id.toString()); @@ -214,6 +222,7 @@ export function ConversationProvider({ children }: { children: React.ReactNode } }); }, [ + user, conversationMap, setSelectedConversation, setConversationMap,