Skip to content

Commit 7c01743

Browse files
fix(web): dismissing a provider banner hides it in every open chat view
The session set was read on render and only the dismissing view re-rendered, so a side chat showing the same banner kept it. Views now subscribe to the set. AI-assisted; verified with the tests and tools listed above.
1 parent f6e897c commit 7c01743

3 files changed

Lines changed: 20 additions & 14 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ import {
309309
} from "./BranchToolbar.logic";
310310
import {
311311
getProviderStatusDismissalKey,
312-
isProviderStatusBannerDismissedForSession,
313312
shouldShowProviderStatusBanner,
313+
useProviderStatusBannerDismissed,
314314
} from "./chat/ProviderStatusBanner";
315315
import {
316316
getThreadErrorBannerKey,
@@ -1708,13 +1708,13 @@ export default function ChatView(props: ChatViewProps) {
17081708
providerEnvironmentId,
17091709
activeProviderStatus,
17101710
);
1711+
const providerStatusDismissed = useProviderStatusBannerDismissed(providerStatusDismissalKey);
17111712
const visibleProviderStatus = shouldShowProviderStatusBanner(
17121713
activeProviderStatus,
1713-
isProviderStatusBannerDismissedForSession(providerStatusDismissalKey),
1714+
providerStatusDismissed,
17141715
)
17151716
? activeProviderStatus
17161717
: null;
1717-
const [, setProviderStatusBannerDismissTick] = useState(0);
17181718
const hasTimelineTopBanner = Boolean(timelineThreadError) || visibleProviderStatus !== null;
17191719
const activeProjectCwd = activeProject?.workspaceRoot ?? null;
17201720
const activeThreadWorktreePath = activeThread?.worktreePath ?? null;
@@ -3377,7 +3377,6 @@ export default function ChatView(props: ChatViewProps) {
33773377
environmentId={activeThread.environmentId}
33783378
providerStatus={visibleProviderStatus}
33793379
providerStatusDismissalKey={providerStatusDismissalKey}
3380-
setProviderStatusBannerDismissTick={setProviderStatusBannerDismissTick}
33813380
onOpenProviderSetup={openProviderSetupStable}
33823381
threadId={activeThread.id}
33833382
threadError={timelineThreadError}

‎apps/web/src/components/chat/ChatBannerLane.tsx‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export function ChatBannerLane(props: {
2020
environmentId: EnvironmentId;
2121
providerStatus: ServerProvider | null;
2222
providerStatusDismissalKey: string | null;
23-
setProviderStatusBannerDismissTick: Dispatch<SetStateAction<number>>;
2423
onOpenProviderSetup: (instanceId: ProviderInstanceId) => void;
2524
threadId: ThreadId;
2625
threadError: string | null;
@@ -33,7 +32,6 @@ export function ChatBannerLane(props: {
3332
const {
3433
providerStatus,
3534
providerStatusDismissalKey,
36-
setProviderStatusBannerDismissTick,
3735
onOpenProviderSetup,
3836
threadId,
3937
threadError,
@@ -48,10 +46,7 @@ export function ChatBannerLane(props: {
4846
<ProviderStatusBanner
4947
environmentId={props.environmentId}
5048
status={providerStatus}
51-
onDismiss={() => {
52-
dismissProviderStatusBannerForSession(providerStatusDismissalKey);
53-
setProviderStatusBannerDismissTick((tick) => tick + 1);
54-
}}
49+
onDismiss={() => dismissProviderStatusBannerForSession(providerStatusDismissalKey)}
5550
onOpenProviderSetup={onOpenProviderSetup}
5651
/>
5752
<ThreadErrorBanner

‎apps/web/src/components/chat/ProviderStatusBanner.tsx‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
type ServerProvider,
55
} from "@t3tools/contracts";
66
import { useAtomValue } from "@effect/atom-react";
7-
import { memo, useRef, useState } from "react";
7+
import { memo, useRef, useState, useSyncExternalStore } from "react";
88
import { InfoIcon, XIcon } from "lucide-react";
99
import { Alert, AlertAction, AlertDescription, AlertTitle } from "../ui/alert";
1010
import { Button, InlineButton } from "../ui/button";
@@ -67,17 +67,29 @@ export function getProviderStatusDismissalKey(
6767

6868
// A dismissal lasts the session, not one view, so opening another thread cannot bring it back.
6969
const sessionDismissedProviderStatusBannerKeys = new Set<string>();
70+
const dismissalListeners = new Set<() => void>();
7071

7172
export function dismissProviderStatusBannerForSession(bannerKey: string | null): void {
72-
if (bannerKey !== null) {
73-
sessionDismissedProviderStatusBannerKeys.add(bannerKey);
74-
}
73+
if (bannerKey === null || sessionDismissedProviderStatusBannerKeys.has(bannerKey)) return;
74+
sessionDismissedProviderStatusBannerKeys.add(bannerKey);
75+
for (const listener of dismissalListeners) listener();
7576
}
7677

7778
export function isProviderStatusBannerDismissedForSession(bannerKey: string | null): boolean {
7879
return bannerKey !== null && sessionDismissedProviderStatusBannerKeys.has(bannerKey);
7980
}
8081

82+
function subscribeToDismissals(listener: () => void) {
83+
dismissalListeners.add(listener);
84+
return () => dismissalListeners.delete(listener);
85+
}
86+
87+
export function useProviderStatusBannerDismissed(bannerKey: string | null): boolean {
88+
return useSyncExternalStore(subscribeToDismissals, () =>
89+
isProviderStatusBannerDismissedForSession(bannerKey),
90+
);
91+
}
92+
8193
export function hasProviderSetup(status: ServerProvider): boolean {
8294
return (
8395
status.driver === "antigravity" ||

0 commit comments

Comments
 (0)