Increase unread cap to 99+ (#10985)

This commit is contained in:
DS Boyce
2026-06-25 14:57:03 -07:00
committed by GitHub
parent 29a0d16b69
commit eae15aca3e
5 changed files with 31 additions and 37 deletions
+3 -10
View File
@@ -23,6 +23,7 @@ import {cleanError} from '#/lib/strings/errors'
import {logger} from '#/logger'
import {MESSAGE_SCREEN_POLL_INTERVAL} from '#/state/messages/convo/const'
import {useMessagesEventBus} from '#/state/messages/events'
import {useUnreadCountsQuery} from '#/state/queries/messages/get-unread-counts'
import {useListConvoRequests} from '#/state/queries/messages/list-conversation-requests'
import {useUpdateAllRead} from '#/state/queries/messages/update-all-read'
import {EmptyState} from '#/view/com/util/EmptyState'
@@ -84,16 +85,8 @@ export function MessagesInboxScreenInner({}: Props) {
return items
}, [data])
const hasUnreadConvos = useMemo(() => {
return conversations.some(
item =>
item.type === 'incoming' &&
item.view.members.every(
member => member.handle !== 'missing.invalid',
) &&
item.view.unreadCount > 0,
)
}, [conversations])
const {data: unreadCounts} = useUnreadCountsQuery()
const hasUnreadConvos = (unreadCounts?.unreadRequestConvos ?? 0) > 0
return (
<Layout.Screen testID="messagesInboxScreen">
@@ -1,14 +1,12 @@
import {plural} from '@lingui/core/macro'
import {useLingui} from '@lingui/react/macro'
import {UNREAD_REQUEST_CAP} from '#/state/queries/messages/get-unread-counts'
import {atoms as a} from '#/alf'
import {ButtonIcon, ButtonText} from '#/components/Button'
import {Inbox_Stroke2_Corner2_Rounded as InboxIcon} from '#/components/icons/Inbox'
import {Link} from '#/components/Link'
// The server caps unreadRequestConvos at 11, where 11 means "any more than 10".
const REQUEST_COUNT_CAP = 11
export function InboxRequests({
count,
variant,
@@ -21,7 +19,7 @@ export function InboxRequests({
const {t: l} = useLingui()
const unread = count > 0
const overflow = count >= REQUEST_COUNT_CAP
const overflow = count >= UNREAD_REQUEST_CAP
const label = !unread
? l({
@@ -30,8 +28,8 @@ export function InboxRequests({
})
: overflow
? l({
message: `10+ requests`,
comment: 'Displayed when the number of requests is greater than 10',
message: `${UNREAD_REQUEST_CAP - 1}+ requests`,
comment: 'Displayed when the number of requests exceeds the cap',
})
: plural(count, {
one: '# request',
@@ -55,9 +53,9 @@ export function InboxRequests({
<ButtonText style={[a.text_md, a.font_bold]}>
{overflow
? l({
message: `10+`,
message: `${UNREAD_REQUEST_CAP - 1}+`,
comment:
'Displayed when the number of requests is greater than 10',
'Displayed when the number of requests exceeds the cap for example, 99+ requests',
})
: count}
</ButtonText>