Merge pull request #10524 from nextcloud/fix/10498/keep_opened_conver…

…sation fix(leftSidebar)- Keep the opened conversation in the list
nextcloud · Sep 18, 2023 · fdda504 · fdda504
2 parents ee644f2 + ada3baa
commit fdda504
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
@@ -378,13 +378,15 @@ export default {
 			}
 
 			if (this.isFiltered === 'unread') {
-				return this.conversationsList.filter(conversation => conversation.unreadMessages > 0 || conversation.hasCall)
+				return this.conversationsList.filter(conversation => conversation.unreadMessages > 0
+				|| conversation.hasCall || conversation.token === this.$store.getters.getToken())
 			}
 
 			if (this.isFiltered === 'mentions') {
 				return this.conversationsList.filter(conversation => conversation.unreadMention
 				|| conversation.hasCall
-				|| (conversation.unreadMessages > 0 && (conversation.type === CONVERSATION.TYPE.ONE_TO_ONE || conversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER)))
+				|| (conversation.unreadMessages > 0 && (conversation.type === CONVERSATION.TYPE.ONE_TO_ONE || conversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER))
+				|| conversation.token === this.$store.getters.getToken())
 			}
 
 			return this.conversationsList