✨(frontend) allow user register to beta feature

I've created a beta form, allowing interested visitors to
register to be a beta user.

This form is yet created with Grist, could be enhance. I'll
investigate using PostHog.

.github/workflows/docker-hub.yml

@@ -117,57 +117,10 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-  build-and-push-summary:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.APP_ID }}
-          private-key: ${{ secrets.PRIVATE_KEY }}
-          owner: ${{ github.repository_owner }}
-          repositories: "meet,secrets"
-      -
-        name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ steps.app-token.outputs.token }}
-      -
-        name: Load sops secrets
-        uses: rouja/actions-sops@main
-        with:
-          secret-file: secrets/numerique-gouv/meet/secrets.enc.env
-          age-key: ${{ secrets.SOPS_PRIVATE }}
-      -
-        name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: lasuite/meet-summary
-      -
-        name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        run: echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USER" --password-stdin
-      -
-        name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: ./src/summary
-          file: ./src/summary/Dockerfile
-          target: production
-          build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-
   notify-argocd:
     needs:
       - build-and-push-frontend
       - build-and-push-backend
-      - build-and-push-summary
     runs-on: ubuntu-latest
     if: |
       github.event_name != 'pull_request'

Makefile

@@ -302,9 +302,7 @@ build-k8s-cluster: ## build the kubernetes cluster using kind
 .PHONY: build-k8s-cluster
 
 start-tilt: ## start the kubernetes cluster using kind
+	kubectl config set-context --current --namespace=meet
 	tilt up -f ./bin/Tiltfile
 .PHONY: build-k8s-cluster
 
-start-tilt-keycloak: ## start the kubernetes cluster using kind, without Pro Connect for authentication, use keycloak
-	DEV_ENV=dev-keycloak tilt up -f ./bin/Tiltfile
-.PHONY: build-k8s-cluster

README.md

@@ -118,8 +118,6 @@ $ make build-k8s-cluster
 Once the Kubernetes cluster is ready, start the application stack locally:
 ```shell
 $ make start-tilt
-or
-$ make start-tilt-keycloak # start stack without Pro Connect, use keycloak
 ```
 These commands set up and run your application environment using Tilt for local Kubernetes development.
 

bin/Tiltfile

@@ -1,6 +1,7 @@
 load('ext://uibutton', 'cmd_button', 'bool_input', 'location')
 load('ext://namespace', 'namespace_create', 'namespace_inject')
 namespace_create('meet')
+
 docker_build(
     'localhost:5001/meet-backend:latest',
     context='..',
@@ -27,18 +28,7 @@ docker_build(
     ]
 )
 
