diff --git a/src/components/Group/QMailMessages.tsx b/src/components/Group/QMailMessages.tsx index 9dbdef0..1674f18 100644 --- a/src/components/Group/QMailMessages.tsx +++ b/src/components/Group/QMailMessages.tsx @@ -103,16 +103,16 @@ export const QMailMessages = ({userName, userAddress}) => { }, [getMails, userName, userAddress]); - const anyUnread = useMemo(()=> { - let unread = false - - mails.forEach((mail)=> { - if(lastEnteredTimestamp && isLessThanOneWeekOld(mail?.created)){ - unread = true - } - }) - return unread - }, [mails, lastEnteredTimestamp]) + const anyUnread = useMemo(()=> { + let unread = false + + mails.forEach((mail)=> { + if(!lastEnteredTimestamp && isLessThanOneWeekOld(mail?.created) || (lastEnteredTimestamp && isLessThanOneWeekOld(mail?.created) && lastEnteredTimestamp < mail?.created)){ + unread = true + } + }) + return unread + }, [mails, lastEnteredTimestamp]) return ( { Latest Q-Mails {isExpanded ? : ( )}