fix(consent): a retry that fails again reopens the terms prompt (#311)

Closing the dialog via "I've accepted — retry" also deactivated its focus
trap, whose onDeactivate is "Later": every close set the 10 s snooze, so
a retry made before the terms were really accepted failed silently.
Retry now closes without snoozing (and clears any earlier snooze).

Fixes #311

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

src/app/components/ConsentRequiredPrompt.tsx

@@ -44,6 +44,9 @@ export function ConsentRequiredPrompt() {
   const [opened, setOpened] = useState(false);
   const [blockedCount, setBlockedCount] = useState(0);
   const snoozedUntil = useRef(0);
+  // [Gitea #311] Closing via Retry also deactivates the focus trap; that must
+  // not snooze, or a retry that fails again (terms not accepted yet) is silent.
+  const closingForRetry = useRef(false);
   const blocked = useRef(new Map<MatrixEvent, Room>());
   const modalStyle = useModalStyle(440);
   const server = mx.getDomain() ?? 'Your homeserver';
@@ -74,6 +77,8 @@ export function ConsentRequiredPrompt() {
   }, [consentUri]);
 
   const retry = useCallback(() => {
+    closingForRetry.current = true;
+    snoozedUntil.current = 0;
     setOpen(false);
     setOpened(false);
     const pending = Array.from(blocked.current.entries());
@@ -97,7 +102,13 @@ export function ConsentRequiredPrompt() {
           focusTrapOptions={{
             initialFocus: '#consent-review',
             fallbackFocus: '#consent-later',
-            onDeactivate: later,
+            onDeactivate: () => {
+              if (closingForRetry.current) {
+                closingForRetry.current = false;
+                return;
+              }
+              later();
+            },
             clickOutsideDeactivates: true,
             escapeDeactivates: true,
           }}

src/app/features/room/message/ForwardMessageDialog.tsx

@@ -47,12 +47,8 @@ import {
   recentForwardTargetsAtom,
   addRecentForwardTarget,
 } from '../../../state/recentForwardTargets';
-import {
-  buildForwardContent,
-  buildPlaintextAttachmentContent,
-  forwardEncryptionWarning,
-} from './forwardContent';
-import { useLocalRoomNames, getLocalRoomName } from '../../../hooks/useRoomMeta';
+import { buildForwardContent, buildPlaintextAttachmentContent } from './forwardContent';
+import { useLocalRoomNames } from '../../../hooks/useRoomMeta';
 
 type RoomRowProps = {
   room: Room;
@@ -279,14 +275,6 @@ export function ForwardMessageDialog({ mEvent, onClose }: Props) {
   // Selection persists across query changes: a room selected then filtered out
   // of the rendered slice stays selected.
   const [selectedRoomIds, setSelectedRoomIds] = useState<Set<string>>(new Set());
-  const encryptionWarning = forwardEncryptionWarning(
-    !!mx.getRoom(mEvent.getRoomId() ?? '')?.hasEncryptionStateEvent(),
-    [...selectedRoomIds]
-      .map((id) => mx.getRoom(id))
-      .filter((r): r is Room => !!r && !r.hasEncryptionStateEvent())
-      // The name the user sees (their own "Rename for me" name, if set).
-      .map((r) => getLocalRoomName(mx, r.roomId) ?? r.name),
-  );
 
   const toggleRoom = useCallback((roomId: string) => {
     setSelectedRoomIds((prev) => {
@@ -602,13 +590,7 @@ export function ForwardMessageDialog({ mEvent, onClose }: Props) {
                   shrink="No"
                   direction="Column"
                   style={{ padding: `${config.space.S200} ${config.space.S400}` }}
-                  gap="200"
                 >
-                  {encryptionWarning && (
-                    <Text size="T200" role="note" style={{ color: color.Warning.Main }}>
-                      {encryptionWarning}
-                    </Text>
-                  )}
                   <Button
                     variant="Primary"
                     size="400"

src/app/features/room/message/forwardContent.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import { MatrixClient, MatrixEvent } from 'matrix-js-sdk';
-import { buildForwardContent, forwardEncryptionWarning, getForwardedMeta } from './forwardContent';
+import { buildForwardContent, getForwardedMeta } from './forwardContent';
 
 // Pure content builder buildForwardContent: refuses undecryptable events, forwards
 // the latest edit (`m.new_content`), and strips reply fallbacks + `m.relates_to`.
@@ -171,16 +171,3 @@ test('getForwardedMeta rejects malformed metadata', () => {
   assert.equal(getForwardedMeta({ 'io.lotus.forwarded': { sender: 1 } }), undefined);
   assert.equal(getForwardedMeta({}), undefined);
 });
-
-test('forwardEncryptionWarning: only from an encrypted room into unencrypted ones (#330)', () => {
-  assert.equal(forwardEncryptionWarning(false, ['general']), undefined);
-  assert.equal(forwardEncryptionWarning(true, []), undefined);
-  assert.match(
-    forwardEncryptionWarning(true, ['general']) ?? '',
-    /^general isn't encrypted\..*that room, along with who originally wrote it\.$/,
-  );
-  assert.match(
-    forwardEncryptionWarning(true, ['a', 'b']) ?? '',
-    /^2 of the rooms you picked aren't encrypted\..*those rooms/,
-  );
-});

src/app/features/room/message/forwardContent.ts

@@ -122,23 +122,3 @@ export async function buildPlaintextAttachmentContent(
 
   return plainContent;
 }
-
-/**
- * [Gitea #330] The note shown when forwarding out of an encrypted room into
- * rooms that aren't: the text (and a re-uploaded attachment) becomes readable
- * by the server, and the original author is shown with it. Undefined when
- * there's nothing to warn about.
- */
-export function forwardEncryptionWarning(
-  sourceEncrypted: boolean,
-  unencryptedDestNames: string[],
-): string | undefined {
-  if (!sourceEncrypted || unencryptedDestNames.length === 0) return undefined;
-  const where =
-    unencryptedDestNames.length === 1
-      ? `${unencryptedDestNames[0]} isn't encrypted.`
-      : `${unencryptedDestNames.length} of the rooms you picked aren't encrypted.`;
-  return `${where} The forwarded message (and any attachment) will be readable by the server and everyone in ${
-    unencryptedDestNames.length === 1 ? 'that room' : 'those rooms'
-  }, along with who originally wrote it.`;
-}