-docker_build(
-    'localhost:5001/meet-summary:latest',
-    context='../src/summary',
-    dockerfile='../src/summary/Dockerfile',
-    only=['.', '../../docker', '../../.dockerignore'],
-    target = 'production',
-    live_update=[
-        sync('../src/summary', '/home/summary'),
-    ]
-)
-
-k8s_yaml(local('cd ../src/helm && helmfile -n meet -e ${DEV_ENV:-dev} template .'))
+k8s_yaml(local('cd ../src/helm && helmfile -n meet -e dev template .'))
 
 migration = '''
 set -eu

bin/start-kind.sh

@@ -29,7 +29,7 @@ echo "2. Create kind cluster with containerd registry config dir enabled"
 # https://github.com/kubernetes-sigs/kind/issues/2875
 # https://github.com/containerd/containerd/blob/main/docs/cri/config.md#registry-configuration
 # See: https://github.com/containerd/containerd/blob/main/docs/hosts.md
-cat <<EOF | kind create cluster --name visio --config=-
+cat <<EOF | kind create cluster --config=-
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 containerdConfigPatches:
@@ -52,6 +52,10 @@ nodes:
   - containerPort: 443
     hostPort: 443
     protocol: TCP
+- role: worker
+  image: kindest/node:v1.27.3
+- role: worker
+  image: kindest/node:v1.27.3
 EOF
 
 echo "3. Add the registry config to the nodes"
@@ -64,7 +68,7 @@ echo "3. Add the registry config to the nodes"
 # We want a consistent name that works from both ends, so we tell containerd to
 # alias localhost:${reg_port} to the registry container when pulling images
 REGISTRY_DIR="/etc/containerd/certs.d/localhost:${reg_port}"
-for node in $(kind get nodes --name visio); do
+for node in $(kind get nodes); do
 	docker exec "${node}" mkdir -p "${REGISTRY_DIR}"
 	cat <<EOF | docker exec -i "${node}" cp /dev/stdin "${REGISTRY_DIR}/hosts.toml"
 [host."http://${reg_name}:5000"]
@@ -132,8 +136,3 @@ echo "6. Install ingress-nginx"
 kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
 kubectl -n ingress-nginx create secret tls mkcert --key /tmp/127.0.0.1.nip.io+1-key.pem --cert /tmp/127.0.0.1.nip.io+1.pem
 kubectl -n ingress-nginx patch deployments.apps ingress-nginx-controller --type 'json' -p '[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value":"--default-ssl-certificate=ingress-nginx/mkcert"}]'
-
-echo "7. Setup namespace"
-kubectl create ns meet
-kubectl config set-context --current --namespace=meet
-kubectl -n meet create secret generic mkcert --from-file=rootCA.pem="$(mkcert -CAROOT)/rootCA.pem"

src/backend/core/api/serializers.py

@@ -130,18 +130,17 @@ class RoomSerializer(serializers.ModelSerializer):
             del output["configuration"]
 
         if role is not None or instance.is_public:
-            room_id = f"{instance.id!s}"
+            slug = f"{instance.id!s}"
             username = request.query_params.get("username", None)
 
             output["livekit"] = {
                 "url": settings.LIVEKIT_CONFIGURATION["url"],
-                "room": room_id,
+                "room": slug,
                 "token": utils.generate_token(
-                    room=room_id, user=request.user, username=username
+                    room=slug, user=request.user, username=username
                 ),
-                "passphrase": utils.get_cached_passphrase(room_id)
             }
-            
+
         output["is_administrable"] = is_admin
 
         return output

src/backend/core/api/viewsets.py

@@ -32,7 +32,6 @@ from core.recording.event.exceptions import (
     InvalidFileTypeError,
     ParsingEventDataError,
 )
-from core.recording.event.notification import notification_service
 from core.recording.event.parsers import get_parser
 from core.recording.worker.exceptions import (
     RecordingStartError,
@@ -47,8 +46,6 @@ from core.recording.worker.mediator import (
 
 from . import permissions, serializers
 
-from livekit import api as livekit_api
-
 # pylint: disable=too-many-ancestors
 
 logger = getLogger(__name__)
@@ -212,10 +209,6 @@ class RoomViewSet(
         Allow unregistered rooms when activated.
         For unregistered rooms we only return a null id and the livekit room and token.
         """
-
-        # todo - determine whether encryption is needed store a shared secret in memory or in redis
-        # todo - check if a secret already exists, else create one.
-
         try:
             instance = self.get_object()
         except Http404:
@@ -349,36 +342,6 @@ class RoomViewSet(
             {"message": f"Recording stopped for room {room.slug}."}
         )
 
-    @decorators.action(
-        detail=False,
-        methods=["post"],
-        url_path="livekit-webhook",
-        permission_classes=[],
-        authentication_classes=[],
-    )
-    def handle_livekit_webhook(self, request, pk=None):  # pylint: disable=unused-argument
-        """Handle LiveKit webhook events."""
-        auth_token = request.headers.get("Authorization")
-        if not auth_token:
-            return drf_response.Response(
-                {"error": "Missing LiveKit authentication token"},
-                status=drf_status.HTTP_401_UNAUTHORIZED
-            )
-
-        token_verifier = livekit_api.TokenVerifier()
-        webhook_receiver = livekit_api.WebhookReceiver(token_verifier)
-
-        webhook_data = webhook_receiver.receive(request.body.decode("utf-8"), auth_token)
-
-        # Todo - livekit triggers a webhook for all events, see if we can restrict webhook to a limited number of events.
-        # Todo - handle Egress stopped / aborted events.
-
-        if webhook_data.event == "room_finished":
-            room_id = webhook_data.room.name
-            utils.clear_cache_passphrase(room_id)
-
-        return drf_response.Response({"message": f"Event processed"})
-
 
 class ResourceAccessListModelMixin:
     """List mixin for resource access API."""
@@ -485,17 +448,7 @@ class RecordingViewSet(
                 " in an error state or has already been saved."
             )
 
-        # Attempt to notify external services about the recording
-        # This is a non-blocking operation - failures are logged but don't interrupt the flow
-        notification_succeeded = notification_service.notify_external_services(
-            recording
-        )
-
-        recording.status = (
-            models.RecordingStatusChoices.NOTIFICATION_SUCCEEDED
-            if notification_succeeded
-            else models.RecordingStatusChoices.SAVED
-        )
+        recording.status = models.RecordingStatusChoices.SAVED
         recording.save()
 
         return drf_response.Response(

src/backend/core/authentication/backends.py

@@ -1,7 +1,7 @@
 """Authentication Backends for the Meet core app."""
 
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
+from django.core.exceptions import SuspiciousOperation
 from django.utils.translation import gettext_lazy as _
 
 import requests
@@ -10,11 +10,6 @@ from mozilla_django_oidc.auth import (
 )
 
 from core.models import User
-from core.services.marketing_service import (
-    ContactCreationError,
-    ContactData,
-    get_marketing_service,
-)
 
 
 class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
@@ -91,10 +86,6 @@ class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
                 password="!",  # noqa: S106
                 **claims,
             )
-
-            if settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL:
-                self.signup_to_marketing_email(email)
-
         elif not user:
             return None
 
@@ -105,26 +96,6 @@ class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
 
         return user
 
-    @staticmethod
-    def signup_to_marketing_email(email):
-        """Pragmatic approach to newsletter signup during authentication flow.
-
-        Details:
-        1. Uses a very short timeout (1s) to prevent blocking the auth process
-        2. Silently fails if the marketing service is down/slow to prioritize user experience
-        3. Trade-off: May miss some signups but ensures auth flow remains fast
-
-        Note: For a more robust solution, consider using Async task processing (Celery/Django-Q)
-        """
-        try:
-            marketing_service = get_marketing_service()
-            contact_data = ContactData(
-                email=email, attributes={"VISIO_SOURCE": ["SIGNIN"]}
-            )
-            marketing_service.create_contact(contact_data, timeout=1)
-        except (ContactCreationError, ImproperlyConfigured, ImportError):
-            pass
-
     def get_existing_user(self, sub, email):
         """Fetch existing user by sub or email."""
         try:

src/backend/core/authentication/views.py

@@ -145,7 +145,7 @@ class OIDCLogoutCallbackView(MozillaOIDCOIDCLogoutView):
 
 
 class OIDCAuthenticationCallbackView(MozillaOIDCAuthenticationCallbackView):
-    """Custom callback view for handling the silent login flow."""
+    """Custom callback view for handling the silent loging flow."""
 
     @property
     def failure_url(self):
@@ -162,7 +162,7 @@ class OIDCAuthenticationCallbackView(MozillaOIDCAuthenticationCallbackView):
 
 
 class OIDCAuthenticationRequestView(MozillaOIDCAuthenticationRequestView):
-    """Custom authentication view for handling the silent login flow."""
+    """Custom authentication view for handling the silent loging flow."""
 
     def get_extra_params(self, request):
         """Handle 'prompt' extra parameter for the silent login flow

src/backend/core/migrations/0009_alter_recording_status.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.3 on 2024-12-02 13:23
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0008_user_full_name_user_short_name'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='recording',
-            name='status',
-            field=models.CharField(choices=[('initiated', 'Initiated'), ('active', 'Active'), ('stopped', 'Stopped'), ('saved', 'Saved'), ('aborted', 'Aborted'), ('failed_to_start', 'Failed to Start'), ('failed_to_stop', 'Failed to Stop'), ('notification_succeeded', 'Notification succeeded')], default='initiated', max_length=50),
-        ),
-    ]

src/backend/core/models.py

@@ -49,7 +49,6 @@ class RecordingStatusChoices(models.TextChoices):
     ABORTED = "aborted", _("Aborted")
     FAILED_TO_START = "failed_to_start", _("Failed to Start")
     FAILED_TO_STOP = "failed_to_stop", _("Failed to Stop")
-    NOTIFICATION_SUCCEEDED = "notification_succeeded", _("Notification succeeded")
 
     @classmethod
     def is_final(cls, status):
@@ -189,7 +188,6 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
 
     class Meta:
         db_table = "meet_user"
-        ordering = ("-created_at",)
         verbose_name = _("user")
         verbose_name_plural = _("users")
 
@@ -305,7 +303,6 @@ class ResourceAccess(BaseModel):
 
     class Meta:
         db_table = "meet_resource_access"
-        ordering = ("-created_at",)
         verbose_name = _("Resource access")
         verbose_name_plural = _("Resource accesses")
         constraints = [
@@ -465,23 +462,7 @@ class BaseAccess(BaseModel):
 
 
 class Recording(BaseModel):
-    """Model for recordings that take place in a room.
-
-     Recording Status Flow:
-    1. INITIATED: Initial state when recording is requested
-    2. ACTIVE: Recording is currently in progress
-    3. STOPPED: Recording has been stopped by user/system
-    4. SAVED: Recording has been successfully processed and stored
-    4. NOTIFICATION_SUCCEEDED: External service has been notified of this recording
-
-    Error States:
-    - FAILED_TO_START: Worker failed to initialize recording
-    - FAILED_TO_STOP: Worker failed during stop operation
-    - ABORTED: Recording was terminated before completion
-
-    Warning: Worker failures may lead to database inconsistency between the actual
-    recording state and its status in the database.
-    """
+    """Model for recordings that take place in a room"""
 
     room = models.ForeignKey(
         Room,
@@ -490,7 +471,7 @@ class Recording(BaseModel):
         verbose_name=_("Room"),
     )
     status = models.CharField(
-        max_length=50,
+        max_length=20,
         choices=RecordingStatusChoices.choices,
         default=RecordingStatusChoices.INITIATED,
     )
@@ -562,7 +543,22 @@ class Recording(BaseModel):
 
 
 class RecordingAccess(BaseAccess):
-    """Relation model to give access to a recording for a user or a team with a role."""
+    """Relation model to give access to a recording for a user or a team with a role.
+
+    Recording Status Flow:
+    1. INITIATED: Initial state when recording is requested
+    2. ACTIVE: Recording is currently in progress
+    3. STOPPED: Recording has been stopped by user/system
+    4. SAVED: Recording has been successfully processed and stored
+
+    Error States:
+    - FAILED_TO_START: Worker failed to initialize recording
+    - FAILED_TO_STOP: Worker failed during stop operation
+    - ABORTED: Recording was terminated before completion
+
+    Warning: Worker failures may lead to database inconsistency between the actual
+    recording state and its status in the database.
+    """
 
     recording = models.ForeignKey(
         Recording,

src/backend/core/recording/event/authentication.py

@@ -47,6 +47,8 @@ class StorageEventAuthentication(BaseAuthentication):
 
     def authenticate(self, request):
         """Validate the Bearer token from the Authorization header."""
+        if not settings.RECORDING_ENABLE_STORAGE_EVENT_AUTH:
+            return MachineUser(), None
 
         if not settings.RECORDING_ENABLE_STORAGE_EVENT_AUTH:
             return MachineUser(), None

src/backend/core/recording/event/notification.py

@@ -1,93 +0,0 @@
-"""Service to notify external services when a new recording is ready."""
-
-import logging
-
-from django.conf import settings
-
-import requests
-
-from core import models
-
-logger = logging.getLogger(__name__)
-
-
-class NotificationService:
-    """Service for processing recordings and notifying external services."""
-
-    def notify_external_services(self, recording):
-        """Process a recording based on its mode."""
-
-        if recording.mode == models.RecordingModeChoices.TRANSCRIPT:
-            return self._notify_summary_service(recording)
-
-        if recording.mode == models.RecordingModeChoices.SCREEN_RECORDING:
-            logger.warning(
-                "Screen recording mode not implemented for recording %s", recording.id
-            )
-            return False
-
-        logger.error(
-            "Unknown recording mode %s for recording %s",
-            recording.mode,
-            recording.id,
-        )
-        return False
-
-    @staticmethod
-    def _notify_summary_service(recording):
-        """Notify summary service about a new recording."""
-
-        if (
-            not settings.SUMMARY_SERVICE_ENDPOINT
-            or not settings.SUMMARY_SERVICE_API_TOKEN
-        ):
-            logger.error("Summary service not configured")
-            return False
-
-        owner_access = (
-            models.RecordingAccess.objects.select_related("user")
-            .filter(
-                role=models.RoleChoices.OWNER,
-                recording_id=recording.id,
-            )
-            .first()
-        )
-
-        if not owner_access:
-            logger.error("No owner found for recording %s", recording.id)
-            return False
-
-        key = f"{settings.RECORDING_OUTPUT_FOLDER}/{recording.id}.ogg"
-
-        payload = {
-            "filename": key,
-            "email": owner_access.user.email,
-            "sub": owner_access.user.sub,
-        }
-
-        headers = {
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {settings.SUMMARY_SERVICE_API_TOKEN}",
-        }
-
-        try:
-            response = requests.post(
-                settings.SUMMARY_SERVICE_ENDPOINT,
-                json=payload,
-                headers=headers,
-                timeout=30,
-            )
-            response.raise_for_status()
-        except requests.HTTPError as exc:
-            logger.exception(
-                "Summary service HTTP error for recording %s. URL: %s. Exception: %s",
-                recording.id,
-                settings.SUMMARY_SERVICE_ENDPOINT,
-                exc,
-            )
-            return False
-
-        return True
-
-
-notification_service = NotificationService()

src/backend/core/services/marketing_service.py

@@ -1,134 +0,0 @@
-"""Marketing service in charge of pushing data for marketing automation."""
-
-import logging
-from dataclasses import dataclass
-from functools import lru_cache
-from typing import Dict, List, Optional, Protocol
-
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-from django.utils.module_loading import import_string
-
-import brevo_python
-
-logger = logging.getLogger(__name__)
-
-
-class ContactCreationError(Exception):
-    """Raised when the contact creation fails."""
-
-
-@dataclass
-class ContactData:
-    """Contact data for marketing service integration."""
-
-    email: str
-    attributes: Optional[Dict[str, str]] = None
-    list_ids: Optional[List[int]] = None
-    update_enabled: bool = True
-
-
-class MarketingServiceProtocol(Protocol):
-    """Interface for marketing automation service integrations."""
-
-    def create_contact(
-        self, contact_data: ContactData, timeout: Optional[int] = None
-    ) -> dict:
-        """Create or update a contact.
-
-        Args:
-            contact_data: Contact information and attributes
-            timeout: API request timeout in seconds
-
-        Returns:
-            dict: Service response
-
-        Raises:
-            ContactCreationError: If contact creation fails
-        """
-
-
-class BrevoMarketingService:
-    """Brevo marketing automation integration.
-
-    Handles:
-    - Contact management and segmentation
-    - Marketing campaigns and automation
-    - Email communications
-
-    Configuration via Django settings:
-    - BREVO_API_KEY: API authentication
-    - BREVO_API_CONTACT_LIST_IDS: Default contact lists
-    - BREVO_API_CONTACT_ATTRIBUTES: Default contact attributes
-    """
-
-    def __init__(self):
-        """Initialize Brevo (ex-sendinblue) marketing service."""
-
-        if not settings.BREVO_API_KEY:
-            raise ImproperlyConfigured("Brevo API key is required")
-
-        configuration = brevo_python.Configuration()
-        configuration.api_key["api-key"] = settings.BREVO_API_KEY
-
-        self._api_client = brevo_python.ApiClient(configuration)
-
-    def create_contact(self, contact_data: ContactData, timeout=None) -> dict:
-        """Create or update a Brevo contact.
-
-        Args:
-            contact_data: Contact information and attributes
-            timeout: API request timeout in seconds
-
-        Returns:
-            dict: Brevo API response
-
-        Raises:
-            ContactCreationError: If contact creation fails
-            ImproperlyConfigured: If required settings are missing
-
-        Note:
-            Contact attributes must be pre-configured in Brevo.
-            Changes to attributes can impact existing workflows.
-        """
-
-        if not settings.BREVO_API_CONTACT_LIST_IDS:
-            raise ImproperlyConfigured(
-                "Default Brevo List IDs must be configured in settings."
-            )
-
-        contact_api = brevo_python.ContactsApi(self._api_client)
-
-        attributes = {
-            **settings.BREVO_API_CONTACT_ATTRIBUTES,
-            **(contact_data.attributes or {}),
-        }
-
-        list_ids = (contact_data.list_ids or []) + settings.BREVO_API_CONTACT_LIST_IDS
-
-        contact = brevo_python.CreateContact(
-            email=contact_data.email,
-            attributes=attributes,
-            list_ids=list_ids,
-            update_enabled=contact_data.update_enabled,
-        )
-
-        api_configurations = {}
-
-        if timeout is not None:
-            api_configurations["_request_timeout"] = timeout
-
-        try:
-            response = contact_api.create_contact(contact, **api_configurations)
-        except brevo_python.rest.ApiException as err:
-            logger.exception("Failed to create contact in Brevo")
-            raise ContactCreationError("Failed to create contact in Brevo") from err
-
-        return response
-
-
-@lru_cache(maxsize=1)
-def get_marketing_service() -> MarketingServiceProtocol:
-    """Return cached instance of configured marketing service."""
-    marketing_service_cls = import_string(settings.MARKETING_SERVICE_CLASS)
-    return marketing_service_cls()

src/backend/core/tests/authentication/test_backends.py

@@ -1,15 +1,12 @@
 """Unit tests for the Authentication Backends."""
 
-from unittest import mock
-
-from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
+from django.core.exceptions import SuspiciousOperation
 
 import pytest
 
 from core import models
 from core.authentication.backends import OIDCAuthenticationBackend
 from core.factories import UserFactory
-from core.services import marketing_service
 
 pytestmark = pytest.mark.django_db
 
@@ -415,139 +412,3 @@ def test_update_user_when_no_update_needed(django_assert_num_queries, claims):
     user.refresh_from_db()
 
     assert user.email == "john.doe@example.com"
-
-
-@mock.patch.object(OIDCAuthenticationBackend, "signup_to_marketing_email")
-def test_marketing_signup_new_user_enabled(mock_signup, monkeypatch, settings):
-    """Test marketing signup for new user with settings enabled."""
-    settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL = True
-
-    klass = OIDCAuthenticationBackend()
-    email = "test@example.com"
-
-    def get_userinfo_mocked(*args):
-        return {"sub": "123", "email": email}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user("test-token", None, None)
-
-    assert user.email == email
-    mock_signup.assert_called_once_with(email)
-
-
-@mock.patch.object(OIDCAuthenticationBackend, "signup_to_marketing_email")
-def test_marketing_signup_new_user_disabled(mock_signup, monkeypatch, settings):
-    """Test no marketing signup for new user with settings disabled."""
-    settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL = False
-
-    klass = OIDCAuthenticationBackend()
-    email = "test@example.com"
-
-    def get_userinfo_mocked(*args):
-        return {"sub": "123", "email": email}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user("test-token", None, None)
-
-    assert user.email == email
-    mock_signup.assert_not_called()
-
-
-@mock.patch.object(OIDCAuthenticationBackend, "signup_to_marketing_email")
-def test_marketing_signup_new_user_default_disabled(mock_signup, monkeypatch):
-    """Test no marketing signup for new user with settings by default disabled."""
-
-    klass = OIDCAuthenticationBackend()
-    email = "test@example.com"
-
-    def get_userinfo_mocked(*args):
-        return {"sub": "123", "email": email}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user("test-token", None, None)
-
-    assert user.email == email
-    mock_signup.assert_not_called()
-
-
-@pytest.mark.parametrize(
-    "is_signup_enabled",
-    [True, False],
-)
-@mock.patch.object(OIDCAuthenticationBackend, "signup_to_marketing_email")
-def test_marketing_signup_existing_user(
-    mock_signup, monkeypatch, settings, is_signup_enabled
-):
-    """Test no marketing signup for existing user regardless of settings."""
-
-    settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL = is_signup_enabled
-
-    klass = OIDCAuthenticationBackend()
-    db_user = UserFactory(email="test@example.com")
-
-    def get_userinfo_mocked(*args):
-        return {"sub": db_user.sub, "email": db_user.email}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user("test-token", None, None)
-    assert user == db_user
-    mock_signup.assert_not_called()
-
-
-@mock.patch("core.authentication.backends.get_marketing_service")
-def test_signup_to_marketing_email_success(mock_marketing):
-    """Test successful marketing signup."""
-
-    email = "test@example.com"
-
-    # Call the method
-    OIDCAuthenticationBackend.signup_to_marketing_email(email)
-
-    # Verify service interaction
-    mock_service = mock_marketing.return_value
-    mock_service.create_contact.assert_called_once()
-
-
-@pytest.mark.parametrize(
-    "error",
-    [
-        ImportError,
-        ImproperlyConfigured,
-    ],
-)
-@mock.patch("core.authentication.backends.get_marketing_service")
-def test_marketing_signup_handles_service_initialization_errors(
-    mock_marketing, error, settings
-):
-    """Tests errors that occur when trying to get/initialize the marketing service."""
-    settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL = True
-
-    mock_marketing.side_effect = error
-
-    # Should not raise any exception
-    OIDCAuthenticationBackend.signup_to_marketing_email("test@example.com")
-
-
-@pytest.mark.parametrize(
-    "error",
-    [
-        marketing_service.ContactCreationError,
-        ImproperlyConfigured,
-        ImportError,
-    ],
-)
-@mock.patch("core.authentication.backends.get_marketing_service")
-def test_marketing_signup_handles_contact_creation_errors(
-    mock_marketing, error, settings
-):
-    """Tests errors that occur during the contact creation process."""
-
-    settings.SIGNUP_NEW_USER_TO_MARKETING_EMAIL = True
-    mock_marketing.return_value.create_contact.side_effect = error
-
-    # Should not raise any exception
-    OIDCAuthenticationBackend.signup_to_marketing_email("test@example.com")

src/backend/core/tests/services/test_marketing_service.py

@@ -1,187 +0,0 @@
-"""
-Test marketing services.
-"""
-
-# pylint: disable=W0621,W0613
-
-from unittest import mock
-
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-
-import brevo_python
-import pytest
-
-from core.services.marketing_service import (
-    BrevoMarketingService,
-    ContactCreationError,
-    ContactData,
-    get_marketing_service,
-)
-
-
-def test_init_missing_api_key(settings):
-    """Test initialization with missing API key."""
-    settings.BREVO_API_KEY = None
-    with pytest.raises(ImproperlyConfigured, match="Brevo API key is required"):
-        BrevoMarketingService()
-
-
-def test_create_contact_missing_list_ids(settings):
-    """Test contact creation with missing list IDs."""
-
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.BREVO_API_CONTACT_LIST_IDS = None
-    settings.BREVO_API_CONTACT_ATTRIBUTES = {"source": "test"}
-
-    valid_contact_data = ContactData(
-        email="test@example.com",
-        attributes={"first_name": "Test"},
-        list_ids=[1, 2],
-        update_enabled=True,
-    )
-
-    brevo_service = BrevoMarketingService()
-
-    with pytest.raises(
-        ImproperlyConfigured, match="Default Brevo List IDs must be configured"
-    ):
-        brevo_service.create_contact(valid_contact_data)
-
-
-@mock.patch("brevo_python.ContactsApi")
-def test_create_contact_success(mock_contact_api):
-    """Test successful contact creation."""
-
-    mock_api = mock_contact_api.return_value
-
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.BREVO_API_CONTACT_LIST_IDS = [1, 2, 3, 4]
-    settings.BREVO_API_CONTACT_ATTRIBUTES = {"source": "test"}
-
-    valid_contact_data = ContactData(
-        email="test@example.com",
-        attributes={"first_name": "Test"},
-        list_ids=[1, 2],
-        update_enabled=True,
-    )
-
-    brevo_service = BrevoMarketingService()
-
-    mock_api.create_contact.return_value = {"id": "test-id"}
-    response = brevo_service.create_contact(valid_contact_data)
-
-    assert response == {"id": "test-id"}
-
-    mock_api.create_contact.assert_called_once()
-    contact_arg = mock_api.create_contact.call_args[0][0]
-    assert contact_arg.email == "test@example.com"
-    assert contact_arg.attributes == {
-        **settings.BREVO_API_CONTACT_ATTRIBUTES,
-        **valid_contact_data.attributes,
-    }
-    assert set(contact_arg.list_ids) == {1, 2, 3, 4}
-    assert contact_arg.update_enabled is True
-
-
-@mock.patch("brevo_python.ContactsApi")
-def test_create_contact_with_timeout(mock_contact_api):
-    """Test contact creation with timeout."""
-
-    mock_api = mock_contact_api.return_value
-
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.BREVO_API_CONTACT_LIST_IDS = [1, 2, 3, 4]
-    settings.BREVO_API_CONTACT_ATTRIBUTES = {"source": "test"}
-
-    valid_contact_data = ContactData(
-        email="test@example.com",
-        attributes={"first_name": "Test"},
-        list_ids=[1, 2],
-        update_enabled=True,
-    )
-
-    brevo_service = BrevoMarketingService()
-    brevo_service.create_contact(valid_contact_data, timeout=30)
-
-    mock_api.create_contact.assert_called_once()
-    assert mock_api.create_contact.call_args[1]["_request_timeout"] == 30
-
-
-@mock.patch("brevo_python.ContactsApi")
-def test_create_contact_api_error(mock_contact_api):
-    """Test contact creation API error handling."""
-
-    mock_api = mock_contact_api.return_value
-
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.BREVO_API_CONTACT_LIST_IDS = [1, 2, 3, 4]
-    settings.BREVO_API_CONTACT_ATTRIBUTES = {"source": "test"}
-
-    valid_contact_data = ContactData(
-        email="test@example.com",
-        attributes={"first_name": "Test"},
-        list_ids=[1, 2],
-        update_enabled=True,
-    )
-
-    brevo_service = BrevoMarketingService()
-
-    mock_api.create_contact.side_effect = brevo_python.rest.ApiException()
-
-    with pytest.raises(ContactCreationError, match="Failed to create contact in Brevo"):
-        brevo_service.create_contact(valid_contact_data)
-
-
-@pytest.fixture
-def clear_marketing_cache():
-    """Clear marketing service cache between tests."""
-    get_marketing_service.cache_clear()
-    yield
-    get_marketing_service.cache_clear()
-
-
-def test_get_marketing_service_caching(clear_marketing_cache):
-    """Test marketing service caching behavior."""
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.MARKETING_SERVICE_CLASS = (
-        "core.services.marketing_service.BrevoMarketingService"
-    )
-
-    service1 = get_marketing_service()
-    service2 = get_marketing_service()
-
-    assert service1 is service2
-    assert isinstance(service1, BrevoMarketingService)
-
-
-def test_get_marketing_service_invalid_class(clear_marketing_cache):
-    """Test handling of invalid service class."""
-    settings.MARKETING_SERVICE_CLASS = "invalid.service.path"
-
-    with pytest.raises(ImportError):
-        get_marketing_service()
-
-
-@mock.patch("core.services.marketing_service.import_string")
-def test_service_instantiation_called_once(mock_import_string, clear_marketing_cache):
-    """Test service class is instantiated only once."""
-
-    settings.BREVO_API_KEY = "test-api-key"
-    settings.MARKETING_SERVICE_CLASS = (
-        "core.services.marketing_service.BrevoMarketingService"
-    )
-    get_marketing_service.cache_clear()
-
-    mock_service_cls = mock.Mock()
-    mock_service_instance = mock.Mock()
-    mock_service_cls.return_value = mock_service_instance
-    mock_import_string.return_value = mock_service_cls
-
-    service1 = get_marketing_service()
-    service2 = get_marketing_service()
-
-    mock_import_string.assert_called_once_with(settings.MARKETING_SERVICE_CLASS)
-    mock_service_cls.assert_called_once()
-    assert service1 is service2
-    assert service1 is mock_service_instance

src/backend/core/tests/test_api_users.py

@@ -66,7 +66,7 @@ def test_api_users_list_query_email():
 
     assert response.status_code == 200
     user_ids = [user["id"] for user in response.json()["results"]]
-    assert user_ids == [str(frank.id), str(nicole.id)]
+    assert user_ids == [str(nicole.id), str(frank.id)]
 
 
 def test_api_users_retrieve_me_anonymous():

src/backend/core/utils.py

@@ -14,47 +14,6 @@ from django.conf import settings
 
 from livekit.api import AccessToken, VideoGrants
 
-import secrets
-import string
-
-from django.core.cache import cache
-from cryptography.fernet import Fernet
-
-import base64
-
-
-def generate_random_passphrase(length=26):
-    """Generate a random passphrase using letters and digits"""
-    alphabet = string.ascii_letters + string.digits
-    return ''.join(secrets.choice(alphabet) for _ in range(length))
-
-
-def build_room_passphrase_key(room_id: str) -> str:
-    """Build cache key for room passphrase."""
-    return f"room_passphrase:{room_id}"
-
-def get_cached_passphrase(room_id: str) -> str:
-    """Get or generate encrypted passphrase for a room.
-
-    Retrieves existing passphrase from cache or generates,
-    encrypts and caches a new one if not found.
-    """
-    cypher = Fernet(settings.PASSPHRASE_ENCRYPTION_KEY.encode())
-    cache_key = build_room_passphrase_key(room_id)
-    encrypted_passphrase = cache.get(cache_key)
-
-    if encrypted_passphrase is None:
-        passphrase = generate_random_passphrase()
-        encrypted_passphrase = cypher.encrypt(passphrase.encode()).decode()
-        cache.set(cache_key, encrypted_passphrase, timeout=86400)  # 24 hours
-        return passphrase
-
-    return cypher.decrypt(encrypted_passphrase.encode()).decode()
-
-def clear_room_passphrase(room_id: str) -> None:
-    """Remove room passphrase from cache."""
-    cache.delete(build_room_passphrase_key(room_id))
-
 
 def generate_color(identity: str) -> str:
     """Generates a consistent HSL color based on a given identity string.

src/backend/meet/settings.py

@@ -324,10 +324,8 @@ class Base(Configuration):
     OIDC_AUTHENTICATE_CLASS = "core.authentication.views.OIDCAuthenticationRequestView"
     OIDC_CALLBACK_CLASS = "core.authentication.views.OIDCAuthenticationCallbackView"
     OIDC_CREATE_USER = values.BooleanValue(
-        default=True, environ_name="OIDC_CREATE_USER", environ_prefix=None
-    )
-    OIDC_VERIFY_SSL = values.BooleanValue(
-        default=True, environ_name="OIDC_VERIFY_SSL", environ_prefix=None
+        default=True,
+        environ_name="OIDC_CREATE_USER",
     )
     OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION = values.BooleanValue(
         default=False,
@@ -448,42 +446,8 @@ class Base(Configuration):
         False, environ_name="RECORDING_STORAGE_EVENT_ENABLE", environ_prefix=None
     )
     RECORDING_STORAGE_EVENT_TOKEN = values.Value(
-        None, environ_name="RECORDING_STORAGE_EVENT_TOKEN", environ_prefix=None
+        None, environ_name="RECORDING_STORAGE_HOOK_TOKEN", environ_prefix=None
     )
-    SUMMARY_SERVICE_ENDPOINT = values.Value(
-        None, environ_name="SUMMARY_SERVICE_ENDPOINT", environ_prefix=None
-    )
-    SUMMARY_SERVICE_API_TOKEN = values.Value(
-        None, environ_name="SUMMARY_SERVICE_API_TOKEN", environ_prefix=None
-    )
-
-    # Marketing and communication settings
-    SIGNUP_NEW_USER_TO_MARKETING_EMAIL = values.BooleanValue(
-        False,
-        environ_name="SIGNUP_NEW_USERS_TO_NEWSLETTER",
-        environ_prefix=None,
-        help_text=(
-            "When enabled, new users are automatically added to mailing list "
-            "for product updates, marketing communications, and customized emails. "
-        ),
-    )
-    MARKETING_SERVICE_CLASS = values.Value(
-        "core.services.marketing_service.BrevoMarketingService",
-        environ_name="MARKETING_SERVICE_CLASS",
-        environ_prefix=None,
-    )
-    BREVO_API_KEY = values.Value(
-        None, environ_name="BREVO_API_KEY", environ_prefix=None
-    )
-    BREVO_API_CONTACT_LIST_IDS = values.ListValue(
-        [],
-        environ_name="BREVO_API_CONTACT_LIST_IDS",
-        environ_prefix=None,
-        converter=lambda x: int(x),  # pylint: disable=unnecessary-lambda
-    )
-    BREVO_API_CONTACT_ATTRIBUTES = values.DictValue({"VISIO_USER": True})
-
-    PASSPHRASE_ENCRYPTION_KEY = values.Value(environ_name="PASSPHRASE_ENCRYPTION_KEY", environ_prefix=None)
 
     # pylint: disable=invalid-name
     @property
@@ -531,10 +495,8 @@ class Base(Configuration):
                 release=get_release(),
                 integrations=[DjangoIntegration()],
             )
-
-            # Add the application name to the Sentry scope
-            scope = sentry_sdk.get_global_scope()
-            scope.set_tag("application", "backend")
+            with sentry_sdk.configure_scope() as scope:
+                scope.set_extra("application", "backend")
 
 
 class Build(Base):

src/backend/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "meet"
-version = "0.1.12"
+version = "0.1.7"
 authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -25,21 +25,20 @@ license = { file = "LICENSE" }
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "boto3==1.35.90",
+    "boto3==1.35.19",
     "Brotli==1.1.0",
-    "brevo-python==1.1.2",
     "celery[redis]==5.4.0",
     "django-configurations==2.5.1",
-    "django-cors-headers==4.6.0",
+    "django-cors-headers==4.4.0",
     "django-countries==7.6.1",
     "django-parler==2.3",
-    "redis==5.2.1",
+    "redis==5.0.8",
     "django-redis==5.4.0",
     "django-storages[s3]==1.14.4",
     "django-timezone-field>=5.1",
-    "django==5.1.4",
+    "django==5.1.1",
     "djangorestframework==3.15.2",
-    "drf_spectacular==0.28.0",
+    "drf_spectacular==0.27.2",
     "dockerflow==2024.4.2",
     "easy_thumbnails==2.10",
     "factory_boy==3.3.1",
@@ -48,17 +47,17 @@ dependencies = [
     "june-analytics-python==2.3.0",
     "markdown==3.7",
     "nested-multipart-parser==1.5.0",
-    "psycopg[binary]==3.2.3",
-    "PyJWT==2.10.1",
+    "psycopg[binary]==3.2.2",
+    "PyJWT==2.9.0",
     "python-frontmatter==1.1.0",
     "requests==2.32.3",
-    "sentry-sdk==2.19.2",
+    "sentry-sdk==2.14.0",
     "url-normalize==1.4.3",
     "WeasyPrint>=60.2",
-    "whitenoise==6.8.2",
+    "whitenoise==6.7.0",
     "mozilla-django-oidc==4.0.1",
-    "livekit-api==0.8.1",
-    "aiohttp==3.11.11",
+    "livekit-api==0.7.0",
+    "aiohttp==3.10.10",
 ]
 
 [project.urls]
@@ -70,21 +69,21 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "django-extensions==3.2.3",
-    "drf-spectacular-sidecar==2024.12.1",
+    "drf-spectacular-sidecar==2024.7.1",
     "freezegun==1.5.1",
     "ipdb==0.13.13",
-    "ipython==8.31.0",
-    "pyfakefs==5.7.3",
-    "pylint-django==2.6.1",
-    "pylint==3.3.3",
-    "pytest-cov==6.0.0",
+    "ipython==8.27.0",
+    "pyfakefs==5.6.0",
+    "pylint-django==2.5.5",
+    "pylint==3.2.7",
+    "pytest-cov==5.0.0",
     "pytest-django==4.9.0",
-    "pytest==8.3.4",
+    "pytest==8.3.3",
     "pytest-icdiff==0.9",
     "pytest-xdist==3.6.1",
     "responses==0.25.3",
-    "ruff==0.8.4",
-    "types-requests==2.32.0.20241016",
+    "ruff==0.6.5",
+    "types-requests==2.32.0.20240914",
 ]
 
 [tool.setuptools]

src/frontend/index.html

@@ -2,7 +2,7 @@
 <html lang="en" data-lk-theme="visio-light">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/assets/icon.svg" />
+    <link rel="icon" type="image/svg+xml" href="/play-icon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Visio</title>
   </head>

src/frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "meet",
   "private": true,
-  "version": "0.1.12",
+  "version": "0.1.7",
   "type": "module",
   "scripts": {
     "dev": "panda codegen && vite",
@@ -13,48 +13,48 @@
     "check": "prettier --check ./src"
   },
   "dependencies": {
-    "@livekit/components-react": "2.6.9",
-    "@livekit/components-styles": "1.1.4",
+    "@livekit/components-react": "2.6.5",
+    "@livekit/components-styles": "1.1.3",
     "@livekit/track-processors": "0.3.2",
-    "@pandacss/preset-panda": "0.48.0",
-    "@react-aria/toast": "3.0.0-beta.18",
-    "@remixicon/react": "4.5.0",
-    "@tanstack/react-query": "5.61.3",
+    "@pandacss/preset-panda": "0.46.1",
+    "@react-aria/toast": "3.0.0-beta.16",
+    "@remixicon/react": "4.2.0",
+    "@tanstack/react-query": "5.59.4",
     "crisp-sdk-web": "1.0.25",
     "hoofd": "1.7.1",
-    "i18next": "24.0.2",
+    "i18next": "23.15.2",
     "i18next-browser-languagedetector": "8.0.0",
     "i18next-parser": "9.0.2",
     "i18next-resources-to-backend": "1.2.1",
-    "livekit-client": "2.6.3",
-    "posthog-js": "1.188.0",
+    "livekit-client": "2.5.7",
+    "posthog-js": "1.167.0",
     "react": "18.3.1",
-    "react-aria-components": "1.5.0",
+    "react-aria-components": "1.4.0",
     "react-dom": "18.3.1",
-    "react-i18next": "15.1.1",
+    "react-i18next": "15.0.2",
     "use-sound": "4.0.3",
-    "valtio": "2.1.2",
+    "valtio": "2.0.0",
     "wouter": "3.3.5"
   },
   "devDependencies": {
-    "@pandacss/dev": "0.48.0",
-    "@tanstack/eslint-plugin-query": "5.61.3",
-    "@tanstack/react-query-devtools": "5.61.3",
-    "@types/node": "22.9.3",
-    "@types/react": "18.3.12",
-    "@types/react-dom": "18.3.1",
-    "@typescript-eslint/eslint-plugin": "8.15.0",
-    "@typescript-eslint/parser": "8.15.0",
-    "@vitejs/plugin-react": "4.3.3",
+    "@pandacss/dev": "0.46.1",
+    "@tanstack/eslint-plugin-query": "5.59.2",
+    "@tanstack/react-query-devtools": "5.59.4",
+    "@types/node": "20.16.11",
+    "@types/react": "18.3.11",
+    "@types/react-dom": "18.3.0",
+    "@typescript-eslint/eslint-plugin": "8.8.1",
+    "@typescript-eslint/parser": "8.8.1",
+    "@vitejs/plugin-react": "4.3.2",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-jsx-a11y": "6.10.2",
-    "eslint-plugin-react-hooks": "5.0.0",
-    "eslint-plugin-react-refresh": "0.4.14",
-    "postcss": "8.4.49",
+    "eslint-plugin-jsx-a11y": "6.10.0",
+    "eslint-plugin-react-hooks": "4.6.2",
+    "eslint-plugin-react-refresh": "0.4.12",
+    "postcss": "8.4.47",
     "prettier": "3.3.3",
-    "typescript": "5.7.2",
-    "vite": "5.4.11",
-    "vite-tsconfig-paths": "5.1.3"
+    "typescript": "5.6.3",
+    "vite": "5.4.8",
+    "vite-tsconfig-paths": "5.0.1"
   }
 }

src/frontend/panda.config.ts

@@ -35,46 +35,11 @@ const config: Config = {
   exclude: [],
   jsxFramework: 'react',
   outdir: 'src/styled-system',
-  globalFontface: {
-    Marianne: [
-      {
-        src: 'url(/fonts/Marianne-Regular-subset.woff2) format("woff2")',
-        fontWeight: 400,
-        fontStyle: 'normal',
-        fontDisplay: 'swap',
-      },
-      {
-        path: 'url(/fonts/Marianne-Regular_Italic-subset.woff2) format("woff2")',
-        fontWeight: 400,
-        fontStyle: 'italic',
-        fontDisplay: 'swap',
-      },
-      {
-        path: 'url(/fonts/Marianne-Medium-subset.woff2) format("woff2")',
-        fontWeight: 500,
-        fontStyle: 'normal',
-        fontDisplay: 'swap',
-      },
-      {
-        path: 'url(/fonts/Marianne-Bold-subset.woff2) format("woff2")',
-        fontWeight: 700,
-        fontStyle: 'normal',
-        fontDisplay: 'swap',
-      },
-      {
-        path: 'url(/fonts/Marianne-ExtraBold-subset.woff2) format("woff2")',
-        fontWeight: 800,
-        fontStyle: 'normal',
-        fontDisplay: 'swap',
-      },
-    ],
-  },
   theme: {
     ...pandaPreset.theme,
     // media queries are defined in em so that zooming with text-only mode triggers breakpoints
     breakpoints: {
       xs: '22.6em', // 360px (we assume less than that are old/entry level mobile phones)
-      xsm: '31.25em', // 500px,
       sm: '40em', // 640px
       md: '48em', // 768px
       lg: '64em', // 1024px
@@ -116,10 +81,10 @@ const config: Config = {
         '80%': { transform: 'rotate(20deg)' },
         '100%': { transform: 'rotate(0)' },
       },
-      pulse_background: {
-        '0%': { opacity: '1' },
-        '50%': { opacity: '0.65' },
-        '100%': { opacity: '1' },
+      pulse_mic: {
+        '0%': { color: 'primary', opacity: '1' },
+        '50%': { color: 'primary', opacity: '0.8' },
+        '100%': { color: 'primary', opacity: '1' },
       },
     },
     tokens: defineTokens({
@@ -127,66 +92,6 @@ const config: Config = {
        * This way we'll only add the things we need step by step and prevent using lots of differents things.
        */
       ...pandaPreset.theme.tokens,
-      colors: defineTokens.colors({
-        ...pandaPreset.theme.tokens.colors,
-        primaryDark: {
-          50: { value: '#161622' },
-          100: { value: '#2D2D46' },
-          200: { value: '#43436A' },
-          300: { value: '#5A5A8F' },
-          400: { value: '#7070B3' },
-          500: { value: '#8787D7' },
-          600: { value: '#9D9DDF' },
-          700: { value: '#B3B3E7' },
-          800: { value: '#C9C9EE' },
-          900: { value: '#DFDFF6' },
-          950: { value: '#F5F5FE' },
-          action: { value: '#C1C1FB' },
-        },
-        primary: {
-          50: { value: '#F5F5FE' },
-          100: { value: '#ECECFE' },
-          200: { value: '#E3E3FB' },
-          300: { value: '#CACAFB' },
-          400: { value: '#8585F6' },
-          500: { value: '#6A6AF4' },
-          600: { value: '#313178' },
-          700: { value: '#272747' },
-          800: { value: '#000091' },
-          900: { value: '#21213F' },
-          950: { value: '#1B1B35' },
-          action: { value: '#1212FF' },
-        },
-        greyscale: {
-          '000': { value: '#FFFFFF' },
-          50: { value: '#F6F6F6' },
-          100: { value: '#EEEEEE' },
-          200: { value: '#E5E5E5' },
-          250: { value: '#DDDDDD' },
-          300: { value: '#CECECE' },
-          400: { value: '#929292' },
-          500: { value: '#7C7C7C' },
-          600: { value: '#666666' },
-          700: { value: '#3A3A3A' },
-          750: { value: '#353535' },
-          800: { value: '#2A2A2A' },
-          900: { value: '#242424' },
-          950: { value: '#1E1E1E' },
-          1000: { value: '#161616' },
-        },
-        error: {
-          100: { value: '#261212' },
-          200: { value: '#6C302E' },
-          300: { value: '#983533' },
-          400: { value: '#CA3632' },
-          500: { value: '#EF413D' },
-          600: { value: '#EE6A66' },
-          700: { value: '#F28D8A' },
-          800: { value: '#F6AFAD' },
-          900: { value: '#FAD2D1' },
-          950: { value: '#FFF4F4' },
-        },
-      }),
       animations: {},
       blurs: {},
       /* just directly use values as tokens. This allows us to follow a specific design scale,
@@ -288,7 +193,7 @@ const config: Config = {
     semanticTokens: defineSemanticTokens({
       colors: {
         default: {
-          text: { value: '{colors.greyscale.1000}' },
+          text: { value: '{colors.gray.900}' },
           bg: { value: 'white' },
           subtle: { value: '{colors.gray.100}' },
           'subtle-text': { value: '{colors.gray.600}' },

src/frontend/public/assets/icon.svg

@@ -1,5 +0,0 @@
-<svg width="160" height="160" viewBox="0 0 160 160" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.61135 59.6951C5 62.832 5 66.6949 5 73.1656V88.7307C5 96.7588 5 100.773 6.16756 104.366C7.20062 107.546 8.89041 110.472 11.1274 112.957C13.6555 115.765 17.1318 117.772 24.0842 121.786L37.564 129.568C43.7169 133.121 47.1472 135.101 50.4165 136.054V88.0288C50.4165 85.6281 49.1052 83.4192 46.9976 82.2696L5.61135 59.6951Z" fill="#C9191E"/>
-<path d="M118.313 66.7489V91.7898C118.313 95.2521 119.818 98.5435 122.436 100.809L140.459 116.406C141.513 117.298 142.608 118.028 143.744 118.596C144.92 119.123 146.056 119.387 147.151 119.387C149.503 119.387 151.389 118.616 152.809 117.075C154.269 115.493 154.999 113.445 154.999 110.93V47.6577C154.999 45.1431 154.269 43.1151 152.809 41.5738C151.389 39.992 149.503 39.2011 147.151 39.2011C146.056 39.2011 144.92 39.4647 143.744 39.992C142.608 40.5193 141.513 41.2494 140.459 42.1822L122.45 57.7172C119.823 59.983 118.313 63.28 118.313 66.7489Z" fill="#000091"/>
-<path d="M11.6345 50.7522C11.1333 50.4788 10.6078 50.2937 10.0757 50.1915C10.4114 49.7628 10.7622 49.3452 11.1276 48.9394C13.6558 46.1315 17.132 44.1245 24.0845 40.1105L37.5643 32.3279C44.5167 28.3139 47.993 26.3069 51.6887 25.5213C54.9587 24.8262 58.3383 24.8262 61.6083 25.5213C65.304 26.3069 68.7803 28.3139 75.7327 32.3279L89.0535 40.0187C89.1066 40.0492 89.1597 40.0798 89.2129 40.1105C96.1653 44.1245 99.6416 46.1316 102.17 48.9394C104.407 51.4238 106.096 54.3506 107.13 57.5301C108.297 61.1235 108.297 65.1375 108.297 73.1656V88.7307C108.297 96.7588 108.297 100.773 107.13 104.366C106.096 107.546 104.407 110.473 102.17 112.957C99.6416 115.765 96.1655 117.772 89.2133 121.785C89.1537 121.82 89.0936 121.855 89.0341 121.889L75.7327 129.568C68.7803 133.582 65.304 135.589 61.6083 136.375C61.4564 136.407 61.3043 136.438 61.1519 136.467L61.1519 88.0288C61.1519 81.6997 57.6948 75.8761 52.1386 72.8455L11.6345 50.7522Z" fill="#000091"/>
-</svg>

src/frontend/public/assets/link-grey.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.66667 4.00098V5.33431H3.33333V12.6676H10.6667V9.33431H12V13.3343C12 13.7025 11.7015 14.001 11.3333 14.001H2.66667C2.29848 14.001 2 13.7025 2 13.3343V4.66764C2 4.29945 2.29848 4.00098 2.66667 4.00098H6.66667ZM14 2.00098V7.33431H12.6667V4.27631L7.47133 9.47231L6.52867 8.52964L11.7233 3.33431H8.66667V2.00098H14Z" fill="#666666"/>
-</svg>

src/frontend/src/App.tsx

@@ -30,7 +30,7 @@ function App() {
               <Route component={NotFoundScreen} />
             </Switch>
           </Layout>
-          <ReactQueryDevtools initialIsOpen={false} buttonPosition="top-left" />
+          <ReactQueryDevtools initialIsOpen={false} />
         </I18nProvider>
       </Suspense>
     </QueryClientProvider>

src/frontend/src/api/useConfig.ts

@@ -1,7 +1,12 @@
 import { fetchApi } from './fetchApi'
 import { keys } from './queryKeys'
 import { useQuery } from '@tanstack/react-query'
-import { RecordingMode } from '@/features/rooms/api/startRecording'
+
+// todo - refactor it in a proper place
+export enum RecordingMode {
+  Transcript = 'transcript',
+  ScreenRecording = 'screen_recording',
+}
 
 export interface ApiConfig {
   analytics?: {

src/frontend/src/assets/logo.svg

@@ -1,6 +0,0 @@
-<svg width="448" height="172" viewBox="0 0 448 172" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.61135 65.6951C5 68.832 5 72.6949 5 79.1656V94.7307C5 102.759 5 106.773 6.16756 110.366C7.20062 113.546 8.89041 116.472 11.1274 118.957C13.6555 121.765 17.1318 123.772 24.0842 127.786L37.564 135.568C43.7169 139.121 47.1472 141.101 50.4165 142.054V94.0288C50.4165 91.6281 49.1052 89.4192 46.9976 88.2696L5.61135 65.6951Z" fill="#C9191E"/>
-<path d="M118.313 72.7489V97.7898C118.313 101.252 119.818 104.544 122.436 106.809L140.459 122.406C141.513 123.298 142.608 124.028 143.744 124.596C144.92 125.123 146.056 125.387 147.151 125.387C149.503 125.387 151.389 124.616 152.809 123.075C154.269 121.493 154.999 119.445 154.999 116.93V53.6577C154.999 51.1431 154.269 49.1151 152.809 47.5738C151.389 45.992 149.503 45.2011 147.151 45.2011C146.056 45.2011 144.92 45.4647 143.744 45.992C142.608 46.5193 141.513 47.2494 140.459 48.1822L122.45 63.7172C119.823 65.983 118.313 69.28 118.313 72.7489Z" fill="#000091"/>
-<path d="M11.6345 56.7522C11.1333 56.4788 10.6078 56.2937 10.0757 56.1915C10.4114 55.7628 10.7622 55.3452 11.1276 54.9394C13.6558 52.1315 17.132 50.1245 24.0845 46.1105L37.5643 38.3279C44.5167 34.3139 47.993 32.3069 51.6887 31.5213C54.9587 30.8262 58.3383 30.8262 61.6083 31.5213C65.304 32.3069 68.7803 34.3139 75.7327 38.3279L89.0535 46.0187C89.1066 46.0492 89.1597 46.0798 89.2129 46.1105C96.1653 50.1245 99.6416 52.1316 102.17 54.9394C104.407 57.4238 106.096 60.3506 107.13 63.5301C108.297 67.1235 108.297 71.1375 108.297 79.1656V94.7307C108.297 102.759 108.297 106.773 107.13 110.366C106.096 113.546 104.407 116.473 102.17 118.957C99.6416 121.765 96.1655 123.772 89.2133 127.785C89.1537 127.82 89.0936 127.855 89.0341 127.889L75.7327 135.568C68.7803 139.582 65.304 141.589 61.6083 142.375C61.4564 142.407 61.3043 142.438 61.1519 142.467L61.1519 94.0288C61.1519 87.6997 57.6948 81.8761 52.1386 78.8455L11.6345 56.7522Z" fill="#000091"/>
-<path d="M193.72 45.7333H211.035L234.771 108.456L258.507 45.7333H275.821L245.435 126H224.107L193.72 45.7333ZM289.019 58.1173C283.859 58.1173 279.501 53.76 279.501 48.6C279.501 43.44 283.859 39.0827 289.019 39.0827C294.179 39.0827 298.421 43.44 298.421 48.6C298.421 53.76 294.179 58.1173 289.019 58.1173ZM281.68 126V68.208H296.243V126H281.68ZM303.29 117.629L312.922 108.915C316.477 113.387 320.72 116.597 326.224 116.597C330.925 116.597 333.333 113.845 333.333 110.405C333.333 100.315 305.698 104.099 305.698 83.8027C305.698 73.5973 314.298 65.9147 326.338 65.9147C335.168 65.9147 343.194 70.1573 347.322 75.776L337.69 84.2613C334.709 80.592 330.925 77.6107 326.453 77.6107C321.866 77.6107 319.688 80.1333 319.688 83.1147C319.688 92.976 347.322 89.536 347.322 109.488C347.093 121.643 337.346 128.293 326.453 128.293C316.133 128.293 308.794 124.165 303.29 117.629ZM363.494 58.1173C358.334 58.1173 353.977 53.76 353.977 48.6C353.977 43.44 358.334 39.0827 363.494 39.0827C368.654 39.0827 372.897 43.44 372.897 48.6C372.897 53.76 368.654 58.1173 363.494 58.1173ZM356.155 126V68.208H370.718V126H356.155ZM411.115 65.9147C429.92 65.9147 442.763 79.7893 442.763 97.104C442.763 114.419 429.92 128.293 411.115 128.293C392.309 128.293 379.467 114.419 379.467 97.104C379.467 79.7893 392.309 65.9147 411.115 65.9147ZM411.344 114.533C420.632 114.533 427.627 107.08 427.627 97.104C427.627 87.0133 420.632 79.6747 411.344 79.6747C401.712 79.6747 394.603 87.0133 394.603 97.104C394.603 107.195 401.712 114.533 411.344 114.533Z" fill="#000091"/>
-</svg>

src/frontend/src/components/Feedback.tsx

@@ -0,0 +1,25 @@
+import { css } from '@/styled-system/css'
+import { RiExternalLinkLine } from '@remixicon/react'
+import { useTranslation } from 'react-i18next'
+import { LinkButton } from '@/primitives'
+
+export const Feedback = () => {
+  const { t } = useTranslation()
+  return (
+    <LinkButton
+      href="https://grist.incubateur.net/o/docs/forms/1YrfNP1QSSy8p2gCxMFnSf/4"
+      variant="success"
+      target="_blank"
+    >
+      <span className={css({ marginRight: 0.5 })} aria-hidden="true">
+        💡
+      </span>
+      {t('feedbackAlert')}
+      <RiExternalLinkLine
+        size={16}
+        className={css({ marginLeft: 0.5 })}
+        aria-hidden="true"
+      />
+    </LinkButton>
+  )
+}

src/frontend/src/components/FeedbackBanner.tsx

@@ -1,44 +0,0 @@
-import { css } from '@/styled-system/css'
-import { RiErrorWarningLine, RiExternalLinkLine } from '@remixicon/react'
-import { useTranslation } from 'react-i18next'
-import { Text, A } from '@/primitives'
-import { GRIST_FORM } from '@/utils/constants'
-
-export const FeedbackBanner = () => {
-  const { t } = useTranslation()
-  return (
-    <div
-      className={css({
-        width: '100%',
-        backgroundColor: '#E8EDFF',
-        color: '#0063CB',
-        display: { base: 'none', sm: 'flex' },
-        justifyContent: 'center',
-        padding: '0.5rem 0',
-      })}
-    >
-      <div
-        className={css({
-          display: 'inline-flex',
-          gap: '0.5rem',
-          alignItems: 'center',
-        })}
-      >
-        <RiErrorWarningLine size={20} />
-        <Text as="p">{t('feedback.context')}</Text>
-        <div
-          className={css({
-            display: 'flex',
-            alignItems: 'center',
-            gap: 0.25,
-          })}
-        >
-          <A href={GRIST_FORM} target="_blank">
-            {t('feedback.cta')}
-          </A>
-          <RiExternalLinkLine size={16} aria-hidden="true" />
-        </div>
-      </div>
-    </div>
-  )
-}

src/frontend/src/components/LoadingScreen.tsx

@@ -7,7 +7,6 @@ import { Center } from '@/styled-system/jsx'
 export const LoadingScreen = ({
   delay = 500,
   header = undefined,
-  footer = undefined,
   layout = 'centered',
 }: {
   delay?: number
@@ -16,7 +15,7 @@ export const LoadingScreen = ({
 
   return (
     <DelayedRender delay={delay}>
-      <Screen layout={layout} header={header} footer={footer}>
+      <Screen layout={layout} header={header}>
         <CenteredContent>
           <Center>
             <p>{t('loading')}</p>

src/frontend/src/components/QueryAware.tsx

@@ -21,7 +21,7 @@ export const QueryAware = ({
   }
 
   if (status === 'pending') {
-    return <LoadingScreen header={undefined} footer={undefined} />
+    return <LoadingScreen header={undefined} />
   }
 
   return children

src/frontend/src/components/SoundTester.tsx

@@ -27,7 +27,7 @@ export const SoundTester = () => {
   return (
     <>
       <Button
-        variant="secondaryText"
+        invisible
         onPress={() => {
           audioRef?.current?.play()
           setIsPlaying(true)

src/frontend/src/features/analytics/hooks/useIsAnalyticsEnabled.ts

@@ -1,6 +0,0 @@
-import { useConfig } from '@/api/useConfig.ts'
-
-export const useIsAnalyticsEnabled = () => {
-  const { data } = useConfig()
-  return !!data?.analytics?.id
-}

src/frontend/src/features/auth/components/UserAware.tsx

@@ -15,6 +15,6 @@ export const UserAware = ({ children }: { children: React.ReactNode }) => {
   return isLoggedIn !== undefined ? (
     children
   ) : (
-    <LoadingScreen header={false} footer={false} delay={1000} />
+    <LoadingScreen header={false} delay={1000} />
   )
 }

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

@@ -38,7 +38,7 @@ const Body = styled('p', {
 
 const Image = styled('img', {
   base: {
-    maxHeight: '362px',
+    maxHeight: '330px',
     height: '100%',
     width: 'fit-content',
   },
@@ -74,15 +74,9 @@ const Container = styled('div', {
   },
 })
 
-const ButtonContainer = styled('div', {
-  base: {
-    display: { base: 'none', xsm: 'block' },
-  },
-})
-
 const ButtonVerticalCenter = styled('div', {
   base: {
-    marginTop: '13.3125rem',
+    marginTop: '10.3125rem',
     transform: 'translateY(-50%)',
   },
 })
@@ -102,9 +96,9 @@ const Slide = styled('div', {
     alignItems: 'center',
     gap: '0.5rem',
     justifyContent: 'start',
-    minHeight: { base: 'none', xsm: '550px' },
-    minWidth: { base: 'none', xsm: '200px' },
-    width: { base: '100%', xsm: '22.625rem' },
+    minHeight: '550px',
+    minWidth: '200px',
+    width: '22.625rem',
   },
   variants: {
     visible: {
@@ -182,11 +176,11 @@ export const IntroSlider = () => {
           justifyContent: 'center',
         })}
       >
-        <ButtonContainer>
+        <div>
           <ButtonVerticalCenter>
             <Button
-              variant="secondaryText"
               square
+              invisible
               aria-label={t('previous.label')}
               tooltip={t('previous.tooltip')}
               onPress={() => setSlideIndex(slideIndex - 1)}
@@ -195,10 +189,10 @@ export const IntroSlider = () => {
               <RiArrowLeftSLine />
             </Button>
           </ButtonVerticalCenter>
-        </ButtonContainer>
+        </div>
         <SlideContainer>
           {SLIDES.map((slide, index) => (
-            <Slide visible={index == slideIndex} key={index}>
+            <Slide visible={index == slideIndex}>
               <Image src={slide.img} alt={t(`${slide.key}.imgAlt`)} />
               <TextAnimation visible={index == slideIndex}>
                 <Heading>{t(`${slide.key}.title`)}</Heading>
@@ -218,11 +212,11 @@ export const IntroSlider = () => {
             </Slide>
           ))}
         </SlideContainer>
-        <ButtonContainer>
+        <div>
           <ButtonVerticalCenter>
             <Button
-              variant="secondaryText"
               square
+              invisible
               aria-label={t('next.label')}
               tooltip={t('next.tooltip')}
               onPress={() => setSlideIndex(slideIndex + 1)}
@@ -231,12 +225,11 @@ export const IntroSlider = () => {
               <RiArrowRightSLine />
             </Button>
           </ButtonVerticalCenter>
-        </ButtonContainer>
+        </div>
       </div>
       <div
         className={css({
           marginTop: '0.5rem',
-          display: { base: 'none', xsm: 'block' },
         })}
       >
         {SLIDES.map((_, index) => (

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

@@ -1,7 +1,7 @@
 import { useTranslation } from 'react-i18next'
 import { DialogTrigger, MenuItem, Menu as RACMenu } from 'react-aria-components'
 import { Button, Menu } from '@/primitives'
-import { styled } from '@/styled-system/jsx'
+import { HStack, styled } from '@/styled-system/jsx'
 import { navigateTo } from '@/navigation/navigateTo'
 import { Screen } from '@/layout/Screen'
 import { generateRoomId } from '@/features/rooms'
@@ -10,6 +10,7 @@ import { JoinMeetingDialog } from '../components/JoinMeetingDialog'
 import { ProConnectButton } from '@/components/ProConnectButton'
 import { useCreateRoom } from '@/features/rooms'
 import { usePersistentUserChoices } from '@livekit/components-react'
+import { menuItemRecipe } from '@/primitives/menuItemRecipe'
 import { RiAddLine, RiLink } from '@remixicon/react'
 import { LaterMeetingDialog } from '@/features/home/components/LaterMeetingDialog'
 import { IntroSlider } from '@/features/home/components/IntroSlider'
@@ -17,31 +18,24 @@ import { MoreLink } from '@/features/home/components/MoreLink'
 import { ReactNode, useState } from 'react'
 
 import { css } from '@/styled-system/css'
-import { menuRecipe } from '@/primitives/menuRecipe.ts'
 
 const Columns = ({ children }: { children?: ReactNode }) => {
   return (
     <div
       className={css({
         alignItems: 'center',
-        margin: 'auto',
         display: 'inline-flex',
         flexDirection: 'column',
         height: '100%',
         minHeight: '100%',
         justifyContent: 'normal',
         padding: '0 1rem',
-        width: 'calc(100% - 2rem)',
-        '@media(prefers-reduced-motion: reduce)': {
-          opacity: 1,
-        },
-        '@media(prefers-reduced-motion: no-preference)': {
-          opacity: 0,
-          animation: '.5s ease-in fade 0s forwards',
-        },
+        width: 'calc(100%-2rem)',
+        opacity: 0,
+        animation: '.5s ease-in fade 0s forwards',
         lg: {
           flexDirection: 'row',
-          justifyContent: 'center',
+          justifyContent: 'space-evenly',
           width: '100%',
           padding: 0,
         },
@@ -62,7 +56,7 @@ const LeftColumn = ({ children }: { children?: ReactNode }) => {
         flexDirection: 'column',
         flexBasis: 'auto',
         flexShrink: 0,
-        maxWidth: '38rem',
+        maxWidth: '39rem',
         width: '100%',
         padding: '1rem 3%',
         marginTop: 'auto',
@@ -71,8 +65,8 @@ const LeftColumn = ({ children }: { children?: ReactNode }) => {
           textAlign: 'left',
           alignItems: 'flex-start',
           flexShrink: '1',
-          flexBasis: '36rem',
-          maxWidth: '36rem',
+          flexBasis: '45rem',
+          maxWidth: '45rem',
           padding: '1em 3em',
         },
       })}
@@ -119,29 +113,25 @@ const Separator = styled('div', {
 
 const Heading = styled('h1', {
   base: {
+    fontSize: '3rem',
+    lineHeight: '3.2rem',
+    letterSpacing: '0',
     fontWeight: '500',
     fontStyle: 'normal',
     fontStretch: 'normal',
     fontOpticalSizing: 'auto',
     marginBottom: 0,
     paddingBottom: '0.75rem',
-    fontSize: '2.3rem',
-    lineHeight: '2.5rem',
-    letterSpacing: '0',
-    xsm: {
-      fontSize: '3rem',
-      lineHeight: '3.2rem',
-    },
   },
 })
 
 const IntroText = styled('div', {
   base: {
     marginBottom: '3rem',
-    fontSize: '1.5rem',
+    fontSize: '1.375rem',
     lineHeight: '1.8rem',
     textWrap: 'pretty',
-    maxWidth: '32rem',
+    maxWidth: '28rem',
   },
 })
 
@@ -163,14 +153,7 @@ export const Home = () => {
           <LeftColumn>
             <Heading>{t('heading')}</Heading>
             <IntroText>{t('intro')}</IntroText>
-            <div
-              className={css({
-                display: 'flex',
-                gap: 0.5,
-                flexDirection: { base: 'column', xsm: 'row' },
-                alignItems: { base: 'center', xsm: 'items-start' },
-              })}
-            >
+            <HStack gap="gutter" alignItems="start">
               {isLoggedIn ? (
                 <Menu>
                   <Button variant="primary" data-attr="create-meeting">
@@ -178,9 +161,7 @@ export const Home = () => {
                   </Button>
                   <RACMenu>
                     <MenuItem
-                      className={
-                        menuRecipe({ icon: true, variant: 'light' }).item
-                      }
+                      className={menuItemRecipe({ icon: true })}
                       onAction={async () => {
                         const slug = generateRoomId()
                         createRoom({ slug, username }).then((data) =>
@@ -195,9 +176,7 @@ export const Home = () => {
                       {t('createMenu.instantOption')}
                     </MenuItem>
                     <MenuItem
-                      className={
-                        menuRecipe({ icon: true, variant: 'light' }).item
-                      }
+                      className={menuItemRecipe({ icon: true })}
                       onAction={() => {
                         const slug = generateRoomId()
                         createRoom({ slug, username }).then((data) =>
@@ -216,7 +195,8 @@ export const Home = () => {
               )}
               <DialogTrigger>
                 <Button
-                  variant="secondary"
+                  variant="primary"
+                  outline
                   style={{
                     height: !isLoggedIn ? '56px' : undefined, // Temporary, Align with ProConnect Button fixed height
                   }}
@@ -225,7 +205,7 @@ export const Home = () => {
                 </Button>
                 <JoinMeetingDialog />
               </DialogTrigger>
-            </div>
+            </HStack>
             <Separator />
             <div
               className={css({

src/frontend/src/features/notifications/MainNotificationToast.tsx

@@ -16,11 +16,11 @@ export const MainNotificationToast = () => {
       if (isMobileBrowser()) {
         return
       }
-      triggerNotificationSound(NotificationType.ParticipantJoined)
+      triggerNotificationSound(NotificationType.Joined)
       toastQueue.add(
         {
           participant,
-          type: NotificationType.ParticipantJoined,
+          type: NotificationType.Joined,
         },
         {
           timeout: 5000,
@@ -67,7 +67,7 @@ export const MainNotificationToast = () => {
       const existingToast = toastQueue.visibleToasts.find(
         (toast) =>
           toast.content.participant === participant &&
-          toast.content.type === NotificationType.HandRaised
+          toast.content.type === NotificationType.Raised
       )
 
       if (existingToast && prevMetadata.raised && !metadata.raised) {
@@ -76,11 +76,11 @@ export const MainNotificationToast = () => {
       }
 
       if (!existingToast && !prevMetadata.raised && metadata.raised) {
-        triggerNotificationSound(NotificationType.HandRaised)
+        triggerNotificationSound(NotificationType.Raised)
         toastQueue.add(
           {
             participant,
-            type: NotificationType.HandRaised,
+            type: NotificationType.Raised,
           },
           { timeout: 5000 }
         )

src/frontend/src/features/notifications/NotificationType.ts

@@ -1,5 +1,6 @@
 export enum NotificationType {
-  ParticipantJoined = 'participantJoined',
-  HandRaised = 'handRaised',
-  // todo - implement message received notification
+  Joined = 'joined',
+  Default = 'default',
+  Raised = 'raised',
+  Lowered = 'lowered',
 }

src/frontend/src/features/notifications/components/ToastRegion.tsx

@@ -17,10 +17,10 @@ export function ToastRegion({ state, ...props }: ToastRegionProps) {
   return (
     <div {...regionProps} ref={ref} className="toast-region">
       {state.visibleToasts.map((toast) => {
-        if (toast.content?.type === NotificationType.ParticipantJoined) {
+        if (toast.content?.type === NotificationType.Joined) {
           return <ToastJoined key={toast.key} toast={toast} state={state} />
         }
-        if (toast.content?.type === NotificationType.HandRaised) {
+        if (toast.content?.type === NotificationType.Raised) {
           return <ToastRaised key={toast.key} toast={toast} state={state} />
         }
         return <Toast key={toast.key} toast={toast} state={state} />

src/frontend/src/features/notifications/hooks/useSoundNotification.tsx

@@ -1,24 +1,18 @@
 import useSound from 'use-sound'
-import { useSnapshot } from 'valtio'
-import { notificationsStore } from '@/stores/notifications'
-import { NotificationType } from '@/features/notifications/NotificationType'
 
 // fixme - handle dynamic audio output changes
 export const useNotificationSound = () => {
-  const notificationsSnap = useSnapshot(notificationsStore)
   const [play] = useSound('./sounds/notifications.mp3', {
     sprite: {
-      participantJoined: [0, 1150],
-      handRaised: [1400, 180],
-      messageReceived: [1580, 300],
+      joined: [0, 1150],
+      raised: [1400, 180],
+      message: [1580, 300],
       waiting: [2039, 710],
       success: [2740, 1304],
     },
-    volume: notificationsSnap.soundNotificationVolume,
   })
-  const triggerNotificationSound = (type: NotificationType) => {
-    const isSoundEnabled = notificationsSnap.soundNotifications.get(type)
-    if (isSoundEnabled) play({ id: type })
+  const triggerNotificationSound = (type: string) => {
+    play({ id: type })
   }
   return { triggerNotificationSound }
 }

src/frontend/src/features/rooms/api/ApiRoom.ts

@@ -3,12 +3,10 @@ export type ApiRoom = {
   name: string
   slug: string
   is_public: boolean
-  is_administrable: boolean
   livekit?: {
     url: string
     room: string
     token: string
-    passphrase: string
   }
   configuration?: {
     [key: string]: string | number | boolean

src/frontend/src/features/rooms/api/startRecording.ts

@@ -1,35 +0,0 @@
-import { useMutation, UseMutationOptions } from '@tanstack/react-query'
-import { fetchApi } from '@/api/fetchApi'
-import { ApiError } from '@/api/ApiError'
-import { ApiRoom } from './ApiRoom'
-
-export enum RecordingMode {
-  Transcript = 'transcript',
-  ScreenRecording = 'screen_recording',
-}
-
-export interface StartRecordingParams {
-  id: string
-  mode?: RecordingMode
-}
-
-const startRecording = ({
-  id,
-  mode = RecordingMode.Transcript,
-}: StartRecordingParams): Promise<ApiRoom> => {
-  return fetchApi(`rooms/${id}/start-recording/`, {
-    method: 'POST',
-    body: JSON.stringify({
-      mode: mode,
-    }),
-  })
-}
-
-export function useStartRecording(
-  options?: UseMutationOptions<ApiRoom, ApiError, StartRecordingParams>
-) {
-  return useMutation<ApiRoom, ApiError, StartRecordingParams>({
-    mutationFn: startRecording,
-    onSuccess: options?.onSuccess,
-  })
-}

src/frontend/src/features/rooms/api/stopRecording.ts

@@ -1,23 +0,0 @@
-import { useMutation, UseMutationOptions } from '@tanstack/react-query'
-import { fetchApi } from '@/api/fetchApi'
-import { ApiError } from '@/api/ApiError'
-import { ApiRoom } from './ApiRoom'
-
-export interface StopRecordingParams {
-  id: string
-}
-
-const stopRecording = ({ id }: StopRecordingParams): Promise<ApiRoom> => {
-  return fetchApi(`rooms/${id}/stop-recording/`, {
-    method: 'POST',
-  })
-}
-
-export function useStopRecording(
-  options?: UseMutationOptions<ApiRoom, ApiError, StopRecordingParams>
-) {
-  return useMutation<ApiRoom, ApiError, StopRecordingParams>({
-    mutationFn: stopRecording,
-    onSuccess: options?.onSuccess,
-  })
-}

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

@@ -1,13 +1,8 @@
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { useQuery } from '@tanstack/react-query'
 import { useTranslation } from 'react-i18next'
 import { LiveKitRoom, type LocalUserChoices } from '@livekit/components-react'
-import {
-  Room,
-  RoomOptions,
-  ExternalE2EEKeyProvider,
-  DeviceUnsupportedError,
-} from 'livekit-client'
+import { Room, RoomOptions } from 'livekit-client'
 import { keys } from '@/api/queryKeys'
 import { queryClient } from '@/api/queryClient'
 import { Screen } from '@/layout/Screen'
@@ -20,10 +15,6 @@ import { InviteDialog } from './InviteDialog'
 
 import { VideoConference } from '../livekit/prefabs/VideoConference'
 import posthog from 'posthog-js'
-import { css } from '@/styled-system/css'
-
-// todo - release worker when quitting the room, same for the key provider?
-// todo - check, seems the demo app from livekit trigger the web worker twice because of re-rendering
 
 export const Conference = ({
   roomId,
@@ -71,85 +62,20 @@ export const Conference = ({
     retry: false,
   })
 
-  const e2eeEnabled = true
-
-  const workerRef = useRef<Worker | null>(null)
-  const keyProvider = useRef<any | null>(null)
-
-  const getKeyProvider = () => {
-    if (!keyProvider.current && typeof window !== 'undefined') {
-      keyProvider.current = new ExternalE2EEKeyProvider()
-    }
-    return keyProvider.current
-  }
-
-  const getWorker = () => {
-    if (!e2eeEnabled) {
-      return
-    }
-    if (!workerRef.current && typeof window !== 'undefined') {
-      workerRef.current = new Worker(
-        new URL('livekit-client/e2ee-worker', import.meta.url)
-      )
-    }
-    return workerRef.current
-  }
-
-  const e2eePassphrase = data?.livekit?.passphrase
-
-  const [e2eeSetupComplete, setE2eeSetupComplete] = useState(false)
-
   const roomOptions = useMemo((): RoomOptions => {
-    const worker = getWorker()
-    const keyProvider = getKeyProvider()
-
-    // todo - explain why
-    const videoCodec = e2eeEnabled ? undefined : 'vp9'
-    const e2ee = e2eeEnabled ? { keyProvider, worker } : undefined
-
     return {
-      adaptiveStream: true,
-      dynacast: true,
-      publishDefaults: {
-        // todo - explain why
-        red: !e2eeEnabled,
-        videoCodec,
-      },
       videoCaptureDefaults: {
         deviceId: userConfig.videoDeviceId ?? undefined,
       },
       audioCaptureDefaults: {
         deviceId: userConfig.audioDeviceId ?? undefined,
       },
-      e2ee,
     }
     // do not rely on the userConfig object directly as its reference may change on every render
   }, [userConfig.videoDeviceId, userConfig.audioDeviceId])
 
   const room = useMemo(() => new Room(roomOptions), [roomOptions])
 
-  useEffect(() => {
-    console.log('enter', e2eePassphrase)
-    if (e2eePassphrase) {
-      const keyProvider = getKeyProvider()
-      keyProvider
-        .setKey(e2eePassphrase)
-        .then(() => {
-          room.setE2EEEnabled(true).catch((e) => {
-            if (e instanceof DeviceUnsupportedError) {
-              alert(
-                `You're trying to join an encrypted meeting, but your browser does not support it. Please update it to the latest version and try again.`
-              )
-              console.error(e)
-            } else {
-              throw e
-            }
-          })
-        })
-        .then(() => setE2eeSetupComplete(true))
-    }
-  }, [room, e2eePassphrase])
-
   const [showInviteDialog, setShowInviteDialog] = useState(mode === 'create')
 
   const { t } = useTranslation('rooms')
@@ -170,25 +96,17 @@ export const Conference = ({
     peerConnectionTimeout: 60000, // Default: 15s. Extended for slow TURN/TLS negotiation
   }
 
-  const handleEncryptionError = () => {
-    console.log('error')
-  }
-
   return (
     <QueryAware status={isFetchError ? createStatus : fetchStatus}>
-      <Screen header={false} footer={false}>
+      <Screen header={false}>
         <LiveKitRoom
           room={room}
           serverUrl={data?.livekit?.url}
           token={data?.livekit?.token}
-          connect={e2eeSetupComplete}
+          connect={true}
           audio={userConfig.audioEnabled}
           video={userConfig.videoEnabled}
           connectOptions={connectOptions}
-          className={css({
-            backgroundColor: 'primaryDark.50 !important',
-          })}
-          onEncryptionError={handleEncryptionError}
         >
           <VideoConference />
           {showInviteDialog && (

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

@@ -49,6 +49,8 @@ export const InviteDialog = ({
     }
   }, [isCopied])
 
+  const [isHovered, setIsHovered] = useState(false)
+
   return (
     <StyledRACDialog {...dialogProps}>
       {({ close }) => (
@@ -64,7 +66,6 @@ export const InviteDialog = ({
           <Div position="absolute" top="5" right="5">
             <Button
               invisible
-              variant="tertiaryText"
               size="xs"
               onPress={() => {
                 dialogProps.onClose?.()
@@ -77,24 +78,45 @@ export const InviteDialog = ({
           </Div>
           <P>{t('shareDialog.description')}</P>
           <Button
-            variant={isCopied ? 'success' : 'tertiary'}
+            variant={isCopied ? 'success' : 'primary'}
+            size="sm"
             fullWidth
             aria-label={t('shareDialog.copy')}
+            style={{
+              justifyContent: 'start',
+            }}
             onPress={() => {
               navigator.clipboard.writeText(roomUrl)
               setIsCopied(true)
             }}
+            onHoverChange={setIsHovered}
             data-attr="share-dialog-copy"
           >
             {isCopied ? (
               <>
-                <RiCheckLine size={24} style={{ marginRight: '8px' }} />
+                <RiCheckLine size={18} style={{ marginRight: '8px' }} />
                 {t('shareDialog.copied')}
               </>
             ) : (
               <>
-                <RiFileCopyLine size={24} style={{ marginRight: '8px' }} />
-                {t('shareDialog.copyButton')}
+                <RiFileCopyLine
+                  size={18}
+                  style={{ marginRight: '8px', minWidth: '18px' }}
+                />
+                {isHovered ? (
+                  t('shareDialog.copy')
+                ) : (
+                  <div
+                    style={{
+                      textOverflow: 'ellipsis',
+                      overflow: 'hidden',
+                      userSelect: 'none',
+                      textWrap: 'nowrap',
+                    }}
+                  >
+                    {roomUrl.replace(/^https?:\/\//, '')}
+                  </div>
+                )}
               </>
             )}
           </Button>

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

@@ -13,7 +13,7 @@ export const Join = ({
   const { user } = useUser()
 
   return (
-    <Screen layout="centered" footer={false}>
+    <Screen layout="centered">
       <CenteredContent title={t('join.heading')}>
         <PreJoin
           persistUserChoices

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

@@ -1,255 +0,0 @@
-import { Button, H, Text, TextArea } from '@/primitives'
-import { useEffect, useState } from 'react'
-import { cva } from '@/styled-system/css'
-import { useTranslation } from 'react-i18next'
-import { styled, VStack } from '@/styled-system/jsx'
-import { usePostHog } from 'posthog-js/react'
-import { PostHog } from 'posthog-js'
-
-const Card = styled('div', {
-  base: {
-    border: '1px solid',
-    borderColor: 'gray.300',
-    padding: '1rem',
-    marginTop: '1.5rem',
-    borderRadius: '0.25rem',
-    boxShadow: '',
-    minWidth: '380px',
-    minHeight: '196px',
-  },
-})
-
-const Bar = styled('div', {
-  base: {
-    display: 'flex',
-    border: '2px solid',
-    borderColor: 'gray.300',
-    borderRadius: '8px',
-    overflowY: 'hidden',
-    scrollbar: 'hidden',
-  },
-})
-
-const ratingButtonRecipe = cva({
-  base: {
-    backgroundColor: 'white',
-    color: 'initial',
-    border: 'none',
-    borderRadius: 0,
-    padding: '0.5rem 0.85rem',
-    flexGrow: '1',
-    cursor: 'pointer',
-  },
-  variants: {
-    selected: {
-      true: {
-        backgroundColor: 'primary.800',
-        color: 'white',
-      },
-      false: {
-        '&[data-hovered]': {
-          backgroundColor: 'gray.100',
-        },
-      },
-    },
-    borderLeft: {
-      true: {
-        borderLeft: '1px solid',
-        borderColor: 'gray.300',
-      },
-    },
-  },
-})
-
-const labelRecipe = cva({
-  base: {
-    color: 'gray.600',
-    paddingTop: '0.25rem',
-  },
-})
-
-const OpenFeedback = ({
-  posthog,
-  onNext,
-}: {
-  posthog: PostHog
-  onNext: () => void
-}) => {
-  const { t } = useTranslation('rooms', { keyPrefix: 'openFeedback' })
-  const [feedback, setFeedback] = useState('')
-
-  const onContinue = () => {
-    setFeedback('')
-    onNext()
-  }
-
-  const onSubmit = () => {
-    try {
-      posthog.capture('survey sent', {
-        $survey_id: '01933c5a-5a1d-0000-ada8-e39f5918c2d4',
-        $survey_response: feedback,
-      })
-    } catch (e) {
-      console.warn(e)
-    } finally {
-      onContinue()
-    }
-  }
-
-  return (
-    <Card>
-      <H lvl={3}>{t('question')}</H>
-      <TextArea
-        id="feedbackInput"
-        name="feedback"
-        placeholder={t('placeholder')}
-        required
-        value={feedback}
-        onChange={(e) => setFeedback(e.target.value)}
-        style={{
-          minHeight: '150px',
-          marginBottom: '1rem',
-        }}
-      />
-      <VStack gap="0.5">
-        <Button
-          variant="primary"
-          size="sm"
-          fullWidth
-          isDisabled={!feedback}
-          onPress={onSubmit}
-        >
-          {t('submit')}
-        </Button>
-        <Button
-          invisible
-          variant="secondary"
-          size="sm"
-          fullWidth
-          onPress={onNext}
-        >
-          {t('skip')}
-        </Button>
-      </VStack>
-    </Card>
-  )
-}
-
-const RateQuality = ({
-  posthog,
-  onNext,
-  maxRating = 7,
-}: {
-  posthog: PostHog
-  onNext: () => void
-  maxRating?: number
-}) => {
-  const { t } = useTranslation('rooms', { keyPrefix: 'rating' })
-  const [selectedRating, setSelectedRating] = useState<number | null>(null)
-
-  const handleRatingClick = (rating: number) => {
-    setSelectedRating((prevRating) => (prevRating === rating ? null : rating))
-  }
-
-  const onSubmit = () => {
-    try {
-      posthog.capture('survey sent', {
-        $survey_id: '01933c22-d005-0000-b623-20b752171e2e',
-        $survey_response: `${selectedRating}`,
-      })
-    } catch (e) {
-      console.warn(e)
-    } finally {
-      setSelectedRating(null)
-      onNext()
-    }
-  }
-
-  return (
-    <Card>
-      <H lvl={3}>{t('question')}</H>
-      <Bar>
-        {[...Array(maxRating)].map((_, index) => (
-          <Button
-            key={index}
-            onPress={() => handleRatingClick(index + 1)}
-            className={ratingButtonRecipe({
-              selected: selectedRating === index + 1,
-              borderLeft: index != 0,
-            })}
-          >
-            {index + 1}
-          </Button>
-        ))}
-      </Bar>
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'space-between',
-          marginBottom: '1rem',
-        }}
-      >
-        <Text variant="sm" className={labelRecipe()}>
-          {t('levels.min')}
-        </Text>
-        <Text variant="sm" className={labelRecipe()}>
-          {t('levels.max')}
-        </Text>
-      </div>
-      <Button
-        variant="primary"
-        size="sm"
-        fullWidth
-        isDisabled={!selectedRating}
-        onPress={onSubmit}
-      >
-        {t('submit')}
-      </Button>
-    </Card>
-  )
-}
-
-const ConfirmationMessage = ({ onNext }: { onNext: () => void }) => {
-  const { t } = useTranslation('rooms', { keyPrefix: 'confirmationMessage' })
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      onNext()
-    }, 10000)
-    return () => clearTimeout(timer)
-  }, [onNext])
-  return (
-    <Card
-      style={{
-        maxWidth: '380px',
-        display: 'flex',
-        flexDirection: 'column',
-        justifyContent: 'center',
-      }}
-    >
-      <VStack gap={0}>
-        <H lvl={3}>{t('heading')}</H>
-        <Text as="p" variant="paragraph" centered>
-          {t('body')}
-        </Text>
-      </VStack>
-    </Card>
-  )
-}
-
-export const Rating = () => {
-  const posthog = usePostHog()
-
-  const [step, setStep] = useState(0)
-
-  if (step == 0) {
-    return <RateQuality posthog={posthog} onNext={() => setStep(step + 1)} />
-  }
-
-  if (step == 1) {
-    return <OpenFeedback posthog={posthog} onNext={() => setStep(step + 1)} />
-  }
-
-  if (step == 2) {
-    return <ConfirmationMessage onNext={() => setStep(0)} />
-  }
-}

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

@@ -151,6 +151,7 @@ export const Effects = () => {
           <HStack>
             <ToggleButton
               size={'sm'}
+              legacyStyle
               aria-label={tooltipLabel(BlurRadius.LIGHT)}
               tooltip={tooltipLabel(BlurRadius.LIGHT)}
               isDisabled={processorPending}
@@ -161,6 +162,7 @@ export const Effects = () => {
             </ToggleButton>
             <ToggleButton
               size={'sm'}
+              legacyStyle
               aria-label={tooltipLabel(BlurRadius.NORMAL)}
               tooltip={tooltipLabel(BlurRadius.NORMAL)}
               isDisabled={processorPending}

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

@@ -10,7 +10,7 @@ const StyledParticipantPlaceHolder = styled('div', {
   base: {
     width: '100%',
     height: '100%',
-    backgroundColor: 'primaryDark.100',
+    backgroundColor: '#3d4043', // fixme - copied from gmeet
     display: 'flex',
     justifyContent: 'center',
     alignItems: 'center',

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

@@ -15,9 +15,8 @@ import {
   VideoTrack,
   TrackRefContext,
   ParticipantContextIfNeeded,
-  useIsSpeaking,
 } from '@livekit/components-react'
-import React, { useEffect } from 'react'
+import React from 'react'
 import {
   isTrackReference,
   isTrackReferencePinned,

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

@@ -1,43 +0,0 @@
-import { css } from '@/styled-system/css'
-import { RiRecordCircleLine } from '@remixicon/react'
-import { Text } from '@/primitives'
-import { useTranslation } from 'react-i18next'
-import { useRoomContext } from '@livekit/components-react'
-
-export const RecordingStateToast = () => {
-  const { t } = useTranslation('rooms', { keyPrefix: 'recording' })
-
-  const room = useRoomContext()
-
-  if (!room?.isRecording) return
-
-  return (
-    <div
-      className={css({
-        display: 'flex',
-        position: 'fixed',
-        top: '10px',
-        left: '10px',
-        paddingY: '0.25rem',
-        paddingX: '0.25rem 0.35rem',
-        backgroundColor: 'primaryDark.200',
-        borderColor: 'primaryDark.400',
-        border: '1px solid',
-        color: 'white',
-        borderRadius: '4px',
-        gap: '0.5rem',
-      })}
-    >
-      <RiRecordCircleLine
-        size={20}
-        className={css({
-          color: 'white',
-          backgroundColor: 'danger.700',
-          padding: '3px',
-          borderRadius: '3px',
-        })}
-      />
-      <Text variant={'sm'}>{t('label')}</Text>
-    </div>
-  )
-}

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

@@ -10,7 +10,6 @@ import { useSidePanel } from '../hooks/useSidePanel'
 import { ReactNode } from 'react'
 import { Effects } from './Effects'
 import { Chat } from '../prefabs/Chat'
-import { Transcript } from './Transcript'
 
 type StyledSidePanelProps = {
   title: string
@@ -69,7 +68,6 @@ const StyledSidePanel = ({
     >
       <Button
         invisible
-        variant="tertiaryText"
         size="xs"
         onPress={onClose}
         aria-label={closeButtonTooltip}
@@ -107,7 +105,6 @@ export const SidePanel = () => {
     isEffectsOpen,
     isChatOpen,
     isSidePanelOpen,
-    isTranscriptOpen,
   } = useSidePanel()
   const { t } = useTranslation('rooms', { keyPrefix: 'sidePanel' })
 
@@ -129,9 +126,6 @@ export const SidePanel = () => {
       <Panel isOpen={isChatOpen}>
         <Chat />
       </Panel>
-      <Panel isOpen={isTranscriptOpen}>
-        <Transcript />
-      </Panel>
     </StyledSidePanel>
   )
 }

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

@@ -1,100 +0,0 @@
-import { Button, Div, H, Text } from '@/primitives'
-
-import thirdSlide from '@/assets/intro-slider/3_resume.png'
-import { css } from '@/styled-system/css'
-
-import { useHasTranscriptAccess } from '../hooks/useHasTranscriptAccess'
-import { RiRecordCircleLine, RiStopCircleLine } from '@remixicon/react'
-import { useRoomId } from '@/features/rooms/livekit/hooks/useRoomId'
-import { useRoomContext } from '@livekit/components-react'
-import {
-  RecordingMode,
-  useStartRecording,
-} from '@/features/rooms/api/startRecording'
-import { useStopRecording } from '@/features/rooms/api/stopRecording'
-import { useEffect, useState } from 'react'
-import { RoomEvent } from 'livekit-client'
-import { useTranslation } from 'react-i18next'
-
-export const Transcript = () => {
-  const [isLoading, setIsLoading] = useState(false)
-
-  const { t } = useTranslation('rooms', { keyPrefix: 'transcript' })
-
-  const hasTranscriptAccess = useHasTranscriptAccess()
-
-  const roomId = useRoomId()
-
-  const { mutateAsync: startRecordingRoom } = useStartRecording()
-  const { mutateAsync: stopRecordingRoom } = useStopRecording()
-
-  const room = useRoomContext()
-
-  useEffect(() => {
-    const handleRecordingStatusChanged = () => {
-      setIsLoading(false)
-    }
-    room.on(RoomEvent.RecordingStatusChanged, handleRecordingStatusChanged)
-    return () => {
-      room.off(RoomEvent.RecordingStatusChanged, handleRecordingStatusChanged)
-    }
-  }, [room])
-
-  const handleTranscript = async () => {
-    if (!roomId) {
-      console.warn('No room ID found')
-      return
-    }
-    try {
-      setIsLoading(true)
-      if (room.isRecording) {
-        await stopRecordingRoom({ id: roomId })
-      } else {
-        await startRecordingRoom({ id: roomId, mode: RecordingMode.Transcript })
-      }
-    } catch (error) {
-      console.error('Failed to handle transcript:', error)
-      setIsLoading(false)
-    }
-  }
-
-  if (!hasTranscriptAccess) return
-
-  return (
-    <Div
-      display="flex"
-      overflowY="scroll"
-      padding="0 1.5rem"
-      flexGrow={1}
-      flexDirection="column"
-      alignItems="center"
-    >
-      <img src={thirdSlide} alt={'wip'} />
-      {room.isRecording ? (
-        <>
-          <H lvl={2}>{t('stop.heading')}</H>
-          <Text variant="sm" centered wrap="balance">
-            {t('stop.body')}
-          </Text>
-          <div className={css({ height: '2rem' })} />
-          <Button isDisabled={isLoading} onPress={() => handleTranscript()}>
-            <RiStopCircleLine style={{ marginRight: '0.5rem' }} />{' '}
-            {t('stop.button')}
-          </Button>
-        </>
-      ) : (
-        <>
-          <H lvl={2}>{t('start.heading')}</H>
-          <Text variant="sm" centered wrap="balance">
-            {t('start.body')}
-          </Text>
-          <div className={css({ height: '2rem' })} />
-          <Button isDisabled={isLoading} onPress={() => handleTranscript()}>
-            <RiRecordCircleLine style={{ marginRight: '0.5rem' }} />{' '}
-            {t('start.button')}
-          </Button>
-        </>
-      )}
-    </Div>
-  )
-}

src/frontend/src/features/rooms/livekit/components/chat/Input.tsx

@@ -1,7 +1,8 @@
-import { Button, TextArea } from '@/primitives'
+import { Button } from '@/primitives'
 import { HStack } from '@/styled-system/jsx'
 import { RiSendPlane2Fill } from '@remixicon/react'
 import { useState, useEffect } from 'react'
+import { TextArea } from '@/primitives/TextArea'
 import { RefObject } from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -107,7 +108,6 @@ export const ChatInput = ({
       <Button
         square
         invisible
-        variant="tertiaryText"
         size="sm"
         onPress={handleSubmit}
         isDisabled={isDisabled}

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

@@ -5,12 +5,8 @@ import { css } from '@/styled-system/css'
 import { ToggleButton } from '@/primitives'
 import { chatStore } from '@/stores/chat'
 import { useSidePanel } from '../../hooks/useSidePanel'
-import { ToggleButtonProps } from '@/primitives/ToggleButton'
 
-export const ChatToggle = ({
-  onPress,
-  ...props
-}: Partial<ToggleButtonProps>) => {
+export const ChatToggle = () => {
   const { t } = useTranslation('rooms', { keyPrefix: 'controls.chat' })
 
   const chatSnap = useSnapshot(chatStore)
@@ -27,16 +23,12 @@ export const ChatToggle = ({
     >
       <ToggleButton
         square
-        variant="primaryTextDark"
+        legacyStyle
         aria-label={t(tooltipLabel)}
         tooltip={t(tooltipLabel)}
         isSelected={isChatOpen}
-        onPress={(e) => {
-          toggleChat()
-          onPress?.(e)
-        }}
+        onPress={() => toggleChat()}
         data-attr={`controls-chat-${tooltipLabel}`}
-        {...props}
       >
         <RiChat1Line />
       </ToggleButton>

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

@@ -24,7 +24,7 @@ export const HandToggle = () => {
     >
       <ToggleButton
         square
-        variant="primaryDark"
+        legacyStyle
         aria-label={t(tooltipLabel)}
         tooltip={t(tooltipLabel)}
         isSelected={isHandRaised}

src/frontend/src/features/rooms/livekit/components/controls/Options/OptionsButton.tsx

@@ -1,24 +1,33 @@
 import { useTranslation } from 'react-i18next'
 import { RiMore2Line } from '@remixicon/react'
 import { Button, Menu } from '@/primitives'
+
+import { useState } from 'react'
 import { OptionsMenuItems } from '@/features/rooms/livekit/components/controls/Options/OptionsMenuItems'
+import { SettingsDialogExtended } from '@/features/settings/components/SettingsDialogExtended'
+
+export type DialogState = 'username' | 'settings' | null
 
 export const OptionsButton = () => {
   const { t } = useTranslation('rooms')
-
+  const [dialogOpen, setDialogOpen] = useState<DialogState>(null)
   return (
     <>
       <Menu>
         <Button
           square
-          variant="primaryDark"
+          legacyStyle
           aria-label={t('options.buttonLabel')}
           tooltip={t('options.buttonLabel')}
         >
           <RiMore2Line />
         </Button>
-        <OptionsMenuItems />
+        <OptionsMenuItems onOpenDialog={setDialogOpen} />
       </Menu>
+      <SettingsDialogExtended
+        isOpen={dialogOpen === 'settings'}
+        onOpenChange={(v) => !v && setDialogOpen(null)}
+      />
     </>
   )
 }

src/frontend/src/features/rooms/livekit/components/controls/Options/OptionsMenuItems.tsx

@@ -1,3 +1,4 @@
+import { menuItemRecipe } from '@/primitives/menuItemRecipe'
 import {
   RiAccountBoxLine,
   RiMegaphoneLine,
@@ -5,17 +6,19 @@ import {
 } from '@remixicon/react'
 import { MenuItem, Menu as RACMenu, Section } from 'react-aria-components'
 import { useTranslation } from 'react-i18next'
+import { Dispatch, SetStateAction } from 'react'
+import { DialogState } from './OptionsButton'
 import { Separator } from '@/primitives/Separator'
 import { useSidePanel } from '../../../hooks/useSidePanel'
-import { menuRecipe } from '@/primitives/menuRecipe.ts'
-import { useSettingsDialog } from '../SettingsDialogContext'
-import { GRIST_FORM } from '@/utils/constants'
 
 // @todo try refactoring it to use MenuList component
-export const OptionsMenuItems = () => {
+export const OptionsMenuItems = ({
+  onOpenDialog,
+}: {
+  onOpenDialog: Dispatch<SetStateAction<DialogState>>
+}) => {
   const { t } = useTranslation('rooms', { keyPrefix: 'options.items' })
   const { toggleEffects } = useSidePanel()
-  const { setDialogOpen } = useSettingsDialog()
   return (
     <RACMenu
       style={{
@@ -26,7 +29,7 @@ export const OptionsMenuItems = () => {
       <Section>
         <MenuItem
           onAction={() => toggleEffects()}
-          className={menuRecipe({ icon: true }).item}
+          className={menuItemRecipe({ icon: true })}
         >
           <RiAccountBoxLine size={20} />
           {t('effects')}
@@ -35,16 +38,16 @@ export const OptionsMenuItems = () => {
       <Separator />
       <Section>
         <MenuItem
-          href={GRIST_FORM}
+          href="https://grist.incubateur.net/o/docs/forms/1YrfNP1QSSy8p2gCxMFnSf/4"
           target="_blank"
-          className={menuRecipe({ icon: true }).item}
+          className={menuItemRecipe({ icon: true })}
         >
           <RiMegaphoneLine size={20} />
           {t('feedbacks')}
         </MenuItem>
         <MenuItem
-          className={menuRecipe({ icon: true }).item}
-          onAction={() => setDialogOpen(true)}
+          className={menuItemRecipe({ icon: true })}
+          onAction={() => onOpenDialog('settings')}
         >
           <RiSettings3Line size={20} />
           {t('settings')}

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

@@ -69,7 +69,7 @@ export const HandRaisedListItem = ({
       </HStack>
       <Button
         square
-        variant="greyscale"
+        invisible
         size="sm"
         onPress={() => lowerHandParticipant(participant)}
         tooltip={t('participants.lowerParticipantHand', { name })}

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

@@ -63,7 +63,7 @@ const MicIndicator = ({ participant }: MicIndicatorProps) => {
     <>
       <Button
         square
-        variant="greyscale"
+        invisible
         size="sm"
         tooltip={
           isLocal(participant)
@@ -84,12 +84,9 @@ const MicIndicator = ({ participant }: MicIndicatorProps) => {
           <RiMicOffFill color={'gray'} />
         ) : (
           <RiMicFill
-            className={css({
-              color: isSpeaking ? 'primaryDark.300' : 'primaryDark.50',
-              animation: isSpeaking
-                ? 'pulse_background 800ms infinite'
-                : undefined,
-            })}
+            style={{
+              animation: isSpeaking ? 'pulse_mic 800ms infinite' : undefined,
+            }}
           />
         )}
       </Button>

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

@@ -4,12 +4,8 @@ import { ToggleButton } from '@/primitives'
 import { css } from '@/styled-system/css'
 import { useParticipants } from '@livekit/components-react'
 import { useSidePanel } from '../../../hooks/useSidePanel'
-import { ToggleButtonProps } from '@/primitives/ToggleButton'
 
-export const ParticipantsToggle = ({
-  onPress,
-  ...props
-}: ToggleButtonProps) => {
+export const ParticipantsToggle = () => {
   const { t } = useTranslation('rooms', { keyPrefix: 'controls.participants' })
 
   /**
@@ -33,16 +29,12 @@ export const ParticipantsToggle = ({
     >
       <ToggleButton
         square
-        variant="primaryTextDark"
+        legacyStyle
         aria-label={t(tooltipLabel)}
         tooltip={t(tooltipLabel)}
         isSelected={isParticipantsOpen}
-        onPress={(e) => {
-          toggleParticipants()
-          onPress?.(e)
-        }}
+        onPress={() => toggleParticipants()}
         data-attr={`controls-participants-${tooltipLabel}`}
-        {...props}
       >
         <RiGroupLine />
       </ToggleButton>

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

@@ -4,21 +4,13 @@ import { useTranslation } from 'react-i18next'
 import { useTrackToggle, UseTrackToggleProps } from '@livekit/components-react'
 import { Track } from 'livekit-client'
 import React from 'react'
-import { type ButtonRecipeProps } from '@/primitives/buttonRecipe'
-import { ToggleButtonProps } from '@/primitives/ToggleButton'
 
-type Props = Omit<
-  UseTrackToggleProps<Track.Source.ScreenShare>,
-  'source' | 'captureOptions'
-> &
-  Pick<NonNullable<ButtonRecipeProps>, 'variant'> &
-  ToggleButtonProps
-
-export const ScreenShareToggle = ({
-  variant = 'primaryDark',
-  onPress,
-  ...props
-}: Props) => {
+export const ScreenShareToggle = (
+  props: Omit<
+    UseTrackToggleProps<Track.Source.ScreenShare>,
+    'source' | 'captureOptions'
+  >
+) => {
   const { t } = useTranslation('rooms', { keyPrefix: 'controls.screenShare' })
   const { buttonProps, enabled } = useTrackToggle({
     ...props,
@@ -34,16 +26,18 @@ export const ScreenShareToggle = ({
     <ToggleButton
       isSelected={enabled}
       square
-      variant={variant}
+      legacyStyle
       tooltip={t(tooltipLabel)}
-      onPress={(e) => {
+      onPress={(e) =>
         buttonProps.onClick?.(
           e as unknown as React.MouseEvent<HTMLButtonElement, MouseEvent>
         )
-        onPress?.(e)
+      }
+      style={{
+        maxWidth: '46px',
+        maxHeight: '46px',
       }}
       data-attr={`controls-screenshare-${tooltipLabel}`}
-      {...props}
     >
       <Div position="relative">
         <RiRectangleLine size={28} />

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

@@ -4,6 +4,7 @@ import {
   useTrackToggle,
   UseTrackToggleProps,
 } from '@livekit/components-react'
+import { HStack } from '@/styled-system/jsx'
 import { Button, Menu, MenuList } from '@/primitives'
 import {
   RemixiconComponentType,
@@ -18,7 +19,6 @@ import { Track } from 'livekit-client'
 import { Shortcut } from '@/features/shortcuts/types'
 
 import { ToggleDevice } from '@/features/rooms/livekit/components/controls/ToggleDevice.tsx'
-import { css } from '@/styled-system/css'
 
 export type ToggleSource = Exclude<
   Track.Source,
@@ -86,12 +86,7 @@ export const SelectToggleDevice = <T extends ToggleSource>({
   const selectLabel = t('choose', { keyPrefix: `join.${config.kind}` })
 
   return (
-    <div
-      className={css({
-        display: 'flex',
-        gap: '1px',
-      })}
-    >
+    <HStack gap={0}>
       <ToggleDevice {...trackProps} config={config} />
       <Menu>
         <Button
@@ -99,7 +94,6 @@ export const SelectToggleDevice = <T extends ToggleSource>({
           aria-label={selectLabel}
           groupPosition="right"
           square
-          variant={trackProps.enabled ? 'primaryDark' : 'error2'}
         >
           <RiArrowDownSLine />
         </Button>
@@ -115,6 +109,6 @@ export const SelectToggleDevice = <T extends ToggleSource>({
           }}
         />
       </Menu>
-    </div>
+    </HStack>
   )
 }

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

@@ -1,36 +0,0 @@
-import { SettingsDialogExtended } from '@/features/settings/components/SettingsDialogExtended'
-import React, { createContext, useContext, useState } from 'react'
-
-const SettingsDialogContext = createContext<
-  | {
-      dialogOpen: boolean
-      setDialogOpen: React.Dispatch<React.SetStateAction<boolean>>
-    }
-  | undefined
->(undefined)
-
-export const SettingsDialogProvider: React.FC<{
-  children: React.ReactNode
-}> = ({ children }) => {
-  const [dialogOpen, setDialogOpen] = useState(false)
-  return (
-    <SettingsDialogContext.Provider value={{ dialogOpen, setDialogOpen }}>
-      {children}
-      <SettingsDialogExtended
-        isOpen={dialogOpen}
-        onOpenChange={(v) => !v && setDialogOpen(false)}
-      />
-    </SettingsDialogContext.Provider>
-  )
-}
-
-// eslint-disable-next-line react-refresh/only-export-components
-export const useSettingsDialog = () => {
-  const context = useContext(SettingsDialogContext)
-  if (!context) {
-    throw new Error(
-      'useSettingsDialog must be used within a SettingsDialogProvider'
-    )
-  }
-  return context
-}

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

@@ -1,50 +0,0 @@
-import { ToggleButton } from '@/primitives'
-import { RiQuestionLine } from '@remixicon/react'
-import { useTranslation } from 'react-i18next'
-import { Crisp } from 'crisp-sdk-web'
-import { useEffect, useState } from 'react'
-import { ToggleButtonProps } from '@/primitives/ToggleButton'
-
-export const SupportToggle = ({ onPress, ...props }: ToggleButtonProps) => {
-  const { t } = useTranslation('rooms', { keyPrefix: 'controls' })
-  const [isOpened, setIsOpened] = useState($crisp.is('chat:opened'))
-
-  useEffect(() => {
-    if (!Crisp) {
-      return
-    }
-
-    Crisp.chat.onChatOpened(() => {
-      setIsOpened(true)
-    })
-    Crisp.chat.onChatClosed(() => {
-      setIsOpened(false)
-    })
-    return () => {
-      Crisp.chat.offChatOpened()
-      Crisp.chat.offChatClosed()
-    }
-  }, [])
-
-  return (
-    <ToggleButton
-      square
-      variant="primaryTextDark"
-      tooltip={t('support')}
-      aria-label={t('support')}
-      isSelected={isOpened}
-      onPress={(e) => {
-        if (isOpened) {
-          Crisp.chat.close()
-        } else {
-          Crisp.chat.open()
-        }
-        onPress?.(e)
-      }}
-      data-attr="controls-support"
-      {...props}
-    >
-      <RiQuestionLine />
-    </ToggleButton>
-  )
-}

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

@@ -57,9 +57,9 @@ export const ToggleDevice = ({
 
   return (
     <ToggleButton
-      isSelected={!enabled}
-      variant={enabled ? 'primaryDark' : 'error2'}
-      shySelected
+      isSelected={enabled}
+      variant={enabled ? undefined : 'danger'}
+      toggledStyles={false}
       onPress={() => toggle()}
       aria-label={toggleLabel}
       tooltip={toggleLabel}

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

@@ -1,46 +0,0 @@
-import { ToggleButton } from '@/primitives'
-import { RiBardLine } from '@remixicon/react'
-import { useTranslation } from 'react-i18next'
-import { useSidePanel } from '../../hooks/useSidePanel'
-import { useHasTranscriptAccess } from '../../hooks/useHasTranscriptAccess'
-import { css } from '@/styled-system/css'
-import { ToggleButtonProps } from '@/primitives/ToggleButton'
-
-export const TranscriptToggle = ({
-  variant = 'primaryDark',
-  onPress,
-  ...props
-}: ToggleButtonProps) => {
-  const { t } = useTranslation('rooms', { keyPrefix: 'controls.transcript' })
-
-  const { isTranscriptOpen, toggleTranscript } = useSidePanel()
-  const tooltipLabel = isTranscriptOpen ? 'open' : 'closed'
-
-  const hasTranscriptAccess = useHasTranscriptAccess()
-
-  if (!hasTranscriptAccess) return
-
-  return (
-    <div
-      className={css({
-        position: 'relative',
-        display: 'inline-block',
-      })}
-    >
-      <ToggleButton
-        square
-        variant={variant}
-        aria-label={t(tooltipLabel)}
-        tooltip={t(tooltipLabel)}
-        isSelected={isTranscriptOpen}
-        onPress={(e) => {
-          toggleTranscript()
-          onPress?.(e)
-        }}
-        {...props}
-      >
-        <RiBardLine />
-      </ToggleButton>
-    </div>
-  )
-}

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

@@ -1,17 +0,0 @@
-import { useFeatureFlagEnabled } from 'posthog-js/react'
-import { useIsAnalyticsEnabled } from '@/features/analytics/hooks/useIsAnalyticsEnabled'
-import { useIsTranscriptEnabled } from './useIsTranscriptEnabled'
-import { useIsAdminOrOwner } from './useIsAdminOrOwner'
-
-export const useHasTranscriptAccess = () => {
-  const featureEnabled = useFeatureFlagEnabled('transcription-summary')
-  const isAnalyticsEnabled = useIsAnalyticsEnabled()
-  const isTranscriptEnabled = useIsTranscriptEnabled()
-  const isAdminOrOwner = useIsAdminOrOwner()
-
-  return (
-    (featureEnabled || !isAnalyticsEnabled) &&
-    isAdminOrOwner &&
-    isTranscriptEnabled
-  )
-}

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

@@ -1,6 +0,0 @@
-import { useRoomData } from './useRoomData'
-
-export const useIsAdminOrOwner = () => {
-  const apiRoomData = useRoomData()
-  return apiRoomData?.is_administrable
-}

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

@@ -1,11 +0,0 @@
-import { RecordingMode } from '@/features/rooms/api/startRecording'
-import { useConfig } from '@/api/useConfig'
-
-export const useIsTranscriptEnabled = () => {
-  const { data } = useConfig()
-
-  return (
-    data?.recording?.is_enabled &&
-    data?.recording?.available_modes?.includes(RecordingMode.Transcript)
-  )
-}

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

@@ -1,6 +0,0 @@
-import { useRoomData } from './useRoomData'
-
-export const useRoomId = () => {
-  const apiRoomData = useRoomData()
-  return apiRoomData?.livekit?.room
-}

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

@@ -5,7 +5,6 @@ export enum PanelId {
   PARTICIPANTS = 'participants',
   EFFECTS = 'effects',
   CHAT = 'chat',
-  TRANSCRIPT = 'transcript',
 }
 
 export const useSidePanel = () => {
@@ -15,7 +14,6 @@ export const useSidePanel = () => {
   const isParticipantsOpen = activePanelId == PanelId.PARTICIPANTS
   const isEffectsOpen = activePanelId == PanelId.EFFECTS
   const isChatOpen = activePanelId == PanelId.CHAT
-  const isTranscriptOpen = activePanelId == PanelId.TRANSCRIPT
   const isSidePanelOpen = !!activePanelId
 
   const toggleParticipants = () => {
@@ -30,20 +28,14 @@ export const useSidePanel = () => {
     layoutStore.activePanelId = isEffectsOpen ? null : PanelId.EFFECTS
   }
 
-  const toggleTranscript = () => {
-    layoutStore.activePanelId = isTranscriptOpen ? null : PanelId.TRANSCRIPT
-  }
-
   return {
     activePanelId,
     toggleParticipants,
     toggleChat,
     toggleEffects,
-    toggleTranscript,
     isChatOpen,
     isParticipantsOpen,
     isEffectsOpen,
     isSidePanelOpen,
-    isTranscriptOpen,
   }
 }

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

@@ -0,0 +1,156 @@
+import { Track } from 'livekit-client'
+import * as React from 'react'
+
+import { supportsScreenSharing } from '@livekit/components-core'
+
+import {
+  useMaybeLayoutContext,
+  usePersistentUserChoices,
+} from '@livekit/components-react'
+
+import { StartMediaButton } from '../components/controls/StartMediaButton'
+import { useMediaQuery } from '../hooks/useMediaQuery'
+import { OptionsButton } from '../components/controls/Options/OptionsButton'
+import { ParticipantsToggle } from '../components/controls/Participants/ParticipantsToggle'
+import { ChatToggle } from '../components/controls/ChatToggle'
+import { HandToggle } from '../components/controls/HandToggle'
+import { SelectToggleDevice } from '../components/controls/SelectToggleDevice'
+import { LeaveButton } from '../components/controls/LeaveButton'
+import { ScreenShareToggle } from '../components/controls/ScreenShareToggle'
+import { css } from '@/styled-system/css'
+
+/** @public */
+export type ControlBarControls = {
+  microphone?: boolean
+  camera?: boolean
+  chat?: boolean
+  screenShare?: boolean
+  leave?: boolean
+  settings?: boolean
+}
+
+/** @public */
+export interface ControlBarProps extends React.HTMLAttributes<HTMLDivElement> {
+  onDeviceError?: (error: { source: Track.Source; error: Error }) => void
+  variation?: 'minimal' | 'verbose' | 'textOnly'
+  controls?: ControlBarControls
+  /**
+   * If `true`, the user's device choices will be persisted.
+   * This will enable the user to have the same device choices when they rejoin the room.
+   * @defaultValue true
+   * @alpha
+   */
+  saveUserChoices?: boolean
+}
+
+/**
+ * The `ControlBar` prefab gives the user the basic user interface to control their
+ * media devices (camera, microphone and screen share), open the `Chat` and leave the room.
+ *
+ * @remarks
+ * This component is build with other LiveKit components like `TrackToggle`,
+ * `DeviceSelectorButton`, `DisconnectButton` and `StartAudio`.
+ *
+ * @example
+ * ```tsx
+ * <LiveKitRoom>
+ *   <ControlBar />
+ * </LiveKitRoom>
+ * ```
+ * @public
+ */
+export function ControlBar({
+  variation,
+  saveUserChoices = true,
+  onDeviceError,
+}: ControlBarProps) {
+  const [isChatOpen, setIsChatOpen] = React.useState(false)
+  const layoutContext = useMaybeLayoutContext()
+  React.useEffect(() => {
+    if (layoutContext?.widget.state?.showChat !== undefined) {
+      setIsChatOpen(layoutContext?.widget.state?.showChat)
+    }
+  }, [layoutContext?.widget.state?.showChat])
+
+  const isTooLittleSpace = useMediaQuery(
+    `(max-width: ${isChatOpen ? 1000 : 760}px)`
+  )
+
+  const defaultVariation = isTooLittleSpace ? 'minimal' : 'verbose'
+  variation ??= defaultVariation
+
+  const browserSupportsScreenSharing = supportsScreenSharing()
+
+  const {
+    saveAudioInputEnabled,
+    saveVideoInputEnabled,
+    saveAudioInputDeviceId,
+    saveVideoInputDeviceId,
+  } = usePersistentUserChoices({ preventSave: !saveUserChoices })
+
+  const microphoneOnChange = React.useCallback(
+    (enabled: boolean, isUserInitiated: boolean) =>
+      isUserInitiated ? saveAudioInputEnabled(enabled) : null,
+    [saveAudioInputEnabled]
+  )
+
+  const cameraOnChange = React.useCallback(
+    (enabled: boolean, isUserInitiated: boolean) =>
+      isUserInitiated ? saveVideoInputEnabled(enabled) : null,
+    [saveVideoInputEnabled]
+  )
+
+  return (
+    <div
+      className={css({
+        display: 'flex',
+        gap: '.5rem',
+        alignItems: 'center',
+        justifyContent: 'center',
+        padding: '.75rem',
+        borderTop: '1px solid var(--lk-border-color)',
+        maxHeight: 'var(--lk-control-bar-height)',
+        height: '80px',
+        position: 'absolute',
+        backgroundColor: '#d1d5db',
+        bottom: 0,
+        left: 0,
+        right: 0,
+      })}
+    >
+      <SelectToggleDevice
+        source={Track.Source.Microphone}
+        onChange={microphoneOnChange}
+        onDeviceError={(error) =>
+          onDeviceError?.({ source: Track.Source.Microphone, error })
+        }
+        onActiveDeviceChange={(deviceId) =>
+          saveAudioInputDeviceId(deviceId ?? '')
+        }
+      />
+      <SelectToggleDevice
+        source={Track.Source.Camera}
+        onChange={cameraOnChange}
+        onDeviceError={(error) =>
+          onDeviceError?.({ source: Track.Source.Camera, error })
+        }
+        onActiveDeviceChange={(deviceId) =>
+          saveVideoInputDeviceId(deviceId ?? '')
+        }
+      />
+      {browserSupportsScreenSharing && (
+        <ScreenShareToggle
+          onDeviceError={(error) =>
+            onDeviceError?.({ source: Track.Source.ScreenShare, error })
+          }
+        />
+      )}
+      <HandToggle />
+      <ChatToggle />
+      <ParticipantsToggle />
+      <OptionsButton />
+      <LeaveButton />
+      <StartMediaButton />
+    </div>
+  )
+}

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

@@ -1,103 +0,0 @@
-import { Track } from 'livekit-client'
-import * as React from 'react'
-import { usePersistentUserChoices } from '@livekit/components-react'
-
-import { MobileControlBar } from './MobileControlBar'
-import { DesktopControlBar } from './DesktopControlBar'
-import { SettingsDialogProvider } from '../../components/controls/SettingsDialogContext'
-import { useIsMobile } from '@/utils/useIsMobile'
-
-/** @public */
-export type ControlBarControls = {
-  microphone?: boolean
-  camera?: boolean
-  chat?: boolean
-  screenShare?: boolean
-  leave?: boolean
-  settings?: boolean
-}
-
-/** @public */
-export interface ControlBarProps extends React.HTMLAttributes<HTMLDivElement> {
-  onDeviceError?: (error: { source: Track.Source; error: Error }) => void
-  variation?: 'minimal' | 'verbose' | 'textOnly'
-  controls?: ControlBarControls
-  /**
-   * If `true`, the user's device choices will be persisted.
-   * This will enable the user to have the same device choices when they rejoin the room.
-   * @defaultValue true
-   * @alpha
-   */
-  saveUserChoices?: boolean
-}
-
-/**
- * The `ControlBar` prefab gives the user the basic user interface to control their
- * media devices (camera, microphone and screen share), open the `Chat` and leave the room.
- *
- * @remarks
- * This component is build with other LiveKit components like `TrackToggle`,
- * `DeviceSelectorButton`, `DisconnectButton` and `StartAudio`.
- *
- * @example
- * ```tsx
- * <LiveKitRoom>
- *   <ControlBar />
- * </LiveKitRoom>
- * ```
- * @public
- */
-export function ControlBar({
-  saveUserChoices = true,
-  onDeviceError,
-}: ControlBarProps) {
-  const {
-    saveAudioInputEnabled,
-    saveVideoInputEnabled,
-    saveAudioInputDeviceId,
-    saveVideoInputDeviceId,
-  } = usePersistentUserChoices({ preventSave: !saveUserChoices })
-
-  const microphoneOnChange = React.useCallback(
-    (enabled: boolean, isUserInitiated: boolean) =>
-      isUserInitiated ? saveAudioInputEnabled(enabled) : null,
-    [saveAudioInputEnabled]
-  )
-
-  const cameraOnChange = React.useCallback(
-    (enabled: boolean, isUserInitiated: boolean) =>
-      isUserInitiated ? saveVideoInputEnabled(enabled) : null,
-    [saveVideoInputEnabled]
-  )
-
-  const barProps = {
-    onDeviceError,
-    microphoneOnChange,
-    cameraOnChange,
-    saveAudioInputDeviceId,
-    saveVideoInputDeviceId,
-  }
-
-  const isMobile = useIsMobile()
-
-  return (
-    <SettingsDialogProvider>
-      {isMobile ? (
-        <MobileControlBar {...barProps} />
-      ) : (
-        <DesktopControlBar {...barProps} />
-      )}
-    </SettingsDialogProvider>
-  )
-}
-
-export interface ControlBarAuxProps {
-  onDeviceError: ControlBarProps['onDeviceError']
-  microphoneOnChange: (
-    enabled: boolean,
-    isUserInitiated: boolean
-  ) => void | null
-  cameraOnChange: (enabled: boolean, isUserInitiated: boolean) => void | null
-  saveAudioInputDeviceId: (deviceId: string) => void
-  saveVideoInputDeviceId: (deviceId: string) => void
-}

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

@@ -1,106 +0,0 @@
-import { supportsScreenSharing } from '@livekit/components-core'
-import { ControlBarAuxProps } from './ControlBar'
-import { css } from '@/styled-system/css'
-import { LeaveButton } from '../../components/controls/LeaveButton'
-import { SelectToggleDevice } from '../../components/controls/SelectToggleDevice'
-import { Track } from 'livekit-client'
-import { HandToggle } from '../../components/controls/HandToggle'
-import { ScreenShareToggle } from '../../components/controls/ScreenShareToggle'
-import { OptionsButton } from '../../components/controls/Options/OptionsButton'
-import { StartMediaButton } from '../../components/controls/StartMediaButton'
-import { ChatToggle } from '../../components/controls/ChatToggle'
-import { ParticipantsToggle } from '../../components/controls/Participants/ParticipantsToggle'
-import { SupportToggle } from '../../components/controls/SupportToggle'
-import { TranscriptToggle } from '../../components/controls/TranscriptToggle'
-
-export function DesktopControlBar({
-  onDeviceError,
-  microphoneOnChange,
-  cameraOnChange,
-  saveAudioInputDeviceId,
-  saveVideoInputDeviceId,
-}: ControlBarAuxProps) {
-  const browserSupportsScreenSharing = supportsScreenSharing()
-  return (
-    <>
-      <div
-        className={css({
-          width: '100vw',
-          display: 'flex',
-          position: 'absolute',
-          padding: '1.125rem',
-          bottom: 0,
-          left: 0,
-          right: 0,
-        })}
-      >
-        <div
-          className={css({
-            display: 'flex',
-            justifyContent: 'flex-start',
-            flex: '1 1 33%',
-            alignItems: 'center',
-            gap: '0.5rem',
-            marginLeft: '0.5rem',
-          })}
-        ></div>
-        <div
-          className={css({
-            flex: '1 1 33%',
-            alignItems: 'center',
-            justifyContent: 'center',
-            display: 'flex',
-            gap: '0.65rem',
-          })}
-        >
-          <SelectToggleDevice
-            source={Track.Source.Microphone}
-            onChange={microphoneOnChange}
-            onDeviceError={(error) =>
-              onDeviceError?.({ source: Track.Source.Microphone, error })
-            }
-            onActiveDeviceChange={(deviceId) =>
-              saveAudioInputDeviceId(deviceId ?? '')
-            }
-          />
-          <SelectToggleDevice
-            source={Track.Source.Camera}
-            onChange={cameraOnChange}
-            onDeviceError={(error) =>
-              onDeviceError?.({ source: Track.Source.Camera, error })
-            }
-            onActiveDeviceChange={(deviceId) =>
-              saveVideoInputDeviceId(deviceId ?? '')
-            }
-          />
-          {browserSupportsScreenSharing && (
-            <ScreenShareToggle
-              onDeviceError={(error) =>
-                onDeviceError?.({ source: Track.Source.ScreenShare, error })
-              }
-            />
-          )}
-          <HandToggle />
-          <OptionsButton />
-          <LeaveButton />
-          <StartMediaButton />
-        </div>
-        <div
-          className={css({
-            display: 'flex',
-            justifyContent: 'flex-end',
-            flex: '1 1 33%',
-            alignItems: 'center',
-            gap: '0.5rem',
-            paddingRight: '0.25rem',
-          })}
-        >
-          <ChatToggle />
-          <ParticipantsToggle />
-          <TranscriptToggle />
-          <SupportToggle />
-        </div>
-      </div>
-    </>
-  )
-}

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

@@ -1,182 +0,0 @@
-import { supportsScreenSharing } from '@livekit/components-core'
-import { useTranslation } from 'react-i18next'
-import { ControlBarAuxProps } from './ControlBar'
-import React from 'react'
-import { css } from '@/styled-system/css'
-import { LeaveButton } from '../../components/controls/LeaveButton'
-import { SelectToggleDevice } from '../../components/controls/SelectToggleDevice'
-import { Track } from 'livekit-client'
-import { HandToggle } from '../../components/controls/HandToggle'
-import { Button } from '@/primitives/Button'
-import {
-  RiAccountBoxLine,
-  RiMegaphoneLine,
-  RiMore2Line,
-  RiSettings3Line,
-} from '@remixicon/react'
-import { ScreenShareToggle } from '../../components/controls/ScreenShareToggle'
-import { ChatToggle } from '../../components/controls/ChatToggle'
-import { ParticipantsToggle } from '../../components/controls/Participants/ParticipantsToggle'
-import { SupportToggle } from '../../components/controls/SupportToggle'
-import { useSidePanel } from '../../hooks/useSidePanel'
-import { LinkButton } from '@/primitives'
-import { useSettingsDialog } from '../../components/controls/SettingsDialogContext'
-import { ResponsiveMenu } from './ResponsiveMenu'
-import { TranscriptToggle } from '../../components/controls/TranscriptToggle'
-
-export function MobileControlBar({
-  onDeviceError,
-  microphoneOnChange,
-  cameraOnChange,
-  saveAudioInputDeviceId,
-  saveVideoInputDeviceId,
-}: ControlBarAuxProps) {
-  const { t } = useTranslation('rooms')
-  const [isMenuOpened, setIsMenuOpened] = React.useState(false)
-  const browserSupportsScreenSharing = supportsScreenSharing()
-  const { toggleEffects } = useSidePanel()
-  const { setDialogOpen } = useSettingsDialog()
-
-  return (
-    <>
-      <div
-        className={css({
-          width: '100vw',
-          display: 'flex',
-          position: 'absolute',
-          padding: '1.125rem',
-          justifyContent: 'center',
-          bottom: 0,
-          left: 0,
-          right: 0,
-        })}
-      >
-        <div
-          className={css({
-            display: 'flex',
-            justifyContent: 'space-between',
-            width: '422px',
-          })}
-        >
-          <LeaveButton />
-          <SelectToggleDevice
-            source={Track.Source.Microphone}
-            onChange={microphoneOnChange}
-            onDeviceError={(error) =>
-              onDeviceError?.({ source: Track.Source.Microphone, error })
-            }
-            onActiveDeviceChange={(deviceId) =>
-              saveAudioInputDeviceId(deviceId ?? '')
-            }
-          />
-          <SelectToggleDevice
-            source={Track.Source.Camera}
-            onChange={cameraOnChange}
-            onDeviceError={(error) =>
-              onDeviceError?.({ source: Track.Source.Camera, error })
-            }
-            onActiveDeviceChange={(deviceId) =>
-              saveVideoInputDeviceId(deviceId ?? '')
-            }
-          />
-          <HandToggle />
-          <Button
-            square
-            variant="primaryDark"
-            aria-label={t('options.buttonLabel')}
-            tooltip={t('options.buttonLabel')}
-            onPress={() => setIsMenuOpened(true)}
-          >
-            <RiMore2Line />
-          </Button>
-        </div>
-      </div>
-      <ResponsiveMenu
-        isOpened={isMenuOpened}
-        onClosed={() => setIsMenuOpened(false)}
-      >
-        <div
-          className={css({
-            display: 'flex',
-            justifyContent: 'center',
-          })}
-        >
-          <div
-            className={css({
-              flexGrow: 1,
-              display: 'grid',
-              gridTemplateColumns: 'repeat(auto-fit, minmax(100px, 1fr))',
-              gridGap: '1rem',
-              '& > *': {
-                alignSelf: 'center',
-                justifySelf: 'center',
-              },
-            })}
-          >
-            {browserSupportsScreenSharing && (
-              <ScreenShareToggle
-                onDeviceError={(error) =>
-                  onDeviceError?.({ source: Track.Source.ScreenShare, error })
-                }
-                variant="primaryTextDark"
-                description={true}
-                onPress={() => setIsMenuOpened(false)}
-              />
-            )}
-            <ChatToggle
-              description={true}
-              onPress={() => setIsMenuOpened(false)}
-            />
-            <ParticipantsToggle
-              description={true}
-              onPress={() => setIsMenuOpened(false)}
-            />
-            <TranscriptToggle
-              description={true}
-              onPress={() => setIsMenuOpened(false)}
-            />
-            <SupportToggle
-              description={true}
-              onPress={() => setIsMenuOpened(false)}
-            />
-            <Button
-              onPress={() => {
-                toggleEffects()
-                setIsMenuOpened(false)
-              }}
-              variant="primaryTextDark"
-              aria-label={t('options.items.effects')}
-              tooltip={t('options.items.effects')}
-              description={true}
-            >
-              <RiAccountBoxLine size={20} />
-            </Button>
-            <LinkButton
-              href="https://grist.incubateur.net/o/docs/forms/1YrfNP1QSSy8p2gCxMFnSf/4"
-              variant="primaryTextDark"
-              tooltip={t('options.items.feedbacks')}
-              aria-label={t('options.items.feedbacks')}
-              description={true}
-              target="_blank"
-              onPress={() => setIsMenuOpened(false)}
-            >
-              <RiMegaphoneLine size={20} />
-            </LinkButton>
-            <Button
-              onPress={() => {
-                setDialogOpen(true)
-                setIsMenuOpened(false)
-              }}
-              variant="primaryTextDark"
-              aria-label={t('options.items.settings')}
-              tooltip={t('options.items.settings')}
-              description={true}
-            >
-              <RiSettings3Line size={20} />
-            </Button>
-          </div>
-        </div>
-      </ResponsiveMenu>
-    </>
-  )
-}