💄(frontend) adjust spacing in the recording side panels

Based on @Arnaud’s feedback, adjust the spacing between the title, details
section, and control buttons to make the layout feel more homogeneous.

.github/workflows/crowdin-download.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Download Crowdin files
         uses: crowdin/github-action@v2

.github/workflows/docker-hub.yml

@@ -23,13 +23,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v6
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: actions/checkout@v4
       -
         name: Docker meta
         id: meta
@@ -55,7 +49,6 @@ jobs:
         with:
           context: .
           target: backend-production
-          platforms: linux/amd64,linux/arm64
           build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
@@ -66,13 +59,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v6
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: actions/checkout@v4
       -
         name: Docker meta
         id: meta
@@ -99,7 +86,6 @@ jobs:
           context: .
           file: ./src/frontend/Dockerfile
           target: frontend-production
-          platforms: linux/amd64,linux/arm64
           build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
@@ -110,13 +96,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v6
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: actions/checkout@v4
       -
         name: Docker meta
         id: meta
@@ -143,7 +123,6 @@ jobs:
           context: .
           file: ./docker/dinum-frontend/Dockerfile
           target: frontend-production
-          platforms: linux/amd64,linux/arm64
           build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
@@ -154,13 +133,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v6
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: actions/checkout@v4
       -
         name: Docker meta
         id: meta
@@ -189,7 +162,6 @@ jobs:
           context: ./src/summary
           file: ./src/summary/Dockerfile
           target: production
-          platforms: linux/amd64,linux/arm64
           build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
@@ -200,13 +172,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v6
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: actions/checkout@v4
       -
         name: Docker meta
         id: meta
@@ -235,7 +201,6 @@ jobs:
           context: ./src/agents
           file: ./src/agents/Dockerfile
           target: production
-          platforms: linux/amd64,linux/arm64
           build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/meet.yml

@@ -7,18 +7,14 @@ on:
   pull_request:
     branches:
       - "*"
-permissions:
-  contents: read
 
 jobs:
   lint-git:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request' # Makes sense only for pull requests
-    permissions:
-      contents: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: show
@@ -43,11 +39,9 @@ jobs:
     if: |
       contains(github.event.pull_request.labels.*.name, 'noChangeLog') == false &&
       github.event_name == 'pull_request'
-    permissions:
-        contents: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 50
       - name: Check that the CHANGELOG has been modified in the current branch
@@ -55,11 +49,9 @@ jobs:
 
   lint-changelog:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       - name: Check CHANGELOG max line length
         run: |
           max_line_length=$(cat CHANGELOG.md | grep -Ev "^\[.*\]: https://github.com" | wc -L)
@@ -70,22 +62,20 @@ jobs:
 
   build-mails:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     defaults:
       run:
         working-directory: src/mail
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version: "18"
 
       - name: Restore the mail templates
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: mail-templates
         with:
           path: "src/backend/core/templates/mail"
@@ -105,23 +95,21 @@ jobs:
 
       - name: Cache mail templates
         if: steps.mail-templates.outputs.cache-hit != 'true'
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: "src/backend/core/templates/mail"
           key: mail-templates-${{ hashFiles('src/mail/mjml') }}
 
   lint-back:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     defaults:
       run:
         working-directory: src/backend
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       - name: Install Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "3.13"
           cache: "pip"
@@ -136,16 +124,14 @@ jobs:
 
   lint-agents:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     defaults:
       run:
         working-directory: src/agents
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       - name: Install Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "3.13"
           cache: "pip"
@@ -158,16 +144,14 @@ jobs:
 
   lint-summary:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     defaults:
       run:
         working-directory: src/summary
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       - name: Install Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "3.13"
           cache: "pip"
@@ -181,8 +165,7 @@ jobs:
   test-back:
     runs-on: ubuntu-latest
     needs: build-mails
-    permissions:
-      contents: read
+
     defaults:
       run:
         working-directory: src/backend
@@ -233,7 +216,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Create writable /data
         run: |
@@ -241,7 +224,7 @@ jobs:
           sudo mkdir -p /data/static
 
       - name: Restore the mail templates
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         id: mail-templates
         with:
           path: "src/backend/core/templates/mail"
@@ -275,7 +258,7 @@ jobs:
             mc mb meet/meet-media-storage"
 
       - name: Install Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "3.13"
           cache: "pip"
@@ -296,11 +279,9 @@ jobs:
 
   lint-front:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: cd src/frontend/ && npm ci
@@ -313,14 +294,12 @@ jobs:
 
   lint-sdk:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     defaults:
       run:
         working-directory: src/sdk/library
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: npm ci
@@ -333,15 +312,13 @@ jobs:
 
   build-sdk:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     needs: lint-sdk
     defaults:
       run:
         working-directory: src/sdk/library
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: npm ci

.github/workflows/release-helm-chart.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

CHANGELOG.md

@@ -10,119 +10,11 @@ and this project adheres to
 
 ### Added
 
-- 👷(docker) add arm64 platform support for image builds
-
-### Changed
-
-- ♻️(frontend) replace custom reactions toolbar with react aria popover #985
-- 🔒️(frontend) uninstall curl from the frontend production image #987
-- 💄(frontend) add focus ring to reaction emoji buttons
-- ✨(frontend) introduce a shortcut settings tab #975
-- 🚚(frontend) rename "wellknown" directory to "well-known" #1009
-- 🌐(frontend) localize SR modifier labels #1010
-- ⬆️(backend) update python dependencies #1011
-- ♿️(a11y) fix focus ring on tab container components
-
-### Fixed
-
-- 🩹(frontend) fix German language preference update #1021
-
-
-## [1.8.0] - 2026-02-20
-
-### Changed
-
-- 🔒️(agents) uninstall pip from the agents image
-- 🔒️(summary) switch to Alpine base image
-- 🔒️(backend) uninstall pip in the production image
-
-### Fixed
-
-- 🔒️(agents) upgrade OpenSSL to address CVE-2025-15467
-- 📌(agents) pin protobuf to 6.33.5 to fix CVE-2026-0994
-
-## [1.7.0] - 2026-02-19
-
-### Added
-
-- ✨(frontend) expose Windows app web link #976
-- ✨(frontend) support additional shortcuts to broaden accessibility
-
-### Changed
-
-- ✨(frontend) add clickable settings general link in idle modal #974
-- ♻️(backend) refactor external API token-related items #1006
-
-## [1.6.0] - 2026-02-10
-
-### Added
-
-- ✨(backend) monitor throttling rate failure through sentry #964
-- 🚀(paas) add PaaS deployment scripts, tested on Scalingo #957
-
-### Changed
-
-- ♿️(frontend) improve spinner reduced‑motion fallback #931
-- ♿️(frontend) fix form labels and autocomplete wiring #932
-- 🥅(summary) catch file-related exceptions when handling recording #944
-- 📝(frontend) update legal terms #956
-- ⚡️(backend) enhance django admin's loading performance #954
-- 🌐(frontend) add missing DE translation for accessibility settings
-
-### Fixed
-
-- 🔐(backend) enforce object-level permission checks on room endpoint #959
-- 🔒️(backend) add application validation when consuming external JWT #963
-
-## [1.5.0] - 2026-01-28
-
-### Changed
-
-- ♿️(frontend) adjust visual-only tooltip a11y labels #910
-- ♿️(frontend) sr pin/unpin announcements with dedicated messages #898
-- ♿(frontend) adjust sr announcements for idle disconnect timer #908
-- ♿️(frontend) add global screen reader announcer#922
-
-### Fixed
-
-- 🔒️(frontend) fix an XSS vulnerability on the recording page #911
-
-## [1.4.0] - 2026-01-25
-
-### Added
-
-- ✨(frontend) add configurable redirect for unauthenticated users #904
-
-### Changed
-
-- ♿️(frontend) add accessible back button in side panel #881
-- ♿️(frontend) improve participants toggle a11y label #880
-- ♿️(frontend) make carousel image decorative #871
-- ♿️(frontend) reactions are now vocalized and configurable #849
-- ♿️(frontend) improve background effect announcements #879
-
-### Fixed
-
-- 🔒(backend) prevent automatic upgrade setuptools
-- ♿(frontend) improve contrast for selected options #863
-- ♿️(frontend) announce copy state in invite dialog #877
-- 📝(frontend) align close dialog label in rooms locale #878
-- 🩹(backend) use case-insensitive email matching in the external api #887
-- 🐛(frontend) ensure transcript segments are sorted by their timestamp #899
-- 🐛(frontend) scope scrollbar gutter override to video rooms #882
-
-## [1.3.0] - 2026-01-13
-
-### Added
-
 - ✨(summary) add dutch and german languages
-- 🔧(agents) make Silero VAD optional
-- 🚸(frontend) explain to a user they were ejected
 
 ### Changed
 
 - 📈(frontend) track new recording's modes
-- ♿️(frontend) improve accessibility of the background and effects menu
 - ♿️(frontend) improve SR and focus for transcript and recording #810
 - 💄(frontend) adjust spacing in the recording side panels
 - 🚸(frontend) remove the default comma delimiter in humanized durations
@@ -130,7 +22,6 @@ and this project adheres to
 ### Fixed
 
 - 🐛(frontend) remove unexpected F2 tooltip when clicking video screen
-- 🩹(frontend) icon font loading to avoid text/icon flickering
 
 ## [1.2.0] - 2026-01-05
 

Dockerfile

@@ -4,7 +4,7 @@
 FROM python:3.13.5-alpine3.21 AS base
 
 # Upgrade pip to its latest release to speed up dependencies installation
-RUN python -m pip install --upgrade pip
+RUN python -m pip install --upgrade pip setuptools
 
 # Upgrade system packages to install security updates
 RUN apk update && \
@@ -127,9 +127,6 @@ ARG MEET_STATIC_ROOT=/data/static
 RUN mkdir -p /usr/local/etc/gunicorn
 COPY docker/files/usr/local/etc/gunicorn/meet.py /usr/local/etc/gunicorn/meet.py
 
-# Remove pip to reduce attack surface in production
-RUN pip uninstall -y pip
-
 # Un-privileged user running the application
 ARG DOCKER_USER
 USER ${DOCKER_USER}

Makefile

@@ -23,10 +23,9 @@
 # ==============================================================================
 # VARIABLES
 
