fix(security): a dismissed status announcement no longer hides the security nudge (#307)

SecurityBanner asked pickBanner whether another strip would show without
the dismissed set, so a dismissed Kuma announcement (often pinned for
weeks) still counted and suppressed the verify / backup nudge on every
device that had dismissed it. The dismissed set is now a shared jotai
atom (still persisted to localStorage) used by both banners. Adds a
Playwright regression.

Fixes #307

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017PCb59uY3UKqDqt7B6hzd5

e2e/security-nudge.spec.ts

@@ -29,6 +29,32 @@ async function settled(page: Page) {
   await page.waitForTimeout(2000);
 }
 
+/** [Gitea #307] Serve a Kuma status page for `localhost` with one posted announcement. */
+async function mockAnnouncement(page: Page) {
+  await page.route(/\/config\.json(\?.*)?$/, async (route) => {
+    const res = await route.fetch();
+    const cfg = await res.json();
+    cfg.statusPages = { localhost: { url: 'https://isitup.lotusguild.org', slug: 'matrix' } };
+    await route.fulfill({ response: res, json: cfg });
+  });
+  await page.route(/isitup\.lotusguild\.org\/api\/status-page\//, async (route) => {
+    const cors = { 'access-control-allow-origin': '*' };
+    if (route.request().url().includes('/heartbeat/')) {
+      await route.fulfill({ headers: cors, json: { heartbeatList: {}, uptimeList: {} } });
+      return;
+    }
+    await route.fulfill({
+      headers: cors,
+      json: {
+        config: { slug: 'matrix' },
+        incidents: [{ id: 7, title: 'Community call on Friday', content: '', style: 'info' }],
+        maintenanceList: [],
+        publicGroupList: [],
+      },
+    });
+  });
+}
+
 test.describe('security nudge (#110, #123)', () => {
   let user: TestUser;
 
@@ -60,6 +86,22 @@ test.describe('security nudge (#110, #123)', () => {
     await expect(page.getByText('Device Verification').first()).toBeVisible();
   });
 
+  test('a dismissed announcement no longer hides the nudge (#307)', async ({ page }) => {
+    test.setTimeout(200_000);
+    await mockAnnouncement(page);
+    await loginUI(page, user);
+    await pastGrace(page);
+    await settled(page);
+    // The announcement wins the one strip slot until it's dismissed.
+    const announcement = page.getByRole('status').filter({ hasText: 'Community call on Friday' });
+    await expect(announcement).toBeVisible();
+    await expect(strip(page)).toHaveCount(0);
+    await announcement.getByRole('button', { name: 'Dismiss' }).click();
+    await page.reload();
+    await settled(page);
+    await expect(strip(page)).toContainText("Your encryption keys aren't backed up");
+  });
+
   test('"Not now" snoozes it across a reload', async ({ page }) => {
     test.setTimeout(200_000);
     await loginUI(page, user);

src/app/components/LogoutDialog.tsx

@@ -1,4 +1,4 @@
-import React, { forwardRef, useCallback, useEffect, useState } from 'react';
+import React, { forwardRef, useCallback } from 'react';
 import { Dialog, Header, config, Box, Text, Button, Spinner, color } from 'folds';
 import { useAtom } from 'jotai';
 import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
@@ -9,8 +9,6 @@ import { useMatrixClient } from '../hooks/useMatrixClient';
 import { useModalStyle } from '../hooks/useModalStyle';
 import { useCrossSigningActive } from '../hooks/useCrossSigning';
 import { InfoCard } from './info-card';
-import { ScheduledMessage } from '../state/scheduledMessages';
-import { cancelScheduledMessage, fetchScheduledMessages } from '../utils/scheduledMessages';
 import {
   useDeviceVerificationStatus,
   VerificationStatus,
@@ -38,36 +36,17 @@ export const LogoutDialog = forwardRef<HTMLDivElement, LogoutDialogProps>(
 
     const [callEmbed, setCallEmbed] = useAtom(callEmbedAtom);
 
-    // [Gitea #322] Scheduled messages live on the server and still send after
-    // logout, where no client would show them. Say so, and offer to cancel.
-    const [scheduled, setScheduled] = useState<ScheduledMessage[]>([]);
-    useEffect(() => {
-      let alive = true;
-      fetchScheduledMessages(mx)
-        .then((list) => alive && setScheduled(list))
-        .catch(() => undefined);
-      return () => {
-        alive = false;
-      };
-    }, [mx]);
-
-    const [logoutState, logout] = useAsyncCallback<void, Error, [boolean?]>(
-      useCallback(
-        async (cancelScheduled?: boolean) => {
-          if (cancelScheduled) {
-            await Promise.all(scheduled.map((m) => cancelScheduledMessage(mx, m.delayId)));
-          }
-          // [Gitea #29] Logging out mid-call must hang up first, or the MatrixRTC
-          // membership (expires: 4 h) stays behind as a ghost participant and
-          // everyone else sees you "in call" until it times out.
-          if (callEmbed && callEmbed.joined && !callEmbed.disposed) {
-            await hangupCallAndWait(mx, callEmbed);
-            setCallEmbed(undefined);
-          }
-          await logoutClient(mx);
-        },
-        [mx, callEmbed, setCallEmbed, scheduled],
-      ),
+    const [logoutState, logout] = useAsyncCallback<void, Error, []>(
+      useCallback(async () => {
+        // [Gitea #29] Logging out mid-call must hang up first, or the MatrixRTC
+        // membership (expires: 4 h) stays behind as a ghost participant and
+        // everyone else sees you "in call" until it times out.
+        if (callEmbed && callEmbed.joined && !callEmbed.disposed) {
+          await hangupCallAndWait(mx, callEmbed);
+          setCallEmbed(undefined);
+        }
+        await logoutClient(mx);
+      }, [mx, callEmbed, setCallEmbed]),
     );
 
     const ongoingLogout = logoutState.status === AsyncStatus.Loading;
@@ -114,13 +93,6 @@ export const LogoutDialog = forwardRef<HTMLDivElement, LogoutDialogProps>(
                 description="Enable device verification or export your encrypted data from settings to avoid losing access to your messages."
               />
             ))}
-          {scheduled.length > 0 && (
-            <InfoCard
-              variant="Warning"
-              title={`${scheduled.length} scheduled message${scheduled.length === 1 ? '' : 's'}`}
-              description="Scheduled messages still send after you log out. Cancel them now if you don't want them sent."
-            />
-          )}
           <Text priority="400">You’re about to log out. Are you sure?</Text>
           {logoutState.status === AsyncStatus.Error && (
             <Text style={{ color: color.Critical.Main }} size="T300">
@@ -130,24 +102,12 @@ export const LogoutDialog = forwardRef<HTMLDivElement, LogoutDialogProps>(
           <Box direction="Column" gap="200">
             <Button
               variant="Critical"
-              onClick={() => logout()}
+              onClick={logout}
               disabled={ongoingLogout}
               before={ongoingLogout && <Spinner variant="Critical" fill="Solid" size="200" />}
             >
-              <Text size="B400">
-                {scheduled.length > 0 ? 'Logout and keep scheduled messages' : 'Logout'}
-              </Text>
+              <Text size="B400">Logout</Text>
             </Button>
-            {scheduled.length > 0 && (
-              <Button
-                variant="Critical"
-                fill="Soft"
-                onClick={() => logout(true)}
-                disabled={ongoingLogout}
-              >
-                <Text size="B400">Cancel scheduled messages and logout</Text>
-              </Button>
-            )}
             <Button variant="Secondary" fill="Soft" onClick={handleClose} disabled={ongoingLogout}>
               <Text size="B400">Cancel</Text>
             </Button>

src/app/features/room/ScheduledMessagesTray.tsx

@@ -4,12 +4,7 @@ import { IContent } from 'matrix-js-sdk';
 import { Box, Button, Icon, IconButton, Icons, Text, color, config } from 'folds';
 import { useMatrixClient } from '../../hooks/useMatrixClient';
 import { scheduledMessagesAtom, ScheduledMessage } from '../../state/scheduledMessages';
-import {
-  cancelScheduledMessage,
-  fetchScheduledMessages,
-  groupScheduledByRoom,
-  sendScheduledMessageNow,
-} from '../../utils/scheduledMessages';
+import { cancelScheduledMessage, sendScheduledMessageNow } from '../../utils/scheduledMessages';
 import { ScheduleMessageModal } from './ScheduleMessageModal';
 import { useTimestampFormatter } from '../../hooks/useTimestampFormatter';
 import { formatFriendlyDateTime } from '../../utils/datetimeInput';
@@ -31,26 +26,6 @@ export function ScheduledMessagesTray({ roomId }: ScheduledMessagesTrayProps) {
 
   const messages = useMemo(() => scheduledMessages.get(roomId) ?? [], [scheduledMessages, roomId]);
 
-  // [Gitea #322] The server is the source of truth: messages scheduled on
-  // another device (or before a logout) show up here and can be cancelled.
-  // localStorage is only a cache for the first paint; on error we keep it.
-  useEffect(() => {
-    let alive = true;
-    const load = () => {
-      fetchScheduledMessages(mx)
-        .then((list) => {
-          if (alive) setScheduledMessages(groupScheduledByRoom(list));
-        })
-        .catch(() => undefined);
-    };
-    load();
-    window.addEventListener('focus', load);
-    return () => {
-      alive = false;
-      window.removeEventListener('focus', load);
-    };
-  }, [mx, roomId, setScheduledMessages]);
-
   // Remove scheduled messages whose time has passed
   useEffect(() => {
     if (messages.length === 0) return undefined;

src/app/features/security-nudge/SecurityBanner.tsx

@@ -14,7 +14,7 @@ import { useKeyBackupInfo, useKeyBackupStatusChange } from '../../hooks/useKeyBa
 import { useAlive } from '../../hooks/useAlive';
 import { useSyncState } from '../../hooks/useSyncState';
 import { settingsRequestAtom } from '../../state/settingsRequest';
-import { serverStatusAtom } from '../../state/serverStatus';
+import { serverStatusAtom, statusDismissedAtom } from '../../state/serverStatus';
 import { pickBanner } from '../../utils/kumaStatus';
 import {
   dismissNudge,
@@ -66,6 +66,7 @@ function SecurityBannerFor({ crypto }: { crypto: CryptoApi }) {
   const backupInfo = useKeyBackupInfo(crypto);
   const backupActive = useBackupActive(crypto);
   const { status: serverStatus, syncLost } = useAtomValue(serverStatusAtom);
+  const statusDismissed = useAtomValue(statusDismissedAtom);
   const requestSettings = useSetAtom(settingsRequestAtom);
   // Not urgent: wait until sync has settled (two SYNCING in a row), so it
   // never stacks under the "Connecting…" strip at startup.
@@ -91,7 +92,11 @@ function SecurityBannerFor({ crypto }: { crypto: CryptoApi }) {
   });
 
   // One strip at a time: outages, maintenance and a lost connection win.
-  const otherStrip = syncLost || !!pickBanner(serverStatus, { syncLost, where: 'client' });
+  // [Gitea #307] Pass what the user dismissed: a dismissed announcement isn't
+  // on screen and must not keep the nudge hidden for as long as it's posted.
+  const otherStrip =
+    syncLost ||
+    !!pickBanner(serverStatus, { syncLost, where: 'client', dismissed: new Set(statusDismissed) });
   if (!settled || !deviceId || !kind || otherStrip || !shouldShowNudge(kind, record, Date.now()))
     return null;
 

src/app/features/server-status/ServerStatusBanner.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useAtomValue, useSetAtom } from 'jotai';
+import { useAtom, useAtomValue, useSetAtom } from 'jotai';
 import { MatrixClient, SyncState } from 'matrix-js-sdk';
 import { Box, Button, config, Icon, IconButton, Icons, IconSrc, Line, Text } from 'folds';
 import { ContainerColor } from '../../styles/ContainerColor.css';
@@ -7,21 +7,9 @@ import { useClientConfig } from '../../hooks/useClientConfig';
 import { useSyncState } from '../../hooks/useSyncState';
 import { useServerStatus } from '../../hooks/useServerStatus';
 import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
-import { serverStatusAtom } from '../../state/serverStatus';
+import { serverStatusAtom, statusDismissedAtom } from '../../state/serverStatus';
 import { pickBanner, resolveStatusPage, StatusBanner } from '../../utils/kumaStatus';
 
-const DISMISS_KEY = 'lotus-status-banner-dismissed';
-const DISMISS_MAX = 50;
-
-const readDismissed = (): string[] => {
-  try {
-    const v = JSON.parse(localStorage.getItem(DISMISS_KEY) ?? '[]');
-    return Array.isArray(v) ? v.filter((k): k is string => typeof k === 'string') : [];
-  } catch {
-    return [];
-  }
-};
-
 const bannerIcon = (b: StripContent): IconSrc => {
   if (b.kind === 'maintenance') return Icons.Setting;
   if (b.tone === 'Primary') return Icons.Info;
@@ -173,22 +161,14 @@ export function ServerStatusFeature({ mx }: { mx: MatrixClient }) {
 /** The logged-in app's status strip. */
 export function ServerStatusBanner() {
   const { status, syncLost } = useAtomValue(serverStatusAtom);
-  const [dismissed, setDismissed] = useState(readDismissed);
+  const [dismissed, dismissKey] = useAtom(statusDismissedAtom);
   const banner = pickBanner(status, {
     syncLost,
     where: 'client',
     dismissed: new Set(dismissed),
   });
   if (!banner) return null;
-  const dismiss = () => {
-    const next = [...dismissed.filter((k) => k !== banner.key), banner.key].slice(-DISMISS_MAX);
-    try {
-      localStorage.setItem(DISMISS_KEY, JSON.stringify(next));
-    } catch {
-      // storage unavailable — dismissed for this session only
-    }
-    setDismissed(next);
-  };
+  const dismiss = () => dismissKey(banner.key);
   return <StatusStrip banner={banner} onDismiss={dismiss} />;
 }
 

src/app/state/scheduledMessages.ts

@@ -21,8 +21,8 @@ const internalAtom = atomWithStorage<Record<string, ScheduledMessage[]>>(
 /**
  * Global atom: Map<roomId, ScheduledMessage[]>
  * Stores all locally-tracked scheduled messages across rooms.
- * Loaded from the server's MSC4140 `GET /delayed_events` when the tray mounts
- * (Gitea #322); localStorage is a cache for the first paint.
+ * MSC4140 has no list endpoint, so we track them ourselves.
+ * Backed by localStorage so scheduled messages survive page refreshes.
  */
 export const scheduledMessagesAtom = atom(
   (get): Map<string, ScheduledMessage[]> => new Map(Object.entries(get(internalAtom))),

src/app/state/serverStatus.ts

@@ -16,3 +16,35 @@ export const serverStatusAtom = atom<{
   syncLost: false,
   lostAt: null,
 });
+
+const DISMISS_KEY = 'lotus-status-banner-dismissed';
+const DISMISS_MAX = 50;
+
+const readDismissed = (): string[] => {
+  try {
+    const v = JSON.parse(localStorage.getItem(DISMISS_KEY) ?? '[]');
+    return Array.isArray(v) ? v.filter((k): k is string => typeof k === 'string') : [];
+  } catch {
+    return [];
+  }
+};
+
+const baseDismissedAtom = atom<string[]>(readDismissed());
+
+/**
+ * [Gitea #307] Status strips the user dismissed (by banner key), shared so
+ * the security nudge knows a dismissed announcement isn't on screen.
+ * Persisted to localStorage; session-only if storage is unavailable.
+ */
+export const statusDismissedAtom = atom(
+  (get) => get(baseDismissedAtom),
+  (get, set, key: string) => {
+    const next = [...get(baseDismissedAtom).filter((k) => k !== key), key].slice(-DISMISS_MAX);
+    try {
+      localStorage.setItem(DISMISS_KEY, JSON.stringify(next));
+    } catch {
+      // storage unavailable — dismissed for this session only
+    }
+    set(baseDismissedAtom, next);
+  },
+);

src/app/utils/scheduledMessages.test.ts

@@ -6,8 +6,6 @@ import {
   scheduleMessage,
   cancelScheduledMessage,
   restartScheduledMessage,
-  parseDelayedEvents,
-  groupScheduledByRoom,
 } from './scheduledMessages';
 
 // Minimal MatrixClient stub: records every authedRequest call and returns a
@@ -121,61 +119,3 @@ test('cancel/restart url-encode the delay id', async () => {
   await cancelScheduledMessage(mx, 'a/b c');
   assert.equal(calls[0][1], '/delayed_events/a%2Fb%20c');
 });
-
-test('parseDelayedEvents: Synapse shape, messages only, sendAt from running_since + delay (#322)', () => {
-  const res = {
-    delayed_events: [
-      {
-        delay_id: 'syd_a',
-        room_id: '!r:x',
-        type: 'm.room.message',
-        content: { msgtype: 'm.text', body: 'hi' },
-        delay: 60000,
-        running_since: 1000,
-      },
-      {
-        delay_id: 'syd_call',
-        room_id: '!r:x',
-        type: 'org.matrix.msc3401.call.member',
-        state_key: '_@a:x_D',
-        content: {},
-        delay: 8000,
-        running_since: 1000,
-      },
-      { delay_id: 'syd_bad', room_id: '!r:x', type: 'm.room.message', content: {} },
-      null,
-    ],
-  };
-  assert.deepEqual(parseDelayedEvents(res), [
-    { delayId: 'syd_a', roomId: '!r:x', content: { msgtype: 'm.text', body: 'hi' }, sendAt: 61000 },
-  ]);
-});
-
-test('parseDelayedEvents: MSC `scheduled` shape and garbage', () => {
-  const item = {
-    delay_id: 'd',
-    room_id: '!r:x',
-    type: 'm.room.message',
-    content: { body: 'b' },
-    delay_ms: 5,
-    delayed_since_ts: 10,
-  };
-  assert.equal(parseDelayedEvents({ scheduled: [item] })[0].sendAt, 15);
-  assert.deepEqual(parseDelayedEvents(undefined), []);
-  assert.deepEqual(parseDelayedEvents({ delayed_events: 'nope' }), []);
-});
-
-test('groupScheduledByRoom: groups and sorts by sendAt', () => {
-  const m = (delayId: string, roomId: string, sendAt: number) => ({
-    delayId,
-    roomId,
-    content: {},
-    sendAt,
-  });
-  const g = groupScheduledByRoom([m('b', '!1', 20), m('a', '!1', 10), m('c', '!2', 5)]);
-  assert.deepEqual(
-    g.get('!1')?.map((x) => x.delayId),
-    ['a', 'b'],
-  );
-  assert.equal(g.get('!2')?.length, 1);
-});

src/app/utils/scheduledMessages.ts

@@ -1,5 +1,4 @@
 import { IContent, MatrixClient, Method } from 'matrix-js-sdk';
-import type { ScheduledMessage } from '../state/scheduledMessages';
 
 /**
  * Schedule a message via MSC4140 (delayed messages).
@@ -77,61 +76,3 @@ export async function sendScheduledMessageNow(mx: MatrixClient, delayId: string)
     { prefix: '/_matrix/client/unstable/org.matrix.msc4140' },
   );
 }
-
-type DelayedEventItem = {
-  delay_id?: unknown;
-  room_id?: unknown;
-  type?: unknown;
-  state_key?: unknown;
-  content?: unknown;
-  delay?: unknown;
-  delay_ms?: unknown;
-  running_since?: unknown;
-  delayed_since_ts?: unknown;
-};
-
-/**
- * [Gitea #322] Pure: the user's pending scheduled messages from an MSC4140
- * `GET /delayed_events` response. Synapse answers `{ delayed_events: [...] }`;
- * the current MSC shape is `{ scheduled: [...] }`. Call-membership delayed
- * events share the endpoint, so only non-state `m.room.message`s are kept.
- */
-export function parseDelayedEvents(res: unknown): ScheduledMessage[] {
-  if (!res || typeof res !== 'object') return [];
-  const r = res as { delayed_events?: unknown; scheduled?: unknown };
-  const list = Array.isArray(r.delayed_events) ? r.delayed_events : r.scheduled;
-  if (!Array.isArray(list)) return [];
-  const out: ScheduledMessage[] = [];
-  list.forEach((raw: DelayedEventItem) => {
-    if (!raw || typeof raw !== 'object') return;
-    if (raw.type !== 'm.room.message' || raw.state_key !== undefined) return;
-    if (typeof raw.delay_id !== 'string' || typeof raw.room_id !== 'string') return;
-    if (!raw.content || typeof raw.content !== 'object') return;
-    const delay = Number(raw.delay ?? raw.delay_ms);
-    const since = Number(raw.running_since ?? raw.delayed_since_ts);
-    if (!Number.isFinite(delay) || !Number.isFinite(since)) return;
-    out.push({
-      delayId: raw.delay_id,
-      roomId: raw.room_id,
-      content: raw.content as IContent,
-      sendAt: since + delay,
-    });
-  });
-  return out;
-}
-
-/** The user's pending scheduled messages, as the server has them. */
-export async function fetchScheduledMessages(mx: MatrixClient): Promise<ScheduledMessage[]> {
-  const res = await mx.http.authedRequest(Method.Get, '/delayed_events', undefined, undefined, {
-    prefix: '/_matrix/client/unstable/org.matrix.msc4140',
-  });
-  return parseDelayedEvents(res);
-}
-
-/** Group by room, the shape of `scheduledMessagesAtom`. */
-export function groupScheduledByRoom(msgs: ScheduledMessage[]): Map<string, ScheduledMessage[]> {
-  const map = new Map<string, ScheduledMessage[]>();
-  msgs.forEach((m) => map.set(m.roomId, [...(map.get(m.roomId) ?? []), m]));
-  map.forEach((list) => list.sort((a, b) => a.sendAt - b.sendAt));
-  return map;
-}