From 26bb1e85266192c02559cd270a7b6a5d40e94cc6 Mon Sep 17 00:00:00 2001 From: tomobre Date: Thu, 2 Feb 2023 11:10:47 +1100 Subject: [PATCH 1/2] fix: unreadcount messages maximum of 9999+ --- .../leftpane/conversation-list-item/HeaderItem.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx index c6bb9034c..6807e32c3 100644 --- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx +++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx @@ -170,7 +170,11 @@ export const ConversationListItemHeaderItem = () => { @ ) : null; - unreadCountDiv =

{unreadCount}

; + unreadCountDiv = ( +

+ {unreadCount > 9999 ? '9999+' : unreadCount} +

+ ); } return ( From 5b59b3eef21482d82d456d8590791753c19c6efa Mon Sep 17 00:00:00 2001 From: William Grant Date: Thu, 2 Feb 2023 11:10:47 +1100 Subject: [PATCH 2/2] fix: extract max unread count to a constant --- ts/components/leftpane/conversation-list-item/HeaderItem.tsx | 3 ++- ts/session/constants.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx index 6807e32c3..b0a1eee31 100644 --- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx +++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx @@ -5,6 +5,7 @@ import styled from 'styled-components'; import { Data } from '../../../data/data'; import { useConversationPropsById, useIsPinned } from '../../../hooks/useParamSelector'; import { getUsBlindedInThatServer } from '../../../session/apis/open_group_api/sogsv3/knownBlindedkeys'; +import { CONVERSATION } from '../../../session/constants'; import { UserUtils } from '../../../session/utils'; import { openConversationToSpecificMessage, @@ -172,7 +173,7 @@ export const ConversationListItemHeaderItem = () => { ) : null; unreadCountDiv = (

- {unreadCount > 9999 ? '9999+' : unreadCount} + {unreadCount > CONVERSATION.MAX_UNREAD_COUNT ? `${CONVERSATION.MAX_UNREAD_COUNT}+` : unreadCount}

); } diff --git a/ts/session/constants.ts b/ts/session/constants.ts index 35bd981fb..72b546a9d 100644 --- a/ts/session/constants.ts +++ b/ts/session/constants.ts @@ -39,6 +39,7 @@ export const CONVERSATION = { // Maximum voice message duraton of 5 minutes // which equates to 1.97 MB MAX_VOICE_MESSAGE_DURATION: 300, + MAX_UNREAD_COUNT: 9999, }; // Max attachment size: 6 MB