diff --git a/src/screens/Messages/ChatList.tsx b/src/screens/Messages/ChatList.tsx index 4624b01645..f046f6c50c 100644 --- a/src/screens/Messages/ChatList.tsx +++ b/src/screens/Messages/ChatList.tsx @@ -131,7 +131,8 @@ export function MessagesScreen({navigation, route}: Props) { convo => !leftConvos.includes(convo.id) && !convo.muted && - convo.unreadCount > 0, + convo.unreadCount > 0 && + convo.members.every(member => member.handle !== 'missing.invalid'), ) ?? [] return inbox diff --git a/src/screens/Messages/Inbox.tsx b/src/screens/Messages/Inbox.tsx index 12fc9c44ed..0f64d20140 100644 --- a/src/screens/Messages/Inbox.tsx +++ b/src/screens/Messages/Inbox.tsx @@ -60,7 +60,12 @@ export function MessagesInboxScreen({}: Props) { }, [data, leftConvos]) const hasUnreadConvos = useMemo(() => { - return conversations.some(conversation => conversation.unreadCount > 0) + return conversations.some( + conversation => + conversation.members.every( + member => member.handle !== 'missing.invalid', + ) && conversation.unreadCount > 0, + ) }, [conversations]) return (