Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(web): show header skeletons while titles load (#1115)

Gener4a324e5796bf
diff --git a/src/web/src/components/community/channels/channel-header.navigation.dom.test.ts b/src/web/src/components/community/channels/channel-header.navigation.dom.test.ts
index dfad583aa..cdfbe6569 100644
--- a/src/web/src/components/community/channels/channel-header.navigation.dom.test.ts
+++ b/src/web/src/components/community/channels/channel-header.navigation.dom.test.ts
@@ -15,6 +15,56 @@ function renderHeader(overrides: Record<string, unknown> = {}) {
}
describe("ChannelHeader hierarchy navigation", () => {
+ it.each([
+ ["thread", "Post"], ["text", "channel"], ["forum", "Forum title"],
+ ] as const)("replaces only the unresolved %s title and accepts the real name %s", (kind, channel) => {
+ const back = vi.fn()
+ const node = (titleState: "ready" | "pending" | "unavailable") => createElement(ChannelHeader, {
+ channel, kind, titleState, rightPanel: null, onToggle: vi.fn(), mobileBack: back,
+ tools: { members: false, threads: false, pinned: false },
+ })
+ const view = render(node("pending"))
+ const header = screen.getByRole("banner")
+ const identity = header.querySelector('[data-slot="message-header-identity"]')
+ const actions = header.querySelector('[data-slot="message-header-actions"]')
+ const button = screen.getByRole("button", { name: "Back" })
+ expect(screen.getByTestId(tid.messageHeaderTitleLoading)).toHaveClass("h-4", "w-32")
+ expect(screen.queryByTitle(channel)).toBeNull()
+ view.rerender(node("ready"))
+ expect(screen.queryByTestId(tid.messageHeaderTitleLoading)).toBeNull()
+ expect(screen.getByTitle(channel)).toHaveTextContent(channel)
+ expect(screen.getByRole("banner")).toBe(header)
+ expect(header.querySelector('[data-slot="message-header-identity"]')).toBe(identity)
+ expect(header.querySelector('[data-slot="message-header-actions"]')).toBe(actions)
+ expect(screen.getByRole("button", { name: "Back" })).toBe(button)
+ fireEvent.click(button)
+ expect(back).toHaveBeenCalledOnce()
+ view.unmount()
+ })
+
+ it("keeps an unavailable title static and retries only its resource while Back remains usable", () => {
+ const back = vi.fn(), retry = vi.fn()
+ const node = (retryingTitle = false) => createElement(ChannelHeader, {
+ channel: "Post", titleState: "unavailable", retryingTitle, onRetryTitle: retry,
+ rightPanel: null, onToggle: vi.fn(), mobileBack: back,
+ tools: { members: false, threads: false, pinned: false },
+ } as const)
+ const view = render(node())
+ const title = screen.getByRole("img", { name: "Title unavailable" })
+ expect(title).toHaveAttribute("data-title-state", "unavailable")
+ expect(title).not.toHaveClass("animate-pulse")
+ expect(screen.queryByTitle("Post")).toBeNull()
+ const button = screen.getByRole("button", { name: "Retry title" })
+ fireEvent.click(button)
+ expect(retry).toHaveBeenCalledOnce()
+ view.rerender(node(true))
+ expect(screen.getByRole("button", { name: "Retry title" })).toBe(button)
+ expect(button).toBeDisabled()
+ fireEvent.click(screen.getByRole("button", { name: "Back" }))
+ expect(back).toHaveBeenCalledOnce()
+ view.unmount()
+ })
+
it("uses one mobile-only 44px Back control for a top-level channel", () => {
const onNavigate = vi.fn()
renderHeader({
diff --git a/src/web/src/components/community/channels/channel-header.tsx b/src/web/src/components/community/channels/channel-header.tsx
index c33e39897..0f7bbdc42 100644
--- a/src/web/src/components/community/channels/channel-header.tsx
+++ b/src/web/src/components/community/channels/channel-header.tsx
@@ -3,7 +3,7 @@
import { useAtom, useCreateAtom } from "@tanstack/react-store";
import { useEffect, useRef, type ReactNode } from "react"
import type { LucideIcon } from "lucide-react"
-import { Bell, BellOff, Pin, Users, MessagesSquare, ChevronLeft, Check, Pencil, MoreHorizontal } from "lucide-react"
+import { Bell, BellOff, Pin, Users, MessagesSquare, ChevronLeft, Check, Pencil, MoreHorizontal, RotateCcw } from "lucide-react"
import { NOTIF_LEVELS, USE_SERVER_DEFAULT, type NotifLevel } from "@alook/shared"
import { Button } from "@/components/ui/button"
import { avatarInitial } from "@/lib/community/avatar"
@@ -19,7 +19,7 @@ import { ServerIcon } from "@/components/community/server-icon"
import type { RightPanel } from "@/components/community/shell/panel-types"
import type { EntityKind } from "@/lib/community/models/navigation"
import { tid } from "@/lib/community/testids"
-import { MessageHeader, MessageHeaderMobileBack } from "./message-header"
+import { MessageHeader, MessageHeaderMobileBack, MessageHeaderTitlePlaceholder, type MessageHeaderTitleState } from "./message-header"
import { ThreadPanelActionsFrame } from "./thread-panel-actions"
const CHANNEL_OVERFLOW_GAP_CLASS_NAME = "ml-0.5"
@@ -53,7 +53,7 @@ export function ChannelHeaderSkeleton({
identity={(
<>
<Skeleton data-channel-header-icon className={`size-6 rounded-md ${kind === "thread" ? compactActions ? "ml-1" : "" : "sm:ml-1"}`} />
- <Skeleton className="h-4 w-32 rounded" />
+ <MessageHeaderTitlePlaceholder state="pending" />
</>
)}
actions={(
@@ -88,9 +88,12 @@ export type ChannelNotifLevel = typeof USE_SERVER_DEFAULT | NotifLevel
export function ChannelHeader({
channel, rightPanel, onToggle, notifLevel, onSetNotifLevel,
kind = "text", server, mobileBack, mobileBackDisplay = "viewport", onBack, tools,
- onRename, endActions, compactActions,
+ onRename, endActions, compactActions, titleState = "ready", onRetryTitle, retryingTitle,
}: {
channel: string
+ titleState?: MessageHeaderTitleState
+ onRetryTitle?: () => void
+ retryingTitle?: boolean
kind?: EntityKind
rightPanel: RightPanel
onToggle: (k: Exclude<RightPanel, null>) => void
@@ -131,8 +134,13 @@ export function ChannelHeader({
<div data-channel-header-icon className={`grid size-6 shrink-0 place-items-center rounded-md bg-muted text-muted-foreground ${mobileBack ? (mobileBackDisplay === "viewport" ? "sm:ml-1" : "") : server ? "" : "ml-1"}`}>
<EntityIcon kind={kind} className="size-4" />
</div>
- <span className="min-w-0 truncate text-base font-semibold" title={channel}>{channel}</span>
- {onRename && (
+ {titleState === "ready" ? <span className="min-w-0 truncate text-base font-semibold" title={channel}>{channel}</span>
+ : <MessageHeaderTitlePlaceholder state={titleState} />}
+ {titleState === "unavailable" && onRetryTitle && <Button variant="ghost" size="icon-sm"
+ className="size-11 sm:size-7" aria-label="Retry title" disabled={retryingTitle} onClick={onRetryTitle}>
+ <RotateCcw className="size-4" />
+ </Button>}
+ {onRename && titleState === "ready" && (
<span data-channel-header-full className="contents">
<HeaderRename
label={channel}
diff --git a/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.ts b/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.ts
index 6609845ac..c13a734f7 100644
--- a/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.ts
+++ b/src/web/src/components/community/channels/channel-route.text-scroll-target.dom.test.ts
@@ -55,7 +55,7 @@ const {
mockHeaderServerNavigate: { current: undefined as undefined | (() => void) },
mockHeaderParentNavigate: { current: undefined as undefined | (() => void) },
mockOpenerGate: vi.fn(() => null),
- mockForumOpener: { data: null as null | { content: string }, isLoading: false, isError: false, error: null as Error | null, isFetching: false, refetch: vi.fn(() => Promise.resolve()) },
+ mockForumOpener: { data: null as null | { content: string }, isLoading: false, isError: false, isSuccess: false, error: null as Error | null, isFetching: false, refetch: vi.fn(() => Promise.resolve()) },
mockSearchParams: { value: "msg=m_target&keep=1" },
mockSplitMode: { value: "full" as "pending" | "split" | "full" },
mockSplitContainerRef: vi.fn(),
@@ -152,14 +152,25 @@ vi.mock("@/components/community/channels/channel-header", () => ({
mobileBack,
kind,
endActions,
+ channel,
+ titleState = "ready",
+ onRetryTitle,
+ retryingTitle,
}: {
mobileBack?: () => void
kind?: string
endActions?: React.ReactNode
+ channel: string
+ titleState?: "ready" | "pending" | "unavailable"
+ onRetryTitle?: () => void
+ retryingTitle?: boolean
}) => {
mockHeaderServerNavigate.current = kind === "thread" ? undefined : mobileBack
mockHeaderParentNavigate.current = kind === "thread" ? mobileBack : undefined
- return React.createElement("header", { "data-header-kind": kind }, endActions)
+ return React.createElement("header", { "data-header-kind": kind },
+ titleState === "ready" ? React.createElement("span", { "data-testid": "resolved-header-title" }, channel)
+ : React.createElement("div", { "data-testid": "community-message-header-title-loading", "data-title-state": titleState }),
+ titleState === "unavailable" && onRetryTitle ? React.createElement("button", { "aria-label": "Retry title", onClick: onRetryTitle, disabled: retryingTitle }) : null, endActions)
},
ChannelHeaderSkeleton: ({ kind = "text" }: { kind?: string }) =>
React.createElement("div", { "data-testid": "channel-header-skeleton", "data-kind": kind }),
@@ -431,7 +442,7 @@ describe("ChannelRoute message surface ownership", () => {
vi.useFakeTimers()
mockedMessageList.mockClear()
mockOpenerGate.mockClear()
- Object.assign(mockForumOpener, { data: null, isLoading: false, isError: false, error: null, isFetching: false })
+ Object.assign(mockForumOpener, { data: null, isLoading: false, isError: false, isSuccess: false, error: null, isFetching: false })
mockForumOpener.refetch.mockClear()
mockSearchParams.value = "msg=m_target&keep=1"
mockSplitMode.value = "full"
@@ -1219,7 +1230,7 @@ describe("ChannelRoute message surface ownership", () => {
renderer.unmount()
})
- it("mounts qualified parent and child while the Forum title is still pending", () => {
+ it.each(["Post title", "Post"])("keeps qualified parent and child while the Forum title waits for %s", title => {
configureThreadRoute()
mockRouteModel.isForumPostChild = true
mockSplitMode.value = "split"
@@ -1227,11 +1238,15 @@ describe("ChannelRoute message surface ownership", () => {
const props = { serverParam: "server_1", channelId: "channel_1" }
const renderer = render(React.createElement(ChannelRoute, props))
const split = screen.getByTestId("community-thread-split")
+ expect(screen.getByTestId("community-message-header-title-loading")).toBeInTheDocument()
+ expect(screen.queryByTestId("resolved-header-title")).toBeNull()
expect(mockSplitParentSurface).toHaveBeenLastCalledWith(expect.objectContaining({ channel: expect.objectContaining({ id: "parent_1" }) }), undefined)
expect(mockedUseChannelMessageFeed).toHaveBeenCalledWith(expect.objectContaining({ channelId: "channel_1" }))
- Object.assign(mockForumOpener, { data: { content: "Post title" }, isLoading: false })
+ Object.assign(mockForumOpener, { data: { content: title }, isLoading: false })
renderer.rerender(React.createElement(ChannelRoute, props))
expect(screen.getByTestId("community-thread-split")).toBe(split)
+ expect(screen.queryByTestId("community-message-header-title-loading")).toBeNull()
+ expect(screen.getByTestId("resolved-header-title")).toHaveTextContent(title)
expect(mockCommitLastCommunityRoute).toHaveBeenCalled()
renderer.unmount()
})
@@ -1243,13 +1258,64 @@ describe("ChannelRoute message surface ownership", () => {
const props = { serverParam: "server_1", channelId: "channel_1" }
const renderer = render(React.createElement(ChannelRoute, props))
expect(mockedUseChannelMessageFeed).toHaveBeenCalledWith(expect.objectContaining({ channelId: "channel_1" }))
+ expect(screen.getByTestId("community-message-header-title-loading")).toBeInTheDocument()
expect(screen.queryByRole("alert")).toBeNull()
+ expect(screen.getByTestId("community-message-header-title-loading")).toHaveAttribute("data-title-state", "unavailable")
+ fireEvent.click(screen.getByRole("button", { name: "Retry title" }))
+ expect(mockForumOpener.refetch).toHaveBeenCalledWith({ cancelRefetch: false })
Object.assign(mockForumOpener, { data: { content: "Recovered title" }, isError: false, error: null, isFetching: false, isLoading: false })
renderer.rerender(React.createElement(ChannelRoute, props))
+ expect(screen.getByTestId("resolved-header-title")).toHaveTextContent("Recovered title")
expect(screen.queryByRole("alert")).toBeNull()
renderer.unmount()
})
+ it("keeps a real Forum title visible through a secondary opener refetch error", () => {
+ configureThreadRoute()
+ mockRouteModel.isForumPostChild = true
+ Object.assign(mockForumOpener, { data: { content: "Post" }, isError: true, isFetching: true, error: new Error("refetch") })
+ const view = render(React.createElement(ChannelRoute, { serverParam: "server_1", channelId: "channel_1" }))
+ expect(screen.queryByTestId("community-message-header-title-loading")).toBeNull()
+ expect(screen.getByTestId("resolved-header-title")).toHaveTextContent("Post")
+ expect(screen.queryByRole("button", { name: "Retry title" })).toBeNull()
+ view.unmount()
+ })
+
+ it("treats a missing Post opener as unavailable instead of an in-flight read", () => {
+ configureThreadRoute()
+ mockRouteModel.isForumPostChild = true
+ mockRouteModel.currentChannelMeta!.parentMessageId = null
+ const view = render(React.createElement(ChannelRoute, { serverParam: "server_1", channelId: "channel_1" }))
+ expect(screen.getByTestId("community-message-header-title-loading")).toHaveAttribute("data-title-state", "unavailable")
+ expect(screen.queryByRole("button", { name: "Retry title" })).toBeNull()
+ expect(mockForumOpener.refetch).not.toHaveBeenCalled()
+ expect(mockedUseChannelMessageFeed).toHaveBeenCalled()
+ view.unmount()
+ })
+
+ it.each(["text", "forum", "thread"] as const)("uses the current %s name resource to distinguish known absence from a ready literal name", async kind => {
+ if (kind === "thread") configureThreadRoute()
+ else {
+ mockRouteModel.isForum = kind === "forum"
+ mockRouteModel.channel!.type = kind
+ }
+ const registry = renderCommunityHook(() => useOptionalCommunityDbRegistry()).result.current!
+ const base = { ...conversationEntryFixture().channel, id: "channel_1", serverId: "server_1", type: kind, muted: false, tags: [], pending: false }
+ registry.collections.channels.utils.writeUpsert(channelSchema.parse({ ...base, name: null }))
+ const view = render(React.createElement(ChannelRoute, { serverParam: "server_1", channelId: "channel_1" }))
+ if (kind === "forum") expect(mockedForumChannelSurface.mock.lastCall![0].channelTitleState).toBe("unavailable")
+ else expect(screen.getByTestId("community-message-header-title-loading")).toHaveAttribute("data-title-state", "unavailable")
+ if (kind === "thread") mockRouteModel.currentChannelMeta = { ...mockRouteModel.currentChannelMeta!, name: "Post" }
+ else mockRouteModel.channel = { ...mockRouteModel.channel!, name: "Post" }
+ await act(async () => registry.collections.channels.utils.writeUpsert(channelSchema.parse({ ...base, name: "Post" })))
+ if (kind === "forum") expect(mockedForumChannelSurface.mock.lastCall![0]).toEqual(expect.objectContaining({ channelTitleState: "ready", channelName: "Post" }))
+ else {
+ expect(screen.queryByTestId("community-message-header-title-loading")).toBeNull()
+ expect(screen.getByTestId("resolved-header-title")).toHaveTextContent("Post")
+ }
+ view.unmount()
+ })
+
it("keeps a qualified target readable while the secondary server directory fails", () => {
Object.assign(mockRouteModel, { server: null, serverError: true })
mockedUseChannelMessageFeed.mockReturnValue(feed())
diff --git a/src/web/src/components/community/channels/channel-route.tsx b/src/web/src/components/community/channels/channel-route.tsx
index 48b666b1b..107df4f13 100644
--- a/src/web/src/components/community/channels/channel-route.tsx
+++ b/src/web/src/components/community/channels/channel-route.tsx
@@ -40,6 +40,7 @@ import { MobilePage } from "@/components/community/shell/mobile-page"
import { ConversationActivityContext, ConversationPresentationContext, useConversationActivity, useConversationPresentation } from "@/contexts/community/conversation-activity"
import { useRouteChannelProjection } from "@/lib/community-db/projections"
import { useNativeSystemNotificationConversationDismissal } from "@/hooks/community/use-native-system-notifications"
+import type { MessageHeaderTitleState } from "./message-header"
const THREAD_VIEW_PARAM = "threadView"
@@ -216,11 +217,24 @@ function ChannelTargetPane({ serverId, serverParam, channelId, searchParams, rou
isForumPostChild,
isNotifyUnit,
} = routeModel
+ const titleIdentity = useRouteChannelProjection(channelId)
+ const forumTitleEnabled = presented && isForumPostChild && !resolvingParent && routeModel.routeHydrated
+ && routeModel.windowReady && !!currentChannelMeta?.parentMessageId
const forumPostOpener = useForumOpenerHint(
serverId,
currentChannelMeta?.parentMessageId,
- presented && isForumPostChild && !resolvingParent && routeModel.routeHydrated && routeModel.windowReady,
+ forumTitleEnabled,
)
+ const channelTitleState: MessageHeaderTitleState = (() => {
+ if (isForumPostChild) {
+ if (forumPostOpener.data != null) return "ready"
+ if (!currentChannelMeta?.parentMessageId) return "unavailable"
+ if (!forumTitleEnabled) return "pending"
+ return forumPostOpener.isError || forumPostOpener.isSuccess ? "unavailable" : "pending"
+ }
+ const name = titleIdentity ? titleIdentity.name : channelInServer?.name ?? currentChannelMeta?.name
+ return name != null ? "ready" : titleIdentity ? "unavailable" : "pending"
+ })()
const channelName = useMemo(() => resolveChannelDisplayName({
forumPostTitle: isForumPostChild ? forumPostOpener.data?.content : null,
topLevelName: channelInServer?.name,
@@ -341,6 +355,10 @@ function ChannelTargetPane({ serverId, serverParam, channelId, searchParams, rou
serverId={serverId}
serverParam={serverParam}
channelName={channelName}
+ channelTitleState={channelTitleState}
+ onRetryTitle={forumTitleEnabled && channelTitleState === "unavailable"
+ ? () => { void forumPostOpener.refetch({ cancelRefetch: false }) } : undefined}
+ retryingTitle={forumPostOpener.isFetching}
viewer={currentUser}
canManagePins={canManageServer(myRole)}
anchorMessageId={currentAnchorMessageId}
@@ -388,6 +406,7 @@ function ChannelTargetPane({ serverId, serverParam, channelId, searchParams, rou
serverId={serverId}
channelId={channelId}
channelName={channelName}
+ channelTitleState={channelTitleState}
routeTag={searchParams.get("tag")}
onSelectTag={(tag) => {
const next = new URLSearchParams(searchParams)
@@ -416,6 +435,7 @@ function ChannelTargetPane({ serverId, serverParam, channelId, searchParams, rou
serverId={serverId}
serverParam={serverParam}
channelName={channelName}
+ channelTitleState={channelTitleState}
viewer={currentUser}
canManagePins={canManageServer(myRole)}
anchorMessageId={currentAnchorMessageId}
diff --git a/src/web/src/components/community/channels/dm-header.identity.dom.test.tsx b/src/web/src/components/community/channels/dm-header.identity.dom.test.tsx
index d0a845c19..c809c8d5c 100644
--- a/src/web/src/components/community/channels/dm-header.identity.dom.test.tsx
+++ b/src/web/src/components/community/channels/dm-header.identity.dom.test.tsx
@@ -1,14 +1,50 @@
import { expect, it, vi } from "vitest"
import { fireEvent, render, screen } from "@/test/react-dom-harness"
-import { DmHeaderSkeleton } from "./dm-header"
+import { DmHeader, DmHeaderSkeleton } from "./dm-header"
+import { tid } from "@/lib/community/testids"
+import type { DM } from "@/lib/community/models/people"
-it("keeps Back usable while recipient identity has a local retry and disables only that retry in flight", () => {
+it.each(["Peer", "Direct message", "Post"])("keeps the DM title slot unresolved until the real name %s arrives", name => {
+ const back = vi.fn()
+ const dm: DM = { id: "dm", userId: "peer", name: "Direct message", discriminator: "0042", avatar: "D", avatarVersion: 0, status: "offline", preview: "" }
+ const view = render(<DmHeader dm={dm} onBack={back} titleState="pending" />)
+ const header = screen.getByTestId(tid.dmHeader)
+ const button = screen.getByRole("button", { name: "Back" })
+ expect(screen.getByTestId(tid.messageHeaderTitleLoading)).toHaveClass("h-4", "w-32")
+ expect(screen.queryByTestId(tid.dmHeaderTitle)).toBeNull()
+ view.rerender(<DmHeader dm={{ ...dm, name, discriminator: "0042" }} onBack={back} titleState="ready" />)
+ expect(screen.getByTestId(tid.dmHeader)).toBe(header)
+ expect(screen.queryByTestId(tid.messageHeaderTitleLoading)).toBeNull()
+ expect(screen.getByTestId(tid.dmHeaderTitle)).toHaveTextContent(`${name}#0042`)
+ expect(screen.getByRole("button", { name: "Back" })).toBe(button)
+ fireEvent.click(button)
+ expect(back).toHaveBeenCalledOnce()
+ view.unmount()
+})
+
+it("keeps a failed recipient name static and uses the existing recipient retry", () => {
+ const retry = vi.fn()
+ const dm: DM = { id: "dm", userId: "peer", name: "Direct message", discriminator: "0042", avatar: "D", avatarVersion: 0, status: "offline", preview: "" }
+ const view = render(<DmHeader dm={dm} titleState="unavailable" onRetryIdentity={retry} />)
+ const title = screen.getByRole("img", { name: "Title unavailable" })
+ expect(title).not.toHaveClass("animate-pulse")
+ expect(screen.queryByTestId(tid.dmHeaderTitle)).toBeNull()
+ fireEvent.click(screen.getByRole("button", { name: "Retry recipient" }))
+ expect(retry).toHaveBeenCalledOnce()
+ view.rerender(<DmHeader dm={dm} titleState="unavailable" onRetryIdentity={retry} retryingIdentity />)
+ expect(screen.getByRole("button", { name: "Retry recipient" })).toBeDisabled()
+ expect(screen.getByRole("img", { name: "Title unavailable" })).toBe(title)
+ view.unmount()
+})
+
+it.each(["pending", "unavailable"] as const)("keeps Back usable while recipient identity is %s and disables only its retry in flight", titleState => {
const back = vi.fn(), retry = vi.fn()
- const view = render(<DmHeaderSkeleton onBack={back} onRetryIdentity={retry} />)
+ const view = render(<DmHeaderSkeleton titleState={titleState} onBack={back} onRetryIdentity={retry} />)
fireEvent.click(screen.getByRole("button", { name: "Retry recipient" }))
expect(retry).toHaveBeenCalledOnce()
const button = screen.getByRole("button", { name: "Retry recipient" })
- view.rerender(<DmHeaderSkeleton onBack={back} onRetryIdentity={retry} retryingIdentity />)
+ view.rerender(<DmHeaderSkeleton titleState={titleState} onBack={back} onRetryIdentity={retry} retryingIdentity />)
+ expect(screen.getByTestId(tid.messageHeaderTitleLoading)).toHaveAttribute("data-title-state", titleState)
expect(screen.getByRole("button", { name: "Retry recipient" })).toBe(button)
expect(button).toBeDisabled()
fireEvent.click(button)
diff --git a/src/web/src/components/community/channels/dm-header.tsx b/src/web/src/components/community/channels/dm-header.tsx
index bd83df26b..f110c5055 100644
--- a/src/web/src/components/community/channels/dm-header.tsx
+++ b/src/web/src/components/community/channels/dm-header.tsx
@@ -6,12 +6,13 @@ import { Skeleton } from "@/components/ui/skeleton"
import { Avatar } from "../avatar"
import type { DM } from "@/lib/community/models/people"
import { tid } from "@/lib/community/testids"
-import { MessageHeader, MessageHeaderMobileBack } from "./message-header"
+import { MessageHeader, MessageHeaderMobileBack, MessageHeaderTitlePlaceholder, type MessageHeaderTitleState } from "./message-header"
-export function DmHeader({ dm, onBack, titleAs: Title = "h1", notifLevel, onSetNotifLevel, onRetryIdentity, retryingIdentity }: {
+export function DmHeader({ dm, onBack, titleAs: Title = "h1", titleState = "ready", notifLevel, onSetNotifLevel, onRetryIdentity, retryingIdentity }: {
dm: DM
onBack?: () => void
titleAs?: "h1" | "div"
+ titleState?: MessageHeaderTitleState
notifLevel?: NotifLevel
onSetNotifLevel?: (level: NotifLevel) => void
onRetryIdentity?: () => void
@@ -25,14 +26,14 @@ export function DmHeader({ dm, onBack, titleAs: Title = "h1", notifLevel, onSetN
identity={(
<>
<Avatar label={dm.avatar} seed={dm.userId} size={24} presence={dm.status} />
- <Title data-testid={tid.dmHeaderTitle} className="min-w-0 truncate font-heading text-base font-medium leading-[1.15] tracking-[-0.015em]">
+ {titleState === "ready" ? <Title data-testid={tid.dmHeaderTitle} className="min-w-0 truncate font-heading text-base font-medium leading-[1.15] tracking-[-0.015em]">
{dm.name}
{dm.discriminator && (
<span className="ml-1 text-xs font-normal tracking-wide text-muted-foreground">
#{dm.discriminator}
</span>
)}
- </Title>
+ </Title> : <MessageHeaderTitlePlaceholder state={titleState} />}
</>
)}
actions={onRetryIdentity || notifLevel ? <>{onRetryIdentity && <RetryRecipient onRetry={onRetryIdentity} retrying={retryingIdentity} />}
@@ -70,7 +71,7 @@ function DmNotifDropdown({ level, onSetLevel }: { level: NotifLevel; onSetLevel?
// Loading placeholder for <DmHeader> — same h-12 footprint so the body below
// stays anchored across the route change.
-export function DmHeaderSkeleton({ onBack, onRetryIdentity, retryingIdentity }: { onBack?: () => void; onRetryIdentity?: () => void; retryingIdentity?: boolean }) {
+export function DmHeaderSkeleton({ onBack, onRetryIdentity, retryingIdentity, titleState = "pending" }: { onBack?: () => void; onRetryIdentity?: () => void; retryingIdentity?: boolean; titleState?: Exclude<MessageHeaderTitleState, "ready"> }) {
return (
<MessageHeader
leading={onBack && onRetryIdentity ? <MessageHeaderMobileBack onNavigate={onBack} /> : onBack ? (
@@ -82,7 +83,7 @@ export function DmHeaderSkeleton({ onBack, onRetryIdentity, retryingIdentity }:
identity={(
<>
<Skeleton className="size-6 rounded-full" />
- <Skeleton className="h-4 w-32 rounded" />
+ <MessageHeaderTitlePlaceholder state={titleState} />
</>
)}
actions={onRetryIdentity ? <RetryRecipient onRetry={onRetryIdentity} retrying={retryingIdentity} /> : <Skeleton className="size-7 rounded-md" />}
diff --git a/src/web/src/components/community/channels/dm-route-error-frame.dom.test.ts b/src/web/src/components/community/channels/dm-route-error-frame.dom.test.ts
index dceaf0b53..2c23d8503 100644
--- a/src/web/src/components/community/channels/dm-route-error-frame.dom.test.ts
+++ b/src/web/src/components/community/channels/dm-route-error-frame.dom.test.ts
@@ -8,7 +8,7 @@ vi.mock("@/components/ui/button", () => ({
PropsWithChildren<Record<string, unknown>>) => createElement("button", props, children),
}))
vi.mock("./dm-header", () => ({
- DmHeaderSkeleton: () => createElement("div", { "data-testid": "dm-header-skeleton" }),
+ DmHeaderSkeleton: ({ titleState }: { titleState?: string }) => createElement("div", { "data-testid": "dm-header-skeleton", "data-title-state": titleState }),
}))
vi.mock("@/components/community/messages/composer", () => ({
ComposerSkeleton: () => createElement("div", { "data-testid": "composer-skeleton" }),
@@ -27,6 +27,7 @@ describe("DmRouteErrorFrame", () => {
await user.click(screen.getByRole("button", { name: "Retry" }))
expect(retry).toHaveBeenCalledOnce()
+ expect(screen.getByTestId("dm-header-skeleton")).toHaveAttribute("data-title-state", "unavailable")
rendered.rerender(createElement(DmRouteErrorFrame, {
onRetry: retry,
diff --git a/src/web/src/components/community/channels/dm-route-error-frame.tsx b/src/web/src/components/community/channels/dm-route-error-frame.tsx
index 7ad9bd820..860b18004 100644
--- a/src/web/src/components/community/channels/dm-route-error-frame.tsx
+++ b/src/web/src/components/community/channels/dm-route-error-frame.tsx
@@ -16,7 +16,7 @@ export function DmRouteErrorFrame({
}) {
return (
<>
- <DmHeaderSkeleton onBack={reserveBackSlot ? () => {} : undefined} />
+ <DmHeaderSkeleton titleState="unavailable" onBack={reserveBackSlot ? () => {} : undefined} />
<main className="flex min-h-0 min-w-0 flex-1 flex-col">
<div role="alert" className="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 px-6 text-center">
<AlertCircle className="size-5 text-muted-foreground" aria-hidden />
diff --git a/src/web/src/components/community/channels/dm-view.send-lifecycle.dom.test.ts b/src/web/src/components/community/channels/dm-view.send-lifecycle.dom.test.ts
index 62c3ca987..5c54c689b 100644
--- a/src/web/src/components/community/channels/dm-view.send-lifecycle.dom.test.ts
+++ b/src/web/src/components/community/channels/dm-view.send-lifecycle.dom.test.ts
@@ -8,12 +8,14 @@ import { createCommunityQueryOwner } from "@/test/community-query-owner"
import { CommunityTestProvider } from "@/test/community-owner-fixture"
import { DmView } from "./dm-view"
import { dmConversationEntryFixture, seedConversationEntry } from "@/test/conversation-entry-fixtures"
+import { communityRowData } from "@/lib/community-db/write"
+import { profileSchema } from "@/lib/community-db/schema"
-const mocks = vi.hoisted(() => ({ api: vi.fn(), advance: vi.fn(), list: vi.fn(), positionEntry: null as object | null, failed: true, breakpoint: "mobile", identity: true, blocked: false, windowBlocked: false }))
+const mocks = vi.hoisted(() => ({ api: vi.fn(), advance: vi.fn(), list: vi.fn(), positionEntry: null as object | null, failed: true, breakpoint: "mobile", identity: true, identityName: "Peer", identityError: false, identitySettled: false, blocked: false, windowBlocked: false }))
vi.mock("@/lib/api/client", () => ({ apiFetch: mocks.api, toastApiError: vi.fn() }))
vi.mock("@/hooks/use-mobile", () => ({ useBreakpoint: () => mocks.breakpoint }))
vi.mock("@/contexts/community/current-user", () => ({ useCurrentUser: () => ({ id: "u_me", name: "Me", avatar: "M" }) }))
-vi.mock("@/hooks/community/use-dms", () => ({ useDms: () => ({ dms: mocks.identity ? ["dm_1", "dm_2"].map(id => ({ id, userId: "peer", name: "Peer", avatar: "P" })) : [], isLoading: false, isFetching: false }) }))
+vi.mock("@/hooks/community/use-dms", () => ({ useDms: () => ({ dms: mocks.identity ? ["dm_1", "dm_2"].map(id => ({ id, userId: "peer", name: mocks.identityName, avatar: "P" })) : [], isLoading: false, isFetching: false, isError: mocks.identityError, isSuccess: mocks.identitySettled }) }))
vi.mock("@/hooks/community/use-friends", () => ({ useFriends: () => ({ friends: [], blocked: mocks.blocked ? [{ id: "peer", userId: "peer" }] : [] }) }))
vi.mock("@/hooks/community/use-messages", () => ({ useDmMessages: () => ({ messages: mocks.failed ? [{ id: "failed", clientNonce: "retry_nonce", authorId: "u_me", type: "chat", content: "retry" }] : [], positionEntry: mocks.positionEntry, positionDataState: "ready", isLoading: false, isPending: false, isError: false, latestSeq: 0, navigationBlocked: mocks.windowBlocked }) }))
vi.mock("@/hooks/community/use-channel-metadata", () => ({ useChannelMetadata: () => ({ canRead: true, status: "readable" }) }))
@@ -26,7 +28,13 @@ vi.mock("@/hooks/community/use-notification-settings", () => ({ useNotificationS
vi.mock("@/hooks/community/use-community-ws", () => ({ communityWsSubscribe: vi.fn(), communityWsUnsubscribe: vi.fn(), communityWsSendTyping: vi.fn(), communityWsEndTyping: vi.fn() }))
vi.mock("@/lib/community-onboarding", () => ({ readCommunityOnboardingState: () => ({ status: "active", stage: "dm", dmId: "dm_1" }), advanceCommunityOnboarding: mocks.advance }))
vi.mock("@/hooks/community/mutations", async importOriginal => ({ ...await importOriginal<typeof import("@/hooks/community/mutations")>(), useAddReactionApi: () => vi.fn(), useToggleReactionApi: () => vi.fn(), useToggleMark: () => vi.fn(), useSetChannelNotif: () => ({ mutate: vi.fn() }) }))
-vi.mock("./dm-header", () => ({ DmHeaderSkeleton: () => React.createElement("header", { "data-testid": "pending-peer" }), DmHeader: ({ onBack }: { onBack?: () => void }) => React.createElement("header", null, onBack ? React.createElement("button", { onClick: onBack, "aria-label": "Back" }) : null) }))
+vi.mock("./dm-header", () => ({
+ DmHeaderSkeleton: () => React.createElement("header", { "data-testid": "pending-peer" }),
+ DmHeader: ({ onBack, dm, titleState = "ready" }: { onBack?: () => void; dm: { name: string }; titleState?: "ready" | "pending" | "unavailable" }) => React.createElement("header", null,
+ titleState === "ready" ? React.createElement("span", { "data-testid": "resolved-peer-title" }, dm.name)
+ : React.createElement("div", { "data-testid": "pending-peer-title", "data-title-state": titleState }),
+ onBack ? React.createElement("button", { onClick: onBack, "aria-label": "Back" }) : null),
+}))
vi.mock("@/components/community/avatar", () => ({ Avatar: () => null }))
vi.mock("@/components/community/messages/message-context-sheet", () => ({ MessageContextSheet: () => null }))
vi.mock("@/components/community/messages/conversation-footer-shell", () => ({ ConversationFooterSlotProvider: ({ children }: PropsWithChildren) => children, ConversationFooterShell: ({ children }: PropsWithChildren) => children }))
@@ -36,7 +44,7 @@ vi.mock("@/components/community/messages/message-list", () => ({ MessageList: (p
return React.createElement("button", { onClick: () => props.onRetry?.("failed") }, "Retry")
} }))
-beforeEach(() => { mocks.api.mockReset(); mocks.advance.mockReset(); mocks.list.mockReset(); mocks.positionEntry = null; mocks.failed = true; mocks.breakpoint = "mobile"; mocks.identity = true; mocks.blocked = false; mocks.windowBlocked = false })
+beforeEach(() => { mocks.api.mockReset(); mocks.advance.mockReset(); mocks.list.mockReset(); mocks.positionEntry = null; mocks.failed = true; mocks.breakpoint = "mobile"; mocks.identity = true; mocks.identityName = "Peer"; mocks.identityError = false; mocks.identitySettled = false; mocks.blocked = false; mocks.windowBlocked = false })
function posted(body: { content: string; nonce: string }) {
return { profiles: messageProfilesFixture([messageResourceFixture({ id: "confirmed", channelId: "dm_1", authorId: "u_me", authorName: "Me", authorAvatarVersion: 0, seq: 9, content: body.content, clientNonce: body.nonce, createdAt: "2026-10-09T00:00:00Z", embeds: [] })]), deduped: false, message: messageResourceFixture({ id: "confirmed", channelId: "dm_1", authorId: "u_me", authorName: "Me", authorAvatarVersion: 0, seq: 9, content: body.content, clientNonce: body.nonce, createdAt: "2026-10-09T00:00:00Z", embeds: [] }) }
@@ -62,6 +70,58 @@ async function createDmOwner() {
}
describe("real DmView accepted send UI lifecycle", () => {
+ it.each(["error", "missing"] as const)("keeps a settled %s identity distinct from a pending name and recovers from canonical data", async outcome => {
+ const owner = await createDmOwner()
+ const profile = profileSchema.parse(communityRowData(owner.registry.collections.profiles.get("peer")))
+ mocks.identity = false
+ mocks.identityError = outcome === "error"
+ mocks.identitySettled = outcome === "missing"
+ await act(async () => owner.registry.collections.profiles.utils.writeDelete("peer"))
+ const wrapper = ({ children }: PropsWithChildren) => React.createElement(CommunityTestProvider, { client: owner.client, registry: owner.registry, userId: "u_me", retainOwner: true }, children)
+ const view = render(React.createElement(DmView, { dmId: "dm_1" }), { wrapper })
+ const retained = screen.getByRole("button", { name: "Retry" })
+ expect(screen.getByTestId("pending-peer-title")).toHaveAttribute("data-title-state", "unavailable")
+ expect(screen.getByRole("button", { name: "Send" })).toBeInTheDocument()
+ await act(async () => owner.registry.collections.profiles.utils.writeUpsert({ ...profile, name: "Direct message" }))
+ await waitFor(() => expect(screen.getByTestId("resolved-peer-title")).toHaveTextContent("Direct message"))
+ expect(screen.getByRole("button", { name: "Retry" })).toBe(retained)
+ expect(mocks.api).not.toHaveBeenCalled()
+ view.unmount()
+ })
+
+ it.each(["Recovered peer", "Direct message"])("retains qualified messages while the known peer waits for canonical name %s", async name => {
+ const owner = await createDmOwner()
+ const profile = profileSchema.parse(communityRowData(owner.registry.collections.profiles.get("peer")))
+ mocks.identity = false
+ await act(async () => owner.registry.collections.profiles.utils.writeDelete("peer"))
+ const wrapper = ({ children }: PropsWithChildren) => React.createElement(CommunityTestProvider, { client: owner.client, registry: owner.registry, userId: "u_me", retainOwner: true }, children)
+ const view = render(React.createElement(DmView, { dmId: "dm_1" }), { wrapper })
+ const retained = screen.getByRole("button", { name: "Retry" })
+ expect(screen.getByTestId("pending-peer-title")).toBeInTheDocument()
+ expect(screen.queryByTestId("resolved-peer-title")).toBeNull()
+ expect(screen.getByRole("button", { name: "Send" })).toBeInTheDocument()
+ await act(async () => owner.registry.collections.profiles.utils.writeUpsert({ ...profile, name }))
+ await waitFor(() => expect(screen.getByTestId("resolved-peer-title")).toHaveTextContent(name))
+ expect(screen.queryByTestId("pending-peer-title")).toBeNull()
+ expect(screen.getByRole("button", { name: "Retry" })).toBe(retained)
+ expect(mocks.api).not.toHaveBeenCalled()
+ view.unmount()
+ })
+
+ it.each(["Peer", "Direct message"])("uses the matching directory name %s while its canonical profile is absent", async name => {
+ const owner = await createDmOwner()
+ mocks.identityName = name
+ mocks.identityError = true
+ await act(async () => owner.registry.collections.profiles.utils.writeDelete("peer"))
+ const wrapper = ({ children }: PropsWithChildren) => React.createElement(CommunityTestProvider, { client: owner.client, registry: owner.registry, userId: "u_me", retainOwner: true }, children)
+ const view = render(React.createElement(DmView, { dmId: "dm_1" }), { wrapper })
+ expect(screen.queryByTestId("pending-peer-title")).toBeNull()
+ expect(screen.getByTestId("resolved-peer-title")).toHaveTextContent(name)
+ expect(screen.getByRole("button", { name: "Send" })).toBeInTheDocument()
+ expect(mocks.api).not.toHaveBeenCalled()
+ view.unmount()
+ })
+
it("keeps the known peer header and composer skeleton until its owned window is ready", async () => {
const owner = await createDmOwner()
mocks.windowBlocked = true
diff --git a/src/web/src/components/community/channels/dm-view.tsx b/src/web/src/components/community/channels/dm-view.tsx
index ac9708ccf..20e9821b3 100644
--- a/src/web/src/components/community/channels/dm-view.tsx
+++ b/src/web/src/components/community/channels/dm-view.tsx
@@ -110,6 +110,8 @@ export function DmView({ dmId, routeCommitted = true }: { dmId: string; routeCom
return { ...profile, id: dmId, userId: peerId, status: profile.presence, preview: "" }
}, [dms, dmId, peerId, peerProfile])
const displayName = dm?.name ?? "Direct message"
+ const titleState = directoryDm?.userId === peerId || peerProfile?.name != null ? "ready"
+ : dmsQuery.isError || dmsQuery.isSuccess ? "unavailable" : "pending"
const dmBlocked = !!peerId && blocked.some((b) => (b.userId ?? b.id) === peerId)
const readDenied = metadata.denied || metadata.denialCode === "blocked"
const historyAllowed = !dmBlocked && metadata.canRead
@@ -435,6 +437,7 @@ export function DmView({ dmId, routeCommitted = true }: { dmId: string; routeCom
<>
{dm ? <DmHeader
dm={dm}
+ titleState={titleState}
onBack={goBack}
onRetryIdentity={!peerProfile?.name ? () => { void dmsQuery.refetch({ cancelRefetch: false }) } : undefined}
retryingIdentity={dmsQuery.isFetching}
@@ -442,7 +445,7 @@ export function DmView({ dmId, routeCommitted = true }: { dmId: string; routeCom
onSetNotifLevel={(level) => setNotification.mutate({ channelId: dmId, level }, {
onError: (error) => toastApiError(error, "Failed to update notification level"),
})}
- /> : <DmHeaderSkeleton onBack={goBack} onRetryIdentity={() => { void dmsQuery.refetch({ cancelRefetch: false }) }} retryingIdentity={dmsQuery.isFetching} />}
+ /> : <DmHeaderSkeleton titleState={titleState === "unavailable" ? "unavailable" : "pending"} onBack={goBack} onRetryIdentity={() => { void dmsQuery.refetch({ cancelRefetch: false }) }} retryingIdentity={dmsQuery.isFetching} />}
<main
data-slot="community-conversation-surface"
data-channel-id={dmId}
diff --git a/src/web/src/components/community/channels/forum-channel-surface.tsx b/src/web/src/components/community/channels/forum-channel-surface.tsx
index 2882d3472..24c60b206 100644
--- a/src/web/src/components/community/channels/forum-channel-surface.tsx
+++ b/src/web/src/components/community/channels/forum-channel-surface.tsx
@@ -16,6 +16,7 @@ import type { NewForumThread } from "@/components/community/messages/create-foru
import type { ComposerProps } from "@/components/community/messages/composer"
import { ForumSurface } from "@/components/community/channels/forum-surface"
import type { Member } from "@/lib/community/models/people"
+import type { MessageHeaderTitleState } from "./message-header"
import {
useCreateForumThread,
useDeleteForumThread,
@@ -26,6 +27,7 @@ export function ForumChannelSurface({
serverId,
channelId,
channelName,
+ channelTitleState = "ready",
viewer,
viewerRole,
onNavigateParent,
@@ -44,6 +46,7 @@ export function ForumChannelSurface({
serverId: string
channelId: string
channelName: string
+ channelTitleState?: MessageHeaderTitleState
viewer: { id: string }
viewerRole: Role | undefined
onNavigateParent?: () => void
@@ -105,6 +108,7 @@ export function ForumChannelSurface({
header={(
<ChannelHeader
channel={channelName}
+ titleState={channelTitleState}
kind="forum"
rightPanel={rightPanel}
onToggle={togglePanel}
diff --git a/src/web/src/components/community/channels/message-header.tsx b/src/web/src/components/community/channels/message-header.tsx
index 3e0cdc00d..55de3b148 100644
--- a/src/web/src/components/community/channels/message-header.tsx
+++ b/src/web/src/components/community/channels/message-header.tsx
@@ -3,6 +3,20 @@ import { ChevronLeft } from "lucide-react"
import { Button } from "@/components/ui/button"
import { useHydratedClient } from "@/components/community/shell/use-hydrated-client"
import { cn } from "@/lib/utils"
+import { Skeleton } from "@/components/ui/skeleton"
+import { tid } from "@/lib/community/testids"
+
+export type MessageHeaderTitleState = "ready" | "pending" | "unavailable"
+
+export function MessageHeaderTitlePlaceholder({ state }: { state: Exclude<MessageHeaderTitleState, "ready"> }) {
+ return <Skeleton
+ data-testid={tid.messageHeaderTitleLoading}
+ data-title-state={state}
+ role="img"
+ aria-label={state === "pending" ? "Loading title" : "Title unavailable"}
+ className={`h-4 w-32 rounded ${state === "unavailable" ? "animate-none" : ""}`}
+ />
+}
export function MessageHeader({
testId,
diff --git a/src/web/src/components/community/channels/text-channel-surface.tsx b/src/web/src/components/community/channels/text-channel-surface.tsx
index 740ea2d84..6fd4e9c0d 100644
--- a/src/web/src/components/community/channels/text-channel-surface.tsx
+++ b/src/web/src/components/community/channels/text-channel-surface.tsx
@@ -24,12 +24,14 @@ import type { OpenProfile } from "@/components/community/social/profile-types"
import type { RightPanel } from "@/components/community/shell/panel-types"
import { tid } from "@/lib/community/testids"
import { ConversationActivityContext, useConversationActivity } from "@/contexts/community/conversation-activity"
+import type { MessageHeaderTitleState } from "./message-header"
export function TextChannelSurface({
channelId,
serverId,
serverParam,
channelName,
+ channelTitleState = "ready",
viewer,
canManagePins,
anchorMessageId,
@@ -51,6 +53,7 @@ export function TextChannelSurface({
serverId: string
serverParam: string
channelName: string
+ channelTitleState?: MessageHeaderTitleState
viewer: { id: string; name: string; discriminator?: string; avatar: string }
canManagePins: boolean
anchorMessageId: string | null
@@ -118,6 +121,7 @@ export function TextChannelSurface({
header={(
<ChannelHeader
channel={channelName}
+ titleState={channelTitleState}
kind="text"
rightPanel={rightPanel}
onToggle={togglePanel}
diff --git a/src/web/src/components/community/channels/thread-channel-surface.tsx b/src/web/src/components/community/channels/thread-channel-surface.tsx
index 034de5929..7e6ca5565 100644
--- a/src/web/src/components/community/channels/thread-channel-surface.tsx
+++ b/src/web/src/components/community/channels/thread-channel-surface.tsx
@@ -22,6 +22,7 @@ import { MessageList } from "@/components/community/messages/message-list"
import { useAuthorMentionInsertion } from "@/components/community/messages/use-author-mention-insertion"
import { ThreadOpener } from "@/components/community/messages/thread-opener"
import { ThreadPanelActions } from "@/components/community/channels/thread-panel-actions"
+import type { MessageHeaderTitleState } from "./message-header"
import type { FileAttachment, ImagePreview } from "@/lib/community/models/message"
import type { OpenProfile } from "@/components/community/social/profile-types"
import type { RightPanel } from "@/components/community/shell/panel-types"
@@ -40,6 +41,9 @@ export function ThreadChannelSurface({
serverId,
serverParam,
channelName,
+ channelTitleState = "ready",
+ onRetryTitle,
+ retryingTitle,
viewer,
canManagePins,
anchorMessageId,
@@ -68,6 +72,9 @@ export function ThreadChannelSurface({
serverId: string
serverParam: string
channelName: string
+ channelTitleState?: MessageHeaderTitleState
+ onRetryTitle?: () => void
+ retryingTitle?: boolean
viewer: { id: string; name: string; discriminator?: string; avatar: string }
canManagePins: boolean
anchorMessageId: string | null
@@ -199,6 +206,9 @@ export function ThreadChannelSurface({
header={(
<ChannelHeader
channel={displayName}
+ titleState={localName !== null ? "ready" : channelTitleState}
+ onRetryTitle={onRetryTitle}
+ retryingTitle={retryingTitle}
kind="thread"
rightPanel={rightPanel}
onToggle={togglePanel}
diff --git a/src/web/src/components/community/channels/thread-split-parent-surface.tsx b/src/web/src/components/community/channels/thread-split-parent-surface.tsx
index d9a5984a9..f3ff748d6 100644
--- a/src/web/src/components/community/channels/thread-split-parent-surface.tsx
+++ b/src/web/src/components/community/channels/thread-split-parent-surface.tsx
@@ -102,6 +102,7 @@ export function ThreadSplitParentSurface({
serverId={serverId}
channelId={channel.id}
channelName={channel.name}
+ channelTitleState={!metadata.canonical ? "pending" : metadata.canonical.name === null ? "unavailable" : "ready"}
viewer={viewer}
viewerRole={members.myRole}
onNavigateParent={onNavigateParent}
@@ -124,6 +125,7 @@ export function ThreadSplitParentSurface({
serverId={serverId}
serverParam={serverParam}
channelName={channel.name}
+ channelTitleState={!metadata.canonical ? "pending" : metadata.canonical.name === null ? "unavailable" : "ready"}
viewer={viewer}
canManagePins={canManageServer(members.myRole)}
anchorMessageId={null}
diff --git a/src/web/src/lib/community/testids.ts b/src/web/src/lib/community/testids.ts
index c8190851e..768f52f61 100644
--- a/src/web/src/lib/community/testids.ts
+++ b/src/web/src/lib/community/testids.ts
@@ -42,6 +42,7 @@ export const tid = {
channelSidebarScroll: "community-channel-sidebar-scroll",
channelSidebarPending: (serverId: string) => `community-channel-sidebar-pending-${serverId}`,
messageHeaderLeadingLoading: "community-message-header-leading-loading",
+ messageHeaderTitleLoading: "community-message-header-title-loading",
dmSidebarPending: "community-dm-sidebar-pending",
createServerSubmit: "community-create-server-submit",
createServerName: "community-create-server-name",