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/CallEmbedProvider.tsx

@@ -89,9 +89,6 @@ import { zIndices } from '../styles/zIndex';
 
 const PIP_MIN_W = 200;
 const PIP_MIN_H = 112;
-/** [Gitea #323] Minimised PiP bar size. */
-const PIP_MINI_W = 220;
-const PIP_MINI_H = 40;
 
 type Corner = 'se' | 'sw' | 'ne' | 'nw';
 
@@ -984,28 +981,6 @@ export function CallEmbedProvider({ children }: CallEmbedProviderProps) {
   );
 
   const [pipIsFullscreen, setPipIsFullscreen] = useState(false);
-  // [Gitea #323] Minimised PiP: a small draggable bar (room name + expand)
-  // instead of the video. Remembered; phones start minimised.
-  const [pipMinimized, setPipMinimized] = useState<boolean>(() => {
-    try {
-      const v = localStorage.getItem('pip-minimized');
-      if (v !== null) return v === '1';
-    } catch {
-      /* storage unavailable */
-    }
-    return window.innerWidth < 600;
-  });
-  const pipFullSizeRef = React.useRef({ width: 280, height: 158 });
-  const togglePipMinimized = useCallback(() => {
-    setPipMinimized((m) => {
-      try {
-        localStorage.setItem('pip-minimized', m ? '0' : '1');
-      } catch {
-        /* storage unavailable */
-      }
-      return !m;
-    });
-  }, []);
   useEffect(() => {
     const onFsChange = () => setPipIsFullscreen(!!document.fullscreenElement);
     document.addEventListener('fullscreenchange', onFsChange);
@@ -1103,26 +1078,6 @@ export function CallEmbedProvider({ children }: CallEmbedProviderProps) {
     }
   }, [pipMode, callVisible]);
 
-  // [Gitea #323] Apply the minimised / full PiP size (after the entry effect
-  // below has positioned and sized it). Keeps the bar on screen.
-  React.useEffect(() => {
-    const el = callEmbedRef.current;
-    if (!el || !pipMode) return;
-    if (pipMinimized) {
-      if (el.offsetHeight > PIP_MINI_H) {
-        pipFullSizeRef.current = { width: el.offsetWidth, height: el.offsetHeight };
-      }
-      el.style.width = `${PIP_MINI_W}px`;
-      el.style.height = `${PIP_MINI_H}px`;
-    } else {
-      el.style.width = `${pipFullSizeRef.current.width}px`;
-      el.style.height = `${pipFullSizeRef.current.height}px`;
-    }
-    const rect = el.getBoundingClientRect();
-    el.style.left = `${Math.max(0, Math.min(rect.left, window.innerWidth - el.offsetWidth))}px`;
-    el.style.top = `${Math.max(0, Math.min(rect.top, window.innerHeight - el.offsetHeight))}px`;
-  }, [pipMode, pipMinimized, callEmbedRef]);
-
   React.useEffect(() => {
     if (!pipMode) return;
     const onPipWindowResize = (): void => {
@@ -1441,50 +1396,19 @@ export function CallEmbedProvider({ children }: CallEmbedProviderProps) {
                 position: 'absolute',
                 inset: 0,
                 zIndex: 1,
-                // Minimised: cover the frame so only the bar shows.
-                background: pipMinimized ? color.Surface.Container : 'transparent',
+                background: 'transparent',
                 cursor: 'grab',
                 // [Gitea #43] The call's "Share your screen?" prompt is drawn
                 // inside the frame: let the click reach its Share button.
                 pointerEvents: pipPromptOpen ? 'none' : undefined,
                 display: 'flex',
+                alignItems: 'flex-start',
                 justifyContent: 'flex-end',
-                alignItems: pipMinimized ? 'center' : 'flex-start',
                 padding: '6px',
               }}
             >
-              <div
-                style={{
-                  display: 'flex',
-                  gap: config.space.S100,
-                  alignItems: 'center',
-                  ...(pipMinimized ? { width: '100%' } : {}),
-                }}
-              >
-                {/* Leftmost: the top-right corner is a resize handle. */}
-                <IconButton
-                  type="button"
-                  size="300"
-                  radii="300"
-                  variant="Surface"
-                  fill="None"
-                  aria-label={pipMinimized ? 'Expand call' : 'Minimise call'}
-                  aria-pressed={pipMinimized}
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    togglePipMinimized();
-                  }}
-                  onMouseDown={(e) => e.stopPropagation()}
-                  onTouchStart={(e) => e.stopPropagation()}
-                  style={{
-                    background: 'rgba(0,0,0,0.65)',
-                    backdropFilter: 'blur(4px)',
-                    color: '#fff',
-                  }}
-                >
-                  <Icon size="100" src={pipMinimized ? Icons.ChevronTop : Icons.Minus} />
-                </IconButton>
-                {!pipMinimized && document.fullscreenEnabled && (
+              <div style={{ display: 'flex', gap: config.space.S100, alignItems: 'center' }}>
+                {document.fullscreenEnabled && (
                   <IconButton
                     type="button"
                     size="300"
@@ -1516,23 +1440,14 @@ export function CallEmbedProvider({ children }: CallEmbedProviderProps) {
                     fontSize: '11px',
                     fontWeight: 600,
                     pointerEvents: 'none',
-                    ...(pipMinimized
-                      ? {
-                          flexGrow: 1,
-                          minWidth: 0,
-                          overflow: 'hidden',
-                          textOverflow: 'ellipsis',
-                          whiteSpace: 'nowrap',
-                        }
-                      : {}),
                   }}
                 >
-                  {pipMinimized ? `↗ ${callEmbed.room.name ?? 'Call'}` : '↗ Return to call'}
+                  ↗ Return to call
                 </div>
               </div>
             </div>
-            {!pipMinimized && <PipMuteOverlay callEmbed={callEmbed} />}
-            {(pipMinimized ? [] : (['se', 'sw', 'ne', 'nw'] as Corner[])).map((corner) => {
+            <PipMuteOverlay callEmbed={callEmbed} />
+            {(['se', 'sw', 'ne', 'nw'] as Corner[]).map((corner) => {
               const s = corner.includes('s');
               const e2 = corner.includes('e');
               const dots = [

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,
           }}