Fix changing tabs marking conversation read

This commit is contained in:
Jamie Kyle 2023-08-21 12:51:12 -07:00 committed by GitHub
parent bddf1f432d
commit 29aa188c0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions

View file

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

View file

@ -79,16 +79,16 @@ export function SmartChatsTab(): JSX.Element {
scrollToMessage(selectedConversationId, targetedMessage); scrollToMessage(selectedConversationId, targetedMessage);
} }
if (!selectedConversationId) { if (
return; 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, onConversationClosed,
onConversationOpened, onConversationOpened,