Remove leave-convo suppression, use real optimistic update (#10834)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Samuel Newman
2026-06-10 11:58:16 +03:00
committed by GitHub
parent f321122656
commit 9a2e636c17
4 changed files with 48 additions and 77 deletions
+2 -10
View File
@@ -16,7 +16,6 @@ import {listenSoftReset} from '#/state/events'
import {MESSAGE_SCREEN_POLL_INTERVAL} from '#/state/messages/convo/const'
import {useMessagesEventBus} from '#/state/messages/events'
import {useChatActorStatusQuery} from '#/state/queries/messages/get-status'
import {useLeftConvos} from '#/state/queries/messages/leave-conversation'
import {useListConvosQuery} from '#/state/queries/messages/list-conversations'
import {EmptyState} from '#/view/com/util/EmptyState'
import {List, type ListRef} from '#/view/com/util/List'
@@ -237,14 +236,9 @@ export function ChatList({
useRefreshOnFocus(refetch)
useRefreshOnFocus(refetchInbox)
const leftConvos = useLeftConvos()
const conversations = useMemo(() => {
if (data?.pages) {
const conversations = data.pages
.flatMap(page => page.convos)
// filter out convos that are actively being left
.filter(convo => !leftConvos.includes(convo.id))
const conversations = data.pages.flatMap(page => page.convos)
return conversations.map(
convo =>
@@ -256,7 +250,7 @@ export function ChatList({
) satisfies ListItem[]
}
return []
}, [data, leftConvos, selectedChat])
}, [data, selectedChat])
const onRefresh = useCallback(async () => {
setIsPTRing(true)
@@ -453,7 +447,6 @@ export function Header({
const {gtMobile} = useBreakpoints()
const aa = useAgeAssurance()
const requireEmailVerification = useRequireEmailVerification()
const leftConvos = useLeftConvos()
const {isWithinSplitView} = useIsWithinSplitView()
// In split view, the left column (and this header) stays mounted while the
@@ -473,7 +466,6 @@ export function Header({
.flatMap(page => page.convos)
.filter(
convo =>
!leftConvos.includes(convo.id) &&
!convo.muted &&
convo.members.every(member => member.handle !== 'missing.invalid') &&
(ChatBskyConvoDefs.isGroupConvo(convo.kind)
+1 -6
View File
@@ -23,7 +23,6 @@ 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 {useLeftConvos} from '#/state/queries/messages/leave-conversation'
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'
@@ -70,16 +69,12 @@ export function MessagesInboxScreenInner({}: Props) {
const listConvosQuery = useListConvoRequests()
const {data} = listConvosQuery
const leftConvos = useLeftConvos()
const conversations = useMemo<RequestItem[]>(() => {
if (!data?.pages) return []
const items: RequestItem[] = []
for (const page of data.pages) {
for (const item of page.requests) {
if (ChatBskyConvoDefs.isConvoView(item)) {
// filter out convos that are actively being left
if (leftConvos.includes(item.id)) continue
items.push({type: 'incoming', view: item})
} else if (ChatBskyGroupDefs.isJoinRequestConvoView(item)) {
items.push({type: 'outgoing', view: item})
@@ -87,7 +82,7 @@ export function MessagesInboxScreenInner({}: Props) {
}
}
return items
}, [data, leftConvos])
}, [data])
const hasUnreadConvos = useMemo(() => {
return conversations.some(