-ESC := $(shell printf '\033')
-BOLD := $(ESC)[1m
-RESET := $(ESC)[0m
-GREEN := $(ESC)[1;32m
+BOLD := \033[1m
+RESET := \033[0m
+GREEN := \033[1;32m
 
 
 # -- Database
@@ -86,8 +85,7 @@ bootstrap: \
 	demo \
 	back-i18n-compile \
 	mails-install \
-	mails-build \
-	run
+	mails-build
 .PHONY: bootstrap
 
 # -- Docker/compose

Procfile

@@ -1,2 +0,0 @@
-web: bin/buildpack_start.sh
-postdeploy: python manage.py migrate

README.md

@@ -50,9 +50,6 @@ La Suite Meet is fully self-hostable and released under the MIT License, ensurin
 
 We’re continuously adding new features to enhance your experience, with the latest updates coming soon!
 
-### 🚀 Major roll out to all French public servants
-
-On the 25th of January 2026, David Amiel, France’s Minister for Civil Service and State Reform, announced the full deployment of Visio—the French government’s dedicated Meet platform—to all public servants. ([Source in French](https://www.latribune.fr/article/la-tribune-dimanche/politique/73157688099661/david-amiel-ministre-delegue-de-la-fonction-publique-nous-allons-sortir-de-la-dependance-aux-outils-americains))
 
 ## Table of Contents
 
@@ -89,7 +86,7 @@ We hope to see many more, here is an incomplete list of public La Suite Meet ins
 | [visio.numerique.gouv.fr](https://visio.numerique.gouv.fr/)   | DINUM    | French public agents working for the central administration and the extended public sphere. ProConnect is required to login in or sign up|
 | [visio.suite.anct.gouv.fr](https://visio.suite.anct.gouv.fr/) | ANCT    | French public agents working for the territorial administration and the extended public sphere. ProConnect is required to login in or sign up|
 | [visio.lasuite.coop](https://visio.lasuite.coop/)             | lasuite.coop    | Free and open demo to all. Content and accounts are reset after one month |
-| [mosacloud.cloud](https://mosa.cloud/)                        | mosa.cloud    | Demo instance of mosa.cloud, a dutch company providing services around La Suite apps. |
+| [meet.demo.mosacloud.eu](https://meet.demo.mosacloud.eu/)     | mosa.cloud    | Demo instance of mosa.cloud, a dutch company providing services around La Suite apps. |
 
 
 ## Contributing

bin/Tiltfile

@@ -18,7 +18,6 @@ docker_build(
     'localhost:5001/meet-backend:latest',
     context='..',
     dockerfile='../Dockerfile',
-    build_args={'DOCKER_USER': '1001:127'},
     only=['./src/backend', './src/mail', './docker'],
     target = 'backend-production',
     live_update=[
@@ -34,7 +33,6 @@ clean_old_images('localhost:5001/meet-backend')
 docker_build(
     'localhost:5001/meet-frontend-dinum:latest',
     context='..',
-    build_args={'DOCKER_USER': '1001:127'},
     dockerfile='../docker/dinum-frontend/Dockerfile',
     only=['./src/frontend', './docker', './.dockerignore'],
     target = 'frontend-production',
@@ -59,7 +57,6 @@ clean_old_images('localhost:5001/meet-frontend-generic')
 docker_build(
     'localhost:5001/meet-summary:latest',
     context='../src/summary',
-    build_args={'DOCKER_USER': '1001:127'},
     dockerfile='../src/summary/Dockerfile',
     only=['.'],
     target = 'production',
@@ -72,9 +69,8 @@ clean_old_images('localhost:5001/meet-summary')
 docker_build(
     'localhost:5001/meet-agents:latest',
     context='../src/agents',
-    build_args={'DOCKER_USER': '1001:127'},
     dockerfile='../src/agents/Dockerfile',
-    only=['.'],
+   only=['.'],
     target = 'production',
     live_update=[
         sync('../src/agents', '/app'),

bin/buildpack_postcompile.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -o errexit    # always exit on error
-set -o pipefail   # don't ignore exit codes when piping output
-
-echo "-----> Running post-compile script"
-
-# Cleanup
-rm -rf docker docs env.d gitlint

bin/buildpack_postfrontend.sh

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-set -o errexit    # always exit on error
-set -o pipefail   # don't ignore exit codes when piping output
-
-echo "-----> Running post-frontend script"
-
-# Move the frontend build to the nginx root and clean up
-mkdir -p build/
-mv src/frontend/dist build/frontend-out
-
-ASSETS_DIR=build/frontend-out/assets
-if [ -n "$CUSTOM_LOGO_URL" ]; then
-    # Ensure https
-    [[ ! "$CUSTOM_LOGO_URL" =~ ^https:// ]] && echo "[custom-logo] ERROR: URL must use HTTPS" >&2 && exit 1
-
-    # Prevent SSRF
-    HOSTNAME=$(echo "$CUSTOM_LOGO_URL" | sed -E 's|^https://([^/:]+).*|\1|')
-    [[ "$HOSTNAME" =~ ^(localhost|127\.|10\.|172\.(1[6-9]|2[0-9]|3[01])\.|192\.168\.|0\.0\.0\.0|\[::1\]) ]] && echo "[custom-logo] ERROR: SSRF blocked: $HOSTNAME" >&2 && exit 1
-
-    LOGO_FILE="${ASSETS_DIR}/logo.svg"
-    TMP_FILE=$(mktemp "${LOGO_FILE}.XXXXXX.tmp")
-
-    # Actual download
-    echo "[custom-logo] INFO: Downloading custom logo from: $CUSTOM_LOGO_URL"
-    curl -fsSL --tlsv1.2 -o "$TMP_FILE" "$CUSTOM_LOGO_URL"
-
-    # Validate filesize
-    FILESIZE=$(stat -c%s "$TMP_FILE" 2>/dev/null || stat -f%z "$TMP_FILE")
-    [[ "$FILESIZE" -eq 0 ]] && echo "[custom-logo] ERROR: empty file" >&2 && exit 1
-    [[ "$FILESIZE" -gt 5242880 ]] && echo "[custom-logo] ERROR: file too large (${FILESIZE}B > 5MB)" >&2 && exit 1
-
-    # Validate file type
-    IS_SVG=false
-
-    HEADER=$(head -c 100 "$TMP_FILE" | tr -d '\0' | tr '[:upper:]' '[:lower:]')
-    [[ "$HEADER" =~ ^.*"<svg".*$ ]] && IS_SVG=true
-    [[ "$HEADER" =~ ^.*"<?xml".*"<svg".*$ ]] && IS_SVG=true
-
-    [[ "$IS_SVG" == false ]] && echo "[custom-logo] ERROR: not a valid SVG file" >&2 && exit 1
-
-    mv -f "$TMP_FILE" "$LOGO_FILE"
-    echo "[custom-logo] INFO: Custom logo downloaded successfuly"
-fi
-
-mv src/backend/* ./
-mv deploy/paas/* ./
-
-echo "3.13" > .python-version
-echo "." > requirements.txt

bin/buildpack_start.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Start the Django backend server
-gunicorn -b 0.0.0.0:8000 meet.wsgi:application --log-file - &
-
-# Start the Nginx server
-bin/run &
-
-# if the current shell is killed, also terminate all its children     
-trap "pkill SIGTERM -P $$" SIGTERM
-
-# wait for a single child to finish,
-wait -n
-# then kill all the other tasks
-pkill -P $$

deploy/paas/servers.conf.erb

@@ -1,52 +0,0 @@
-# ERB templated nginx configuration
-# see https://doc.scalingo.com/platform/deployment/buildpacks/nginx
-
-upstream backend_server {
-	server localhost:8000 fail_timeout=0;
-}
-
-server {
-  listen <%= ENV["PORT"] %>;
-  server_name _;
-  server_tokens off;
-
-  root /app/build/frontend-out;
-
-  # Django rest framework
-  location ^~ /api/ {
-      proxy_set_header X-Forwarded-Proto https;
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      proxy_redirect off;
-      proxy_pass http://backend_server;
-  }
-
-  # Django admin
-  location ^~ /admin/ {
-      proxy_set_header X-Forwarded-Proto https;
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-      proxy_redirect off;
-      proxy_pass http://backend_server;
-  }
-
-  # Serve static files with caching
-  location ~* ^/assets/.*\.(css|js|json|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
-      expires 30d;
-      add_header Cache-Control "public, max-age=2592000";
-  }
-
-  # Serve static files
-  location / {
-      try_files $uri $uri/ /index.html;
-      # Add no-cache headers
-      add_header Cache-Control "no-cache, no-store, must-revalidate";
-      add_header Pragma "no-cache";  # HTTP 1.0 header for backward compatibility
-      add_header Expires 0;
-  }
-
-  # Optionally, handle 404 errors by redirecting to index.html
-  error_page 404 =200 /index.html;
-}

docker/files/production/default.conf.template

@@ -1,9 +1,9 @@
 upstream meet_backend {
-    server ${BACKEND_INTERNAL_HOST}:8000 fail_timeout=0;
+    server ${BACKEND_HOST}:8000 fail_timeout=0;
 }
 
 upstream meet_frontend {
-    server ${FRONTEND_INTERNAL_HOST}:8080 fail_timeout=0;
+    server ${FRONTEND_HOST}:8080 fail_timeout=0;
 }
 
 server {

docker/livekit/Dockerfile

@@ -1,4 +1,4 @@
-FROM livekit/livekit-server:v1.9.4
+FROM livekit/livekit-server:v1.9.0
 
 # We inject the nip.io certificate manually because the livekit chart doesn't support volume mounting
 COPY rootCA.pem /etc/ssl/certs/

docker/livekit/config/livekit-server.yaml

@@ -3,8 +3,3 @@ redis:
   address: redis:6379
 keys:
   devkey: secret
-
-webhook:
-  api_key: devkey
-  urls:
-      - http://app-dev:8000/api/v1.0/rooms/webhooks-livekit/

docs/examples/compose/compose.yaml

@@ -10,7 +10,7 @@ services:
     - env.d/postgresql
     - env.d/common
     volumes:
-    - ./data/databases/backend:/var/lib/postgresql/data
+    - ./data/databases/backend:/var/lib/postgresql/data/pgdata
 
   redis:
     image: redis:5
@@ -20,8 +20,8 @@ services:
     user: ${DOCKER_USER:-1000}
     restart: always
     env_file:
-    - .env
     - env.d/common
+    - env.d/backend
     - env.d/postgresql
     healthcheck:
       test: ["CMD", "python", "manage.py", "check"]
@@ -45,7 +45,6 @@ services:
     - /docker-entrypoint.sh
     command: ["nginx", "-g", "daemon off;"]
     env_file:
-    - .env
     - env.d/common
     # Uncomment and set your values if using our nginx proxy example
     # environment:

docs/examples/compose/keycloak/README.md

@@ -8,7 +8,7 @@
 ### Step 1: Prepare your working environment:
 
 ```bash
-mkdir -p keycloak/env.d && cd keycloak
+mkdir keycloak/env.d && cd keycloak
 curl -o compose.yaml https://raw.githubusercontent.com/suitenumerique/meet/refs/heads/main/docs/examples/compose/keycloak/compose.yaml
 curl -o env.d/kc_postgresql https://raw.githubusercontent.com/suitenumerique/meet/refs/heads/main/env.d/production.dist/kc_postgresql
 curl -o env.d/keycloak https://raw.githubusercontent.com/suitenumerique/meet/refs/heads/main/env.d/production.dist/keycloak
@@ -89,4 +89,4 @@ Your keycloak instance is now available on https://doc.yourdomain.tld
 #### Step 3: Get Client Credentials
 
 1. Go to the "Credentials" tab.
-2. Copy the client ID (`meet` in this example) and the client secret.
+2. Copy the client ID (`meet` in this example) and the client secret.

docs/installation/README.md

@@ -9,10 +9,6 @@ La Suite Meet maintainers use only the Kubernetes deployment method in productio
 We understand that not everyone has a Kubernetes cluster available, please follow the instructions provided [here](/docs/installation/compose.md) to set up a docker compose instance.
 We also provide [Docker images](https://hub.docker.com/u/lasuite?page=1&search=meet) that can be deployed using Compose.
 
-## Scalingo
-
-La Suite Meet can be deployed on Scalingo PaaS using the Suite Numérique buildpack. See the [Scalingo deployment guide](./scalingo.md) for detailed instructions.
-
 ## Other ways to install La Suite Meet
 Community members have contributed alternative ways to install La Suite Meet 🙏. While maintainers may not provide direct support, we help keep these instructions up to date, and you can reach out to contributors or the community for assistance.
 

docs/installation/compose.md

@@ -1,6 +1,6 @@
 # Installation with docker compose
 
-We provide a sample configuration for running Meet using Docker Compose. Please note that this configuration is experimental, and the official way to deploy Meet in production is to use [k8s](../installation/kubernetes.md).
+We provide a sample configuration for running Meet using Docker Compose. Please note that this configuration is experimental, and the official way to deploy Meet in production is to use [k8s](../installation/k8s.md)
 
 ## Requirements
 
@@ -47,7 +47,7 @@ curl -o default.conf.template https://raw.githubusercontent.com/suitenumerique/m
 
 ## Step 2: Configuration
 
-Meet configuration is achieved through environment variables. We provide a [detailed description of all variables](../../src/helm/meet/README.md).
+Meet configuration is achieved through environment variables. We provide a [detailed description of all variables](../env.md).
 
 In this example, we assume the following services:
 
@@ -129,7 +129,7 @@ The following ports will need to be opened:
 - 7881/tcp - WebRTC ICE over TCP
 - 7882/udp - for WebRTC multiplexing over UDP
 
-If you are using ufw, enter the following:
+If you are using ufw, enter the follwoing:
 ```
 ufw allow 80/tcp
 ufw allow 443/tcp
@@ -177,15 +177,6 @@ You will need to uncomment the environment and network sections in compose file
 #    external: true
 ```
 
-#### Caddy Reverse Proxy
-Expose the Frontend port to the host
-```yaml
-frontend:
-  …
-  ports:
-    - "8086:8086"
-```
-
 ## Step 5: Start Meet
 
 You are ready to start your Meet application !
@@ -207,7 +198,7 @@ Replace `<admin email>` with the email of your admin user and generate a secure
 
 Your Meet instance is now available on the domain you defined, https://meet.yourdomain.tld.
 
-The admin interface is available on https://meet.yourdomain.tld/admin with the admin user you just created.
+THe admin interface is available on https://meet.yourdomain.tld/admin with the admin user you just created.
 
 ## How to upgrade your Meet application
 

docs/installation/scalingo.md

@@ -1,185 +0,0 @@
-# Deployment on Scalingo
-
-This guide explains how to deploy La Suite Meet on [Scalingo](https://scalingo.com/) using the [Suite Numérique buildpack](https://github.com/suitenumerique/buildpack).
-
-## Overview
-
-Scalingo is a Platform-as-a-Service (PaaS) that simplifies application deployment. This setup uses a custom buildpack to handle both the frontend (Vite) and backend (Django) builds, serving them through Nginx.
-
-## Prerequisites
-
-- A Scalingo account
-- Scalingo CLI installed (optional but recommended)
-- A PostgreSQL database addon
-- A Redis addon (for caching and sessions)
-
-## Step 1: Create Your App
-
-Create a new app on Scalingo using `scalingo` cli or using the [Scalingo dashboard](https://dashboard.scalingo.com/).
-
-## Step 2: Provision Addons
-
-Add the required PostgreSQL and Redis services.
-
-This will set the following environment variables automatically:
-- `SCALINGO_POSTGRESQL_URL` - Database connection string
-- `SCALINGO_REDIS_URL` - Redis connection string
-
-## Step 3: Configure Environment Variables
-
-Set the following environment variables in your Scalingo app:
-
-### Buildpack Configuration
-
-```bash
-scalingo env-set BUILDPACK_URL="https://github.com/suitenumerique/buildpack#main"
-scalingo env-set LASUITE_APP_NAME="meet"
-scalingo env-set LASUITE_BACKEND_DIR="."
-scalingo env-set LASUITE_FRONTEND_DIR="src/frontend/"
-scalingo env-set LASUITE_NGINX_DIR="."
-scalingo env-set LASUITE_SCRIPT_POSTCOMPILE="bin/buildpack_postcompile.sh"
-scalingo env-set LASUITE_SCRIPT_POSTFRONTEND="bin/buildpack_postfrontend.sh"
-```
-
-### Database and Cache
-
-```bash
-scalingo env-set DATABASE_URL="\$SCALINGO_POSTGRESQL_URL"
-scalingo env-set REDIS_URL="\$SCALINGO_REDIS_URL"
-```
-
-### Django Settings
-
-```bash
-scalingo env-set DJANGO_SETTINGS_MODULE="meet.settings"
-scalingo env-set DJANGO_CONFIGURATION="Production"
-scalingo env-set DJANGO_SECRET_KEY="<generate-a-secure-secret-key>"
-scalingo env-set DJANGO_ALLOWED_HOSTS="my-meet-app.osc-fr1.scalingo.io"
-```
-
-### OIDC Authentication
-
-Configure your OIDC provider (e.g., Keycloak, Authentik):
-
-```bash
-scalingo env-set OIDC_OP_BASE_URL="https://auth.yourdomain.com/realms/meet"
-scalingo env-set OIDC_RP_CLIENT_ID="meet-client-id"
-scalingo env-set OIDC_RP_CLIENT_SECRET="<your-client-secret>"
-scalingo env-set OIDC_RP_SIGN_ALGO="RS256"
-```
-
-### LiveKit Configuration
-
-Meet requires a LiveKit server for video conferencing:
-
-```bash
-scalingo env-set LIVEKIT_API_URL="wss://livekit.yourdomain.com"
-scalingo env-set LIVEKIT_API_KEY="<your-livekit-api-key>"
-scalingo env-set LIVEKIT_API_SECRET="<your-livekit-api-secret>"
-```
-
-### Email Configuration (Optional)
-
-For email notifications see https://doc.scalingo.com/platform/app/sending-emails:
-
-```bash
-scalingo env-set DJANGO_EMAIL_HOST="smtp.example.org"
-scalingo env-set DJANGO_EMAIL_PORT="587"
-scalingo env-set DJANGO_EMAIL_HOST_USER="<smtp-user>"
-scalingo env-set DJANGO_EMAIL_HOST_PASSWORD="<smtp-password>"
-scalingo env-set DJANGO_EMAIL_USE_TLS="True"
-scalingo env-set DJANGO_EMAIL_FROM="meet@yourdomain.com"
-```
-
-## Step 4: Deploy
-
-Deploy your application:
-
-```bash
-git push scalingo main
-```
-
-The Procfile will automatically:
-1. Build the frontend (Vite)
-2. Build the backend (Django)
-3. Run the post-compile script (cleanup)
-4. Run the post-frontend script (move assets and prepare for deployment)
-5. Start Nginx and Gunicorn
-6. Run django migrations
-
-## Step 5: Create superuser
-
-After the first deployment, create an admin user:
-
-```bash
-scalingo run python manage.py createsuperuser
-```
-
-## Custom Domain (Optional)
-
-To use a custom domain:
-
-1. Add the domain in Scalingo dashboard
-2. Update `DJANGO_ALLOWED_HOSTS` with your custom domain
-3. Configure your DNS to point to Scalingo
-
-```bash
-scalingo domains-add meet.yourdomain.com
-scalingo env-set DJANGO_ALLOWED_HOSTS="meet.yourdomain.com,my-meet-app.osc-fr1.scalingo.io"
-```
-
-## Custom Logo (Optional)
-
-To use a custom logo, set the `CUSTOM_LOGO_URL` environment variable with an HTTPS URL pointing to an SVG item (max 5MB):
-
-```bash
-scalingo env-set CUSTOM_LOGO_URL="https://cdn.yourdomain.com/logo.svg"
-```
-
-## Troubleshooting
-
-### Check Logs
-
-```bash
-scalingo logs --tail
-```
-
-### Common Issues
-
-1. **Build fails**: Check that all required environment variables are set
-2. **Database connection error**: Verify `DATABASE_URL` is correctly set to `$SCALINGO_POSTGRESQL_URL`
-3. **Static files not served**: Ensure the buildpack post-frontend script ran successfully
-4. **OIDC errors**: Verify your OIDC provider configuration and callback URLs
-
-### Useful Commands
-
-```bash
-# Open a console
-scalingo run bash
-
-# Restart the app
-scalingo restart
-
-# Scale containers
-scalingo scale web:2
-
-# One-off command
-scalingo run python manage.py shell
-```
-
-## Architecture
-
-On Scalingo, the application runs as follows:
-
-1. **Build Phase**: The buildpack compiles both frontend and backend
-2. **Runtime**:
-   - Nginx serves static files and proxies to the backend
-   - Gunicorn runs the Django WSGI application
-   - Both processes are managed by the `bin/buildpack_start.sh` script
-
-## Additional Resources
-
-- [Scalingo Documentation](https://doc.scalingo.com/)
-- [Suite Numérique Buildpack](https://github.com/suitenumerique/buildpack)
-- [Meet Environment Variables](../../src/helm/meet/README.md)
-- [Django Configurations Documentation](https://django-configurations.readthedocs.io/)

env.d/production.dist/common

@@ -20,7 +20,7 @@ DJANGO_EMAIL_FROM=<your email address>
 #DJANGO_EMAIL_USE_SSL=true # A flag to enable or disable SSL for email sending.
 
 DJANGO_EMAIL_BRAND_NAME="La Suite Numérique" 
-DJANGO_EMAIL_LOGO_IMG="https://${MEET_HOST}/assets/logo-suite-numerique.png"
+DJANGO_EMAIL_LOGO_IMG="https://${meet_HOST}/assets/logo-suite-numerique.png"
 
 # Backend url
 MEET_BASE_URL="https://${MEET_HOST}"

renovate.json

@@ -3,21 +3,6 @@
   "dependencyDashboard": true,
   "labels": ["dependencies", "noChangeLog"],
   "packageRules": [
-    {
-        "groupName": "js dependencies",
-        "matchManagers": ["npm"],
-        "schedule": ["on the first day of the month"],
-        "matchPackagePatterns": ["*"],
-        "minimumReleaseAge": "7 days",
-        "internalChecksFilter": "strict"
-      },
-      {
-        "groupName": "python dependencies",
-        "matchManagers": ["setup-cfg", "pep621"],
-        "schedule": ["on the first day of the month"],
-        "matchPackagePatterns": ["*"],
-        "minimumReleaseAge": "7 days"
-      },
     {
       "enabled": false,
       "groupName": "ignored python dependencies",
@@ -30,12 +15,6 @@
       "matchPackageNames": ["pylint"],
       "allowedVersions": "<4.0.0"
     },
-    {
-        "groupName": "allowed django versions",
-        "matchManagers": ["pep621"],
-        "matchPackageNames": ["django"],
-        "allowedVersions": "<6.0.0"
-    },
     {
       "enabled": false,
       "groupName": "ignored js dependencies",

src/agents/Dockerfile

@@ -4,8 +4,6 @@ FROM python:3.13-slim AS base
 RUN apt-get update && apt-get install -y \
     libglib2.0-0 \
     libgobject-2.0-0 \
-    "openssl=3.5.4-1~deb13u2" \
-    "libssl3t64=3.5.4-1~deb13u2" \
     && rm -rf /var/lib/apt/lists/*
 
 FROM base AS builder
@@ -21,9 +19,6 @@ FROM base AS production
 
 WORKDIR /app
 
-# Remove pip to reduce attack surface in production
-RUN pip uninstall -y pip
-
 ARG DOCKER_USER
 USER ${DOCKER_USER}
 

src/agents/multi-user-transcriber.py

@@ -31,7 +31,6 @@ logger = logging.getLogger("transcriber")
 
 TRANSCRIBER_AGENT_NAME = os.getenv("TRANSCRIBER_AGENT_NAME", "multi-user-transcriber")
 STT_PROVIDER = os.getenv("STT_PROVIDER", "deepgram")
-ENABLE_SILERO_VAD = os.getenv("ENABLE_SILERO_VAD", "true").lower() == "true"
 
 
 def create_stt_provider():
@@ -123,8 +122,9 @@ class MultiUserTranscriber:
         if participant.identity in self._sessions:
             return self._sessions[participant.identity]
 
-        vad = self.ctx.proc.userdata.get("vad", None)
-        session = AgentSession(vad=vad)
+        session = AgentSession(
+            vad=self.ctx.proc.userdata["vad"],
+        )
         room_io = RoomIO(
             agent_session=session,
             room=self.ctx.room,
@@ -193,8 +193,7 @@ async def handle_transcriber_job_request(job_req: JobRequest) -> None:
 
 def prewarm(proc: JobProcess):
     """Preload voice activity detection model."""
-    if ENABLE_SILERO_VAD:
-        proc.userdata["vad"] = silero.VAD.load()
+    proc.userdata["vad"] = silero.VAD.load()
 
 
 if __name__ == "__main__":

src/agents/pyproject.toml

@@ -1,15 +1,14 @@
 
 [project]
 name = "agents"
-version = "1.8.0"
+version = "1.2.0"
 requires-python = ">=3.12"
 dependencies = [
     "livekit-agents==1.3.10",
     "livekit-plugins-deepgram==1.3.10",
     "livekit-plugins-silero==1.3.10",
     "livekit-plugins-kyutai-lasuite==0.0.6",
-    "python-dotenv==1.2.1",
-    "protobuf==6.33.5"
+    "python-dotenv==1.2.1"
 ]
 
 [project.optional-dependencies]

src/backend/core/admin.py

@@ -115,10 +115,6 @@ class RoomAdmin(admin.ModelAdmin):
     list_filter = ["access_level", "created_at"]
     readonly_fields = ["id", "created_at", "updated_at"]
 
-    def get_queryset(self, request):
-        """Optimize queries by prefetching related access and user data to avoid N+1 queries."""
-        return super().get_queryset(request).prefetch_related("accesses__user")
-
     def get_owner(self, obj):
         """Return the owner of the room for display in the admin list."""
 
@@ -142,7 +138,6 @@ class RecordingAccessInline(admin.TabularInline):
 
     model = models.RecordingAccess
     extra = 0
-    autocomplete_fields = ["user"]
 
 
 @admin.action(description=_("Resend notification to external service"))
@@ -212,18 +207,8 @@ class RecordingAdmin(admin.ModelAdmin):
         "created_at",
         "worker_id",
     )
-    list_filter = ["created_at"]
-    list_select_related = ("room",)
-    readonly_fields = (
-        "id",
-        "created_at",
-        "options",
-        "mode",
-        "room",
-        "status",
-        "updated_at",
-        "worker_id",
-    )
+    list_filter = ["status", "room", "created_at"]
+    readonly_fields = ["id", "created_at", "updated_at"]
     actions = [resend_notification]
 
     def get_queryset(self, request):

src/backend/core/api/throttling.py

@@ -1,26 +0,0 @@
-"""Throttling modules for the API."""
-
-from lasuite.drf.throttling import MonitoredThrottleMixin
-from rest_framework.throttling import AnonRateThrottle
-from sentry_sdk import capture_message
-
-
-def sentry_monitoring_throttle_failure(message):
-    """Log when a failure occurs to detect rate limiting issues."""
-    capture_message(message, "warning")
-
-
-class MonitoredAnonRateThrottle(MonitoredThrottleMixin, AnonRateThrottle):
-    """Throttle for the monitored scoped rate throttle."""
-
-
-class RequestEntryAnonRateThrottle(MonitoredAnonRateThrottle):
-    """Throttle Anonymous user requesting room entry"""
-
-    scope = "request_entry"
-
-
-class CreationCallbackAnonRateThrottle(MonitoredAnonRateThrottle):
-    """Throttle Anonymous user requesting room generation callback"""
-
-    scope = "creation_callback"

src/backend/core/api/viewsets.py

@@ -10,7 +10,7 @@ from django.http import Http404
 from django.shortcuts import get_object_or_404
 from django.utils.text import slugify
 
-from rest_framework import decorators, mixins, pagination, viewsets
+from rest_framework import decorators, mixins, pagination, throttling, viewsets
 from rest_framework import (
     exceptions as drf_exceptions,
 )
@@ -58,7 +58,7 @@ from core.services.room_creation import RoomCreation
 from core.services.subtitle import SubtitleException, SubtitleService
 
 from ..authentication.livekit import LiveKitTokenAuthentication
-from . import permissions, serializers, throttling
+from . import permissions, serializers
 from .feature_flag import FeatureFlag
 
 # pylint: disable=too-many-ancestors
@@ -191,6 +191,18 @@ class UserViewSet(
         )
 
 
+class RequestEntryAnonRateThrottle(throttling.AnonRateThrottle):
+    """Throttle Anonymous user requesting room entry"""
+
+    scope = "request_entry"
+
+
+class CreationCallbackAnonRateThrottle(throttling.AnonRateThrottle):
+    """Throttle Anonymous user requesting room generation callback"""
+
+    scope = "creation_callback"
+
+
 class RoomViewSet(
     mixins.CreateModelMixin,
     mixins.DestroyModelMixin,
@@ -367,7 +379,7 @@ class RoomViewSet(
         methods=["post"],
         url_path="request-entry",
         permission_classes=[],
-        throttle_classes=[throttling.RequestEntryAnonRateThrottle],
+        throttle_classes=[RequestEntryAnonRateThrottle],
     )
     def request_entry(self, request, pk=None):  # pylint: disable=unused-argument
         """Request entry to a room"""
@@ -477,7 +489,7 @@ class RoomViewSet(
         methods=["post"],
         url_path="creation-callback",
         permission_classes=[],
-        throttle_classes=[throttling.CreationCallbackAnonRateThrottle],
+        throttle_classes=[CreationCallbackAnonRateThrottle],
     )
     def creation_callback(self, request):
         """Retrieve cached room data via an unauthenticated request with a unique ID.

src/backend/core/external_api/authentication.py

@@ -1,51 +1,25 @@
 """Authentication Backends for external application to the Meet core app."""
 
-# pylint: disable=R0913,R0917
-# ruff: noqa: PLR0913
-
 import logging
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.exceptions import SuspiciousOperation
 
+import jwt as pyJwt
 from lasuite.oidc_resource_server.backend import ResourceServerBackend as LaSuiteBackend
 from rest_framework import authentication, exceptions
 
-from core.models import Application
-from core.services import jwt_token
-
 User = get_user_model()
 logger = logging.getLogger(__name__)
 
 
-class BaseJWTAuthentication(authentication.BaseAuthentication):
-    """Base JWT authentication class."""
+class ApplicationJWTAuthentication(authentication.BaseAuthentication):
+    """JWT authentication for application-delegated API access.
 
-    def __init__(
-        self, secret_key, algorithm, issuer, audience, expiration_seconds, token_type
-    ):
-        """Initialize the JWT authentication backend with the given token service configuration.
-
-        Args:
-            secret_key: Secret key for JWT encoding/decoding
-            algorithm: JWT algorithm (e.g. HS256)
-            issuer: Expected token issuer identifier
-            audience: Expected token audience identifier
-            expiration_seconds: Token expiration time in seconds
-            token_type: Token type (e.g. Bearer)
-        """
-
-        super().__init__()
-
-        self._token_service = jwt_token.JwtTokenService(
-            secret_key=secret_key,
-            algorithm=algorithm,
-            issuer=issuer,
-            audience=audience,
-            expiration_seconds=expiration_seconds,
-            token_type=token_type,
-        )
+    Validates JWT tokens issued to applications that are acting on behalf
+    of users. Tokens must include user_id, client_id, and delegation flag.
+    """
 
     def authenticate(self, request):
         """Extract and validate JWT from Authorization header.
@@ -72,78 +46,6 @@ class BaseJWTAuthentication(authentication.BaseAuthentication):
 
         return self.authenticate_credentials(token)
 
-    def decode_jwt(self, token):
-        """Decode and validate JWT token.
-
-        Args:
-            token: JWT token string
-
-        Returns:
-            Decoded payload dict, or None if token is invalid
-
-        Raises:
-            AuthenticationFailed: If token is expired or has invalid issuer/audience
-        """
-
-        try:
-            payload = self._token_service.decode_jwt(token)
-            return payload
-        except jwt_token.TokenExpiredError as e:
-            logger.warning("Token expired")
-            raise exceptions.AuthenticationFailed("Token expired.") from e
-        except jwt_token.TokenInvalidError as e:
-            logger.warning("Invalid JWT issuer or audience: %s", e)
-            raise exceptions.AuthenticationFailed("Invalid token.") from e
-        except jwt_token.TokenDecodeError:
-            # Invalid JWT token - defer to next authentication backend
-            return None
-
-    def validate_payload(self, payload):
-        """Validate JWT payload claims.
-
-        Override in subclasses to add custom validation.
-
-        Args:
-            payload: Decoded JWT payload
-
-        Raises:
-            AuthenticationFailed: If required claims are missing or invalid
-        """
-
-    def get_user(self, payload):
-        """Retrieve and validate user from payload.
-
-        Args:
-            payload: Decoded JWT payload
-
-        Returns:
-            User instance
-
-        Raises:
-            AuthenticationFailed: If user not found or inactive
-        """
-        user_id = payload.get("user_id")
-
-        if not user_id:
-            logger.warning("Missing 'user_id' in JWT payload")
-            raise exceptions.AuthenticationFailed("Invalid token claims.")
-
-        try:
-            user = User.objects.get(id=user_id)
-        except User.DoesNotExist as e:
-            logger.warning("User not found: %s", user_id)
-            raise exceptions.AuthenticationFailed("User not found.") from e
-
-        if not user.is_active:
-            logger.warning("Inactive user attempted authentication: %s", user_id)
-            raise exceptions.AuthenticationFailed("User account is disabled.")
-
-        return user
-
-    def authenticate_header(self, request):
-        """Return authentication scheme for WWW-Authenticate header."""
-        return "Bearer"
-
     def authenticate_credentials(self, token):
         """Validate JWT token and return authenticated user.
 
@@ -158,61 +60,60 @@ class BaseJWTAuthentication(authentication.BaseAuthentication):
         Raises:
             AuthenticationFailed: If token is expired, or user not found
         """
-
-        payload = self.decode_jwt(token)
-
-        if payload is None:
+        # Decode and validate JWT
+        try:
+            payload = pyJwt.decode(
+                token,
+                settings.APPLICATION_JWT_SECRET_KEY,
+                algorithms=[settings.APPLICATION_JWT_ALG],
+                issuer=settings.APPLICATION_JWT_ISSUER,
+                audience=settings.APPLICATION_JWT_AUDIENCE,
+            )
+        except pyJwt.ExpiredSignatureError as e:
+            logger.warning("Token expired")
+            raise exceptions.AuthenticationFailed("Token expired.") from e
+        except pyJwt.InvalidIssuerError as e:
+            logger.warning("Invalid JWT issuer: %s", e)
+            raise exceptions.AuthenticationFailed("Invalid token.") from e
+        except pyJwt.InvalidAudienceError as e:
+            logger.warning("Invalid JWT audience: %s", e)
+            raise exceptions.AuthenticationFailed("Invalid token.") from e
+        except pyJwt.InvalidTokenError:
+            # Invalid JWT token - defer to next authentication backend
             return None
 
-        self.validate_payload(payload)
-        user = self.get_user(payload)
-
-        return (user, payload)
-
-
-class ApplicationJWTAuthentication(BaseJWTAuthentication):
-    """JWT authentication for application-delegated API access.
-
-    Validates JWT tokens issued to applications that are acting on behalf
-    of users. Tokens must include user_id, client_id, and delegation flag.
-    """
-
-    def __init__(self):
-        """Initialize authentication backend with application JWT settings from Django settings."""
-        super().__init__(
-            secret_key=settings.APPLICATION_JWT_SECRET_KEY,
-            algorithm=settings.APPLICATION_JWT_ALG,
-            issuer=settings.APPLICATION_JWT_ISSUER,
-            audience=settings.APPLICATION_JWT_AUDIENCE,
-            expiration_seconds=settings.APPLICATION_JWT_EXPIRATION_SECONDS,
-            token_type=settings.APPLICATION_JWT_TOKEN_TYPE,
-        )
-
-    def validate_payload(self, payload):
-        """Validate application-specific claims."""
+        user_id = payload.get("user_id")
         client_id = payload.get("client_id")
         is_delegated = payload.get("delegated", False)
 
+        if not user_id:
+            logger.warning("Missing 'user_id' in JWT payload")
+            raise exceptions.AuthenticationFailed("Invalid token claims.")
+
         if not client_id:
             logger.warning("Missing 'client_id' in JWT payload")
             raise exceptions.AuthenticationFailed("Invalid token claims.")
 
-        try:
-            application = Application.objects.get(client_id=client_id)
-        except Application.DoesNotExist as e:
-            logger.warning("Application not found: %s", client_id)
-            raise exceptions.AuthenticationFailed("Application not found.") from e
-
-        if not application.active:
-            logger.warning(
-                "Inactive application attempted authentication: %s", client_id
-            )
-            raise exceptions.AuthenticationFailed("Application is disabled.")
-
         if not is_delegated:
             logger.warning("Token is not marked as delegated")
             raise exceptions.AuthenticationFailed("Invalid token type.")
 
+        try:
+            user = User.objects.get(id=user_id)
+        except User.DoesNotExist as e:
+            logger.warning("User not found: %s", user_id)
+            raise exceptions.AuthenticationFailed("User not found.") from e
+
+        if not user.is_active:
+            logger.warning("Inactive user attempted authentication: %s", user_id)
+            raise exceptions.AuthenticationFailed("User account is disabled.")
+
+        return (user, payload)
+
+    def authenticate_header(self, request):
+        """Return authentication scheme for WWW-Authenticate header."""
+        return "Bearer"
+
 
 class ResourceServerBackend(LaSuiteBackend):
     """OIDC Resource Server backend for user creation and retrieval."""

src/backend/core/external_api/permissions.py

@@ -33,11 +33,12 @@ class BaseScopePermission(permissions.BasePermission):
         Raises:
             PermissionDenied: If required scope is missing from token
         """
-        # Get the current action (e.g., 'list', 'create'), if None let DRF handle it
+        # Get the current action (e.g., 'list', 'create')
         action = getattr(view, "action", None)
         if not action:
-            # DRF routers return a 405 for unsupported methods
-            return True
+            raise exceptions.PermissionDenied(
+                "Insufficient permissions. Unknown action."
+            )
 
         required_scope = self.scope_map.get(action)
         if not required_scope:
@@ -56,12 +57,9 @@ class BaseScopePermission(permissions.BasePermission):
         if isinstance(token_scopes, str):
             token_scopes = token_scopes.split()
 
-        # Ensure scopes is a deduplicated list (preserving order) and lowercase all scopes
-        token_scopes = list(dict.fromkeys(scope.lower() for scope in token_scopes))
-
         if settings.OIDC_RS_SCOPES_PREFIX:
             token_scopes = [
-                scope.removeprefix(f"{settings.OIDC_RS_SCOPES_PREFIX}:")
+                scope.replace(f"{settings.OIDC_RS_SCOPES_PREFIX}:", "")
                 for scope in token_scopes
             ]
 
@@ -84,23 +82,3 @@ class HasRequiredRoomScope(BaseScopePermission):
         "partial_update": models.ApplicationScope.ROOMS_UPDATE,
         "destroy": models.ApplicationScope.ROOMS_DELETE,
     }
-
-
-class RoomPermissions(permissions.BasePermission):
-    """Permissions applying to the room API endpoint."""
-
-    def has_permission(self, request, view):
-        """Allow access only to authenticated users."""
-        return request.user.is_authenticated
-
-    def has_object_permission(self, request, view, obj):
-        """Enforce role-based access: read=any role, delete=owner, write=admin or owner."""
-        user = request.user
-
-        if request.method in permissions.SAFE_METHODS:
-            return obj.has_any_role(user)
-
-        if request.method == "DELETE":
-            return obj.is_owner(user)
-
-        return obj.is_administrator_or_owner(user)

src/backend/core/external_api/viewsets.py

@@ -1,12 +1,14 @@
 """External API endpoints"""
 
+from datetime import datetime, timedelta, timezone
 from logging import getLogger
 
 from django.conf import settings
 from django.contrib.auth.hashers import check_password
-from django.core.exceptions import SuspiciousOperation, ValidationError
+from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
 
+import jwt
 from lasuite.oidc_resource_server.authentication import ResourceServerAuthentication
 from rest_framework import decorators, mixins, viewsets
 from rest_framework import (
@@ -20,14 +22,13 @@ from rest_framework import (
 )
 
 from core import api, models
-from core.services.jwt_token import JwtTokenService
 
 from . import authentication, permissions, serializers
 
 logger = getLogger(__name__)
 
 
-class ApplicationViewSet(viewsets.ViewSet):
+class ApplicationViewSet(viewsets.GenericViewSet):
     """API endpoints for application authentication and token generation."""
 
     @decorators.action(
@@ -92,7 +93,7 @@ class ApplicationViewSet(viewsets.ViewSet):
             )
 
         try:
-            user = models.User.objects.get(email__iexact=email)
+            user = models.User.objects.get(email=email)
         except models.User.DoesNotExist as e:
             if (
                 settings.APPLICATION_ALLOW_USER_CREATION
@@ -122,33 +123,34 @@ class ApplicationViewSet(viewsets.ViewSet):
                 )
             else:
                 raise drf_exceptions.NotFound("User not found.") from e
-        except models.User.MultipleObjectsReturned as e:
-            raise SuspiciousOperation(
-                "Multiple user accounts share a common email."
-            ) from e
 
+        now = datetime.now(timezone.utc)
         scope = " ".join(application.scopes or [])
 
-        token_service = JwtTokenService(
-            secret_key=settings.APPLICATION_JWT_SECRET_KEY,
-            algorithm=settings.APPLICATION_JWT_ALG,
-            issuer=settings.APPLICATION_JWT_ISSUER,
-            audience=settings.APPLICATION_JWT_AUDIENCE,
-            expiration_seconds=settings.APPLICATION_JWT_EXPIRATION_SECONDS,
-            token_type=settings.APPLICATION_JWT_TOKEN_TYPE,
-        )
+        payload = {
+            "iss": settings.APPLICATION_JWT_ISSUER,
+            "aud": settings.APPLICATION_JWT_AUDIENCE,
+            "iat": now,
+            "exp": now + timedelta(seconds=settings.APPLICATION_JWT_EXPIRATION_SECONDS),
+            "client_id": client_id,
+            "scope": scope,
+            "user_id": str(user.id),
+            "delegated": True,
+        }
 
-        data = token_service.generate_jwt(
-            user,
-            scope,
-            {
-                "client_id": client_id,
-                "delegated": True,
-            },
+        token = jwt.encode(
+            payload,
+            settings.APPLICATION_JWT_SECRET_KEY,
+            algorithm=settings.APPLICATION_JWT_ALG,
         )
 
         return drf_response.Response(
-            data,
+            {
+                "access_token": token,
+                "token_type": settings.APPLICATION_JWT_TOKEN_TYPE,
+                "expires_in": settings.APPLICATION_JWT_EXPIRATION_SECONDS,
+                "scope": scope,
+            },
             status=drf_status.HTTP_200_OK,
         )
 
@@ -176,9 +178,7 @@ class RoomViewSet(
         ResourceServerAuthentication,
     ]
     permission_classes = [
-        api.permissions.IsAuthenticated
-        & permissions.HasRequiredRoomScope
-        & permissions.RoomPermissions
+        api.permissions.IsAuthenticated & permissions.HasRequiredRoomScope
     ]
     queryset = models.Room.objects.all()
     serializer_class = serializers.RoomSerializer

src/backend/core/models.py

@@ -292,10 +292,6 @@ class Resource(BaseModel):
                 role = RoleChoices.MEMBER
         return role
 
-    def has_any_role(self, user):
-        """Check if a user has any role on the resource."""
-        return self.get_role(user) is not None
-
     def is_administrator_or_owner(self, user):
         """
         Check if a user is administrator or owner of the resource."""

src/backend/core/services/jwt_token.py

@@ -1,153 +0,0 @@
-"""JWT token service."""
-
-# pylint: disable=R0913,R0917
-# ruff: noqa: PLR0913
-
-from datetime import datetime, timedelta, timezone
-from typing import Optional
-
-from django.core.exceptions import ImproperlyConfigured
-
-import jwt
-
-
-class JWTError(Exception):
-    """Base exception for all JWT token errors."""
-
-
-class TokenExpiredError(JWTError):
-    """Raised when the JWT token has expired."""
-
-
-class TokenInvalidError(JWTError):
-    """Raised when the JWT token has an invalid issuer or audience."""
-
-
-class TokenDecodeError(JWTError):
-    """Raised for any other unrecoverable JWT decode failure."""
-
-
-class JwtTokenService:
-    """Generic JWT token service with configurable settings."""
-
-    def __init__(
-        self,
-        secret_key: str,
-        algorithm: str,
-        issuer: str,
-        audience: str,
-        expiration_seconds: int,
-        token_type: str,
-    ):
-        """
-        Initialize the token service with custom settings.
-
-        Args:
-            secret_key: Secret key for JWT encoding/decoding
-            algorithm: JWT algorithm
-            issuer: Token issuer identifier
-            audience: Token audience identifier
-            expiration_seconds: Token expiration time in seconds
-            token_type: Token type
-
-        Raises:
-            ImproperlyConfigured: If secret_key is None or empty
-        """
-        if not secret_key:
-            raise ImproperlyConfigured("Secret key is required.")
-        if not algorithm:
-            raise ImproperlyConfigured("Algorithm is required.")
-        if not token_type:
-            raise ImproperlyConfigured("Token's type is required.")
-        if expiration_seconds is None:
-            raise ImproperlyConfigured("Expiration's seconds is required.")
-
-        self._key = secret_key
-        self._algorithm = algorithm
-        self._issuer = issuer
-        self._audience = audience
-        self._expiration_seconds = expiration_seconds
-        self._token_type = token_type
-
-    def generate_jwt(
-        self, user, scope: str, extra_payload: Optional[dict] = None
-    ) -> dict:
-        """
-        Generate an access token for the given user.
-
-        Note: any extra_payload variables named iat, exp, or user_id will
-        be overwritten by this service
-
-        Args:
-            user: User instance for whom to generate the token
-            scope: Space-separated scope string
-
-        Returns:
-            Dictionary containing access_token, token_type, expires_in, and scope optionally
-        """
-        now = datetime.now(timezone.utc)
-
-        payload = extra_payload.copy() if extra_payload else {}
-
-        payload.update(
-            {
-                "iat": now,
-                "exp": now + timedelta(seconds=self._expiration_seconds),
-                "user_id": str(user.id),
-            }
-        )
-
-        if self._issuer:
-            payload["iss"] = self._issuer
-        if self._audience:
-            payload["aud"] = self._audience
-        if scope:
-            payload["scope"] = scope
-
-        token = jwt.encode(
-            payload,
-            self._key,
-            algorithm=self._algorithm,
-        )
-
-        response = {
-            "access_token": token,
-            "token_type": self._token_type,
-            "expires_in": self._expiration_seconds,
-        }
-
-        if scope:
-            response["scope"] = scope
-
-        return response
-
-    def decode_jwt(self, token):
-        """Decode and validate JWT token.
-
-        Args:
-            token: JWT token string
-
-        Returns:
-            Decoded payload dict.
-
-        Raises:
-            TokenExpiredError: If the token has expired.
-            TokenInvalidError: If the token has an invalid issuer or audience.
-            TokenDecodeError: If the token is malformed or cannot be decoded.
-        """
-
-        try:
-            payload = jwt.decode(
-                token,
-                self._key,
-                algorithms=[self._algorithm],
-                issuer=self._issuer,
-                audience=self._audience,
-            )
-            return payload
-        except jwt.ExpiredSignatureError as e:
-            raise TokenExpiredError("Token expired.") from e
-        except (jwt.InvalidIssuerError, jwt.InvalidAudienceError) as e:
-            raise TokenInvalidError("Invalid token.") from e
-        except jwt.InvalidTokenError as e:
-            raise TokenDecodeError("Token decode error.") from e

src/backend/core/tests/recording/event/test_notification.py

@@ -102,7 +102,6 @@ def test_notify_user_by_email_success(mocked_current_site, settings):
     settings.EMAIL_SUPPORT_EMAIL = "support@acme.com"
     settings.EMAIL_LOGO_IMG = "https://acme.com/logo"
     settings.SCREEN_RECORDING_BASE_URL = "https://acme.com/recordings"
-    settings.RECORDING_DOWNLOAD_BASE_URL = None
     settings.EMAIL_FROM = "notifications@acme.com"
 
     recording = factories.RecordingFactory(room__name="Conference Room A")

src/backend/core/tests/test_external_api_rooms.py

@@ -2,21 +2,21 @@
 Tests for external API /room endpoint
 """
 
-# pylint: disable=W0621,C0302
+# pylint: disable=W0621
 
-import uuid
 from datetime import datetime, timedelta, timezone
-from unittest import mock
 
 from django.conf import settings
 
 import jwt
 import pytest
 import responses
-from lasuite.oidc_resource_server.authentication import ResourceServerAuthentication
 from rest_framework.test import APIClient
 
-from core.factories import ApplicationFactory, RoomFactory, UserFactory
+from core.factories import (
+    RoomFactory,
+    UserFactory,
+)
 from core.models import ApplicationScope, RoleChoices, Room, RoomAccessLevel, User
 
 pytestmark = pytest.mark.django_db
@@ -27,14 +27,12 @@ def generate_test_token(user, scopes):
     now = datetime.now(timezone.utc)
     scope_string = " ".join(scopes)
 
-    application = ApplicationFactory()
-
     payload = {
         "iss": settings.APPLICATION_JWT_ISSUER,
         "aud": settings.APPLICATION_JWT_AUDIENCE,
         "iat": now,
         "exp": now + timedelta(seconds=settings.APPLICATION_JWT_EXPIRATION_SECONDS),
-        "client_id": str(application.client_id),
+        "client_id": "test-client-id",
         "scope": scope_string,
         "user_id": str(user.id),
         "delegated": True,
@@ -55,25 +53,11 @@ def test_api_rooms_list_requires_authentication():
     assert response.status_code == 401
 
 
-def test_api_rooms_list_inactive_user():
-    """List should return 401 if user is inactive."""
-
-    user1 = UserFactory(is_active=False)
-    RoomFactory(users=[(user1, RoleChoices.OWNER)])
-
-    token = generate_test_token(user1, [ApplicationScope.ROOMS_LIST])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 401
-    assert "user account is disabled" in str(response.data).lower()
-
-
-def test_api_rooms_list_with_valid_token():
+def test_api_rooms_list_with_valid_token(settings):
     """Listing rooms with valid token should succeed."""
 
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
+
     user = UserFactory()
     room = RoomFactory(users=[(user, RoleChoices.OWNER)])
 
@@ -89,25 +73,9 @@ def test_api_rooms_list_with_valid_token():
     assert response.data["results"][0]["id"] == str(room.id)
 
 
-def test_api_rooms_list_with_no_rooms():
-    """Listing rooms with a valid token returns an empty list when there are no rooms."""
-
-    user = UserFactory()
-
-    # Generate valid token
-    token = generate_test_token(user, [ApplicationScope.ROOMS_LIST])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 200
-    assert response.data["count"] == 0
-    assert response.data["results"] == []
-
-
 def test_api_rooms_list_with_expired_token(settings):
     """Listing rooms with expired token should return 401."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
     settings.APPLICATION_JWT_EXPIRATION_SECONDS = 0
 
     user = UserFactory()
@@ -124,8 +92,8 @@ def test_api_rooms_list_with_expired_token(settings):
 
 
 @responses.activate
-def test_api_rooms_list_with_invalid_rs_token(settings):
-    """Listing rooms with invalid resource server token should return 400."""
+def test_api_rooms_list_with_invalid_token(settings):
+    """Listing rooms with invalid token should return 400."""
 
     settings.OIDC_OP_INTROSPECTION_ENDPOINT = "https://oidc.example.com/introspect"
     settings.OIDC_OP_URL = "https://oidc.example.com"
@@ -148,8 +116,9 @@ def test_api_rooms_list_with_invalid_rs_token(settings):
     assert response.status_code == 400
 
 
-def test_api_rooms_list_missing_scope():
+def test_api_rooms_list_missing_scope(settings):
     """Listing rooms without required scope should return 403."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
 
     user = UserFactory()
 
@@ -161,30 +130,12 @@ def test_api_rooms_list_missing_scope():
     response = client.get("/external-api/v1.0/rooms/")
 
     assert response.status_code == 403
-    assert (
-        "insufficient permissions. required scope: rooms:list"
-        in str(response.data).lower()
-    )
+    assert "Insufficient permissions. Required scope: rooms:list" in str(response.data)
 
 
-def test_api_rooms_list_no_scope():
-    """Listing rooms without any scope should return 403."""
-
-    user = UserFactory()
-
-    # Token without scope
-    token = generate_test_token(user, [])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 403
-    assert "insufficient permissions." in str(response.data).lower()
-
-
-def test_api_rooms_list_filters_by_user():
+def test_api_rooms_list_filters_by_user(settings):
     """List should only return rooms accessible to the authenticated user."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
 
     user1 = UserFactory()
     user2 = UserFactory()
@@ -193,9 +144,7 @@ def test_api_rooms_list_filters_by_user():
     room2 = RoomFactory(users=[(user2, RoleChoices.OWNER)])
     room3 = RoomFactory(users=[(user1, RoleChoices.MEMBER)])
 
-    token = generate_test_token(
-        user1, [ApplicationScope.ROOMS_LIST, ApplicationScope.ROOMS_CREATE]
-    )
+    token = generate_test_token(user1, [ApplicationScope.ROOMS_LIST])
 
     client = APIClient()
     client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
@@ -209,82 +158,9 @@ def test_api_rooms_list_filters_by_user():
     assert str(room2.id) not in returned_ids
 
 
-def test_api_rooms_retrieve_requires_authentication():
-    """Retrieving rooms without authentication should return 401."""
-
-    user1 = UserFactory()
-    room1 = RoomFactory(users=[(user1, RoleChoices.OWNER)])
-
-    client = APIClient()
-    response = client.get(f"/external-api/v1.0/rooms/{room1.id}/")
-
-    assert response.status_code == 401
-
-
-def test_api_rooms_retrieve_inactive_user():
-    """Retrieve should return 401 if user is inactive."""
-
-    user1 = UserFactory(is_active=False)
-    room1 = RoomFactory(users=[(user1, RoleChoices.OWNER)])
-
-    token = generate_test_token(user1, [ApplicationScope.ROOMS_LIST])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get(f"/external-api/v1.0/rooms/{room1.id}/")
-
-    assert response.status_code == 401
-    assert "user account is disabled" in str(response.data).lower()
-
-
-def test_api_rooms_retrieve_with_expired_token(settings):
-    """Retrieving rooms with expired token should return 401."""
-    settings.APPLICATION_JWT_EXPIRATION_SECONDS = 0
-
-    user = UserFactory()
-    room = RoomFactory(users=[(user, RoleChoices.OWNER)])
-
-    # Generate expired token
-    token = generate_test_token(user, [ApplicationScope.ROOMS_CREATE])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get(f"/external-api/v1.0/rooms/{room.id}/")
-
-    assert response.status_code == 401
-    assert "expired" in str(response.data).lower()
-
-
-@responses.activate
-def test_api_rooms_retrieve_with_invalid_rs_token(settings):
-    """Retrieving rooms with invalid resource server token should return 400."""
-
-    settings.OIDC_OP_INTROSPECTION_ENDPOINT = "https://oidc.example.com/introspect"
-    settings.OIDC_OP_URL = "https://oidc.example.com"
-
-    responses.add(
-        responses.POST,
-        "https://oidc.example.com/introspect",
-        json={
-            "iss": "https://oidc.example.com",
-            "active": False,
-        },
-    )
-
-    user = UserFactory()
-    room = RoomFactory(users=[(user, RoleChoices.OWNER)])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION="Bearer invalid-token-123")
-    response = client.get(f"/external-api/v1.0/rooms/{room.id}/")
-
-    # Return 400 instead of 401 because ResourceServerAuthentication raises
-    # SuspiciousOperation when the introspected user is not active
-    assert response.status_code == 400
-
-
-def test_api_rooms_retrieve_requires_scope():
+def test_api_rooms_retrieve_requires_scope(settings):
     """Retrieving a room requires ROOMS_RETRIEVE scope."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
 
     user = UserFactory()
     room = RoomFactory(users=[(user, RoleChoices.OWNER)])
@@ -302,25 +178,9 @@ def test_api_rooms_retrieve_requires_scope():
     )
 
 
-def test_api_rooms_retrieve_no_scope():
-    """Retrieving rooms without any scope should return 403."""
-
-    user = UserFactory()
-
-    # Token without scope
-    token = generate_test_token(user, [])
-    room = RoomFactory(users=[(user, RoleChoices.OWNER)])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get(f"/external-api/v1.0/rooms/{room.id}/")
-
-    assert response.status_code == 403
-    assert "insufficient permissions." in str(response.data).lower()
-
-
 def test_api_rooms_retrieve_success(settings):
     """Retrieving a room with correct scope should succeed."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
     settings.APPLICATION_BASE_URL = "http://your-application.com"
     settings.ROOM_TELEPHONY_ENABLED = True
     settings.ROOM_TELEPHONY_PHONE_NUMBER = "+1-555-0100"
@@ -352,128 +212,9 @@ def test_api_rooms_retrieve_success(settings):
     }
 
 
-def test_api_rooms_retrieve_success_by_user():
-    """Retrieve should only return rooms accessible to the authenticated user."""
-
-    user1 = UserFactory()
-    user2 = UserFactory()
-
-    room1 = RoomFactory(users=[(user1, RoleChoices.OWNER)])
-    room2 = RoomFactory(users=[(user2, RoleChoices.OWNER)])
-    room3 = RoomFactory(users=[(user1, RoleChoices.MEMBER)])
-    room4 = RoomFactory(users=[(user1, RoleChoices.ADMIN)])
-
-    token = generate_test_token(
-        user1, [ApplicationScope.ROOMS_RETRIEVE, ApplicationScope.ROOMS_LIST]
-    )
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get(f"/external-api/v1.0/rooms/{room2.id}/")
-
-    assert response.status_code == 403
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get(f"/external-api/v1.0/rooms/{room1.id}/")
-
-    assert response.status_code == 200
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get(f"/external-api/v1.0/rooms/{room3.id}/")
-
-    assert response.status_code == 200
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get(f"/external-api/v1.0/rooms/{room4.id}/")
-
-    assert response.status_code == 200
-
-
-def test_api_rooms_retrieve_not_found():
-    """Retrieving a non-existing room with correct scope should return a 404."""
-
-    user = UserFactory()
-    token = generate_test_token(user, [ApplicationScope.ROOMS_RETRIEVE])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get(f"/external-api/v1.0/rooms/{uuid.uuid4()}/")
-
-    assert response.status_code == 404
-    assert "no room matches the given query." in str(response.data).lower()
-
-
-def test_api_rooms_create_requires_authentication():
-    """Creating rooms without authentication should return 401."""
-
-    client = APIClient()
-    response = client.post("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 401
-
-
-def test_api_rooms_create_with_expired_token(settings):
-    """Creating rooms with expired token should return 401."""
-    settings.APPLICATION_JWT_EXPIRATION_SECONDS = 0
-
-    user = UserFactory()
-
-    # Generate expired token
-    token = generate_test_token(user, [ApplicationScope.ROOMS_CREATE])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.post("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 401
-    assert "expired" in str(response.data).lower()
-
-
-@responses.activate
-def test_api_rooms_create_with_invalid_rs_token(settings):
-    """Creating rooms with invalid resource server token should return 400."""
-
-    settings.OIDC_OP_INTROSPECTION_ENDPOINT = "https://oidc.example.com/introspect"
-    settings.OIDC_OP_URL = "https://oidc.example.com"
-
-    responses.add(
-        responses.POST,
-        "https://oidc.example.com/introspect",
-        json={
-            "iss": "https://oidc.example.com",
-            "active": False,
-        },
-    )
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION="Bearer invalid-token-123")
-    response = client.post("/external-api/v1.0/rooms/")
-
-    # Return 400 instead of 401 because ResourceServerAuthentication raises
-    # SuspiciousOperation when the introspected user is not active
-    assert response.status_code == 400
-
-
-def test_api_rooms_create_inactive_user():
-    """Create should return 401 if user is inactive."""
-
-    user1 = UserFactory(is_active=False)
-
-    token = generate_test_token(user1, [ApplicationScope.ROOMS_CREATE])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.post("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 401
-    assert "user account is disabled" in str(response.data).lower()
-
-
-def test_api_rooms_create_requires_scope():
+def test_api_rooms_create_requires_scope(settings):
     """Creating a room requires ROOMS_CREATE scope."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
     user = UserFactory()
 
     # Token without ROOMS_CREATE scope
@@ -484,36 +225,18 @@ def test_api_rooms_create_requires_scope():
     response = client.post("/external-api/v1.0/rooms/", {}, format="json")
 
     assert response.status_code == 403
-    assert (
-        "insufficient permissions. required scope: rooms:create"
-        in str(response.data).lower()
+    assert "Insufficient permissions. Required scope: rooms:create" in str(
+        response.data
     )
 
 
-def test_api_rooms_create_no_scope():
-    """Creating rooms without any scope should return 403."""
-
-    user = UserFactory()
-
-    # Token without scope
-    token = generate_test_token(user, [])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.post("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 403
-    assert "insufficient permissions." in str(response.data).lower()
-
-
-def test_api_rooms_create_success():
+def test_api_rooms_create_success(settings):
     """Creating a room with correct scope should succeed."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
 
     user = UserFactory()
 
-    token = generate_test_token(
-        user, [ApplicationScope.ROOMS_CREATE, ApplicationScope.ROOMS_LIST]
-    )
+    token = generate_test_token(user, [ApplicationScope.ROOMS_CREATE])
 
     client = APIClient()
     client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
@@ -522,8 +245,6 @@ def test_api_rooms_create_success():
     assert response.status_code == 201
     assert "id" in response.data
     assert "slug" in response.data
-    assert "name" in response.data
-    assert response.data["name"] == response.data["slug"]
 
     # Verify room was created with user as owner
     room = Room.objects.get(id=response.data["id"])
@@ -531,72 +252,9 @@ def test_api_rooms_create_success():
     assert room.access_level == "trusted"
 
 
-def test_api_rooms_create_readonly_enforcement():
-    """Creating a room succeeds and any provided read-only fields are ignored."""
-
-    user = UserFactory()
-
-    token = generate_test_token(user, [ApplicationScope.ROOMS_CREATE])
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.post(
-        "/external-api/v1.0/rooms/",
-        {
-            "id": "fake-id",
-            "slug": "fake-slug",
-            "name": "fake-name",
-            "access_level": "public",
-        },
-        format="json",
-    )
-
-    assert response.status_code == 201
-    assert "slug" in response.data
-    assert response.data["id"] != "fake-id"
-    assert "name" in response.data
-    assert response.data["slug"] != "fake-slug"
-    assert "id" in response.data
-    assert response.data["name"] != "fake-name"
-
-    # Verify room was created with user as owner
-    room = Room.objects.get(id=response.data["id"])
-    assert room.get_role(user) == RoleChoices.OWNER
-    assert room.access_level == "trusted"
-
-
-def test_api_rooms_unknown_actions():
-    """Updating or deleting a room are not supported yet."""
-
-    user = UserFactory()
-    room = RoomFactory(users=[(user, RoleChoices.OWNER)])
-
-    token = generate_test_token(
-        user,
-        [
-            ApplicationScope.ROOMS_RETRIEVE,
-            ApplicationScope.ROOMS_DELETE,
-            ApplicationScope.ROOMS_UPDATE,
-        ],
-    )
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.delete(f"/external-api/v1.0/rooms/{room.id}/")
-
-    assert response.status_code == 405
-    assert 'method "delete" not allowed.' in str(response.data).lower()
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.patch(f"/external-api/v1.0/rooms/{room.id}/")
-
-    assert response.status_code == 405
-    assert 'method "patch" not allowed.' in str(response.data).lower()
-
-
 def test_api_rooms_response_no_url(settings):
     """Response should not include url field when APPLICATION_BASE_URL is None."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
     settings.APPLICATION_BASE_URL = None
 
     user = UserFactory()
@@ -615,6 +273,7 @@ def test_api_rooms_response_no_url(settings):
 
 def test_api_rooms_response_no_telephony(settings):
     """Response should not include telephony field when ROOM_TELEPHONY_ENABLED is False."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
     settings.ROOM_TELEPHONY_ENABLED = False
 
     user = UserFactory()
@@ -631,41 +290,10 @@ def test_api_rooms_response_no_telephony(settings):
     assert response.data["id"] == str(room.id)
 
 
-def test_api_rooms_token_scope_case_insensitive(settings):
-    """Token's scope should be case-insensitive."""
-    user = UserFactory()
-    application = ApplicationFactory()
-
-    # Generate token with mixed-case scope "Rooms:List" to verify that scope
-    # validation is case-insensitive (should match "rooms:list")
-    now = datetime.now(timezone.utc)
-    payload = {
-        "iss": settings.APPLICATION_JWT_ISSUER,
-        "aud": settings.APPLICATION_JWT_AUDIENCE,
-        "iat": now,
-        "exp": now + timedelta(hours=1),
-        "client_id": str(application.client_id),
-        "scope": "Rooms:List",  # Mixed case - should be accepted as "rooms:list"
-        "user_id": str(user.id),
-        "delegated": True,
-    }
-    token = jwt.encode(
-        payload,
-        settings.APPLICATION_JWT_SECRET_KEY,
-        algorithm=settings.APPLICATION_JWT_ALG,
-    )
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 200
-
-
 def test_api_rooms_token_without_delegated_flag(settings):
     """Token without delegated flag should be rejected."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
     user = UserFactory()
-    application = ApplicationFactory()
 
     # Generate token without delegated flag
     now = datetime.now(timezone.utc)
@@ -674,7 +302,7 @@ def test_api_rooms_token_without_delegated_flag(settings):
         "aud": settings.APPLICATION_JWT_AUDIENCE,
         "iat": now,
         "exp": now + timedelta(hours=1),
-        "client_id": str(application.client_id),
+        "client_id": "test-client",
         "scope": "rooms:list",
         "user_id": str(user.id),
         "delegated": False,  # Not delegated
@@ -690,75 +318,12 @@ def test_api_rooms_token_without_delegated_flag(settings):
     response = client.get("/external-api/v1.0/rooms/")
 
     assert response.status_code == 401
-    assert "invalid token type." in str(response.data).lower()
-
-
-@mock.patch.object(ResourceServerAuthentication, "authenticate", return_value=None)
-def test_api_rooms_token_invalid_signature(mock_rs_authenticate, settings):
-    """Token signed with an invalid key should defer to the next authentication."""
-    user = UserFactory()
-    application = ApplicationFactory()
-
-    # Generate token without delegated flag
-    now = datetime.now(timezone.utc)
-    payload = {
-        "iss": settings.APPLICATION_JWT_ISSUER,
-        "aud": settings.APPLICATION_JWT_AUDIENCE,
-        "iat": now,
-        "exp": now + timedelta(hours=1),
-        "client_id": str(application.client_id),
-        "scope": "rooms:list",
-        "user_id": str(user.id),
-        "delegated": True,
-    }
-    token = jwt.encode(
-        payload,
-        "invalid-private-key",
-        algorithm=settings.APPLICATION_JWT_ALG,
-    )
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get("/external-api/v1.0/rooms/")
-
-    mock_rs_authenticate.assert_called()
-    assert response.status_code == 401
-
-
-@mock.patch.object(ResourceServerAuthentication, "authenticate", return_value=None)
-def test_api_rooms_token_invalid_alg(mock_rs_authenticate, settings):
-    """Token signed with an invalid alg should defer to the next authentication."""
-    settings.APPLICATION_JWT_ALG = "RS256"
-    user = UserFactory()
-
-    # Generate token without delegated flag
-    now = datetime.now(timezone.utc)
-    payload = {
-        "iss": settings.APPLICATION_JWT_ISSUER,
-        "aud": settings.APPLICATION_JWT_AUDIENCE,
-        "iat": now,
-        "exp": now + timedelta(hours=1),
-        "client_id": "test-client",
-        "scope": "rooms:list",
-        "user_id": str(user.id),
-        "delegated": True,
-    }
-    token = jwt.encode(
-        payload,
-        settings.APPLICATION_JWT_SECRET_KEY,
-        algorithm="HS256",  # different value
-    )
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get("/external-api/v1.0/rooms/")
-
-    mock_rs_authenticate.assert_called()
-    assert response.status_code == 401
+    assert "Invalid token type." in str(response.data)
 
 
 def test_api_rooms_token_missing_client_id(settings):
     """Token without client_id should be rejected."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
     user = UserFactory()
 
     now = datetime.now(timezone.utc)
@@ -783,152 +348,7 @@ def test_api_rooms_token_missing_client_id(settings):
     response = client.get("/external-api/v1.0/rooms/")
 
     assert response.status_code == 401
-    assert "invalid token claims." in str(response.data).lower()
-
-
-def test_api_rooms_token_missing_user_id(settings):
-    """Token without user_id should be rejected."""
-    application = ApplicationFactory()
-
-    now = datetime.now(timezone.utc)
-    payload = {
-        "iss": settings.APPLICATION_JWT_ISSUER,
-        "aud": settings.APPLICATION_JWT_AUDIENCE,
-        "iat": now,
-        "exp": now + timedelta(hours=1),
-        "client_id": str(application.client_id),
-        "scope": "rooms:list",
-        "delegated": True,
-        # Missing user_id
-    }
-    token = jwt.encode(
-        payload,
-        settings.APPLICATION_JWT_SECRET_KEY,
-        algorithm=settings.APPLICATION_JWT_ALG,
-    )
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 401
-    assert "invalid token claims." in str(response.data).lower()
-
-
-def test_api_rooms_token_invalid_audience(settings):
-    """Token with an invalid audience should be rejected."""
-    user = UserFactory()
-    application = ApplicationFactory()
-
-    now = datetime.now(timezone.utc)
-    payload = {
-        "iss": settings.APPLICATION_JWT_ISSUER,
-        "aud": "invalid-audience",
-        "iat": now,
-        "exp": now + timedelta(hours=1),
-        "client_id": str(application.client_id),
-        "user_id": str(user.id),
-        "scope": "rooms:list",
-        "delegated": True,
-    }
-    token = jwt.encode(
-        payload,
-        settings.APPLICATION_JWT_SECRET_KEY,
-        algorithm=settings.APPLICATION_JWT_ALG,
-    )
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 401
-    assert "invalid token." in str(response.data).lower()
-
-
-def test_api_rooms_token_unknown_user(settings):
-    """Token for unknown user should be rejected."""
-    application = ApplicationFactory()
-
-    now = datetime.now(timezone.utc)
-    payload = {
-        "iss": settings.APPLICATION_JWT_ISSUER,
-        "aud": settings.APPLICATION_JWT_AUDIENCE,
-        "iat": now,
-        "exp": now + timedelta(hours=1),
-        "client_id": str(application.client_id),
-        "user_id": str(uuid.uuid4()),
-        "scope": "rooms:list",
-        "delegated": True,
-    }
-    token = jwt.encode(
-        payload,
-        settings.APPLICATION_JWT_SECRET_KEY,
-        algorithm=settings.APPLICATION_JWT_ALG,
-    )
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 401
-    assert "user not found." in str(response.data).lower()
-
-
-def test_api_rooms_token_unknown_application(settings):
-    """Token for unknown application should be rejected."""
-
-    now = datetime.now(timezone.utc)
-    payload = {
-        "iss": settings.APPLICATION_JWT_ISSUER,
-        "aud": settings.APPLICATION_JWT_AUDIENCE,
-        "iat": now,
-        "exp": now + timedelta(hours=1),
-        "client_id": "unknown-client-id",
-        "user_id": str(uuid.uuid4()),
-        "scope": "rooms:list",
-        "delegated": True,
-    }
-    token = jwt.encode(
-        payload,
-        settings.APPLICATION_JWT_SECRET_KEY,
-        algorithm=settings.APPLICATION_JWT_ALG,
-    )
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 401
-    assert "application not found." in str(response.data).lower()
-
-
-def test_api_rooms_token_inactive_application(settings):
-    """Token for inactive application should be rejected."""
-    application = ApplicationFactory(active=False)
-
-    now = datetime.now(timezone.utc)
-    payload = {
-        "iss": settings.APPLICATION_JWT_ISSUER,
-        "aud": settings.APPLICATION_JWT_AUDIENCE,
-        "iat": now,
-        "exp": now + timedelta(hours=1),
-        "client_id": str(application.client_id),
-        "user_id": str(uuid.uuid4()),
-        "scope": "rooms:list",
-        "delegated": True,
-    }
-    token = jwt.encode(
-        payload,
-        settings.APPLICATION_JWT_SECRET_KEY,
-        algorithm=settings.APPLICATION_JWT_ALG,
-    )
-
-    client = APIClient()
-    client.credentials(HTTP_AUTHORIZATION=f"Bearer {token}")
-    response = client.get("/external-api/v1.0/rooms/")
-
-    assert response.status_code == 401
-    assert "application is disabled." in str(response.data).lower()
+    assert "Invalid token claims." in str(response.data)
 
 
 @responses.activate
@@ -1087,7 +507,7 @@ def test_resource_server_authentication_successful(settings):
             "aud": "some_client_id",  # settings.OIDC_RS_CLIENT_ID
             "sub": "very-specific-sub",
             "client_id": "some_service_provider",
-            "scope": "openid lasuite_meet lasuite_meet:rooms:list lasuite_meet:rooms:retrieve",
+            "scope": "openid lasuite_meet lasuite_meet:rooms:list",
             "active": True,
         },
     )

src/backend/core/tests/test_external_api_token.py

@@ -21,7 +21,8 @@ pytestmark = pytest.mark.django_db
 
 def test_api_applications_generate_token_success(settings):
     """Valid credentials should return a JWT token."""
-    UserFactory(email="User.Family@example.com")
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
+    user = UserFactory(email="user@example.com")
     application = ApplicationFactory(
         active=True,
         scopes=[ApplicationScope.ROOMS_LIST, ApplicationScope.ROOMS_CREATE],
@@ -39,7 +40,7 @@ def test_api_applications_generate_token_success(settings):
             "client_id": application.client_id,
             "client_secret": plain_secret,
             "grant_type": "client_credentials",
-            "scope": "user.family@example.com",
+            "scope": user.email,
         },
         format="json",
     )
@@ -172,8 +173,9 @@ def test_api_applications_generate_token_domain_not_authorized():
     assert "not authorized for this email domain" in str(response.data)
 
 
-def test_api_applications_generate_token_domain_authorized():
+def test_api_applications_generate_token_domain_authorized(settings):
     """Application with domain authorization should succeed."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
     user = UserFactory(email="user@allowed.com")
     application = ApplicationFactory(
         active=True,
@@ -228,6 +230,7 @@ def test_api_applications_generate_token_user_not_found():
 @freeze_time("2023-01-15 12:00:00")
 def test_api_applications_token_payload_structure(settings):
     """Generated token should have correct payload structure."""
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
     user = UserFactory(email="user@example.com")
 
     application = ApplicationFactory(
@@ -277,6 +280,7 @@ def test_api_applications_token_payload_structure(settings):
 def test_api_applications_token_new_user(settings):
     """Should create a new pending user when creation is allowed and user doesn't exist."""
 
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
     settings.APPLICATION_ALLOW_USER_CREATION = True
     settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = True
     settings.OIDC_USER_SUB_FIELD_IMMUTABLE = False
@@ -333,6 +337,7 @@ def test_api_applications_token_new_user(settings):
 def test_api_applications_token_existing_user(settings):
     """Application should not create a new user when user exist."""
 
+    settings.APPLICATION_JWT_SECRET_KEY = "devKey"
     user = UserFactory(email="user@example.com")
 
     settings.APPLICATION_ALLOW_USER_CREATION = True

src/backend/meet/settings.py

@@ -18,7 +18,6 @@ from socket import gethostbyname, gethostname
 
 from django.utils.translation import gettext_lazy as _
 
-import dj_database_url
 import sentry_sdk
 from configurations import Configuration, values
 from lasuite.configuration.values import SecretFileValue
@@ -93,11 +92,7 @@ class Base(Configuration):
 
     # Database
     DATABASES = {
-        "default": dj_database_url.config()
-        if values.DatabaseURLValue(
-            None, environ_name="DATABASE_URL", environ_prefix=None
-        )
-        else {
+        "default": {
             "ENGINE": values.Value(
                 "django.db.backends.postgresql_psycopg2",
                 environ_name="DB_ENGINE",
@@ -297,9 +292,6 @@ class Base(Configuration):
             ),
         },
     }
-    MONITORED_THROTTLE_FAILURE_CALLBACK = (
-        "core.api.throttling.sentry_monitoring_throttle_failure"
-    )
 
     SPECTACULAR_SETTINGS = {
         "TITLE": "Meet API",
@@ -344,9 +336,6 @@ class Base(Configuration):
         "feedback": values.DictValue(
             {}, environ_name="FRONTEND_FEEDBACK", environ_prefix=None
         ),
-        "external_home_url": values.Value(
-            None, environ_name="FRONTEND_EXTERNAL_HOME_URL", environ_prefix=None
-        ),
         "use_french_gov_footer": values.BooleanValue(
             False, environ_name="FRONTEND_USE_FRENCH_GOV_FOOTER", environ_prefix=None
         ),
@@ -667,7 +656,7 @@ class Base(Configuration):
         [],
         environ_name="BREVO_API_CONTACT_LIST_IDS",
         environ_prefix=None,
-        converter=int,
+        converter=lambda x: int(x),  # pylint: disable=unnecessary-lambda
     )
     BREVO_API_CONTACT_ATTRIBUTES = values.DictValue({"VISIO_USER": True})
     BREVO_API_TIMEOUT = values.PositiveIntegerValue(
@@ -917,9 +906,6 @@ class Test(Base):
     USE_SWAGGER = True
     EXTERNAL_API_ENABLED = True
 
-    APPLICATION_JWT_SECRET_KEY = "devKey"  # noqa:S105
-    APPLICATION_JWT_AUDIENCE = "Test inc."
-
     CELERY_TASK_ALWAYS_EAGER = values.BooleanValue(True)
 
     def __init__(self):

src/backend/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "meet"
-version = "1.8.0"
+version = "1.2.0"
 authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -25,38 +25,37 @@ license = { file = "LICENSE" }
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "boto3==1.42.49",
+    "boto3==1.40.69",
     "Brotli==1.2.0",
     "brevo-python==1.2.0",
-    "celery[redis]==5.6.2",
-    "dj-database-url==3.1.0",
+    "celery[redis]==5.5.3",
     "django-configurations==2.5.1",
     "django-cors-headers==4.9.0",
-    "django-countries==8.2.0",
-    "django-lasuite[all]==0.0.24",
+    "django-countries==8.0.0",
+    "django-lasuite[all]==0.0.19",
     "django-parler==2.3",
     "redis==5.2.1",
     "django-redis==6.0.0",
     "django-storages[s3]==1.14.6",
     "django-timezone-field>=5.1",
-    "django==5.2.11",
+    "django==5.2.9",
     "djangorestframework==3.16.1",
     "drf_spectacular==0.29.0",
-    "dockerflow==2026.1.26",
+    "dockerflow==2024.4.2",
     "easy_thumbnails==2.10.1",
     "factory_boy==3.3.3",
-    "gunicorn==25.1.0",
-    "jsonschema==4.26.0",
-    "markdown==3.10.2",
+    "gunicorn==23.0.0",
+    "jsonschema==4.25.1",
+    "markdown==3.10",
     "nested-multipart-parser==1.6.0",
-    "psycopg[binary]==3.3.2",
-    "PyJWT==2.11.0",
+    "psycopg[binary]==3.2.12",
+    "PyJWT==2.10.1",
     "python-frontmatter==1.1.0",
     "requests==2.32.5",
-    "sentry-sdk==2.53.0",
+    "sentry-sdk==2.43.0",
     "whitenoise==6.11.0",
-    "mozilla-django-oidc==5.0.2",
-    "livekit-api==1.1.0",
+    "mozilla-django-oidc==4.0.1",
+    "livekit-api==1.0.7",
     "aiohttp==3.13.3",
 ]
 
@@ -69,21 +68,21 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "django-extensions==4.1",
-    "drf-spectacular-sidecar==2026.1.1",
+    "drf-spectacular-sidecar==2025.10.1",
     "freezegun==1.5.5",
     "ipdb==0.13.13",
-    "ipython==9.10.0",
-    "pyfakefs==6.1.1",
-    "pylint-django==2.7.0",
+    "ipython==9.7.0",
+    "pyfakefs==5.10.2",
+    "pylint-django==2.6.1",
     "pylint<4.0.0",
     "pytest-cov==7.0.0",
-    "pytest-django==4.12.0",
-    "pytest==9.0.2",
+    "pytest-django==4.11.1",
+    "pytest==9.0.0",
     "pytest-icdiff==0.9",
     "pytest-xdist==3.8.0",
     "responses==0.25.8",
-    "ruff==0.15.1",
-    "types-requests==2.32.4.20260107",
+    "ruff==0.14.4",
+    "types-requests==2.32.4.20250913",
 ]
 
 [tool.setuptools]

src/frontend/Dockerfile

@@ -43,8 +43,7 @@ RUN apk update && apk upgrade libssl3 \
     libxml2>=2.12.7-r2 \
     libxslt>=1.1.39-r2 \
     libexpat>=2.7.2-r0 \
-    libpng>=1.6.53-r0 \
-    && apk del curl
+    libpng>=1.6.53-r0
 
 USER nginx
 

src/frontend/default.conf

@@ -5,12 +5,6 @@ server {
 
   root /usr/share/nginx/html;
 
-  location = /.well-known/windows-app-web-link {
-      default_type application/json;
-      alias /usr/share/nginx/html/.well-known/windows-app-web-link;
-      add_header Content-Disposition "attachment; filename=windows-app-web-link";
-  }
-
   # Serve static files with caching
   location ~* ^/assets/.*\.(css|js|json|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
       expires 30d;

src/frontend/index.html

@@ -6,22 +6,6 @@
     <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
     <link rel="manifest" href="/site.webmanifest">
-    <!-- Font URLs are resolved and replaced by Vite during the build process. Font loading failures will not break the application. -->
-    <link
-      rel="preload"
-      as="font"
-      crossorigin="anonymous"
-      href="/node_modules/@fontsource/material-icons-outlined/files/material-icons-outlined-latin-400-normal.woff2"
-      type="font/woff2"
-    />
-    <!-- Font URLs are resolved and replaced by Vite during the build process. Font loading failures will not break the application. -->
-    <link
-      rel="preload"
-      as="font"
-      crossorigin="anonymous"
-      href="/node_modules/@fontsource-variable/material-symbols-outlined/files/material-symbols-outlined-latin-wght-normal.woff2"
-      type="font/woff2"
-    />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>%VITE_APP_TITLE%</title>
   </head>

src/frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "meet",
   "private": true,
-  "version": "1.8.0",
+  "version": "1.2.0",
   "type": "module",
   "scripts": {
     "dev": "panda codegen && vite",
@@ -13,56 +13,56 @@
     "check": "prettier --check ./src"
   },
   "dependencies": {
-    "@fontsource-variable/material-symbols-outlined": "5.2.34",
+    "@fontsource-variable/material-symbols-outlined": "5.2.30",
     "@fontsource/material-icons-outlined": "5.2.6",
-    "@livekit/components-react": "2.9.19",
-    "@livekit/components-styles": "1.2.0",
-    "@livekit/track-processors": "0.7.0",
-    "@pandacss/preset-panda": "1.8.2",
-    "@react-aria/toast": "3.0.10",
-    "@react-types/overlays": "3.9.3",
+    "@livekit/components-react": "2.9.13",
+    "@livekit/components-styles": "1.1.6",
+    "@livekit/track-processors": "0.6.1",
+    "@pandacss/preset-panda": "0.54.0",
+    "@react-aria/toast": "3.0.5",
+    "@react-types/overlays": "3.9.0",
     "@remixicon/react": "4.6.0",
-    "@tanstack/react-query": "5.90.21",
+    "@tanstack/react-query": "5.81.5",
     "@timephy/rnnoise-wasm": "1.0.0",
-    "crisp-sdk-web": "1.0.27",
+    "crisp-sdk-web": "1.0.25",
     "derive-valtio": "0.2.0",
     "hoofd": "1.7.3",
-    "humanize-duration": "3.33.2",
-    "i18next": "25.8.8",
-    "i18next-browser-languagedetector": "8.2.1",
+    "humanize-duration": "3.33.0",
+    "i18next": "25.3.1",
+    "i18next-browser-languagedetector": "8.2.0",
     "i18next-parser": "9.3.0",
     "i18next-resources-to-backend": "1.2.1",
     "libphonenumber-js": "1.12.10",
-    "livekit-client": "2.17.1",
-    "posthog-js": "1.342.1",
+    "livekit-client": "2.15.7",
+    "posthog-js": "1.256.2",
     "react": "18.3.1",
     "react-aria-components": "1.10.1",
     "react-dom": "18.3.1",
     "react-i18next": "15.1.1",
     "use-sound": "5.0.0",
-    "valtio": "2.3.0",
-    "wouter": "3.9.0"
+    "valtio": "2.1.5",
+    "wouter": "3.7.1"
   },
   "devDependencies": {
-    "@pandacss/dev": "1.8.2",
-    "@tanstack/eslint-plugin-query": "5.91.4",
-    "@tanstack/react-query-devtools": "5.91.3",
+    "@pandacss/dev": "0.54.0",
+    "@tanstack/eslint-plugin-query": "5.81.2",
+    "@tanstack/react-query-devtools": "5.81.5",
     "@types/humanize-duration": "3.27.4",
     "@types/node": "22.16.0",
     "@types/react": "18.3.12",
     "@types/react-dom": "18.3.1",
     "@typescript-eslint/eslint-plugin": "8.35.1",
     "@typescript-eslint/parser": "8.35.1",
-    "@vitejs/plugin-react": "5.1.4",
+    "@vitejs/plugin-react": "4.6.0",
     "eslint": "8.57.0",
     "eslint-config-prettier": "10.1.5",
     "eslint-plugin-jsx-a11y": "6.10.2",
     "eslint-plugin-react-hooks": "5.2.0",
     "eslint-plugin-react-refresh": "0.4.20",
     "postcss": "8.5.6",
-    "prettier": "3.8.1",
+    "prettier": "3.6.2",
     "typescript": "5.8.3",
-    "vite": "7.3.1",
-    "vite-tsconfig-paths": "6.1.1"
+    "vite": "7.0.8",
+    "vite-tsconfig-paths": "5.1.4"
   }
 }

src/frontend/public/.well-known/windows-app-web-link

@@ -1,6 +0,0 @@
-[
-{
-  "packageFamilyName" : "Visio_g3z6ba6vek6vg",
-  "paths" : [ "*" ]
-}
-]

src/frontend/src/api/useConfig.ts

@@ -17,7 +17,6 @@ export interface ApiConfig {
   feedback: {
     url: string
   }
-  external_home_url?: string
   silence_livekit_debug_logs?: boolean
   is_silent_login_enabled?: boolean
   custom_css_url?: string

src/frontend/src/components/icons/BlurOnStrong.tsx

@@ -6,7 +6,6 @@ export const BlurOnStrong = () => {
       viewBox="0 0 24 24"
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
-      aria-hidden="true"
     >
       <path
         fillRule="evenodd"

src/frontend/src/features/home/components/IntroSlider.tsx

@@ -192,7 +192,7 @@ export const IntroSlider = () => {
         <SlideContainer>
           {SLIDES.map((slide, index) => (
             <Slide visible={index == slideIndex} key={index}>
-              <Image src={slide.src} alt="" role="presentation" />
+              <Image src={slide.src} alt={t(`${slide.key}.imgAlt`)} />
               <TextAnimation visible={index == slideIndex}>
                 <Heading>{t(`${slide.key}.title`)}</Heading>
                 <Body>{t(`${slide.key}.body`)}</Body>

src/frontend/src/features/home/routes/Home.tsx

@@ -11,7 +11,7 @@ import { RiAddLine, RiLink } from '@remixicon/react'
 import { LaterMeetingDialog } from '@/features/home/components/LaterMeetingDialog'
 import { IntroSlider } from '@/features/home/components/IntroSlider'
 import { MoreLink } from '@/features/home/components/MoreLink'
-import { ReactNode, useEffect, useState } from 'react'
+import { ReactNode, useState } from 'react'
 
 import { css } from '@/styled-system/css'
 import { menuRecipe } from '@/primitives/menuRecipe.ts'
@@ -19,7 +19,6 @@ import { usePersistentUserChoices } from '@/features/rooms/livekit/hooks/usePers
 import { useConfig } from '@/api/useConfig'
 import { LoginButton } from '@/components/LoginButton'
 import { ApiRoom } from '@/features/rooms/api/ApiRoom'
-import { LoadingScreen } from '@/components/LoadingScreen'
 
 const Columns = ({ children }: { children?: ReactNode }) => {
   return (
@@ -156,34 +155,9 @@ export const Home = () => {
 
   const { mutateAsync: createRoom } = useCreateRoom()
   const [laterRoom, setLaterRoom] = useState<null | ApiRoom>(null)
-  const [redirectFailed, setRedirectFailed] = useState(false)
 
   const { data } = useConfig()
 
-  useEffect(() => {
-    const checkSiteAndRedirect = async () => {
-      if (!data?.external_home_url) return
-      if (isLoggedIn === false) {
-        try {
-          await fetch(data.external_home_url, {
-            method: 'HEAD', // Use HEAD to avoid downloading the full page
-            mode: 'no-cors', // Needed for cross-origin requests
-          })
-          window.location.replace(data.external_home_url)
-        } catch (error) {
-          setRedirectFailed(true)
-          console.error('Site is not reachable:', error)
-        }
-      }
-    }
-
-    checkSiteAndRedirect()
-  }, [isLoggedIn, data])
-
-  if (data?.external_home_url && isLoggedIn == false && !redirectFailed) {
-    return <LoadingScreen header={false} footer={false} delay={0} />
-  }
-
   return (
     <UserAware>
       <Screen>

src/frontend/src/features/legalsTerms/TermsOfService.tsx

@@ -25,27 +25,15 @@ export const TermsOfServiceRoute = () => {
         {/* Article 2 */}
         <H lvl={2}>{t('articles.article2.title')}</H>
         <P>{t('articles.article2.content')}</P>
-        {ensureArray(
-          t('articles.article2.paragraphs', {
-            returnObjects: true,
-          })
-        ).map((paragraph, index) => (
-          <P key={index}>{paragraph}</P>
-        ))}
+        <P>{t('articles.article2.purposes')}</P>
 
         {/* Article 3 */}
         <H lvl={2}>{t('articles.article3.title')}</H>
-        {ensureArray(
-          t('articles.article3.paragraphs', {
-            returnObjects: true,
-          })
-        ).map((paragraph, index) => (
-          <P key={index}>{paragraph}</P>
-        ))}
+        <P>{t('articles.article3.definition')}</P>
 
         {/* Article 4 */}
         <H lvl={2}>{t('articles.article4.title')}</H>
-        <P>{t('articles.article4.definition')}</P>
+        <P>{t('articles.article4.content')}</P>
 
         {/* Article 5 */}
         <H lvl={2} margin={false}>
@@ -74,7 +62,6 @@ export const TermsOfServiceRoute = () => {
             __html: t('articles.article5.sections.section1.paragraph3'),
           }}
         ></P>
-        <P>{t('articles.article5.sections.section1.paragraph4')}</P>
 
         {/* Section 5.2 */}
         <H lvl={3} bold>
@@ -125,6 +112,7 @@ export const TermsOfServiceRoute = () => {
 
         {/* Article 7 */}
         <H lvl={2}>{t('articles.article7.title')}</H>
+        <P>{t('articles.article7.content')}</P>
 
         {/* Section 7.1 */}
         <H lvl={3} bold>

src/frontend/src/features/recording/components/ControlsButton.tsx

@@ -1,7 +1,7 @@
-import { css } from '@/styled-system/css'
+import { css, cx } from '@/styled-system/css'
 import { HStack } from '@/styled-system/jsx'
 import { Spinner } from '@/primitives/Spinner'
-import { Button, Icon, Text } from '@/primitives'
+import { Button, Text } from '@/primitives'
 import { useTranslation } from 'react-i18next'
 import { RecordingStatuses } from '../hooks/useRecordingStatuses'
 import { ReactNode, useEffect, useRef, useState } from 'react'
@@ -141,23 +141,31 @@ export const ControlsButton = ({
           })}
           onPress={() => openSidePanel()}
         >
-          <Icon
-            className={css({
-              color: 'primary.500',
-              marginRight: '1rem',
-            })}
-            name="info"
-          />
+          <span
+            className={cx(
+              'material-icons',
+              css({
+                color: 'primary.500',
+                marginRight: '1rem',
+              })
+            )}
+          >
+            info
+          </span>
           <Text variant={'smNote'}>
             {parseLineBreaks(t('button.anotherModeStarted'))}
           </Text>
-          <Icon
-            className={css({
-              color: 'primary.500',
-              marginLeft: 'auto',
-            })}
-            name="chevron_right"
-          />
+          <span
+            className={cx(
+              'material-icons',
+              css({
+                color: 'primary.500',
+                marginLeft: 'auto',
+              })
+            )}
+          >
+            chevron_right
+          </span>
         </RACButton>
       )}
       <Button

src/frontend/src/features/recording/components/LoginPrompt.tsx

@@ -1,4 +1,4 @@
-import { H, Text, Icon } from '@/primitives'
+import { H, Text } from '@/primitives'
 import { css } from '@/styled-system/css'
 import { LoginButton } from '@/components/LoginButton'
 import { HStack } from '@/styled-system/jsx'
@@ -24,7 +24,9 @@ export const LoginPrompt = ({ heading, body }: LoginPromptProps) => {
       })}
     >
       <HStack justify="start" alignItems="center" marginBottom="0.5rem">
-        <Icon type="symbols" name="login" />
+        <span className="material-symbols" aria-hidden={true}>
+          login
+        </span>
         <H lvl={3} margin={false} padding={false}>
           {heading}
         </H>

src/frontend/src/features/recording/components/RecordingStateToast.tsx

@@ -1,6 +1,6 @@
 import { css } from '@/styled-system/css'
 import { useTranslation } from 'react-i18next'
-import { useMemo, useRef, useEffect } from 'react'
+import { useMemo, useRef, useState, useEffect } from 'react'
 import { Text } from '@/primitives'
 import {
   RecordingMode,
@@ -13,7 +13,6 @@ import { useSidePanel } from '@/features/rooms/livekit/hooks/useSidePanel'
 import { useRoomMetadata } from '../hooks/useRoomMetadata'
 import { RecordingStatusIcon } from './RecordingStatusIcon'
 import { useIsRecording } from '@livekit/components-react'
-import { useScreenReaderAnnounce } from '@/hooks/useScreenReaderAnnounce'
 
 export const RecordingStateToast = () => {
   const { t } = useTranslation('rooms', {
@@ -22,8 +21,8 @@ export const RecordingStateToast = () => {
 
   const { openTranscript, openScreenRecording } = useSidePanel()
 
+  const [srMessage, setSrMessage] = useState('')
   const lastKeyRef = useRef('')
-  const announce = useScreenReaderAnnounce()
 
   const hasTranscriptAccess = useHasRecordingAccess(
     RecordingMode.Transcript,
@@ -77,9 +76,16 @@ export const RecordingStateToast = () => {
     if (key && key !== lastKeyRef.current) {
       lastKeyRef.current = key
       const message = t(key)
-      announce(message)
+      setSrMessage(message)
+
+      // Clear message after 3 seconds to prevent it from being announced again
+      const timer = setTimeout(() => {
+        setSrMessage('')
+      }, 3000)
+
+      return () => clearTimeout(timer)
     }
-  }, [announce, key, t])
+  }, [key, t])
 
   if (!key) return null
 
@@ -89,6 +95,15 @@ export const RecordingStateToast = () => {
 
   return (
     <>
+      {/* Screen reader only message to announce state changes once */}
+      <div
+        role="status"
+        aria-live="polite"
+        aria-atomic="true"
+        className="sr-only"
+      >
+        {srMessage}
+      </div>
       {/* Visual banner (without aria-live to avoid duplicate announcements) */}
       <div
         className={css({

src/frontend/src/features/recording/components/RecordingStatusIcon.tsx

@@ -1,5 +1,4 @@
 import { Spinner } from '@/primitives/Spinner'
-import { Icon } from '@/primitives'
 
 interface RecordingStatusIconProps {
   isStarted: boolean
@@ -15,8 +14,8 @@ export const RecordingStatusIcon = ({
   }
 
   if (isTranscriptActive) {
-    return <Icon type="symbols" name="speech_to_text" />
+    return <span className="material-symbols">speech_to_text</span>
   }
 
-  return <Icon type="symbols" name="screen_record" />
+  return <span className="material-symbols">screen_record</span>
 }

src/frontend/src/features/recording/components/RequestRecording.tsx

@@ -1,4 +1,4 @@
-import { Button, Icon, H, Text } from '@/primitives'
+import { Button, H, Text } from '@/primitives'
 import { css } from '@/styled-system/css'
 import { HStack } from '@/styled-system/jsx'
 import { useEffect, useRef, useState } from 'react'
@@ -59,7 +59,7 @@ export const RequestRecording = ({
       })}
     >
       <HStack justify="start" alignItems="center" marginBottom="0.5rem">
-        <Icon type="symbols" name="person_raised_hand" />
+        <span className="material-symbols">person_raised_hand</span>
         <H lvl={3} margin={false} padding={false}>
           {heading}
         </H>

src/frontend/src/features/recording/components/RowWrapper.tsx

@@ -1,6 +1,5 @@
 import { css } from '@/styled-system/css'
 import { ReactNode } from 'react'
-import { Icon } from '@/primitives'
 
 type RowPosition = 'first' | 'middle' | 'last' | 'single'
 
@@ -46,7 +45,7 @@ export const RowWrapper = ({
         })}
       >
         {/*  fixme - doesn't handle properly material-symbols  */}
-        <Icon name={iconName} />
+        <span className="material-icons">{iconName}</span>
       </div>
       <div
         className={css({

src/frontend/src/features/recording/routes/RecordingDownload.tsx

@@ -104,12 +104,14 @@ export const RecordingDownload = () => {
               {t('success.title')}
             </H>
             <Text centered margin="md" wrap={'balance'}>
-              <span>
-                {t('success.body', {
-                  room: data.room.name,
-                  created_at: formatDate(data.created_at, 'YYYY-MM-DD HH:mm'),
-                })}
-              </span>
+              <span
+                dangerouslySetInnerHTML={{
+                  __html: t('success.body', {
+                    room: data.room.name,
+                    created_at: formatDate(data.created_at, 'YYYY-MM-DD HH:mm'),
+                  }),
+                }}
+              />
               <span>
                 {configData?.recording?.expiration_days && (
                   <>

src/frontend/src/features/rooms/components/Conference.tsx

@@ -25,12 +25,12 @@ import { VideoConference } from '../livekit/prefabs/VideoConference'
 import { css } from '@/styled-system/css'
 import { BackgroundProcessorFactory } from '../livekit/components/blur'
 import { LocalUserChoices } from '@/stores/userChoices'
+import { navigateTo } from '@/navigation/navigateTo'
 import { MediaDeviceErrorAlert } from './MediaDeviceErrorAlert'
 import { usePostHog } from 'posthog-js/react'
 import { useConfig } from '@/api/useConfig'
 import { isFireFox } from '@/utils/livekit'
 import { useIsMobile } from '@/utils/useIsMobile'
-import { navigateTo } from '@/navigation/navigateTo'
 
 export const Conference = ({
   roomId,
@@ -228,20 +228,10 @@ export const Conference = ({
             posthog.captureException(e)
           }}
           onDisconnected={(e) => {
-            switch (e) {
-              case DisconnectReason.CLIENT_INITIATED:
-                navigateTo('feedback')
-                return
-              case DisconnectReason.DUPLICATE_IDENTITY:
-              case DisconnectReason.PARTICIPANT_REMOVED:
-                navigateTo(
-                  'feedback',
-                  {},
-                  {
-                    state: { reason: e },
-                  }
-                )
-                return
+            if (e == DisconnectReason.CLIENT_INITIATED) {
+              navigateTo('feedback', { duplicateIdentity: false })
+            } else if (e == DisconnectReason.DUPLICATE_IDENTITY) {
+              navigateTo('feedback', { duplicateIdentity: true })
             }
           }}
           onMediaDeviceFailure={(e, kind) => {

src/frontend/src/features/rooms/components/InviteDialog.tsx

@@ -112,8 +112,8 @@ export const InviteDialog = (props: Omit<DialogProps, 'title'>) => {
                     square
                     size={'sm'}
                     onPress={copyRoomUrlToClipboard}
-                    aria-label={isRoomUrlCopied ? t('copied') : t('copyUrl')}
-                    tooltip={isRoomUrlCopied ? t('copied') : t('copyUrl')}
+                    aria-label={t('copyUrl')}
+                    tooltip={t('copyUrl')}
                   >
                     {isRoomUrlCopied ? (
                       <RiCheckLine aria-hidden="true" />
@@ -138,12 +138,11 @@ export const InviteDialog = (props: Omit<DialogProps, 'title'>) => {
                   {formatPinCode(roomData?.pin_code)}
                 </Text>
               </div>
-
               <Button
                 variant={isCopied ? 'success' : 'secondaryText'}
                 size="sm"
                 fullWidth
-                aria-label={isCopied ? t('copied') : t('copy')}
+                aria-label={t('copy')}
                 style={{
                   justifyContent: 'start',
                 }}
@@ -174,7 +173,7 @@ export const InviteDialog = (props: Omit<DialogProps, 'title'>) => {
             <Button
               variant={isCopied ? 'success' : 'tertiary'}
               fullWidth
-              aria-label={isCopied ? t('copied') : t('copy')}
+              aria-label={t('copy')}
               onPress={copyRoomToClipboard}
               data-attr="share-dialog-copy"
             >

src/frontend/src/features/rooms/components/Join.tsx

@@ -446,14 +446,16 @@ export const Join = ({
                 type="text"
                 onChange={saveUsername}
                 label={t('usernameLabel')}
-                id="input-name"
+                aria-label={t('usernameLabel')}
                 defaultValue={username}
                 validate={(value) => !value && t('errors.usernameEmpty')}
                 wrapperProps={{
                   noMargin: true,
                   fullWidth: true,
                 }}
-                autoComplete="name"
+                labelProps={{
+                  center: true,
+                }}
                 maxLength={50}
               />
             </VStack>

src/frontend/src/features/rooms/livekit/components/IsIdleDisconnectModal.tsx

@@ -1,29 +1,21 @@
-import { A, Button, Dialog, H, P, ScreenReaderAnnouncer } from '@/primitives'
+import { Button, Dialog, H, P } from '@/primitives'
 import { useTranslation } from 'react-i18next'
 import { css } from '@/styled-system/css'
 import { useSnapshot } from 'valtio'
 import { connectionObserverStore } from '@/stores/connectionObserver'
 import { HStack } from '@/styled-system/jsx'
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { navigateTo } from '@/navigation/navigateTo'
 import humanizeDuration from 'humanize-duration'
 import i18n from 'i18next'
-import { useScreenReaderAnnounce } from '@/hooks/useScreenReaderAnnounce'
-import { useSettingsDialog } from '@/features/settings/hook/useSettingsDialog'
-import { SettingsDialogExtendedKey } from '@/features/settings/type'
 
 const IDLE_DISCONNECT_TIMEOUT_MS = 120000 // 2 minutes
-const COUNTDOWN_ANNOUNCEMENT_SECONDS = [90, 60, 30]
-const FINAL_COUNTDOWN_SECONDS = 10
 
 export const IsIdleDisconnectModal = () => {
   const connectionObserverSnap = useSnapshot(connectionObserverStore)
   const [timeRemaining, setTimeRemaining] = useState(IDLE_DISCONNECT_TIMEOUT_MS)
-  const lastAnnouncementRef = useRef<number | null>(null)
-  const { openSettingsDialog } = useSettingsDialog()
 
   const { t } = useTranslation('rooms', { keyPrefix: 'isIdleDisconnectModal' })
-  const announce = useScreenReaderAnnounce()
 
   useEffect(() => {
     if (connectionObserverSnap.isIdleDisconnectModalOpen) {
@@ -43,42 +35,10 @@ export const IsIdleDisconnectModal = () => {
     }
   }, [connectionObserverSnap.isIdleDisconnectModalOpen])
 
-  useEffect(() => {
-    if (!connectionObserverSnap.isIdleDisconnectModalOpen) {
-      lastAnnouncementRef.current = null
-    }
-  }, [connectionObserverSnap.isIdleDisconnectModalOpen])
-
-  const remainingSeconds = Math.floor(timeRemaining / 1000)
-  const minutes = Math.floor(remainingSeconds / 60)
-  const seconds = remainingSeconds % 60
+  const minutes = Math.floor(timeRemaining / 1000 / 60)
+  const seconds = (timeRemaining / 1000) % 60
   const formattedTime = `${minutes}:${seconds.toString().padStart(2, '0')}`
 
-  useEffect(() => {
-    if (!connectionObserverSnap.isIdleDisconnectModalOpen) return
-
-    const shouldAnnounce =
-      COUNTDOWN_ANNOUNCEMENT_SECONDS.includes(remainingSeconds) ||
-      remainingSeconds <= FINAL_COUNTDOWN_SECONDS
-
-    if (shouldAnnounce && remainingSeconds !== lastAnnouncementRef.current) {
-      lastAnnouncementRef.current = remainingSeconds
-      const message = t('countdownAnnouncement', {
-        duration: humanizeDuration(remainingSeconds * 1000, {
-          language: i18n.language,
-          round: false,
-          largest: 2,
-        }),
-      })
-      announce(message, 'assertive', 'idle')
-    }
-  }, [
-    announce,
-    connectionObserverSnap.isIdleDisconnectModalOpen,
-    remainingSeconds,
-    t,
-  ])
-
   return (
     <Dialog
       isOpen={connectionObserverSnap.isIdleDisconnectModalOpen}
@@ -92,7 +52,6 @@ export const IsIdleDisconnectModal = () => {
       {({ close }) => {
         return (
           <div>
-            <ScreenReaderAnnouncer channel="idle" />
             <div
               className={css({
                 height: '50px',
@@ -106,7 +65,6 @@ export const IsIdleDisconnectModal = () => {
                 color: 'blue.800',
                 margin: 'auto',
               })}
-              aria-hidden="true"
             >
               {formattedTime}
             </div>
@@ -120,19 +78,7 @@ export const IsIdleDisconnectModal = () => {
                 }),
               })}
             </P>
-            <P>
-              {t('settingsPrefix')}{' '}
-              <A
-                color="primary"
-                onPress={() => {
-                  connectionObserverStore.isIdleDisconnectModalOpen = false
-                  openSettingsDialog(SettingsDialogExtendedKey.GENERAL)
-                }}
-              >
-                {t('settingsLink')}
-              </A>
-              {t('settingsSuffix')}
-            </P>
+            <P>{t('settings')}</P>
             <HStack marginTop="2rem">
               <Button
                 onPress={() => {

src/frontend/src/features/rooms/livekit/components/ReactionPortal.tsx

@@ -5,10 +5,6 @@ import { css } from '@/styled-system/css'
 import { Participant } from 'livekit-client'
 import { useTranslation } from 'react-i18next'
 import { Reaction } from '@/features/rooms/livekit/components/controls/ReactionsToggle'
-import { getEmojiLabel } from '@/features/rooms/livekit/utils/reactionUtils'
-import { accessibilityStore } from '@/stores/accessibility'
-import { useSnapshot } from 'valtio'
-import { useScreenReaderAnnounce } from '@/hooks/useScreenReaderAnnounce'
 
 export const ANIMATION_DURATION = 3000
 export const ANIMATION_DISTANCE = 300
@@ -144,41 +140,11 @@ export function ReactionPortal({
   )
 }
 
-export const ReactionPortals = ({ reactions }: { reactions: Reaction[] }) => {
-  const { t } = useTranslation('rooms', { keyPrefix: 'controls.reactions' })
-  const { announceReactions } = useSnapshot(accessibilityStore)
-  const [lastAnnouncedId, setLastAnnouncedId] = useState<number | null>(null)
-  const announce = useScreenReaderAnnounce()
-
-  const latestReaction =
-    reactions.length > 0 ? reactions[reactions.length - 1] : undefined
-
-  useEffect(() => {
-    if (!announceReactions) {
-      return
-    }
-    if (!latestReaction) return
-    const isNewReaction = latestReaction.id !== lastAnnouncedId
-    if (!isNewReaction) return
-
-    const emojiLabel = getEmojiLabel(latestReaction.emoji, t)
-    const participantName = latestReaction.participant?.isLocal
-      ? t('you')
-      : latestReaction.participant?.name?.trim() ||
-        t('someone', { defaultValue: 'Someone' })
-    announce(t('announce', { name: participantName, emoji: emojiLabel }))
-    setLastAnnouncedId(latestReaction.id)
-  }, [announce, latestReaction, lastAnnouncedId, announceReactions, t])
-
-  return (
-    <>
-      {reactions.map((instance) => (
-        <ReactionPortal
-          key={instance.id}
-          emoji={instance.emoji}
-          participant={instance.participant}
-        />
-      ))}
-    </>
-  )
-}
+export const ReactionPortals = ({ reactions }: { reactions: Reaction[] }) =>
+  reactions.map((instance) => (
+    <ReactionPortal
+      key={instance.id}
+      emoji={instance.emoji}
+      participant={instance.participant}
+    />
+  ))

src/frontend/src/features/rooms/livekit/components/SidePanel.tsx

@@ -13,32 +13,27 @@ import { Effects } from './effects/Effects'
 import { Admin } from './Admin'
 import { Tools } from './Tools'
 import { Info } from './Info'
-import { HStack } from '@/styled-system/jsx'
 
 type StyledSidePanelProps = {
   title: string
-  ariaLabel: string
   children: ReactNode
   onClose: () => void
   isClosed: boolean
   closeButtonTooltip: string
   isSubmenu: boolean
   onBack: () => void
-  backButtonLabel: string
 }
 
 const StyledSidePanel = ({
   title,
-  ariaLabel,
   children,
   onClose,
   isClosed,
   closeButtonTooltip,
   isSubmenu = false,
   onBack,
-  backButtonLabel,
 }: StyledSidePanelProps) => (
-  <aside
+  <div
     className={css({
       borderWidth: '1px',
       borderStyle: 'solid',
@@ -63,37 +58,32 @@ const StyledSidePanel = ({
     style={{
       transform: isClosed ? 'translateX(calc(360px + 1.5rem))' : 'none',
     }}
-    aria-hidden={isClosed}
-    aria-label={ariaLabel}
   >
-    <HStack alignItems="center">
+    <Heading
+      slot="title"
+      level={1}
+      className={text({ variant: 'h2' })}
+      style={{
+        paddingLeft: '1.5rem',
+        paddingTop: '1rem',
+        display: isClosed ? 'none' : 'flex',
+        justifyContent: 'start',
+        alignItems: 'center',
+      }}
+    >
       {isSubmenu && (
         <Button
           variant="secondaryText"
-          size="sm"
+          size={'sm'}
           square
-          className={css({ marginRight: '0.5rem', marginLeft: '1rem' })}
-          aria-label={backButtonLabel}
+          className={css({ marginRight: '0.5rem' })}
           onPress={onBack}
         >
-          <RiArrowLeftLine size={20} aria-hidden="true" />
+          <RiArrowLeftLine size={20} />
         </Button>
       )}
-      <Heading
-        slot="title"
-        level={1}
-        className={text({ variant: 'h2' })}
-        style={{
-          paddingLeft: isSubmenu ? 0 : '1.5rem',
-          paddingTop: '1rem',
-          display: isClosed ? 'none' : 'flex',
-          justifyContent: 'start',
-          alignItems: 'center',
-        }}
-      >
-        {title}
-      </Heading>
-    </HStack>
+      {title}
+    </Heading>
     <Div
       position="absolute"
       top="5"
@@ -114,7 +104,7 @@ const StyledSidePanel = ({
       </Button>
     </Div>
     {children}
-  </aside>
+  </div>
 )
 
 type PanelProps = {
@@ -135,6 +125,7 @@ const Panel = ({ isOpen, keepAlive = false, children }: PanelProps) => (
     {keepAlive || isOpen ? children : null}
   </div>
 )
+
 export const SidePanel = () => {
   const {
     activePanelId,
@@ -153,7 +144,6 @@ export const SidePanel = () => {
   return (
     <StyledSidePanel
       title={t(`heading.${activeSubPanelId || activePanelId}`)}
-      ariaLabel={t('ariaLabel')}
       onClose={() => {
         layoutStore.activePanelId = null
         layoutStore.activeSubPanelId = null
@@ -163,7 +153,6 @@ export const SidePanel = () => {
       })}
       isClosed={!isSidePanelOpen}
       isSubmenu={isSubPanelOpen}
-      backButtonLabel={t('backToTools')}
       onBack={() => (layoutStore.activeSubPanelId = null)}
     >
       <Panel isOpen={isParticipantsOpen}>

src/frontend/src/features/rooms/livekit/components/Tools.tsx

@@ -1,4 +1,4 @@
-import { A, Div, Icon, Text } from '@/primitives'
+import { A, Div, Text } from '@/primitives'
 import { css } from '@/styled-system/css'
 import { Button as RACButton } from 'react-aria-components'
 import { useTranslation } from 'react-i18next'
@@ -87,7 +87,7 @@ const ToolButton = ({
           alignItems: 'center',
         })}
       >
-        <Icon type="symbols" name="chevron_forward" />
+        <span className="material-symbols">chevron_forward</span>
       </div>
     </RACButton>
   )
@@ -163,7 +163,7 @@ export const Tools = () => {
       </Text>
       {isTranscriptEnabled && (
         <ToolButton
-          icon={<Icon type="symbols" name="speech_to_text" />}
+          icon={<span className="material-symbols">speech_to_text</span>}
           title={t('tools.transcript.title')}
           description={t('tools.transcript.body')}
           onPress={() => openTranscript()}
@@ -171,7 +171,7 @@ export const Tools = () => {
       )}
       {isScreenRecordingEnabled && (
         <ToolButton
-          icon={<Icon type="symbols" name="mode_standby" />}
+          icon={<span className="material-symbols">mode_standby</span>}
           title={t('tools.screenRecording.title')}
           description={t('tools.screenRecording.body')}
           onPress={() => openScreenRecording()}

src/frontend/src/features/rooms/livekit/components/blur/UnifiedBackgroundTrackProcessor.ts

@@ -11,7 +11,9 @@ import {
   ProcessorType,
 } from '.'
 
-export class UnifiedBackgroundTrackProcessor implements BackgroundProcessorInterface {
+export class UnifiedBackgroundTrackProcessor
+  implements BackgroundProcessorInterface
+{
   processor: ProcessorWrapper<BackgroundOptions>
   opts: BackgroundOptions
   processorType: ProcessorType

src/frontend/src/features/rooms/livekit/components/blur/index.ts

@@ -13,7 +13,8 @@ export interface ProcessorSerialized {
   options: BackgroundOptions
 }
 
-export interface BackgroundProcessorInterface extends TrackProcessor<Track.Kind> {
+export interface BackgroundProcessorInterface
+  extends TrackProcessor<Track.Kind> {
   update(opts: BackgroundOptions): Promise<void>
   options: BackgroundOptions
   clone(): BackgroundProcessorInterface

src/frontend/src/features/rooms/livekit/components/controls/ChatToggle.tsx

@@ -6,7 +6,6 @@ import { ToggleButton } from '@/primitives'
 import { chatStore } from '@/stores/chat'
 import { useSidePanel } from '../../hooks/useSidePanel'
 import { ToggleButtonProps } from '@/primitives/ToggleButton'
-import { useRegisterKeyboardShortcut } from '@/features/shortcuts/useRegisterKeyboardShortcut'
 
 export const ChatToggle = ({
   onPress,
@@ -19,11 +18,6 @@ export const ChatToggle = ({
   const { isChatOpen, toggleChat } = useSidePanel()
   const tooltipLabel = isChatOpen ? 'open' : 'closed'
 
-  useRegisterKeyboardShortcut({
-    id: 'toggle-chat',
-    handler: toggleChat,
-  })
-
   return (
     <div
       className={css({

src/frontend/src/features/rooms/livekit/components/controls/Device/ToggleDevice.tsx

@@ -18,7 +18,6 @@ import { useCannotUseDevice } from '../../../hooks/useCannotUseDevice'
 import { useDeviceIcons } from '../../../hooks/useDeviceIcons'
 import { useDeviceShortcut } from '../../../hooks/useDeviceShortcut'
 import { ToggleSource, CaptureOptionsBySource } from '@livekit/components-core'
-import { getShortcutDescriptorById } from '@/features/shortcuts/catalog'
 
 type ToggleDeviceStyleProps = {
   variant?: NonNullable<ButtonRecipeProps>['variant']
@@ -89,14 +88,12 @@ export const ToggleDevice = <T extends ToggleSource>({
   const deviceShortcut = useDeviceShortcut(kind)
 
   useRegisterKeyboardShortcut({
-    id: deviceShortcut?.id,
+    shortcut: deviceShortcut,
     handler: async () => await toggle(),
     isDisabled: cannotUseDevice,
   })
-
-  const pushToTalkShortcut = getShortcutDescriptorById('push-to-talk')
   useLongPress({
-    keyCode: kind === 'audioinput' ? pushToTalkShortcut?.code : undefined,
+    keyCode: kind === 'audioinput' ? 'KeyV' : undefined,
     onKeyDown,
     onKeyUp,
     isDisabled: cannotUseDevice,
@@ -106,9 +103,7 @@ export const ToggleDevice = <T extends ToggleSource>({
     const label = t(enabled ? 'disable' : 'enable', {
       keyPrefix: `selectDevice.${kind}`,
     })
-    return deviceShortcut?.shortcut
-      ? appendShortcutLabel(label, deviceShortcut.shortcut)
-      : label
+    return deviceShortcut ? appendShortcutLabel(label, deviceShortcut) : label
   }, [enabled, kind, deviceShortcut, t])
 
   const Icon =

src/frontend/src/features/rooms/livekit/components/controls/HandToggle.tsx

@@ -9,7 +9,6 @@ import {
   closeLowerHandToasts,
   showLowerHandToast,
 } from '@/features/notifications/utils'
-import { useRegisterKeyboardShortcut } from '@/features/shortcuts/useRegisterKeyboardShortcut'
 
 const SPEAKING_DETECTION_DELAY = 3000
 
@@ -34,16 +33,6 @@ export const HandToggle = () => {
     closeLowerHandToasts()
   }, [isHandRaised])
 
-  const handleToggle = () => {
-    toggleRaisedHand()
-    resetToastState()
-  }
-
-  useRegisterKeyboardShortcut({
-    id: 'raise-hand',
-    handler: handleToggle,
-  })
-
   useEffect(() => {
     const shouldShowToast = isSpeaking && isHandRaised && !hasShownToast
 
@@ -79,7 +68,10 @@ export const HandToggle = () => {
         aria-label={t(tooltipLabel)}
         tooltip={t(tooltipLabel)}
         isSelected={isHandRaised}
-        onPress={handleToggle}
+        onPress={() => {
+          toggleRaisedHand()
+          resetToastState()
+        }}
         data-attr={`controls-hand-${tooltipLabel}`}
       >
         <RiHand />

src/frontend/src/features/rooms/livekit/components/controls/Participants/ParticipantsToggle.tsx

@@ -1,12 +1,10 @@
 import { useTranslation } from 'react-i18next'
 import { RiGroupLine, RiInfinityLine } from '@remixicon/react'
 import { ToggleButton } from '@/primitives'
-import { VisualOnlyTooltip } from '@/primitives/VisualOnlyTooltip'
 import { css } from '@/styled-system/css'
 import { useParticipants } from '@livekit/components-react'
 import { useSidePanel } from '../../../hooks/useSidePanel'
 import { ToggleButtonProps } from '@/primitives/ToggleButton'
-import { useRegisterKeyboardShortcut } from '@/features/shortcuts/useRegisterKeyboardShortcut'
 
 export const ParticipantsToggle = ({
   onPress,
@@ -21,18 +19,11 @@ export const ParticipantsToggle = ({
    */
   const participants = useParticipants()
   const numParticipants = participants?.length
-  const announcedCount =
-    numParticipants && numParticipants > 0 ? numParticipants : 1
 
   const { isParticipantsOpen, toggleParticipants } = useSidePanel()
 
   const tooltipLabel = isParticipantsOpen ? 'open' : 'closed'
 
-  useRegisterKeyboardShortcut({
-    id: 'toggle-participants',
-    handler: toggleParticipants,
-  })
-
   return (
     <div
       className={css({
@@ -40,24 +31,21 @@ export const ParticipantsToggle = ({
         display: 'inline-block',
       })}
     >
-      <VisualOnlyTooltip tooltip={t(tooltipLabel)}>
-        <ToggleButton
-          square
-          variant="primaryTextDark"
-          aria-label={`${t(tooltipLabel)}. ${t('count', {
-            count: announcedCount,
-          })}.`}
-          isSelected={isParticipantsOpen}
-          onPress={(e) => {
-            toggleParticipants()
-            onPress?.(e)
-          }}
-          data-attr={`controls-participants-${tooltipLabel}`}
-          {...props}
-        >
-          <RiGroupLine />
-        </ToggleButton>
-      </VisualOnlyTooltip>
+      <ToggleButton
+        square
+        variant="primaryTextDark"
+        aria-label={t(tooltipLabel)}
+        tooltip={t(tooltipLabel)}
+        isSelected={isParticipantsOpen}
+        onPress={(e) => {
+          toggleParticipants()
+          onPress?.(e)
+        }}
+        data-attr={`controls-participants-${tooltipLabel}`}
+        {...props}
+      >
+        <RiGroupLine />
+      </ToggleButton>
       <div
         className={css({
           position: 'absolute',

src/frontend/src/features/rooms/livekit/components/controls/ReactionsToggle.tsx

@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next'
 import { RiEmotionLine } from '@remixicon/react'
-import { useState, useRef } from 'react'
+import { useState, useRef, useEffect } from 'react'
 import { css } from '@/styled-system/css'
 import { useRoomContext } from '@livekit/components-react'
 import { ToggleButton, Button } from '@/primitives'
@@ -10,14 +10,7 @@ import {
   ANIMATION_DURATION,
   ReactionPortals,
 } from '@/features/rooms/livekit/components/ReactionPortal'
-import { getEmojiLabel } from '@/features/rooms/livekit/utils/reactionUtils'
-import { useRegisterKeyboardShortcut } from '@/features/shortcuts/useRegisterKeyboardShortcut'
-import {
-  Popover as RACPopover,
-  Dialog,
-  DialogTrigger,
-} from 'react-aria-components'
-import { FocusScope } from '@react-aria/focus'
+import { Toolbar as RACToolbar } from 'react-aria-components'
 import { Participant } from 'livekit-client'
 import useRateLimiter from '@/hooks/useRateLimiter'
 
@@ -45,12 +38,7 @@ export const ReactionsToggle = () => {
   const instanceIdRef = useRef(0)
   const room = useRoomContext()
 
-  const [isOpen, setIsOpen] = useState(false)
-
-  useRegisterKeyboardShortcut({
-    id: 'reaction',
-    handler: () => setIsOpen((prev) => !prev),
-  })
+  const [isVisible, setIsVisible] = useState(false)
 
   const sendReaction = async (emoji: string) => {
     const encoder = new TextEncoder()
@@ -84,76 +72,100 @@ export const ReactionsToggle = () => {
     windowMs: 1000,
   })
 
+  // Custom animation implementation for the emoji toolbar
+  // Could not use a menu and its animation, because a menu would make the toolbar inaccessible by keyboard
+  // animation isn't perfect
+  const [isRendered, setIsRendered] = useState(isVisible)
+  const [opacity, setOpacity] = useState(isVisible ? 1 : 0)
+
+  useEffect(() => {
+    if (isVisible) {
+      // Show: first render, then animate in
+      setIsRendered(true)
+      // Need to delay setting opacity to ensure CSS transition works
+      // (using requestAnimationFrame to ensure DOM has updated)
+      requestAnimationFrame(() => {
+        requestAnimationFrame(() => {
+          setOpacity(1)
+        })
+      })
+    } else if (isRendered) {
+      // Hide: first animate out, then unrender
+      setOpacity(0)
+
+      // Wait for animation to complete before removing from DOM
+      const timer = setTimeout(() => {
+        setIsRendered(false)
+      }, 200) // Match this to your animation duration
+      return () => clearTimeout(timer)
+    }
+  }, [isVisible, isRendered])
+
   return (
     <>
-      <div className={css({ position: 'relative' })}>
-        <DialogTrigger isOpen={isOpen} onOpenChange={setIsOpen}>
-          <ToggleButton
-            square
-            variant="primaryDark"
-            aria-label={t('button')}
-            tooltip={t('button')}
-            isSelected={isOpen}
-            onChange={setIsOpen}
-          >
-            <RiEmotionLine />
-          </ToggleButton>
-          <RACPopover
-            placement="top"
-            offset={8}
-            isNonModal
-            shouldCloseOnInteractOutside={() => false}
+      <div
+        className={css({
+          position: 'relative',
+        })}
+      >
+        <ToggleButton
+          square
+          variant="primaryDark"
+          aria-label={t('button')}
+          tooltip={t('button')}
+          onPress={() => setIsVisible(!isVisible)}
+        >
+          <RiEmotionLine />
+        </ToggleButton>
+        {isRendered && (
+          <div
             className={css({
+              position: 'absolute',
+              top: -63,
+              left: -162,
               borderRadius: '8px',
               padding: '0.35rem',
               backgroundColor: 'primaryDark.50',
-              '&[data-entering]': {
-                animation: 'fade 200ms ease',
-              },
-              '&[data-exiting]': {
-                animation: 'fade 200ms ease-in reverse',
-              },
+              opacity: opacity,
+              transition: 'opacity 0.2s ease',
             })}
+            onTransitionEnd={() => {
+              if (!isVisible) {
+                setIsRendered(false)
+              }
+            }}
           >
-            <Dialog className={css({ outline: 'none' })}>
-              {/* eslint-disable-next-line jsx-a11y/no-autofocus -- FocusScope autoFocus is programmatic focus for overlays, not the HTML autofocus attribute */}
-              <FocusScope contain autoFocus restoreFocus>
-                <div
-                  role="toolbar"
-                  aria-orientation="horizontal"
-                  aria-label={t('button')}
-                  className={css({
-                    display: 'flex',
-                    gap: '0.5rem',
-                  })}
+            <RACToolbar
+              className={css({
+                display: 'flex',
+                gap: '0.5rem',
+              })}
+            >
+              {Object.values(Emoji).map((emoji, index) => (
+                <Button
+                  key={index}
+                  onPress={() => debouncedSendReaction(emoji)}
+                  aria-label={t('send', { emoji })}
+                  variant="primaryTextDark"
+                  size="sm"
+                  square
+                  data-attr={`send-reaction-${emoji}`}
                 >
-                  {Object.values(Emoji).map((emoji, index) => (
-                    <Button
-                      key={index}
-                      onPress={() => debouncedSendReaction(emoji)}
-                      aria-label={t('send', { emoji: getEmojiLabel(emoji, t) })}
-                      variant="primaryTextDark"
-                      size="sm"
-                      square
-                      data-attr={`send-reaction-${emoji}`}
-                    >
-                      <img
-                        src={`/assets/reactions/${emoji}.png`}
-                        alt=""
-                        className={css({
-                          width: '28px',
-                          height: '28px',
-                          pointerEvents: 'none',
-                          userSelect: 'none',
-                        })}
-                      />
-                    </Button>
-                  ))}
-                </div>
-              </FocusScope>
-            </Dialog>
-          </RACPopover>
-        </DialogTrigger>
+                  <img
+                    src={`/assets/reactions/${emoji}.png`}
+                    alt=""
+                    className={css({
+                      minHeight: '28px',
+                      minWidth: '28px',
+                      pointerEvents: 'none',
+                      userSelect: 'none',
+                    })}
+                  />
+                </Button>
+              ))}
+            </RACToolbar>
+          </div>
+        )}
       </div>
       <ReactionPortals reactions={reactions} />
     </>

src/frontend/src/features/rooms/livekit/components/controls/StartMediaButton.tsx

@@ -6,7 +6,8 @@ import {
 import React from 'react'
 
 /** @public */
-export interface AllowMediaPlaybackProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+export interface AllowMediaPlaybackProps
+  extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   label?: string
 }
 

src/frontend/src/features/rooms/livekit/components/effects/EffectsConfiguration.tsx

@@ -9,16 +9,15 @@ import {
 } from '../blur'
 import { css } from '@/styled-system/css'
 import { H, P, Text, ToggleButton } from '@/primitives'
-import { VisualOnlyTooltip } from '@/primitives/VisualOnlyTooltip'
 import { styled } from '@/styled-system/jsx'
 import { BlurOn } from '@/components/icons/BlurOn'
 import { BlurOnStrong } from '@/components/icons/BlurOnStrong'
 import { useTrackToggle } from '@livekit/components-react'
 import { Loader } from '@/primitives/Loader'
 import { useSyncAfterDelay } from '@/hooks/useSyncAfterDelay'
+import { RiProhibited2Line } from '@remixicon/react'
 import { FunnyEffects } from './FunnyEffects'
 import { useHasFunnyEffectsAccess } from '../../hooks/useHasFunnyEffectsAccess'
-import { useScreenReaderAnnounce } from '@/hooks/useScreenReaderAnnounce'
 
 enum BlurRadius {
   NONE = 0,
@@ -51,17 +50,11 @@ export const EffectsConfiguration = ({
   layout = 'horizontal',
 }: EffectsConfigurationProps) => {
   const videoRef = useRef<HTMLVideoElement>(null)
-  const blurLightRef = useRef<HTMLButtonElement | null>(null)
   const { t } = useTranslation('rooms', { keyPrefix: 'effects' })
   const { toggle, enabled } = useTrackToggle({ source: Track.Source.Camera })
   const [processorPending, setProcessorPending] = useState(false)
   const processorPendingReveal = useSyncAfterDelay(processorPending)
   const hasFunnyEffectsAccess = useHasFunnyEffectsAccess()
-  const announce = useScreenReaderAnnounce()
-  const effectAnnouncementTimeout = useRef<ReturnType<
-    typeof setTimeout
-  > | null>(null)
-  const effectAnnouncementId = useRef(0)
 
   useEffect(() => {
     const videoElement = videoRef.current
@@ -76,92 +69,16 @@ export const EffectsConfiguration = ({
     }
   }, [videoTrack, videoTrack?.isMuted])
 
-  useEffect(() => {
-    if (!blurLightRef.current) return
-
-    const rafId = requestAnimationFrame(() => {
-      blurLightRef.current?.focus({ preventScroll: true })
-    })
-
-    return () => {
-      cancelAnimationFrame(rafId)
-    }
-  }, [])
-
-  useEffect(
-    () => () => {
-      if (effectAnnouncementTimeout.current) {
-        clearTimeout(effectAnnouncementTimeout.current)
-      }
-    },
-    []
-  )
-
-  const announceEffectStatusMessage = (message: string) => {
-    effectAnnouncementId.current += 1
-    const currentId = effectAnnouncementId.current
-
-    if (effectAnnouncementTimeout.current) {
-      clearTimeout(effectAnnouncementTimeout.current)
-    }
-
-    effectAnnouncementTimeout.current = setTimeout(() => {
-      if (currentId !== effectAnnouncementId.current) return
-      announce(message)
-    }, 80)
-  }
-
   const clearEffect = async () => {
     await videoTrack.stopProcessor()
     onSubmit?.(undefined)
   }
 
-  const getVirtualBackgroundName = (imagePath?: string) => {
-    if (!imagePath) return ''
-    const match = imagePath.match(/\/backgrounds\/(\d+)\.jpg$/)
-    if (!match) return ''
-    const index = Number(match[1]) - 1
-    if (Number.isNaN(index)) return ''
-    return t(`virtual.descriptions.${index}`)
-  }
-
-  const updateEffectStatusMessage = (
-    type: ProcessorType,
-    options: BackgroundOptions,
-    wasSelectedBeforeToggle: boolean
-  ) => {
-    if (wasSelectedBeforeToggle) {
-      announceEffectStatusMessage(t('blur.status.none'))
-      return
-    }
-
-    if (type === ProcessorType.BLUR) {
-      const message =
-        options.blurRadius === BlurRadius.LIGHT
-          ? t('blur.status.light')
-          : t('blur.status.strong')
-      announceEffectStatusMessage(message)
-      return
-    }
-
-    if (type === ProcessorType.VIRTUAL) {
-      const backgroundName = getVirtualBackgroundName(options.imagePath)
-      if (backgroundName) {
-        announceEffectStatusMessage(
-          `${t('virtual.selectedLabel')} ${backgroundName}`
-        )
-        return
-      }
-    }
-  }
-
   const toggleEffect = async (
     type: ProcessorType,
     options: BackgroundOptions
   ) => {
     setProcessorPending(true)
-    const wasSelectedBeforeToggle = isSelected(type, options)
-
     if (!videoTrack) {
       /**
        * Special case: if no video track is available, then we must pass directly the processor into the
@@ -187,7 +104,7 @@ export const EffectsConfiguration = ({
 
     const processor = getProcessor()
     try {
-      if (wasSelectedBeforeToggle) {
+      if (isSelected(type, options)) {
         // Stop processor.
         await clearEffect()
       } else if (
@@ -214,8 +131,6 @@ export const EffectsConfiguration = ({
         // We want to trigger onSubmit when options changes so the parent component is aware of it.
         onSubmit?.(processor)
       }
-
-      updateEffectStatusMessage(type, options, wasSelectedBeforeToggle)
     } catch (error) {
       console.error('Error applying effect:', error)
     } finally {
@@ -238,28 +153,8 @@ export const EffectsConfiguration = ({
     )
   }
 
-  const tooltipBlur = (type: ProcessorType, options: BackgroundOptions) => {
-    const strength =
-      options.blurRadius === BlurRadius.LIGHT ? 'light' : 'normal'
-    const action = isSelected(type, options) ? 'clear' : 'apply'
-
-    return t(`${type}.${strength}.${action}`)
-  }
-
-  const ariaLabelVirtualBackground = (
-    index: number,
-    imagePath: string
-  ): string => {
-    const isSelectedBackground = isSelected(ProcessorType.VIRTUAL, {
-      imagePath,
-    })
-    const prefix = isSelectedBackground ? 'selectedLabel' : 'apply'
-    const backgroundName = t(`virtual.descriptions.${index}`)
-    return `${t(`virtual.${prefix}`)} ${backgroundName}`
-  }
-
-  const tooltipVirtualBackground = (index: number): string => {
-    return t(`virtual.descriptions.${index}`)
+  const tooltipLabel = (type: ProcessorType, options: BackgroundOptions) => {
+    return t(`${type}.${isSelected(type, options) ? 'clear' : 'apply'}`)
   }
 
   return (
@@ -370,57 +265,65 @@ export const EffectsConfiguration = ({
               >
                 {t('blur.title')}
               </H>
-              <div>
-                <div
-                  className={css({
-                    display: 'flex',
-                    gap: '1.25rem',
-                  })}
+              <div
+                className={css({
+                  display: 'flex',
+                  gap: '1.25rem',
+                })}
+              >
+                <ToggleButton
+                  variant="bigSquare"
+                  aria-label={t('clear')}
+                  onPress={async () => {
+                    await clearEffect()
+                  }}
+                  isSelected={!getProcessor()}
+                  isDisabled={processorPendingReveal || isDisabled}
                 >
-                  <ToggleButton
-                    ref={blurLightRef}
-                    variant="bigSquare"
-                    aria-label={tooltipBlur(ProcessorType.BLUR, {
+                  <RiProhibited2Line />
+                </ToggleButton>
+                <ToggleButton
+                  variant="bigSquare"
+                  aria-label={tooltipLabel(ProcessorType.BLUR, {
+                    blurRadius: BlurRadius.LIGHT,
+                  })}
+                  tooltip={tooltipLabel(ProcessorType.BLUR, {
+                    blurRadius: BlurRadius.LIGHT,
+                  })}
+                  isDisabled={processorPendingReveal || isDisabled}
+                  onChange={async () =>
+                    await toggleEffect(ProcessorType.BLUR, {
                       blurRadius: BlurRadius.LIGHT,
-                    })}
-                    tooltip={tooltipBlur(ProcessorType.BLUR, {
-                      blurRadius: BlurRadius.LIGHT,
-                    })}
-                    isDisabled={processorPendingReveal || isDisabled}
-                    onChange={async () =>
-                      await toggleEffect(ProcessorType.BLUR, {
-                        blurRadius: BlurRadius.LIGHT,
-                      })
-                    }
-                    isSelected={isSelected(ProcessorType.BLUR, {
-                      blurRadius: BlurRadius.LIGHT,
-                    })}
-                    data-attr="toggle-blur-light"
-                  >
-                    <BlurOn />
-                  </ToggleButton>
-                  <ToggleButton
-                    variant="bigSquare"
-                    aria-label={tooltipBlur(ProcessorType.BLUR, {
+                    })
+                  }
+                  isSelected={isSelected(ProcessorType.BLUR, {
+                    blurRadius: BlurRadius.LIGHT,
+                  })}
+                  data-attr="toggle-blur-light"
+                >
+                  <BlurOn />
+                </ToggleButton>
+                <ToggleButton
+                  variant="bigSquare"
+                  aria-label={tooltipLabel(ProcessorType.BLUR, {
+                    blurRadius: BlurRadius.NORMAL,
+                  })}
+                  tooltip={tooltipLabel(ProcessorType.BLUR, {
+                    blurRadius: BlurRadius.NORMAL,
+                  })}
+                  isDisabled={processorPendingReveal || isDisabled}
+                  onChange={async () =>
+                    await toggleEffect(ProcessorType.BLUR, {
                       blurRadius: BlurRadius.NORMAL,
-                    })}
-                    tooltip={tooltipBlur(ProcessorType.BLUR, {
-                      blurRadius: BlurRadius.NORMAL,
-                    })}
-                    isDisabled={processorPendingReveal || isDisabled}
-                    onChange={async () =>
-                      await toggleEffect(ProcessorType.BLUR, {
-                        blurRadius: BlurRadius.NORMAL,
-                      })
-                    }
-                    isSelected={isSelected(ProcessorType.BLUR, {
-                      blurRadius: BlurRadius.NORMAL,
-                    })}
-                    data-attr="toggle-blur-normal"
-                  >
-                    <BlurOnStrong />
-                  </ToggleButton>
-                </div>
+                    })
+                  }
+                  isSelected={isSelected(ProcessorType.BLUR, {
+                    blurRadius: BlurRadius.NORMAL,
+                  })}
+                  data-attr="toggle-blur-normal"
+                >
+                  <BlurOnStrong />
+                </ToggleButton>
               </div>
               <div
                 className={css({
@@ -440,37 +343,39 @@ export const EffectsConfiguration = ({
                   className={css({
                     display: 'flex',
                     gap: '1.25rem',
-                    paddingBottom: '0.5rem',
                     flexWrap: 'wrap',
                   })}
                 >
                   {[...Array(8).keys()].map((i) => {
                     const imagePath = `/assets/backgrounds/${i + 1}.jpg`
                     const thumbnailPath = `/assets/backgrounds/thumbnails/${i + 1}.jpg`
-                    const tooltipText = tooltipVirtualBackground(i)
                     return (
-                      <VisualOnlyTooltip key={i} tooltip={tooltipText}>
-                        <ToggleButton
-                          variant="bigSquare"
-                          aria-label={ariaLabelVirtualBackground(i, imagePath)}
-                          isDisabled={processorPendingReveal || isDisabled}
-                          onChange={async () =>
-                            await toggleEffect(ProcessorType.VIRTUAL, {
-                              imagePath,
-                            })
-                          }
-                          isSelected={isSelected(ProcessorType.VIRTUAL, {
+                      <ToggleButton
+                        key={i}
+                        variant="bigSquare"
+                        aria-label={tooltipLabel(ProcessorType.VIRTUAL, {
+                          imagePath,
+                        })}
+                        tooltip={tooltipLabel(ProcessorType.VIRTUAL, {
+                          imagePath,
+                        })}
+                        isDisabled={processorPendingReveal || isDisabled}
+                        onChange={async () =>
+                          await toggleEffect(ProcessorType.VIRTUAL, {
                             imagePath,
-                          })}
-                          className={css({
-                            bgSize: 'cover',
-                          })}
-                          style={{
-                            backgroundImage: `url(${thumbnailPath})`,
-                          }}
-                          data-attr={`toggle-virtual-${i}`}
-                        />
-                      </VisualOnlyTooltip>
+                          })
+                        }
+                        isSelected={isSelected(ProcessorType.VIRTUAL, {
+                          imagePath,
+                        })}
+                        className={css({
+                          bgSize: 'cover',
+                        })}
+                        style={{
+                          backgroundImage: `url(${thumbnailPath})`,
+                        }}
+                        data-attr={`toggle-virtual-${i}`}
+                      />
                     )
                   })}
                 </div>

src/frontend/src/features/rooms/livekit/components/layout/CarouselLayout.tsx

@@ -11,7 +11,8 @@ const ASPECT_RATIO = 16 / 10
 const ASPECT_RATIO_INVERT = (1 - ASPECT_RATIO) * -1
 
 /** @public */
-export interface CarouselLayoutProps extends React.HTMLAttributes<HTMLMediaElement> {
+export interface CarouselLayoutProps
+  extends React.HTMLAttributes<HTMLMediaElement> {
   tracks: TrackReferenceOrPlaceholder[]
   children: React.ReactNode
   /** Place the tiles vertically or horizontally next to each other.

src/frontend/src/features/rooms/livekit/components/layout/GridLayout.tsx

@@ -13,8 +13,7 @@ import { PaginationControl } from '../controls/PaginationControl'
 
 /** @public */
 export interface GridLayoutProps
-  extends
-    React.HTMLAttributes<HTMLDivElement>,
+  extends React.HTMLAttributes<HTMLDivElement>,
     Pick<UseParticipantsOptions, 'updateOnlyOn'> {
   children: React.ReactNode
   tracks: TrackReferenceOrPlaceholder[]

src/frontend/src/features/rooms/livekit/hooks/useCanPublishTrack.ts

@@ -12,6 +12,6 @@ export function useCanPublishTrack(trackSource: TrackSource): boolean {
 
   return Boolean(
     permissions?.canPublish &&
-    permissions?.canPublishSources?.includes(trackSource)
+      permissions?.canPublishSources?.includes(trackSource)
   )
 }

src/frontend/src/features/rooms/livekit/hooks/useDeviceShortcut.ts

@@ -1,16 +1,19 @@
 import { useMemo } from 'react'
-import {
-  getShortcutDescriptorById,
-  ShortcutDescriptor,
-} from '@/features/shortcuts/catalog'
+import { Shortcut } from '@/features/shortcuts/types'
 
 export const useDeviceShortcut = (kind: MediaDeviceKind) => {
-  return useMemo<ShortcutDescriptor | undefined>(() => {
+  return useMemo<Shortcut | undefined>(() => {
     switch (kind) {
       case 'audioinput':
-        return getShortcutDescriptorById('toggle-microphone')
+        return {
+          key: 'd',
+          ctrlKey: true,
+        }
       case 'videoinput':
-        return getShortcutDescriptorById('toggle-camera')
+        return {
+          key: 'e',
+          ctrlKey: true,
+        }
       default:
         return undefined
     }

src/frontend/src/features/rooms/livekit/prefabs/Chat.tsx

@@ -18,7 +18,8 @@ import { css } from '@/styled-system/css'
 import { useRestoreFocus } from '@/hooks/useRestoreFocus'
 
 export interface ChatProps
-  extends React.HTMLAttributes<HTMLDivElement>, ChatOptions {}
+  extends React.HTMLAttributes<HTMLDivElement>,
+    ChatOptions {}
 
 /**
  * The Chat component adds a basis chat functionality to the LiveKit room. The messages are distributed to all participants

src/frontend/src/features/rooms/livekit/prefabs/ControlBar/DesktopControlBar.tsx

@@ -22,7 +22,7 @@ export function DesktopControlBar({
   const desktopControlBarEl = useRef<HTMLDivElement>(null)
 
   useRegisterKeyboardShortcut({
-    id: 'focus-toolbar',
+    shortcut: { key: 'F2' },
     handler: () => {
       const root = desktopControlBarEl.current
       if (!root) return

src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx

@@ -5,8 +5,9 @@ import {
   isWeb,
   log,
 } from '@livekit/components-core'
-import { Participant, RoomEvent, Track } from 'livekit-client'
-import React, { useCallback, useRef, useState, useEffect } from 'react'
+import { RoomEvent, Track } from 'livekit-client'
+import * as React from 'react'
+import { useState } from 'react'
 import {
   ConnectionStateToast,
   FocusLayoutContainer,
@@ -15,9 +16,7 @@ import {
   usePinnedTracks,
   useTracks,
   useCreateLayoutContext,
-  useRoomContext,
 } from '@livekit/components-react'
-import { useTranslation } from 'react-i18next'
 
 import { ControlBar } from './ControlBar/ControlBar'
 import { styled } from '@/styled-system/jsx'
@@ -38,8 +37,6 @@ import { Subtitles } from '@/features/subtitle/component/Subtitles'
 import { CarouselLayout } from '../components/layout/CarouselLayout'
 import { GridLayout } from '../components/layout/GridLayout'
 import { IsIdleDisconnectModal } from '../components/IsIdleDisconnectModal'
-import { getParticipantName } from '@/features/rooms/utils/getParticipantName'
-import { useScreenReaderAnnounce } from '@/hooks/useScreenReaderAnnounce'
 
 const LayoutWrapper = styled(
   'div',
@@ -66,7 +63,8 @@ const LayoutWrapper = styled(
 /**
  * @public
  */
-export interface VideoConferenceProps extends React.HTMLAttributes<HTMLDivElement> {
+export interface VideoConferenceProps
+  extends React.HTMLAttributes<HTMLDivElement> {
   /** @alpha */
   SettingsComponent?: React.ComponentType
 }
@@ -91,22 +89,7 @@ export interface VideoConferenceProps extends React.HTMLAttributes<HTMLDivElemen
  */
 export function VideoConference({ ...props }: VideoConferenceProps) {
   const lastAutoFocusedScreenShareTrack =
-    useRef<TrackReferenceOrPlaceholder | null>(null)
-  const lastPinnedParticipantIdentityRef = useRef<string | null>(null)
-  const { t } = useTranslation('rooms', { keyPrefix: 'pinAnnouncements' })
-  const { t: tRooms } = useTranslation('rooms')
-  const room = useRoomContext()
-  const announce = useScreenReaderAnnounce()
-
-  const getAnnouncementName = useCallback(
-    (participant?: Participant | null) => {
-      if (!participant) return tRooms('participants.unknown')
-      return participant.isLocal
-        ? tRooms('participants.you')
-        : getParticipantName(participant)
-    },
-    [tRooms]
-  )
+    React.useRef<TrackReferenceOrPlaceholder | null>(null)
 
   useConnectionObserver()
   useVideoResolutionSubscription()
@@ -132,62 +115,9 @@ export function VideoConference({ ...props }: VideoConferenceProps) {
     (track) => !isEqualTrackRef(track, focusTrack)
   )
 
-  // handle pin announcements
-
-  useEffect(() => {
-    const participant = focusTrack?.participant
-
-    // 1. unpin
-    if (!participant) {
-      if (!lastPinnedParticipantIdentityRef.current) return
-
-      const lastIdentity = lastPinnedParticipantIdentityRef.current
-      const lastParticipant =
-        room.localParticipant.identity === lastIdentity
-          ? room.localParticipant
-          : room.remoteParticipants.get(lastIdentity)
-      const announcementName = getAnnouncementName(lastParticipant)
-
-      announce(
-        lastParticipant?.isLocal
-          ? t('self.unpin')
-          : t('unpin', {
-              name: announcementName,
-            })
-      )
-
-      lastPinnedParticipantIdentityRef.current = null
-      return
-    }
-
-    // 2. same pin → do nothing
-    if (lastPinnedParticipantIdentityRef.current === participant.identity) {
-      return
-    }
-
-    // 3. new pin
-    const participantName = participant.isLocal
-      ? tRooms('participants.you')
-      : getParticipantName(participant)
-
-    lastPinnedParticipantIdentityRef.current = participant.identity
-
-    announce(
-      participant.isLocal ? t('self.pin') : t('pin', { name: participantName })
-    )
-  }, [
-    announce,
-    focusTrack,
-    getAnnouncementName,
-    room.localParticipant,
-    room.remoteParticipants,
-    t,
-    tRooms,
-  ])
-
   /* eslint-disable react-hooks/exhaustive-deps */
   // Code duplicated from LiveKit; this warning will be addressed in the refactoring.
-  useEffect(() => {
+  React.useEffect(() => {
     // If screen share tracks are published, and no pin is set explicitly, auto set the screen share.
     if (
       screenShareTracks.some((track) => track.publication.isSubscribed) &&

src/frontend/src/features/rooms/livekit/processors/RnnNoiseProcessor.ts

@@ -9,7 +9,8 @@ import NoiseSuppressorWorklet from '@timephy/rnnoise-wasm/NoiseSuppressorWorklet
 // and suspend/resume it as needed to manage audio state
 let audioContext: AudioContext
 
-export interface AudioProcessorInterface extends TrackProcessor<Track.Kind.Audio> {
+export interface AudioProcessorInterface
+  extends TrackProcessor<Track.Kind.Audio> {
   name: string
 }
 

src/frontend/src/features/rooms/livekit/utils/reactionUtils.ts

@@ -1,24 +0,0 @@
-import { useTranslation } from 'react-i18next'
-
-export const getEmojiLabel = (
-  emoji: string,
-  t: ReturnType<typeof useTranslation>['t']
-) => {
-  const emojiLabels: Record<string, string> = {
-    'thumbs-up': t('emojis.thumbs-up', { defaultValue: 'thumbs up' }),
-    'thumbs-down': t('emojis.thumbs-down', { defaultValue: 'thumbs down' }),
-    'clapping-hands': t('emojis.clapping-hands', {
-      defaultValue: 'clapping hands',
-    }),
-    'red-heart': t('emojis.red-heart', { defaultValue: 'red heart' }),
-    'face-with-tears-of-joy': t('emojis.face-with-tears-of-joy', {
-      defaultValue: 'face with tears of joy',
-    }),
-    'face-with-open-mouth': t('emojis.face-with-open-mouth', {
-      defaultValue: 'surprised face',
-    }),
-    'party-popper': t('emojis.party-popper', { defaultValue: 'party popper' }),
-    'folded-hands': t('emojis.folded-hands', { defaultValue: 'folded hands' }),
-  }
-  return emojiLabels[emoji] ?? emoji
-}

src/frontend/src/features/rooms/routes/Feedback.tsx

@@ -3,9 +3,7 @@ import { Button } from '@/primitives'
 import { Screen } from '@/layout/Screen'
 import { Center, HStack, styled, VStack } from '@/styled-system/jsx'
 import { Rating } from '@/features/rooms/components/Rating.tsx'
-import { useLocation } from 'wouter'
-import { useMemo } from 'react'
-import { DisconnectReason } from 'livekit-client'
+import { useLocation, useSearchParams } from 'wouter'
 
 // fixme - duplicated with home, refactor in a proper style
 const Heading = styled('h1', {
@@ -22,40 +20,25 @@ const Heading = styled('h1', {
   },
 })
 
-enum DisconnectReasonKey {
-  DuplicateIdentity = 'duplicateIdentity',
-  ParticipantRemoved = 'participantRemoved',
-}
-
 export const FeedbackRoute = () => {
   const { t } = useTranslation('rooms')
   const [, setLocation] = useLocation()
 
-  const reasonKey = useMemo(() => {
-    const state = window.history.state
-
-    if (!state?.reason) return
-    switch (state.reason) {
-      case DisconnectReason.DUPLICATE_IDENTITY:
-        return DisconnectReasonKey.DuplicateIdentity
-      case DisconnectReason.PARTICIPANT_REMOVED:
-        return DisconnectReasonKey.ParticipantRemoved
-    }
-  }, [])
-
-  const showBackButton = reasonKey !== DisconnectReasonKey.ParticipantRemoved
+  const [searchParams] = useSearchParams()
 
   return (
     <Screen layout="centered" footer={false}>
       <Center>
         <VStack>
-          <Heading>{t(`feedback.heading.${reasonKey || 'normal'}`)}</Heading>
-          <HStack>
-            {showBackButton && (
-              <Button variant="secondary" onPress={() => window.history.back()}>
-                {t('feedback.back')}
-              </Button>
+          <Heading>
+            {t(
+              `feedback.heading.${searchParams.get('duplicateIdentity') ? 'duplicateIdentity' : 'normal'}`
             )}
+          </Heading>
+          <HStack>
+            <Button variant="secondary" onPress={() => window.history.back()}>
+              {t('feedback.back')}
+            </Button>
             <Button variant="primary" onPress={() => setLocation('/')}>
               {t('feedback.home')}
             </Button>

src/frontend/src/features/settings/components/SettingsDialogExtended.tsx

@@ -2,7 +2,6 @@ import { Dialog, type DialogProps } from '@/primitives'
 import { Tab, Tabs, TabList } from '@/primitives/Tabs.tsx'
 import { css } from '@/styled-system/css'
 import { text } from '@/primitives/Text.tsx'
-import { Icon } from '@/primitives/Icon'
 import { Heading } from 'react-aria-components'
 import { useTranslation } from 'react-i18next'
 import {
@@ -11,8 +10,6 @@ import {
   RiSettings3Line,
   RiSpeakerLine,
   RiVideoOnLine,
-  RiEyeLine,
-  RiKeyboardBoxLine,
 } from '@remixicon/react'
 import { AccountTab } from './tabs/AccountTab'
 import { NotificationsTab } from './tabs/NotificationsTab'
@@ -20,12 +17,10 @@ import { GeneralTab } from './tabs/GeneralTab'
 import { AudioTab } from './tabs/AudioTab'
 import { VideoTab } from './tabs/VideoTab'
 import { TranscriptionTab } from './tabs/TranscriptionTab'
-import { ShortcutTab } from './tabs/ShortcutTab'
 import { useRef } from 'react'
 import { useMediaQuery } from '@/features/rooms/livekit/hooks/useMediaQuery'
 import { SettingsDialogExtendedKey } from '@/features/settings/type'
 import { useIsAdminOrOwner } from '@/features/rooms/livekit/hooks/useIsAdminOrOwner'
-import { AccessibilityTab } from './tabs/AccessibilityTab'
 
 const tabsStyle = css({
   maxHeight: '40.625rem', // fixme size copied from meet settings modal
@@ -41,7 +36,6 @@ const tabListContainerStyle = css({
   flexDirection: 'column',
   borderRight: '1px solid lightGray', // fixme poor color management
   paddingY: '1rem',
-  paddingLeft: '0.2rem',
   paddingRight: '1.5rem',
 })
 
@@ -110,22 +104,13 @@ export const SettingsDialogExtended = (props: SettingsDialogExtended) => {
               {isWideScreen &&
                 t(`tabs.${SettingsDialogExtendedKey.NOTIFICATIONS}`)}
             </Tab>
-            <Tab icon highlight id={SettingsDialogExtendedKey.SHORTCUTS}>
-              <RiKeyboardBoxLine />
-              {isWideScreen && t(`tabs.${SettingsDialogExtendedKey.SHORTCUTS}`)}
-            </Tab>
             {isAdminOrOwner && (
               <Tab icon highlight id={SettingsDialogExtendedKey.TRANSCRIPTION}>
-                <Icon type="symbols" name="speech_to_text" />
+                <span className="material-symbols">speech_to_text</span>
                 {isWideScreen &&
                   t(`tabs.${SettingsDialogExtendedKey.TRANSCRIPTION}`)}
               </Tab>
             )}
-            <Tab icon highlight id={SettingsDialogExtendedKey.ACCESSIBILITY}>
-              <RiEyeLine />
-              {isWideScreen &&
-                t(`tabs.${SettingsDialogExtendedKey.ACCESSIBILITY}`)}
-            </Tab>
           </TabList>
         </div>
         <div className={tabPanelContainerStyle}>
@@ -137,10 +122,8 @@ export const SettingsDialogExtended = (props: SettingsDialogExtended) => {
           <VideoTab id={SettingsDialogExtendedKey.VIDEO} />
           <GeneralTab id={SettingsDialogExtendedKey.GENERAL} />
           <NotificationsTab id={SettingsDialogExtendedKey.NOTIFICATIONS} />
-          <ShortcutTab id={SettingsDialogExtendedKey.SHORTCUTS} />
           {/* Transcription tab won't be accessible if the tab is not active in the tab list */}
           <TranscriptionTab id={SettingsDialogExtendedKey.TRANSCRIPTION} />
-          <AccessibilityTab id={SettingsDialogExtendedKey.ACCESSIBILITY} />
         </div>
       </Tabs>
     </Dialog>

src/frontend/src/features/settings/components/tabs/AccessibilityTab.tsx

@@ -1,38 +0,0 @@
-import { Field, H } from '@/primitives'
-import { TabPanel, TabPanelProps } from '@/primitives/Tabs'
-import { css } from '@/styled-system/css'
-import { useTranslation } from 'react-i18next'
-import { useSnapshot } from 'valtio'
-import { accessibilityStore } from '@/stores/accessibility'
-
-export type AccessibilityTabProps = Pick<TabPanelProps, 'id'>
-
-export const AccessibilityTab = ({ id }: AccessibilityTabProps) => {
-  const { t } = useTranslation('settings')
-  const snap = useSnapshot(accessibilityStore)
-
-  return (
-    <TabPanel padding={'md'} flex id={id}>
-      <H lvl={2}>{t('tabs.accessibility')}</H>
-      <ul
-        className={css({
-          display: 'flex',
-          flexDirection: 'column',
-          gap: '1rem',
-        })}
-      >
-        <li>
-          <Field
-            type="switch"
-            label={t('accessibility.announceReactions.label')}
-            isSelected={snap.announceReactions}
-            onChange={(value) => {
-              accessibilityStore.announceReactions = value
-            }}
-            wrapperProps={{ noMargin: true, fullWidth: true }}
-          />
-        </li>
-      </ul>
-    </TabPanel>
-  )
-}

src/frontend/src/features/settings/components/tabs/ShortcutTab.tsx

@@ -1,51 +0,0 @@
-import { shortcutCatalog } from '@/features/shortcuts/catalog'
-import { ShortcutRow } from '@/features/shortcuts/components/ShortcutRow'
-import { css } from '@/styled-system/css'
-import { useTranslation } from 'react-i18next'
-import { TabPanel, type TabPanelProps } from '@/primitives/Tabs'
-import { H } from '@/primitives'
-
-const tableStyle = css({
-  width: '100%',
-  borderCollapse: 'collapse',
-  overflowY: 'auto',
-  '& th, & td': {
-    padding: '0.65rem 0',
-    textAlign: 'left',
-  },
-  '& tbody tr': {
-    borderBottom: '1px solid rgba(255,255,255,0.08)',
-  },
-})
-
-export const ShortcutTab = ({ id }: Pick<TabPanelProps, 'id'>) => {
-  const { t } = useTranslation(['settings', 'rooms'])
-
-  return (
-    <TabPanel
-      id={id}
-      padding="md"
-      flex
-      className={css({
-        display: 'flex',
-        flexDirection: 'column',
-        gap: '0.75rem',
-      })}
-    >
-      <H lvl={2}>{t('shortcuts.listLabel')}</H>
-      <table className={tableStyle}>
-        <thead className="sr-only">
-          <tr>
-            <th scope="col">{t('shortcuts.columnAction')}</th>
-            <th scope="col">{t('shortcuts.columnShortcut')}</th>
-          </tr>
-        </thead>
-        <tbody>
-          {shortcutCatalog.map((item) => (
-            <ShortcutRow key={item?.id} descriptor={item} />
-          ))}
-        </tbody>
-      </table>
-    </TabPanel>
-  )
-}

src/frontend/src/features/settings/type.ts

@@ -5,6 +5,4 @@ export enum SettingsDialogExtendedKey {
   GENERAL = 'general',
   NOTIFICATIONS = 'notifications',
   TRANSCRIPTION = 'transcription',
-  SHORTCUTS = 'shortcuts',
-  ACCESSIBILITY = 'accessibility',
 }

src/frontend/src/features/shortcuts/catalog.ts

@@ -1,83 +0,0 @@
-import { Shortcut } from './types'
-
-// Central list of current keyboard shortcuts.
-// Keep a single source of truth for display and, later, customization
-export type ShortcutCategory = 'navigation' | 'media' | 'interaction'
-
-export type ShortcutId =
-  | 'focus-toolbar'
-  | 'toggle-microphone'
-  | 'toggle-camera'
-  | 'push-to-talk'
-  | 'toggle-chat'
-  | 'toggle-participants'
-  | 'raise-hand'
-  | 'recording'
-  | 'reaction'
-  | 'fullscreen'
-
-export const getShortcutDescriptorById = (id: ShortcutId) =>
-  shortcutCatalog.find((item) => item.id === id)
-
-export type ShortcutDescriptor = {
-  id: ShortcutId
-  category: ShortcutCategory
-  shortcut?: Shortcut
-  kind?: 'press' | 'longPress'
-  code?: string // used when kind === 'longPress' (KeyboardEvent.code)
-  description?: string
-}
-
-export const shortcutCatalog: ShortcutDescriptor[] = [
-  {
-    id: 'focus-toolbar',
-    category: 'navigation',
-    shortcut: { key: 'F2' },
-  },
-  {
-    id: 'toggle-microphone',
-    category: 'media',
-    shortcut: { key: 'd', ctrlKey: true },
-  },
-  {
-    id: 'toggle-camera',
-    category: 'media',
-    shortcut: { key: 'e', ctrlKey: true },
-  },
-  {
-    id: 'push-to-talk',
-    category: 'media',
-    kind: 'longPress',
-    code: 'KeyV',
-  },
-  {
-    id: 'reaction',
-    category: 'interaction',
-    shortcut: { key: 'E', ctrlKey: true, shiftKey: true },
-  },
-  {
-    id: 'fullscreen',
-    category: 'interaction',
-    shortcut: { key: 'F', ctrlKey: true, shiftKey: true },
-  },
-  {
-    id: 'recording',
-    category: 'interaction',
-    shortcut: { key: 'L', ctrlKey: true, shiftKey: true },
-  },
-  {
-    id: 'raise-hand',
-    category: 'interaction',
-    shortcut: { key: 'H', ctrlKey: true, shiftKey: true },
-  },
-  {
-    id: 'toggle-chat',
-    category: 'interaction',
-    shortcut: { key: 'M', ctrlKey: true, shiftKey: true },
-  },
-  {
-    id: 'toggle-participants',
-    category: 'interaction',
-    shortcut: { key: 'P', ctrlKey: true, shiftKey: true },
-  },
-]

src/frontend/src/features/shortcuts/components/ShortcutBadge.tsx

@@ -1,34 +0,0 @@
-import React from 'react'
-import { css, cx } from '@/styled-system/css'
-
-type ShortcutBadgeProps = {
-  visualLabel: string
-  srLabel?: string
-  className?: string
-}
-
-const badgeStyle = css({
-  fontFamily: 'monospace',
-  backgroundColor: 'rgba(255,255,255,0.12)',
-  paddingInline: '0.4rem',
-  paddingBlock: '0.2rem',
-  borderRadius: '6px',
-  whiteSpace: 'nowrap',
-  minWidth: '5.5rem',
-  textAlign: 'center',
-})
-
-export const ShortcutBadge: React.FC<ShortcutBadgeProps> = ({
-  visualLabel,
-  srLabel,
-  className,
-}) => {
-  return (
-    <>
-      <div className={cx(badgeStyle, className)} aria-hidden="true">
-        <span>{visualLabel}</span>
-      </div>
-      {srLabel && <span className="sr-only">{srLabel}</span>}
-    </>
-  )
-}

src/frontend/src/features/shortcuts/components/ShortcutRow.tsx

@@ -1,42 +0,0 @@
-import React from 'react'
-import { css } from '@/styled-system/css'
-import { text } from '@/primitives/Text'
-import { ShortcutDescriptor } from '../catalog'
-import { ShortcutBadge } from './ShortcutBadge'
-import { useShortcutFormatting } from '../hooks/useShortcutFormatting'
-import { useTranslation } from 'react-i18next'
-
-type ShortcutRowProps = {
-  descriptor: ShortcutDescriptor
-}
-
-const shortcutCellStyle = css({
-  textAlign: 'right',
-})
-
-export const ShortcutRow: React.FC<ShortcutRowProps> = ({ descriptor }) => {
-  const { t } = useTranslation('rooms', { keyPrefix: 'shortcutsPanel' })
-  const { formatVisual, formatForSR } = useShortcutFormatting()
-
-  const visualShortcut = formatVisual(
-    descriptor.shortcut,
-    descriptor.code,
-    descriptor.kind
-  )
-  const srShortcut = formatForSR(
-    descriptor.shortcut,
-    descriptor.code,
-    descriptor.kind
-  )
-
-  return (
-    <tr>
-      <td className={text({ variant: 'body' })}>
-        {t(`actions.${descriptor.id}`)}
-      </td>
-      <td className={shortcutCellStyle}>
-        <ShortcutBadge visualLabel={visualShortcut} srLabel={srShortcut} />
-      </td>
-    </tr>
-  )
-}

src/frontend/src/features/shortcuts/formatLabels.ts

@@ -1,59 +0,0 @@
-import { Shortcut } from './types'
-import { isMacintosh } from '@/utils/livekit'
-
-// Visible label for a shortcut (uses ⌘/Ctrl prefix when needed).
-export const formatShortcutLabel = (shortcut?: Shortcut) => {
-  if (!shortcut) return '—'
-  const key = shortcut.key?.toUpperCase()
-  if (!key) return '—'
-  const parts: string[] = []
-  if (shortcut.ctrlKey) parts.push(isMacintosh() ? '⌘' : 'Ctrl')
-  if (shortcut.altKey) parts.push(isMacintosh() ? '⌥' : 'Alt')
-  if (shortcut.shiftKey) parts.push('Shift')
-  parts.push(key)
-  return parts.join('+')
-}
-
-// SR-friendly label for a shortcut (reads "Control plus D").
-export const formatShortcutLabelForSR = (
-  shortcut: Shortcut | undefined,
-  {
-    controlLabel,
-    commandLabel,
-    altLabel,
-    optionLabel,
-    shiftLabel,
-    plusLabel,
-    noShortcutLabel,
-  }: {
-    controlLabel: string
-    commandLabel: string
-    altLabel: string
-    optionLabel: string
-    shiftLabel: string
-    plusLabel: string
-    noShortcutLabel: string
-  }
-) => {
-  if (!shortcut) return noShortcutLabel
-  const key = shortcut.key?.toUpperCase()
-  if (!key) return noShortcutLabel
-  const ctrlWord = isMacintosh() ? commandLabel : controlLabel
-  const altWord = isMacintosh() ? optionLabel : altLabel
-  const parts: string[] = []
-  if (shortcut.ctrlKey) parts.push(ctrlWord)
-  if (shortcut.altKey) parts.push(altWord)
-  if (shortcut.shiftKey) parts.push(shiftLabel)
-  parts.push(key)
-  return parts.join(` ${plusLabel} `)
-}
-
-// Extract displayable key name from KeyboardEvent.code (ex: KeyV -> V).
-export const getKeyLabelFromCode = (code?: string) => {
-  if (!code) return ''
-  if (code.startsWith('Key') && code.length === 4) return code.slice(3)
-  if (code.startsWith('Digit') && code.length === 6) return code.slice(5)
-  if (code === 'Space') return '␣'
-  if (code.startsWith('Arrow')) return code.slice(5) // Up, Down, Left, Right
-  return code
-}

src/frontend/src/features/shortcuts/hooks/useShortcutFormatting.ts

@@ -1,47 +0,0 @@
-import { useCallback } from 'react'
-import { useTranslation } from 'react-i18next'
-import { Shortcut } from '../types'
-import {
-  formatShortcutLabel,
-  formatShortcutLabelForSR,
-  getKeyLabelFromCode,
-} from '../formatLabels'
-
-export const useShortcutFormatting = () => {
-  const { t } = useTranslation('rooms')
-
-  const formatVisual = useCallback(
-    (shortcut?: Shortcut, code?: string, kind?: string) => {
-      if (code && kind === 'longPress') {
-        const label = getKeyLabelFromCode(code)
-        return t('shortcutsPanel.visual.hold', { key: label || '?' })
-      }
-      return formatShortcutLabel(shortcut)
-    },
-    [t]
-  )
-
-  const formatForSR = useCallback(
-    (shortcut?: Shortcut, code?: string, kind?: string) => {
-      if (code && kind === 'longPress') {
-        const label = getKeyLabelFromCode(code)
-        return t('shortcutsPanel.sr.hold', { key: label || '?' })
-      }
-      return formatShortcutLabelForSR(shortcut, {
-        controlLabel: t('shortcutsPanel.sr.control'),
-        commandLabel: t('shortcutsPanel.sr.command'),
-        altLabel: t('shortcutsPanel.sr.alt'),
-        optionLabel: t('shortcutsPanel.sr.option'),
-        shiftLabel: t('shortcutsPanel.sr.shift'),
-        plusLabel: t('shortcutsPanel.sr.plus'),
-        noShortcutLabel: t('shortcutsPanel.sr.noShortcut'),
-      })
-    },
-    [t]
-  )
-
-  return {
-    formatVisual,
-    formatForSR,
-  }
-}

src/frontend/src/features/shortcuts/types.ts

@@ -1,6 +1,4 @@
 export type Shortcut = {
   key: string
   ctrlKey?: boolean
-  shiftKey?: boolean
-  altKey?: boolean
 }

src/frontend/src/features/shortcuts/useKeyboardShortcuts.ts

@@ -11,13 +11,11 @@ export const useKeyboardShortcuts = () => {
     // This approach handles basic shortcuts but isn't comprehensive.
     // Issues might occur. First draft.
     const onKeyDown = async (e: KeyboardEvent) => {
-      const { key, metaKey, ctrlKey, shiftKey, altKey } = e
+      const { key, metaKey, ctrlKey } = e
       if (!key) return
       const shortcutKey = formatShortcutKey({
         key,
         ctrlKey: ctrlKey || (isMacintosh() && metaKey),
-        shiftKey,
-        altKey,
       })
       const shortcut = shortcutsSnap.shortcuts.get(shortcutKey)
       if (!shortcut) return

src/frontend/src/features/shortcuts/useRegisterKeyboardShortcut.ts

@@ -1,28 +1,26 @@
 import { useEffect } from 'react'
 import { keyboardShortcutsStore } from '@/stores/keyboardShortcuts'
 import { formatShortcutKey } from '@/features/shortcuts/utils'
-import { ShortcutId, getShortcutDescriptorById } from './catalog'
+import { Shortcut } from '@/features/shortcuts/types'
 
 export type useRegisterKeyboardShortcutProps = {
-  id?: ShortcutId
+  shortcut?: Shortcut
   handler: () => Promise<void | boolean | undefined> | void
   isDisabled?: boolean
 }
 
 export const useRegisterKeyboardShortcut = ({
-  id,
+  shortcut,
   handler,
   isDisabled = false,
 }: useRegisterKeyboardShortcutProps) => {
   useEffect(() => {
-    if (!id) return
-    const descriptor = getShortcutDescriptorById(id)
-    if (!descriptor?.shortcut) return
-    const formattedKey = formatShortcutKey(descriptor.shortcut)
+    if (!shortcut) return
+    const formattedKey = formatShortcutKey(shortcut)
     if (isDisabled) {
       keyboardShortcutsStore.shortcuts.delete(formattedKey)
     } else {
       keyboardShortcutsStore.shortcuts.set(formattedKey, handler)
     }
-  }, [handler, id, isDisabled])
+  }, [handler, shortcut, isDisabled])
 }

src/frontend/src/features/shortcuts/utils.ts

@@ -4,27 +4,15 @@ import { Shortcut } from '@/features/shortcuts/types'
 export const CTRL = 'ctrl'
 
 export const formatShortcutKey = (shortcut: Shortcut) => {
-  const parts = []
-  if (shortcut.ctrlKey) parts.push(CTRL)
-  if (shortcut.altKey) parts.push('alt')
-  if (shortcut.shiftKey) parts.push('shift')
-  parts.push(shortcut.key.toUpperCase())
-  return parts.join('+')
+  if (shortcut.ctrlKey) return `${CTRL}+${shortcut.key.toUpperCase()}`
+  return shortcut.key.toUpperCase()
 }
 
 export const appendShortcutLabel = (label: string, shortcut: Shortcut) => {
   if (!shortcut.key) return
-  const parts: string[] = []
+  let formattedKeyLabel = shortcut.key.toLowerCase()
   if (shortcut.ctrlKey) {
-    parts.push(isMacintosh() ? '⌘' : 'Ctrl')
+    formattedKeyLabel = `${isMacintosh() ? '⌘' : 'Ctrl'}+${formattedKeyLabel}`
   }
-  if (shortcut.altKey) {
-    parts.push(isMacintosh() ? '⌥' : 'Alt')
-  }
-  if (shortcut.shiftKey) {
-    parts.push('Shift')
-  }
-  parts.push(shortcut.key.toLowerCase())
-  const formattedKeyLabel = parts.join('+')
   return `${label} (${formattedKeyLabel})`
 }

src/frontend/src/features/subtitle/component/Subtitles.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useSubtitles } from '../hooks/useSubtitles'
 import { css, cva } from '@/styled-system/css'
 import { styled } from '@/styled-system/jsx'
@@ -13,62 +13,101 @@ export interface TranscriptionSegment {
   id: string
   text: string
   language: string
-  startTime?: number
+  startTime: number
   endTime: number
   final: boolean
   firstReceivedTime: number
   lastReceivedTime: number
 }
 
-export interface TranscriptionSegmentWithParticipant extends TranscriptionSegment {
-  participant: Participant
-}
-
 export interface TranscriptionRow {
   id: string
   participant: Participant
   segments: TranscriptionSegment[]
-  startTime?: number
+  startTime: number
   lastUpdateTime: number
-  lastReceivedTime: number
 }
 
 const useTranscriptionState = () => {
-  const [transcriptionSegments, setTranscriptionSegments] = useState<
-    TranscriptionSegmentWithParticipant[]
+  const [transcriptionRows, setTranscriptionRows] = useState<
+    TranscriptionRow[]
   >([])
+  const [lastActiveParticipantIdentity, setLastActiveParticipantIdentity] =
+    useState<string | null>(null)
 
-  const updateTranscriptionSegments = (
+  const updateTranscriptions = (
     segments: TranscriptionSegment[],
     participant?: Participant
   ) => {
-    console.log(participant, segments)
-
     if (!participant || segments.length === 0) return
 
-    if (segments.length > 1) {
-      console.warn('Unexpected error more segments')
-      return
-    }
+    setTranscriptionRows((prevRows) => {
+      const updatedRows = [...prevRows]
+      const now = Date.now()
 
-    const segment = segments[0]
+      const shouldAppendToLastRow =
+        lastActiveParticipantIdentity === participant.identity &&
+        updatedRows.length > 0
 
-    setTranscriptionSegments((prevSegments) => {
-      const existingSegmentIds = new Set(prevSegments.map((s) => s.id))
-      if (existingSegmentIds.has(segment.id)) return prevSegments
-      return [
-        ...prevSegments,
-        {
-          participant: participant,
-          ...segment,
-        },
-      ]
+      if (shouldAppendToLastRow) {
+        const lastRowIndex = updatedRows.length - 1
+        const lastRow = updatedRows[lastRowIndex]
+
+        const existingSegmentIds = new Set(lastRow.segments.map((s) => s.id))
+        const newSegments = segments.filter(
+          (segment) => !existingSegmentIds.has(segment.id)
+        )
+        const updatedSegments = lastRow.segments.map((existing) => {
+          const update = segments.find((s) => s.id === existing.id)
+          return update && update.final ? update : existing
+        })
+
+        updatedRows[lastRowIndex] = {
+          ...lastRow,
+          segments: [...updatedSegments, ...newSegments],
+          lastUpdateTime: now,
+        }
+      } else {
+        const newRow: TranscriptionRow = {
+          id: `${participant.identity}-${now}`,
+          participant,
+          segments: [...segments],
+          startTime: Math.min(...segments.map((s) => s.startTime)),
+          lastUpdateTime: now,
+        }
+        updatedRows.push(newRow)
+      }
+
+      return updatedRows
+    })
+
+    setLastActiveParticipantIdentity(participant.identity)
+  }
+
+  const clearTranscriptions = () => {
+    setTranscriptionRows([])
+    setLastActiveParticipantIdentity(null)
+  }
+
+  const updateParticipant = (_name: string, participant: Participant) => {
+    setTranscriptionRows((prevRows) => {
+      return prevRows.map((row) => {
+        if (row.participant.identity === participant.identity) {
+          return {
+            ...row,
+            participant,
+          }
+        }
+        return row
+      })
     })
   }
 
   return {
-    updateTranscriptionSegments,
-    transcriptionSegments,
+    transcriptionRows,
+    updateTranscriptions,
+    clearTranscriptions,
+    updateParticipant,
   }
 }
 
@@ -153,54 +192,24 @@ const SubtitlesWrapper = styled(
 export const Subtitles = () => {
   const { areSubtitlesOpen } = useSubtitles()
   const room = useRoomContext()
-
-  const { transcriptionSegments, updateTranscriptionSegments } =
+  const { transcriptionRows, updateTranscriptions, updateParticipant } =
     useTranscriptionState()
 
   useEffect(() => {
     if (!room) return
-    room.on(RoomEvent.TranscriptionReceived, updateTranscriptionSegments)
+    room.on(RoomEvent.TranscriptionReceived, updateTranscriptions)
     return () => {
-      room.off(RoomEvent.TranscriptionReceived, updateTranscriptionSegments)
+      room.off(RoomEvent.TranscriptionReceived, updateTranscriptions)
     }
-  }, [room, updateTranscriptionSegments])
+  }, [room, updateTranscriptions])
 
-  const transcriptionRows = useMemo(() => {
-    if (transcriptionSegments.length === 0) return []
-
-    const rows: TranscriptionRow[] = []
-    let currentRow: TranscriptionRow | null = null
-
-    for (const segment of transcriptionSegments) {
-      const shouldStartNewRow =
-        !currentRow ||
-        currentRow.participant.identity !== segment.participant.identity
-
-      if (shouldStartNewRow) {
-        currentRow = {
-          id: `${segment.participant.identity}-${segment.firstReceivedTime}`,
-          participant: segment.participant,
-          segments: [segment],
-          startTime: segment.startTime,
-          lastUpdateTime: segment.lastReceivedTime,
-          lastReceivedTime: segment.lastReceivedTime,
-        }
-        rows.push(currentRow)
-      } else if (currentRow) {
-        currentRow.segments.push(segment)
-        currentRow.lastUpdateTime = Math.max(
-          currentRow.lastUpdateTime,
-          segment.lastReceivedTime
-        )
-        currentRow.lastReceivedTime = Math.max(
-          currentRow.lastReceivedTime,
-          segment.lastReceivedTime
-        )
-      }
+  useEffect(() => {
+    if (!room) return
+    room.on(RoomEvent.ParticipantNameChanged, updateParticipant)
+    return () => {
+      room.off(RoomEvent.ParticipantNameChanged, updateParticipant)
     }
-
-    return rows
-  }, [transcriptionSegments])
+  }, [room, updateParticipant])
 
   return (
     <SubtitlesWrapper areOpen={areSubtitlesOpen}>

src/frontend/src/features/subtitle/hooks/useSubtitles.tsx

@@ -2,14 +2,10 @@ import { useSnapshot } from 'valtio'
 import { layoutStore } from '@/stores/layout'
 import { useStartSubtitle } from '../api/startSubtitle'
 import { useRoomData } from '@/features/rooms/livekit/hooks/useRoomData'
-import { useRoomContext } from '@livekit/components-react'
-import { useEffect } from 'react'
-import { RoomEvent } from 'livekit-client'
 
 export const useSubtitles = () => {
   const layoutSnap = useSnapshot(layoutStore)
 
-  const room = useRoomContext()
   const apiRoomData = useRoomData()
   const { mutateAsync: startSubtitleRoom, isPending } = useStartSubtitle()
 
@@ -24,18 +20,6 @@ export const useSubtitles = () => {
     layoutStore.showSubtitles = !layoutSnap.showSubtitles
   }
 
-  useEffect(() => {
-    if (!room) return
-
-    const closeSubtitles = () => {
-      layoutStore.showSubtitles = false
-    }
-    room.on(RoomEvent.Disconnected, closeSubtitles)
-    return () => {
-      room.off(RoomEvent.Disconnected, closeSubtitles)
-    }
-  }, [room])
-
   return {
     areSubtitlesOpen: layoutSnap.showSubtitles,
     toggleSubtitles,