colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix changing tabs marking conversation read

Browse Source
This commit is contained in:
Jamie Kyle
2023-08-21 12:51:12 -07:00
committed by GitHub
parent bddf1f432d
commit 29aa188c0f
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ts/state/ducks/conversations.ts
View File

@@ -3947,6 +3947,8 @@ function showConversation({
if (nav.selectedNavTab !== NavTab.Chats) {
dispatch(navActions.changeNavTab(NavTab.Chats));
const conversation = window.ConversationController.get(conversationId);
conversation?.setMarkedUnread(false);
}
if (conversationId === conversations.selectedConversationId) {

18
ts/state/smart/ChatsTab.tsx
View File

@@ -79,16 +79,16 @@ export function SmartChatsTab(): JSX.Element {
scrollToMessage(selectedConversationId, targetedMessage);
}
if (!selectedConversationId) {
return;
if (
selectedConversationId != null &&
selectedConversationId !== prevConversationId
) {
const conversation = window.ConversationController.get(
selectedConversationId
);
strictAssert(conversation, 'Conversation must be found');
conversation.setMarkedUnread(false);
}
const conversation = window.ConversationController.get(
selectedConversationId
);
strictAssert(conversation, 'Conversation must be found');
conversation.setMarkedUnread(false);
}, [
onConversationClosed,
onConversationOpened,