Update js-sdk

Add units to constant
Change rageshake persistence to throttled flushing
2023-01-17 11:15:39 +00:00 · 2023-01-17 11:15:12 +00:00 · 2023-01-17 11:15:00 +00:00 · 2023-01-17 11:13:40 +00:00 · 2023-01-17 11:11:39 +00:00 · 2023-01-17 11:11:13 +00:00
124 changed files with 1360 additions and 6343 deletions
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -1,24 +0,0 @@
-name: Run E2E tests
-on:
-  workflow_run:
-    workflows: ["deploy"]
-    types:
-      - completed
-    branches-ignore:
-      - "main"
-jobs:
-  e2e:
-    name: E2E tests runs on Element Call
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out test private repo
-        uses: actions/checkout@v3
-        with:
-          repository: vector-im/static-call-participant
-          ref: refs/heads/main
-          path: static-call-participant
-          token: ${{ secrets.GH_E2E_TEST_TOKEN }}
-      - name: Build E2E Image
-        run: "cd static-call-participant && docker build --no-cache --tag matrixdotorg/chrome-node-static-call-participant:latest ."
-      - name: Run E2E tests in container
-        run: "docker run --rm -v '${{ github.workspace }}/static-call-participant/callemshost-users.txt:/opt/app/callemshost-users.txt' matrixdotorg/chrome-node-static-call-participant:latest ./e2e.sh"
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@ dist-ssr
 *.local
 .idea/
 public/config.json
-/coverage
--- a/README.md
+++ b/README.md
@@ -5,8 +5,6 @@

 Full mesh group calls powered by [Matrix](https://matrix.org), implementing [MatrixRTC](https://github.com/matrix-org/matrix-spec-proposals/blob/matthew/group-voip/proposals/3401-group-voip.md).

-![A demo of Element Call with six people](demo.jpg)
-
 To try it out, visit our hosted version at [call.element.io](https://call.element.io). You can also find the latest development version continuously deployed to [element-call.netlify.app](https://element-call.netlify.app).

 ## Host it yourself
@@ -42,28 +40,6 @@ server {
 }
 ```

-By default, the app expects you to have a Matrix homeserver (such as [Synapse](https://matrix-org.github.io/synapse/latest/setup/installation.html)) installed locally and running on port 8008. If you wish to use a homeserver on a different URL or one that is hosted on a different server, you can add a config file as above, and include the homeserver URL that you'd like to use.
-
-Element Call requires a homeserver with registration enabled without any 3pid or token requirements, if you want it to be used by unregistered users. Furthermore, it is not recommended to use it with an existing homeserver where user accounts have joined normal rooms, as it may not be able to handle those yet and it may behave unreliably.
-
-Therefore, to use a self-hosted homeserver, this is recommended to be a new server where any user account created has not joined any normal rooms anywhere in the Matrix federated network. The homeserver used can be setup to disable federation, so as to prevent spam registrations (if you keep registrations open) and to ensure Element Call continues to work in case any user decides to log in to their Element Call account using the standard Element app and joins normal rooms that Element Call cannot handle.
-
-### Features
-
-#### Allow joining group calls without a camera and a microphone
-
-You can allow joining a group call without video and audio enabling this feature in your `config.json`:
-
-```json
-{
-  ...
-
-  "features": {
-    "feature_group_calls_without_video_and_audio": true
-  }
-}
-```
-
 ## Development

 Element Call is built against [matrix-js-sdk](https://github.com/matrix-org/matrix-js-sdk/pull/2553). To get started, clone, install, and link the package:
@@ -84,6 +60,8 @@ yarn
 yarn link matrix-js-sdk
 ```

+By default, the app expects you to have [Synapse](https://matrix-org.github.io/synapse/latest/setup/installation.html) installed locally and running on port 8008. If you wish to use another homeserver, you can add a config file as above.
+
 You're now ready to launch the development server:

 ```
--- a/config/element_io_preview.json
+++ b/config/element_io_preview.json
@@ -5,10 +5,6 @@
      "server_name": "call.ems.host"
    }
  },
-  "posthog": {
-    "api_key": "phc_rXGHx9vDmyEvyRxPziYtdVIv0ahEv8A9uLWFcCi1WcU",
-    "api_host": "https://posthog-element-call.element.io"
-  },
  "rageshake": {
    "submit_url": "https://element.io/bugreports/submit"
  }
--- a/config/otel_dev/README.md
+++ b/config/otel_dev/README.md
@@ -1,18 +0,0 @@
-# OpenTelemetry Collector for development
-
-This directory contains a docker compose file that starts a jaeger all-in-one instance
-with an in-memory database, along with a standalone OpenTelemetry collector that forwards
-traces into the jaeger. Jaeger has a built-in OpenTelemetry collector, but it can't be
-configured to send CORS headers so can't be used from a browser. This sets the config on
-the collector to send CORS headers.
-
-This also adds an nginx to add CORS headers to the jaeger query endpoint, such that it can
-be used from webapps like stalk (https://deniz.co/stalk/). The CORS enabled endpoint is
-exposed on port 16687. To use stalk, you should simply be able to navigate to it and add
-http://127.0.0.1:16687/api as a data source.
-
-(Yes, we could enable the OTLP collector in jaeger all-in-one and passed this through
-the nginx to enable CORS too, rather than running a separate collector. There's no reason
-it's done this way other than that I'd already set up the separate collector.)
-
-Running `docker compose up` in this directory should be all you need.
--- a/config/otel_dev/collector-gateway.yaml
+++ b/config/otel_dev/collector-gateway.yaml
@@ -1,41 +0,0 @@
-receivers:
-  otlp:
-    protocols:
-      http:
-        endpoint: 0.0.0.0:4318
-        cors:
-          allowed_origins:
-            # This can't be '*' because opentelemetry-js uses sendBeacon which always operates
-            # in 'withCredentials' mode, which browsers don't allow with an allow-origin of '*'
-            #- "https://pr976--element-call.netlify.app"
-            - "http://*"
-          allowed_headers:
-            - "*"
-processors:
-  batch:
-    timeout: 1s
-  resource:
-    attributes:
-      - key: test.key
-        value: "test-value"
-        action: insert
-exporters:
-  logging:
-    loglevel: info
-  jaeger:
-    endpoint: jaeger-all-in-one:14250
-    tls:
-      insecure: true
-extensions:
-  health_check:
-  pprof:
-    endpoint: :1888
-  zpages:
-    endpoint: :55679
-service:
-  extensions: [pprof, zpages, health_check]
-  pipelines:
-    traces:
-      receivers: [otlp]
-      processors: [batch, resource]
-      exporters: [logging, jaeger]
--- a/config/otel_dev/docker-compose.yaml
+++ b/config/otel_dev/docker-compose.yaml
@@ -1,29 +0,0 @@
-version: "2"
-services:
-  # Jaeger
-  jaeger-all-in-one:
-    image: jaegertracing/all-in-one:latest
-    ports:
-      - "16686:16686"
-      - "14268"
-      - "14250"
-  # Collector
-  collector-gateway:
-    image: otel/opentelemetry-collector:latest
-    volumes:
-      - ./collector-gateway.yaml:/etc/collector-gateway.yaml
-    command: ["--config=/etc/collector-gateway.yaml"]
-    ports:
-      - "1888:1888" # pprof extension
-      - "13133:13133" # health_check extension
-      - "4317:4317" # OTLP gRPC receiver
-      - "4318:4318" # OTLP HTTP receiver
-      - "55670:55679" # zpages extension
-    depends_on:
-      - jaeger-all-in-one
-  nginx:
-    image: nginxinc/nginx-unprivileged:latest
-    volumes:
-      - ./nginx_otel.conf:/etc/nginx/conf.d/default.conf:ro
-    ports:
-      - "16687:8080"
--- a/config/otel_dev/nginx_otel.conf
+++ b/config/otel_dev/nginx_otel.conf
@@ -1,16 +0,0 @@
-server {
-    listen       8080;
-    server_name  localhost;
-
-    location / {
-            proxy_pass  http://jaeger-all-in-one:16686/;
-            add_header Access-Control-Allow-Origin *;
-
-            if ($request_method = OPTIONS) {
-                add_header Access-Control-Allow-Origin *;
-                add_header Content-Type text/plain;
-                add_header Content-Length 0;
-                return 204;
-            }
-    }
-}
--- a/demo.jpg
+++ b/demo.jpg
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "type": "module",
  "scripts": {
    "dev": "vite",
-    "build": "NODE_OPTIONS=--max-old-space-size=16384 vite build",
+    "build": "vite build",
    "serve": "vite preview",
    "storybook": "start-storybook -p 6006",
    "build-storybook": "build-storybook",
@@ -18,14 +18,7 @@
  },
  "dependencies": {
    "@juggle/resize-observer": "^3.3.1",
-    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
-    "@opentelemetry/api": "^1.4.0",
-    "@opentelemetry/context-zone": "^1.9.1",
-    "@opentelemetry/exporter-jaeger": "^1.9.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.35.1",
-    "@opentelemetry/instrumentation-document-load": "^0.31.1",
-    "@opentelemetry/instrumentation-user-interaction": "^0.32.1",
-    "@opentelemetry/sdk-trace-web": "^1.9.1",
+    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
    "@react-aria/button": "^3.3.4",
    "@react-aria/dialog": "^3.1.4",
    "@react-aria/focus": "^3.5.0",
@@ -53,8 +46,8 @@
    "i18next-browser-languagedetector": "^6.1.8",
    "i18next-http-backend": "^1.4.4",
    "lodash": "^4.17.21",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#3cfad3cdeb7b19b8e0e7015784efd803cb9542f1",
-    "matrix-widget-api": "^1.3.1",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#a34d06c7c24c3523a77f70c01d4e31c45e92aa6b",
+    "matrix-widget-api": "^1.0.0",
    "mermaid": "^8.13.8",
    "normalize.css": "^8.0.1",
    "pako": "^2.0.4",
@@ -70,7 +63,6 @@
    "react-use-clipboard": "^1.0.7",
    "react-use-measure": "^2.1.1",
    "sdp-transform": "^2.14.1",
-    "tinyqueue": "^2.0.3",
    "unique-names-generator": "^4.6.0"
  },
  "devDependencies": {
--- a/public/locales/bg/app.json
+++ b/public/locales/bg/app.json
@@ -23,6 +23,7 @@
  "Create account": "Създай акаунт",
  "Debug log": "Debug логове",
  "Debug log request": "Заявка за debug логове",
+  "Description (optional)": "Описание (незадължително)",
  "Details": "Детайли",
  "Developer": "Разработчик",
  "Display name": "Име/псевдоним",
@@ -33,6 +34,7 @@
  "Full screen": "Цял екран",
  "Go": "Напред",
  "Grid layout menu": "Меню \"решетков изглед\"",
+  "Having trouble? Help us fix it.": "Имате проблем? Помогнете да го поправим.",
  "Home": "Начало",
  "Include debug logs": "Включи debug логове",
  "Incompatible versions": "Несъвместими версии",
@@ -44,6 +46,7 @@
  "Join call now": "Влез в разговора сега",
  "Join existing call?": "Присъединяване към съществуващ разговор?",
  "Leave": "Напусни",
+  "Loading room…": "Напускане на стаята…",
  "Loading…": "Зареждане…",
  "Local volume": "Локална сила на звука",
  "Logging in…": "Влизане…",
@@ -53,6 +56,7 @@
  "Microphone permissions needed to join the call.": "Необходими са разрешения за микрофона за да можете да се присъедините в разговора.",
  "Microphone {{n}}": "Микрофон {{n}}",
  "More": "Още",
+  "More menu": "Мено \"още\"",
  "Mute microphone": "Заглуши микрофона",
  "No": "Не",
  "Not now, return to home screen": "Не сега, върни се на началния екран",
@@ -73,6 +77,8 @@
  "Release to stop": "Отпуснете за да спрете",
  "Remove": "Премахни",
  "Return to home screen": "Връщане на началния екран",
+  "Save": "Запази",
+  "Saving…": "Запазване…",
  "Select an option": "Изберете опция",
  "Send debug logs": "Изпратете debug логове",
  "Sending…": "Изпращане…",
@@ -87,6 +93,7 @@
  "Spotlight": "Прожектор",
  "Stop sharing screen": "Спри споделянето на екрана",
  "Submit feedback": "Изпрати обратна връзка",
+  "Submitting feedback…": "Изпращане на обратна връзка…",
  "Take me Home": "Отиди в Начало",
  "Talk over speaker": "Говорете заедно с говорителя",
  "Talking…": "Говорене…",
@@ -97,6 +104,7 @@
  "Turn off camera": "Изключи камерата",
  "Turn on camera": "Включи камерата",
  "Unmute microphone": "Включи микрофона",
+  "User ID": "Потребителски идентификатор",
  "User menu": "Потребителско меню",
  "Username": "Потребителско име",
  "Version: {{version}}": "Версия: {{version}}",
--- a/public/locales/cs/app.json
+++ b/public/locales/cs/app.json
@@ -26,12 +26,14 @@
  "Version: {{version}}": "Verze: {{version}}",
  "Username": "Uživatelské jméno",
  "User menu": "Uživatelské menu",
+  "User ID": "ID uživatele",
  "Unmute microphone": "Zapnout mikrofon",
  "Turn on camera": "Zapnout kameru",
  "Turn off camera": "Vypnout kameru",
  "This call already exists, would you like to join?": "Tento hovor již existuje, chcete se připojit?",
  "Thanks! We'll get right on it.": "Děkujeme! Hned se na to vrhneme.",
  "Take me Home": "Domovská obrazovka",
+  "Submitting feedback…": "Odesílání zpětné vazby…",
  "Submit feedback": "Dát feedback",
  "Stop sharing screen": "Zastavit sdílení obrazovek",
  "Speaker {{n}}": "Reproduktor {{n}}",
@@ -46,6 +48,8 @@
  "Sending debug logs…": "Posílání ladícího záznamu…",
  "Send debug logs": "Poslat ladící záznam",
  "Select an option": "Vyberte možnost",
+  "Saving…": "Ukládání…",
+  "Save": "Uložit",
  "Return to home screen": "Vrátit se na domácí obrazovku",
  "Remove": "Odstranit",
  "Registering…": "Registrování…",
@@ -67,6 +71,7 @@
  "Logging in…": "Přihlašování se…",
  "Local volume": "Lokální hlasitost",
  "Loading…": "Načítání…",
+  "Loading room…": "Načítání místnosti…",
  "Leave": "Opustit hovor",
  "Join call now": "Připojit se k hovoru",
  "Join call": "Připojit se k hovoru",
@@ -86,10 +91,13 @@
  "Walkie-talkie call name": "Jméno vysílačkového hovoru",
  "Walkie-talkie call": "Vysílačkový hovor",
  "{{roomName}} - Walkie-talkie call": "{{roomName}} - Vysílačkový hovor",
+  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Zapnout jedno-klávesové zkratky, např. 'm' pro vypnutí/zapnutí mikrofonu.",
  "{{names}}, {{name}}": "{{names}}, {{name}}",
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Toto bude odesílat anonymizovaná data (jako délku a počet účastníků hovoru) týmu Element Call, aby nám pomohly zlepšovat aplikaci podle toho, jak je používaná.",
  "Talking…": "Mluvení…",
  "Talk over speaker": "Mluvit přes mluvčího",
  "Spotlight": "Soustředěný mód",
+  "Single-key keyboard shortcuts": "Jedno-klávesová klávesnice",
  "Release to stop": "Pusťte pro ukončení",
  "Release spacebar key to stop": "Pusťte mezerník pro ukončení",
  "Recaptcha not loaded": "Recaptcha se nenačetla",
@@ -98,9 +106,11 @@
  "Press and hold spacebar to talk over {{name}}": "Zmáčkněte a držte mezerník, abyste mluvili přes {{name}}",
  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Ostatní uživatelé se pokoušejí připojit k tomuto hovoru s nekompatibilních verzí. Tito uživatelé by se měli ujistit, že stránku načetli znovu:<1>{userLis}</1>",
  "Not registered yet? <2>Create an account</2>": "Nejste registrovaní? <2>Vytvořit účet</2>",
+  "More menu": "Další možnosti",
  "Join existing call?": "Připojit se k existujícimu hovoru?",
  "Include debug logs": "Zahrnout ladící záznamy",
  "Home": "Domov",
+  "Having trouble? Help us fix it.": "Máte problémy? Pomozte nám je spravit.",
  "Grid layout menu": "Menu rozložení",
  "Go": "Pokračovat",
  "Full screen": "Zvětšit na celou obrazovku",
@@ -112,6 +122,7 @@
  "Display name": "Zobrazované jméno",
  "Developer": "Vývojář",
  "Details": "Detaily",
+  "Description (optional)": "Popis (nepovinný)",
  "Debug log request": "Žádost o protokoly ladění",
  "Debug log": "Protokoly ladění",
  "Create account": "Vytvořit účet",
@@ -120,14 +131,10 @@
  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Kliknutím na \"Připojit se do hovoru\", odsouhlasíte naše <2>Terms and conditions</2>",
  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Kliknutím na \"Pokračovat\", odsouhlasíte naše <2>Terms and conditions</2>",
  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Jiný uživatel v tomto hovoru má problémy. Abychom mohli diagnostikovat problém, rádi bychom shromáždili protokoly ladění.",
+  "Allow analytics": "Povolit analytiku",
+  "Advanced": "Pokročilé",
  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Proč neskončit nastavením hesla, abyste mohli účet použít znovu?</0><1>Budete si moci nechat své jméno a nastavit si avatar pro budoucí hovory </1>",
  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Připojit se</0><1>Or</1><2>Zkopírovat odkaz a připojit se později</2>",
  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Už máte účet?</0><1><0>Přihlásit se</0> Or <2>Jako host</2></1>",
-  "{{name}} (Waiting for video...)": "{{name}} (Čekání na video...)",
-  "This feature is only supported on Firefox.": "Tato funkce je podporována jen ve Firefoxu.",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Odeslání ladících záznamů nám pomůže diagnostikovat problém.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Oops, něco se pokazilo.</0>",
-  "Use the upcoming grid system": "Používat nový systém pro zobrazení videí",
-  "Expose developer settings in the settings window.": "Zobrazit vývojářské nastavení.",
-  "Developer Settings": "Vývojářské nastavení"
+  "{{name}} (Waiting for video...)": "{{name}} (Čekání na video...)"
 }
--- a/public/locales/de/app.json
+++ b/public/locales/de/app.json
@@ -23,6 +23,7 @@
  "Create account": "Konto erstellen",
  "Debug log": "Debug-Protokoll",
  "Debug log request": "Debug-Log Anfrage",
+  "Description (optional)": "Beschreibung (optional)",
  "Details": "Details",
  "Developer": "Entwickler",
  "Display name": "Anzeigename",
@@ -32,6 +33,7 @@
  "Full screen": "Vollbild",
  "Go": "Los geht’s",
  "Grid layout menu": "Grid-Layout-Menü",
+  "Having trouble? Help us fix it.": "Du hast ein Problem? Hilf uns, es zu beheben.",
  "Home": "Startseite",
  "Include debug logs": "Debug-Protokolle einschließen",
  "Incompatible versions": "Inkompatible Versionen",
@@ -43,6 +45,7 @@
  "Join call now": "Anruf beitreten",
  "Join existing call?": "An bestehendem Anruf teilnehmen?",
  "Leave": "Verlassen",
+  "Loading room…": "Lade Raum …",
  "Loading…": "Lade …",
  "Local volume": "Lokale Lautstärke",
  "Logging in…": "Anmelden …",
@@ -52,6 +55,7 @@
  "Microphone permissions needed to join the call.": "Mikrofon-Berechtigung ist erforderlich, um dem Anruf beizutreten.",
  "Microphone {{n}}": "Mikrofon {{n}}",
  "More": "Mehr",
+  "More menu": "Weiteres Menü",
  "Mute microphone": "Mikrofon stummschalten",
  "No": "Nein",
  "Not now, return to home screen": "Nicht jetzt, zurück zum Startbildschirm",
@@ -72,6 +76,8 @@
  "Release to stop": "Loslassen zum Stoppen",
  "Remove": "Entfernen",
  "Return to home screen": "Zurück zum Startbildschirm",
+  "Save": "Speichern",
+  "Saving…": "Speichere …",
  "Select an option": "Wähle eine Option",
  "Send debug logs": "Debug-Logs senden",
  "Sending…": "Senden …",
@@ -86,6 +92,7 @@
  "Spotlight": "Rampenlicht",
  "Stop sharing screen": "Beenden der Bildschirmfreigabe",
  "Submit feedback": "Rückmeldung geben",
+  "Submitting feedback…": "Sende Rückmeldung …",
  "Take me Home": "Zurück zur Startseite",
  "Talk over speaker": "Aktiven Sprecher verdrängen und sprechen",
  "Talking…": "Sprechen …",
@@ -96,6 +103,7 @@
  "Turn off camera": "Kamera ausschalten",
  "Turn on camera": "Kamera einschalten",
  "Unmute microphone": "Mikrofon aktivieren",
+  "User ID": "Benutzer-ID",
  "User menu": "Benutzermenü",
  "Username": "Benutzername",
  "Version: {{version}}": "Version: {{version}}",
@@ -121,21 +129,13 @@
  "Sending debug logs…": "Sende Debug-Protokolle …",
  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Anruf beitreten</0><1>Oder</1><2>Anruflink kopieren und später beitreten</2>",
  "{{name}} (Connecting...)": "{{name}} (verbindet sich …)",
+  "Allow analytics": "Analysedaten senden",
+  "Advanced": "Erweitert",
  "Copy": "Kopieren",
  "Element Call Home": "Element Call-Startseite",
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Dies wird anonymisierte Daten (wie z. B. die Dauer eines Anrufs und die Zahl der Teilnehmenden) dem Element Call-Team senden, um uns bei der Optimierung der Anwendung basierend auf dem Nutzungsverhalten zu helfen.",
+  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Ob Tastenkürzel mit nur einer Taste aktiviert sein sollen, z. B. „m“ um das Mikrofon stumm/aktiv zu schalten.",
+  "Single-key keyboard shortcuts": "Ein-Tasten-Tastenkürzel",
  "{{name}} (Waiting for video...)": "{{name}} (Warte auf Video …)",
-  "This feature is only supported on Firefox.": "Diese Funktion wird nur in Firefox unterstützt.",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Übermittelte Problemberichte helfen uns, Fehler zu beheben.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Hoppla, etwas ist schiefgelaufen.</0>",
-  "Use the upcoming grid system": "Nutze das kommende Rastersystem",
-  "Expose developer settings in the settings window.": "Zeige die Entwicklereinstellungen im Einstellungsfenster.",
-  "Developer Settings": "Entwicklereinstellungen",
-  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Mit der Teilnahme an der Beta akzeptierst du die Sammlung von anonymen Daten, die wir zur Verbesserung des Produkts verwenden. Weitere Informationen zu den von uns erhobenen Daten findest du in unserer <2>Datenschutzerklärung</2> und unseren <5>Cookie-Richtlinien</5>.",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Du kannst deine Zustimmung durch Abwählen dieses Kästchens zurückziehen. Falls du dich aktuell in einem Anruf befindest, wird diese Einstellung nach dem Ende des Anrufs wirksam.",
-  "Feedback": "Rückmeldung",
-  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Falls du auf Probleme stößt oder einfach nur eine Rückmeldung geben möchtest, sende uns bitte eine kurze Beschreibung.",
-  "Your feedback": "Deine Rückmeldung",
-  "Thanks, we received your feedback!": "Danke, wir haben deine Rückmeldung erhalten!",
-  "Submitting…": "Sende …",
-  "Submit": "Absenden"
+  "This feature is only supported on Firefox.": "Diese Funktion wird nur in Firefox unterstützt."
 }
--- a/public/locales/el/app.json
+++ b/public/locales/el/app.json
@@ -1,96 +0,0 @@
-{
-  "You can't talk at the same time": "Δεν μπορείς να μιλάς ταυτόχρονα",
-  "Version: {{version}}": "Έκδοση: {{version}}",
-  "User menu": "Μενού χρήστη",
-  "Submit feedback": "Υποβάλετε σχόλια",
-  "Stop sharing screen": "Διακοπή κοινής χρήσης οθόνης",
-  "Sign in": "Σύνδεση",
-  "Show call inspector": "Εμφάνιση του επιθεωρητή κλήσης",
-  "Share screen": "Κοινή χρήση οθόνης",
-  "Sending…": "Αποστολή…",
-  "Select an option": "Επιλέξτε μια επιλογή",
-  "Remove": "Αφαίρεση",
-  "Registering…": "Εγγραφή…",
-  "Press and hold to talk": "Πατήστε παρατεταμένα για να μιλήσετε",
-  "Not registered yet? <2>Create an account</2>": "Δεν έχετε εγγραφεί ακόμα; <2>Δημιουργήστε λογαριασμό</2>",
-  "Login to your account": "Συνδεθείτε στο λογαριασμό σας",
-  "Logging in…": "Σύνδεση…",
-  "Invite people": "Προσκαλέστε άτομα",
-  "Invite": "Πρόσκληση",
-  "Inspector": "Επιθεωρητής",
-  "Incompatible versions!": "Μη συμβατές εκδόσεις!",
-  "Incompatible versions": "Μη συμβατές εκδόσεις",
-  "Display name": "Εμφανιζόμενο όνομα",
-  "Developer Settings": "Ρυθμίσεις προγραμματιστή",
-  "Debug log request": "Αίτημα αρχείου καταγραφής",
-  "Call link copied": "Ο σύνδεσμος κλήσης αντιγράφηκε",
-  "Avatar": "Avatar",
-  "Accept microphone permissions to join the call.": "Αποδεχτείτε τα δικαιώματα μικροφώνου για να συμμετάσχετε στην κλήση.",
-  "Accept camera/microphone permissions to join the call.": "Αποδεχτείτε τα δικαιώματα κάμερας/μικροφώνου για να συμμετάσχετε στην κλήση.",
-  "<0>Oops, something's gone wrong.</0>": "<0>Ωχ, κάτι πήγε στραβά.</0>",
-  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Δημιουργήστε λογαριασμό</0> Ή <2>Συμμετέχετε ως επισκέπτης</2>",
-  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Έχετε ήδη λογαριασμό;</0><1><0>Συνδεθείτε</0> Ή <2>Συμμετέχετε ως επισκέπτης</2></1>",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - Κλήση walkie-talkie",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "Your recent calls": "Οι πρόσφατες κλήσεις σας",
-  "Yes, join call": "Ναι, συμμετοχή στην κλήση",
-  "WebRTC is not supported or is being blocked in this browser.": "Το WebRTC δεν υποστηρίζεται ή έχει αποκλειστεί σε αυτό το πρόγραμμα περιήγησης.",
-  "Walkie-talkie call name": "Όνομα κλήσης walkie-talkie",
-  "Walkie-talkie call": "Κλήση walkie-talkie",
-  "Waiting for other participants…": "Αναμονή για άλλους συμμετέχοντες…",
-  "Waiting for network": "Αναμονή για δίκτυο",
-  "Video call name": "Όνομα βίντεο κλήσης",
-  "Video call": "Βίντεο κλήση",
-  "Video": "Βίντεο",
-  "Username": "Όνομα χρήστη",
-  "Turn on camera": "Ενεργοποιήστε την κάμερα",
-  "Turn off camera": "Απενεργοποιήστε την κάμερα",
-  "This feature is only supported on Firefox.": "Αυτή η δυνατότητα υποστηρίζεται μόνο στον Firefox.",
-  "This call already exists, would you like to join?": "Αυτή η κλήση υπάρχει ήδη, θα θέλατε να συμμετάσχετε;",
-  "Speaker": "Ηχείο",
-  "Spatial audio": "Χωρικός ήχος",
-  "Sign out": "Αποσύνδεση",
-  "Settings": "Ρυθμίσεις",
-  "Return to home screen": "Επιστροφή στην αρχική οθόνη",
-  "Register": "Εγγραφή",
-  "Profile": "Προφίλ",
-  "Press and hold spacebar to talk": "Για να μιλήσετε κρατήστε πατημένο το πλήκτρο διαστήματος",
-  "Passwords must match": "Οι κωδικοί πρέπει να ταιριάζουν",
-  "Password": "Κωδικός",
-  "Not now, return to home screen": "Όχι τώρα, επιστροφή στην αρχική οθόνη",
-  "No": "Όχι",
-  "Mute microphone": "Σίγαση μικροφώνου",
-  "More": "Περισσότερα",
-  "Microphone permissions needed to join the call.": "Απαιτούνται δικαιώματα μικροφώνου για συμμετοχή στην κλήση.",
-  "Microphone {{n}}": "Μικρόφωνο {{n}}",
-  "Microphone": "Μικρόφωνο",
-  "Login": "Σύνδεση",
-  "Loading…": "Φόρτωση…",
-  "Leave": "Αποχώρηση",
-  "Join existing call?": "Συμμετοχή στην υπάρχουσα κλήση;",
-  "Join call now": "Συμμετοχή στην κλήση τώρα",
-  "Join call": "Συμμετοχή στην κλήση",
-  "Go": "Μετάβαση",
-  "Full screen": "Πλήρη οθόνη",
-  "Exit full screen": "Έξοδος από πλήρη οθόνη",
-  "Details": "Λεπτομέρειες",
-  "Create account": "Δημιουργία λογαριασμού",
-  "Copy and share this call link": "Αντιγράψτε και μοιραστείτε αυτόν τον σύνδεσμο κλήσης",
-  "Copy": "Αντιγραφή",
-  "Copied!": "Αντιγράφηκε!",
-  "Connection lost": "Η σύνδεση χάθηκε",
-  "Confirm password": "Επιβεβαίωση κωδικού",
-  "Close": "Κλείσιμο",
-  "Change layout": "Αλλαγή διάταξης",
-  "Camera/microphone permissions needed to join the call.": "Απαιτούνται δικαιώματα κάμερας/μικροφώνου για να συμμετάσχετε στην κλήση.",
-  "Camera {{n}}": "Κάμερα {{n}}",
-  "Camera": "Κάμερα",
-  "Audio": "Ήχος",
-  "{{name}} is talking…": "{{name}} ομιλεί…",
-  "{{name}} is presenting": "{{name}} παρουσιάζει",
-  "{{name}} (Waiting for video...)": "{{name}} (Αναμονή για βίντεο...)",
-  "{{name}} (Connecting...)": "{{name}} (Συνδέεται...)",
-  "{{displayName}}, your call is now ended": "{{displayName}}, η κλήση σας τερματίστηκε",
-  "{{count}} people connected|other": "{{count}} άτομα συνδεδεμένα",
-  "{{count}} people connected|one": "{{count}} άτομο συνδεδεμένο"
-}
--- a/public/locales/en-GB/app.json
+++ b/public/locales/en-GB/app.json
@@ -1,32 +1,28 @@
 {
  "{{count}} people connected|one": "{{count}} person connected",
  "{{count}} people connected|other": "{{count}} people connected",
-  "{{count}} stars|one": "{{count}} star",
-  "{{count}} stars|other": "{{count}} stars",
-  "{{displayName}}, your call has ended.": "{{displayName}}, your call has ended.",
+  "{{displayName}}, your call is now ended": "{{displayName}}, your call is now ended",
  "{{name}} (Connecting...)": "{{name}} (Connecting...)",
  "{{name}} (Waiting for video...)": "{{name}} (Waiting for video...)",
  "{{name}} is presenting": "{{name}} is presenting",
  "{{name}} is talking…": "{{name}} is talking…",
  "{{names}}, {{name}}": "{{names}}, {{name}}",
  "{{roomName}} - Walkie-talkie call": "{{roomName}} - Walkie-talkie call",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.",
  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>",
  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Create an account</0> Or <2>Access as a guest</2>",
  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>",
  "<0>Oops, something's gone wrong.</0>": "<0>Oops, something's gone wrong.</0>",
  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Submitting debug logs will help us track down the problem.</0>",
-  "<0>Thanks for your feedback!</0>": "<0>Thanks for your feedback!</0>",
-  "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>We'd love to hear your feedback so we can improve your experience.</0>",
  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>",
  "Accept camera/microphone permissions to join the call.": "Accept camera/microphone permissions to join the call.",
  "Accept microphone permissions to join the call.": "Accept microphone permissions to join the call.",
+  "Advanced": "Advanced",
+  "Allow analytics": "Allow analytics",
  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.",
  "Audio": "Audio",
  "Avatar": "Avatar",
  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "By clicking \"Go\", you agree to our <2>Terms and conditions</2>",
  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>",
-  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.",
  "Call link copied": "Call link copied",
  "Call type menu": "Call type menu",
  "Camera": "Camera",
@@ -42,23 +38,20 @@
  "Create account": "Create account",
  "Debug log": "Debug log",
  "Debug log request": "Debug log request",
+  "Description (optional)": "Description (optional)",
  "Details": "Details",
  "Developer": "Developer",
-  "Developer Settings": "Developer Settings",
  "Display name": "Display name",
  "Download debug logs": "Download debug logs",
  "Element Call Home": "Element Call Home",
  "Exit full screen": "Exit full screen",
-  "Expose developer settings in the settings window.": "Expose developer settings in the settings window.",
-  "Feedback": "Feedback",
  "Fetching group call timed out.": "Fetching group call timed out.",
  "Freedom": "Freedom",
  "Full screen": "Full screen",
  "Go": "Go",
  "Grid layout menu": "Grid layout menu",
+  "Having trouble? Help us fix it.": "Having trouble? Help us fix it.",
  "Home": "Home",
-  "How did it go?": "How did it go?",
-  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.",
  "Include debug logs": "Include debug logs",
  "Incompatible versions": "Incompatible versions",
  "Incompatible versions!": "Incompatible versions!",
@@ -69,6 +62,7 @@
  "Join call now": "Join call now",
  "Join existing call?": "Join existing call?",
  "Leave": "Leave",
+  "Loading room…": "Loading room…",
  "Loading…": "Loading…",
  "Local volume": "Local volume",
  "Logging in…": "Logging in…",
@@ -78,6 +72,7 @@
  "Microphone {{n}}": "Microphone {{n}}",
  "Microphone permissions needed to join the call.": "Microphone permissions needed to join the call.",
  "More": "More",
+  "More menu": "More menu",
  "Mute microphone": "Mute microphone",
  "No": "No",
  "Not now, return to home screen": "Not now, return to home screen",
@@ -98,6 +93,8 @@
  "Release to stop": "Release to stop",
  "Remove": "Remove",
  "Return to home screen": "Return to home screen",
+  "Save": "Save",
+  "Saving…": "Saving…",
  "Select an option": "Select an option",
  "Send debug logs": "Send debug logs",
  "Sending debug logs…": "Sending debug logs…",
@@ -107,27 +104,27 @@
  "Show call inspector": "Show call inspector",
  "Sign in": "Sign in",
  "Sign out": "Sign out",
+  "Single-key keyboard shortcuts": "Single-key keyboard shortcuts",
  "Spatial audio": "Spatial audio",
  "Speaker": "Speaker",
  "Speaker {{n}}": "Speaker {{n}}",
  "Spotlight": "Spotlight",
  "Stop sharing screen": "Stop sharing screen",
-  "Submit": "Submit",
  "Submit feedback": "Submit feedback",
-  "Submitting…": "Submitting…",
+  "Submitting feedback…": "Submitting feedback…",
  "Take me Home": "Take me Home",
  "Talk over speaker": "Talk over speaker",
  "Talking…": "Talking…",
-  "Thanks, we received your feedback!": "Thanks, we received your feedback!",
  "Thanks! We'll get right on it.": "Thanks! We'll get right on it.",
  "This call already exists, would you like to join?": "This call already exists, would you like to join?",
  "This feature is only supported on Firefox.": "This feature is only supported on Firefox.",
  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>",
  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)",
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.",
  "Turn off camera": "Turn off camera",
  "Turn on camera": "Turn on camera",
  "Unmute microphone": "Unmute microphone",
-  "Use the upcoming grid system": "Use the upcoming grid system",
+  "User ID": "User ID",
  "User menu": "User menu",
  "Username": "Username",
  "Version: {{version}}": "Version: {{version}}",
@@ -139,8 +136,8 @@
  "Walkie-talkie call": "Walkie-talkie call",
  "Walkie-talkie call name": "Walkie-talkie call name",
  "WebRTC is not supported or is being blocked in this browser.": "WebRTC is not supported or is being blocked in this browser.",
+  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.",
  "Yes, join call": "Yes, join call",
  "You can't talk at the same time": "You can't talk at the same time",
-  "Your feedback": "Your feedback",
  "Your recent calls": "Your recent calls"
 }
--- a/public/locales/es/app.json
+++ b/public/locales/es/app.json
@@ -23,6 +23,7 @@
  "Version: {{version}}": "Versión: {{version}}",
  "Username": "Nombre de usuario",
  "User menu": "Menú de usuario",
+  "User ID": "ID de usuario",
  "Unmute microphone": "Desilenciar el micrófono",
  "Turn on camera": "Encender la cámara",
  "Turn off camera": "Apagar la cámara",
@@ -32,6 +33,7 @@
  "Talking…": "Hablando…",
  "Talk over speaker": "Hablar por encima",
  "Take me Home": "Volver al inicio",
+  "Submitting feedback…": "Enviando comentarios…",
  "Submit feedback": "Enviar comentarios",
  "Stop sharing screen": "Dejar de compartir pantalla",
  "Spotlight": "Foco",
@@ -47,6 +49,8 @@
  "Sending debug logs…": "Enviando registros de depuración…",
  "Send debug logs": "Enviar registros de depuración",
  "Select an option": "Selecciona una opción",
+  "Saving…": "Guardando…",
+  "Save": "Guardar",
  "Return to home screen": "Volver a la pantalla de inicio",
  "Remove": "Eliminar",
  "Release to stop": "Suelta para parar",
@@ -64,6 +68,7 @@
  "Not now, return to home screen": "Ahora no, volver a la pantalla de inicio",
  "No": "No",
  "Mute microphone": "Silenciar micrófono",
+  "More menu": "Menú Más",
  "More": "Más",
  "Microphone permissions needed to join the call.": "Se necesitan permisos del micrófono para unirse a la llamada.",
  "Microphone {{n}}": "Micrófono {{n}}",
@@ -72,6 +77,7 @@
  "Logging in…": "Iniciando sesión…",
  "Local volume": "Volumen local",
  "Loading…": "Cargando…",
+  "Loading room…": "Cargando sala…",
  "Leave": "Abandonar",
  "Join existing call?": "¿Unirse a llamada existente?",
  "Join call now": "Unirse a la llamada ahora",
@@ -83,6 +89,7 @@
  "Incompatible versions": "Versiones incompatibles",
  "Include debug logs": "Incluir registros de depuración",
  "Home": "Inicio",
+  "Having trouble? Help us fix it.": "¿Tienes problemas? Ayúdanos a resolverlos.",
  "Grid layout menu": "Menú de distribución de cuadrícula",
  "Go": "Comenzar",
  "Full screen": "Pantalla completa",
@@ -93,6 +100,7 @@
  "Display name": "Nombre a mostrar",
  "Developer": "Desarrollador",
  "Details": "Detalles",
+  "Description (optional)": "Descripción (opcional)",
  "Debug log request": "Petición de registros de depuración",
  "Debug log": "Registro de depuración",
  "Create account": "Crear cuenta",
@@ -121,15 +129,12 @@
  "{{displayName}}, your call is now ended": "{{displayName}}, tu llamada ha finalizado",
  "{{count}} people connected|other": "{{count}} personas conectadas",
  "{{count}} people connected|one": "{{count}} persona conectada",
+  "Allow analytics": "Permitir analíticas",
+  "Advanced": "Avanzado",
  "Element Call Home": "Inicio de Element Call",
  "Copy": "Copiar",
-  "{{name}} (Waiting for video...)": "{{name}} (Esperando al video...)",
-  "This feature is only supported on Firefox.": "Esta característica solo está disponible en Firefox.",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Subir los registros de depuración nos ayudará a encontrar el problema.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Ups, algo ha salido mal.</0>",
-  "Expose developer settings in the settings window.": "Muestra los ajustes de desarrollador en la ventana de ajustes.",
-  "Developer Settings": "Ajustes de desarrollador",
-  "Use the upcoming grid system": "Utilizar el próximo sistema de cuadrícula",
-  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Al participar en esta beta, consientes a la recogida de datos anónimos, los cuales usaremos para mejorar el producto. Puedes encontrar más información sobre que datos recogemos en nuestra <2>Política de privacidad</2> y en nuestra <5>Política sobre Cookies</5>.",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Puedes retirar tu consentimiento desmarcando esta casilla. Si estás en una llamada, este ajuste se aplicará al final de esta."
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Esto enviará datos anónimos (como la duración de la llamada y el número de participantes) al equipo de Element Call para ayudarnos a optimizar la aplicación dependiendo de cómo se use.",
+  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Habilita los atajos de teclado de una sola tecla, por ejemplo 'm' para silenciar/desilenciar el micrófono.",
+  "Single-key keyboard shortcuts": "Atajos de teclado de una sola tecla",
+  "{{name}} (Waiting for video...)": "{{name}} (Esperando al video...)"
 }
--- a/public/locales/et/app.json
+++ b/public/locales/et/app.json
@@ -20,6 +20,7 @@
  "Incompatible versions": "Ühildumatud versioonid",
  "Include debug logs": "Lisa veatuvastuslogid",
  "Home": "Avavaatesse",
+  "Having trouble? Help us fix it.": "Kas on probleeme? Aita meil asja parandada.",
  "Grid layout menu": "Ruudustikvaate menüü",
  "Go": "Jätka",
  "Full screen": "Täisekraan",
@@ -30,6 +31,7 @@
  "Display name": "Kuvatav nimi",
  "Developer": "Arendaja",
  "Details": "Täpsemalt",
+  "Description (optional)": "Kirjeldus (valikuline)",
  "Debug log request": "Veaotsingulogi päring",
  "Debug log": "Veaotsingulogi",
  "Create account": "Loo konto",
@@ -58,6 +60,7 @@
  "Mute microphone": "Summuta mikrofon",
  "Your recent calls": "Hiljutised kõned",
  "You can't talk at the same time": "Üheaegselt ei saa rääkida",
+  "More menu": "Rohkem valikuid",
  "More": "Rohkem",
  "Microphone permissions needed to join the call.": "Kõnega liitumiseks on vaja lubada mikrofoni kasutamine.",
  "Microphone {{n}}": "Mikrofon {{n}}",
@@ -67,12 +70,15 @@
  "Logging in…": "Sisselogimine …",
  "Local volume": "Kohalik helitugevus",
  "Loading…": "Laadimine …",
+  "Loading room…": "Ruumi laadimine …",
  "Leave": "Lahku",
  "Join existing call?": "Liitu juba käimasoleva kõnega?",
  "Join call now": "Kõnega liitumine",
  "Join call": "Kõnega liitumine",
+  "User ID": "Kasutajatunnus",
  "Turn on camera": "Lülita kaamera sisse",
  "Turn off camera": "Lülita kaamera välja",
+  "Submitting feedback…": "Tagasiside saatmine…",
  "Take me Home": "Mine avalehele",
  "Submit feedback": "Jaga tagasisidet",
  "Stop sharing screen": "Lõpeta ekraani jagamine",
@@ -89,6 +95,8 @@
  "Sending debug logs…": "Veaotsingulogide saatmine…",
  "Send debug logs": "Saada veaotsingulogid",
  "Select an option": "Vali oma eelistus",
+  "Saving…": "Salvestamine…",
+  "Save": "Salvesta",
  "Return to home screen": "Tagasi avalehele",
  "Remove": "Eemalda",
  "Release to stop": "Peatamiseks vabasta klahv",
@@ -121,21 +129,13 @@
  "WebRTC is not supported or is being blocked in this browser.": "WebRTC pole kas selles brauseris toetatud või on keelatud.",
  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Muudab kõneleja heli nii, nagu tuleks see sealt, kus on tema pilt ekraanil. (See on katseline funktsionaalsus ja võib mõjutada heli stabiilsust.)",
  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Siin saidis on kasutusel ReCAPTCHA ning kehtivad Google <2>privaatsuspoliitika</2> ja <6>teenusetingimused</6>.<9></9>Klikkides „Registreeru“, nõustud meie <12>kasutustingimustega</12>",
+  "Allow analytics": "Luba analüütika",
+  "Advanced": "Lisaseadistused",
  "Element Call Home": "Element Call Home",
  "Copy": "Kopeeri",
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Me saadame kõne anonüümsed andmed (nagu kõne kestus ja osalejate arv) meie arendustiimile ja see võimaldab levinud kasutusmustrite alusel arendust optimeerida.",
+  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Kas kasutame üheklahvilisi kiirklahve, näiteks „m“ mikrofoni sisse/välja lülitamiseks.",
+  "Single-key keyboard shortcuts": "Üheklahvilised kiirklahvid",
  "{{name}} (Waiting for video...)": "{{name}} (Ootame videovoo algust...)",
-  "This feature is only supported on Firefox.": "See funktsionaalsus on toetatud vaid Firefoxis.",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Kui saadad meile vealogid, siis on lihtsam vea põhjust otsida.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Ohoo, midagi on nüüd katki.</0>",
-  "Use the upcoming grid system": "Kasuta tulevast ruudustiku-põhist paigutust",
-  "Expose developer settings in the settings window.": "Näita seadistuste aknas arendajale vajalikke seadeid.",
-  "Developer Settings": "Arendaja seadistused",
-  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Nõustudes selle beetaversiooni kasutamisega sa nõustud ka toote arendamiseks kasutatavate anonüümsete andmete kogumisega. Täpsemat teavet kogutavate andmete kohta leiad meie <2>Privaatsuspoliitikast</2> ja meie <5>Küpsiste kasutamise reeglitest</5>.",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Sa võid selle valiku eelmaldamisega alati oma nõusoleku tagasi võtta. Kui sul parasjagu on kõne pooleli, siis seadistuste muudatus jõustub pärast kõne lõppu.",
-  "Your feedback": "Sinu tagasiside",
-  "Thanks, we received your feedback!": "Tänud, me oleme sinu tagasiside kätte saanud!",
-  "Submitting…": "Saadan…",
-  "Submit": "Saada",
-  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Kui selle rakenduse kasutamisel tekib sul probleeme või lihtsalt soovid oma arvamust avaldada, siis palun täida alljärgnev lühike kirjeldus.",
-  "Feedback": "Tagasiside"
+  "This feature is only supported on Firefox.": "See funktsionaalsus on toetatud vaid Firefoxis."
 }
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -3,6 +3,7 @@
  "Video call": "تماس تصویری",
  "Video": "ویدیو",
  "Username": "نام کاربری",
+  "User ID": "آی دی کاربر",
  "Turn on camera": "روشن کردن دوربین",
  "Turn off camera": "خاموش کردن دوربین",
  "Take me Home": "مرا به خانه ببر",
@@ -10,6 +11,7 @@
  "Sign out": "خروج",
  "Sign in": "ورود",
  "Settings": "تنظیمات",
+  "Save": "ذخیره",
  "Profile": "پروفایل",
  "Password": "رمز عبور",
  "No": "خیر",
@@ -19,6 +21,7 @@
  "Login to your account": "به حساب کاربری خود وارد شوید",
  "Login": "ورود",
  "Loading…": "بارگزاری…",
+  "Loading room…": "بارگزاری اتاق…",
  "Leave": "خروج",
  "Join existing call?": "پیوست به تماس؟",
  "Join call now": "الان به تماس بپیوند",
@@ -34,6 +37,7 @@
  "Display name": "نام نمایشی",
  "Developer": "توسعه دهنده",
  "Details": "جزئیات",
+  "Description (optional)": "توضیحات (اختیاری)",
  "Debug log request": "درخواست لاگ عیب‌یابی",
  "Debug log": "لاگ عیب‌یابی",
  "Create account": "ساخت حساب کاربری",
@@ -77,6 +81,7 @@
  "Sending debug logs…": "در حال ارسال باگ‌های عیب‌یابی…",
  "Send debug logs": "ارسال لاگ‌های عیب‌یابی",
  "Select an option": "یک گزینه را انتخاب کنید",
+  "Saving…": "در حال ذخیره…",
  "Return to home screen": "برگشت به صفحه اصلی",
  "Remove": "حذف",
  "Release to stop": "برای توقف رها کنید",
@@ -93,10 +98,12 @@
  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "کاربران دیگر تلاش می‌کنند با ورژن‌های ناسازگار به مکالمه بپیوندند. این کاربران باید از بروزرسانی مرورگرشان اطمینان داشته باشند:<1>{userLis}</1>",
  "Not registered yet? <2>Create an account</2>": "هنوز ثبت‌نام نکرده‌اید؟ <2>ساخت حساب کاربری</2>",
  "Not now, return to home screen": "الان نه، به صفحه اصلی برگردید",
+  "More menu": "تنظیمات بیشتر",
  "Microphone permissions needed to join the call.": "برای پیوستن به مکالمه دسترسی به میکروفون نیاز است.",
  "Microphone {{n}}": "میکروفون {{n}}",
  "Logging in…": "ورود…",
  "Include debug logs": "شامل لاگ‌های عیب‌یابی",
+  "Having trouble? Help us fix it.": "با مشکلی رو به رو شدید؟ به ما کمک کنید رفعش کنیم.",
  "Grid layout menu": "منوی طرح‌بندی شبکه‌ای",
  "Fetching group call timed out.": "زمان اتصال به مکالمه گروهی تمام شد.",
  "You can't talk at the same time": "نمی توانید هم‌زمان صحبت کنید",
@@ -116,11 +123,17 @@
  "Thanks! We'll get right on it.": "با تشکر! ما به درستی آن را انجام خواهیم داد.",
  "Talking…": "در حال صحبت کردن…",
  "Talk over speaker": "روی بلندگو صحبت کنید",
+  "Submitting feedback…": "در حال ارسال بازخورد…",
  "Submit feedback": "بازخورد ارائه دهید",
  "Stop sharing screen": "توقف اشتراک‌گذاری صفحه نمایش",
  "Spatial audio": "صدای جهت‌دار",
+  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "این که میان‌برهای صفحه‌کلید تک‌کلیده مثل m برای خموشی و ناخموشی میکروفون به کار بیفتند یا نه.",
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "داده‌های ناشناس شده (از اطَلاعاتی مثل طول تماس و شمارهٔ طرف‌ها) را به گروه تماس المنت فرستاده تا در بهینه‌سازی برنامه بر پایهٔ چگونگی استفاده‌اش یاریمان کنند.",
+  "Single-key keyboard shortcuts": "میان‌برهای صفحه‌کلید تک‌کلیده",
  "Element Call Home": "خانهٔ تماس المنت",
  "Copy": "رونوشت",
+  "Allow analytics": "نمایش تجزیه‌ها",
+  "Advanced": "پیش رفته",
  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>اکنون به تماس پیوسته</0><1>یا</1><2>پیوند تماس را رونوشت کرده و بعداً بپیوندید</2>",
  "{{name}} (Waiting for video...)": "{{name}} (منتظر تصویر…)",
  "{{name}} (Connecting...)": "{{name}} (وصل شدن…)"
--- a/public/locales/fr/app.json
+++ b/public/locales/fr/app.json
@@ -22,6 +22,7 @@
  "Create account": "Créer un compte",
  "Debug log": "Journal de débogage",
  "Debug log request": "Demande d’un journal de débogage",
+  "Description (optional)": "Description (facultatif)",
  "Details": "Informations",
  "Developer": "Développeur",
  "Display name": "Nom d’affichage",
@@ -31,6 +32,7 @@
  "Full screen": "Plein écran",
  "Go": "Commencer",
  "Grid layout menu": "Menu en grille",
+  "Having trouble? Help us fix it.": "Un problème ? Aidez nous à le résoudre.",
  "Home": "Accueil",
  "Include debug logs": "Inclure les journaux de débogage",
  "Incompatible versions": "Versions incompatibles",
@@ -41,6 +43,7 @@
  "Join call now": "Rejoindre l’appel maintenant",
  "Join existing call?": "Rejoindre un appel existant ?",
  "Leave": "Partir",
+  "Loading room…": "Chargement du salon…",
  "Loading…": "Chargement…",
  "Local volume": "Volume local",
  "Logging in…": "Connexion…",
@@ -50,6 +53,7 @@
  "Microphone permissions needed to join the call.": "Accès au microphone requis pour rejoindre l’appel.",
  "Microphone {{n}}": "Microphone {{n}}",
  "More": "Plus",
+  "More menu": "Menu plus",
  "Mute microphone": "Couper le micro",
  "No": "Non",
  "Not now, return to home screen": "Pas maintenant, retourner à l’accueil",
@@ -70,6 +74,8 @@
  "Release to stop": "Relâcher pour arrêter",
  "Remove": "Supprimer",
  "Return to home screen": "Retour à l’accueil",
+  "Save": "Enregistrer",
+  "Saving…": "Enregistrement…",
  "Select an option": "Sélectionnez une option",
  "Send debug logs": "Envoyer les journaux de débogage",
  "Sending…": "Envoi…",
@@ -82,6 +88,7 @@
  "Spotlight": "Premier plan",
  "Stop sharing screen": "Arrêter le partage d’écran",
  "Submit feedback": "Envoyer des retours",
+  "Submitting feedback…": "Envoi des retours…",
  "Take me Home": "Retouner à l’accueil",
  "Talk over speaker": "Parler par dessus l’intervenant",
  "Thanks! We'll get right on it.": "Merci ! Nous allons nous y attaquer.",
@@ -108,6 +115,7 @@
  "Version: {{version}}": "Version : {{version}}",
  "Username": "Nom d’utilisateur",
  "User menu": "Menu utilisateur",
+  "User ID": "Identifiant utilisateur",
  "Unmute microphone": "Allumer le micro",
  "Turn on camera": "Allumer la caméra",
  "Turn off camera": "Couper la caméra",
@@ -121,21 +129,13 @@
  "Sending debug logs…": "Envoi des journaux de débogage…",
  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Rejoindre l’appel maintenant</0><1>Ou</1><2>Copier le lien de l’appel et rejoindre plus tard</2>",
  "{{name}} (Connecting...)": "{{name}} (Connexion…)",
+  "Allow analytics": "Autoriser les statistiques",
+  "Advanced": "Avancé",
  "Element Call Home": "Accueil Element Call",
  "Copy": "Copier",
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Cela enverra des données anonymisées (telles que la durée d’un appel et le nombre de participants) à l’équipe de Element Call pour aider à optimiser l’application en fonction de l’utilisation.",
+  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Bascule sur les raccourcis clavier à touche unique, par exemple « m » pour désactiver / activer le micro.",
+  "Single-key keyboard shortcuts": "Raccourcis clavier en une touche",
  "{{name}} (Waiting for video...)": "{{name}} (En attente de vidéo…)",
-  "This feature is only supported on Firefox.": "Cette fonctionnalité est prise en charge dans Firefox uniquement.",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Soumettre les journaux de débogage nous aidera à déterminer le problème.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Oups, quelque chose s’est mal passé.</0>",
-  "Use the upcoming grid system": "Utiliser le futur système de grille",
-  "Expose developer settings in the settings window.": "Affiche les paramètres développeurs dans la fenêtre des paramètres.",
-  "Developer Settings": "Paramètres développeurs",
-  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "En participant à cette beta, vous consentez à la collecte de données anonymes, qui seront utilisées pour améliorer le produit. Vous trouverez plus d’informations sur les données collectées dans notre <2>Politique de vie privée</2> et notre <5>Politique de cookies</5>.",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Vous pouvez retirer votre consentement en décochant cette case. Si vous êtes actuellement en communication, ce paramètre prendra effet à la fin de l’appel.",
-  "Your feedback": "Votre commentaire",
-  "Thanks, we received your feedback!": "Merci, nous avons reçu vos commentaires !",
-  "Submitting…": "Envoi…",
-  "Submit": "Envoyer",
-  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Si vous rencontrez des problèmes, ou vous voulez simplement faire un commentaire, veuillez nous envoyer une courte description ci-dessous.",
-  "Feedback": "Commentaires"
+  "This feature is only supported on Firefox.": "Cette fonctionnalité est prise en charge dans Firefox uniquement."
 }
--- a/public/locales/id/app.json
+++ b/public/locales/id/app.json
@@ -23,6 +23,7 @@
  "Create account": "Buat akun",
  "Debug log": "Catatan pengawakutuan",
  "Debug log request": "Permintaan catatan pengawakutuan",
+  "Description (optional)": "Deskripsi (opsional)",
  "Details": "Detail",
  "Developer": "Pengembang",
  "Display name": "Nama tampilan",
@@ -33,6 +34,7 @@
  "Full screen": "Layar penuh",
  "Go": "Bergabung",
  "Grid layout menu": "Menu tata letak kisi",
+  "Having trouble? Help us fix it.": "Mengalami masalah? Bantu kami memperbaikinya.",
  "Home": "Beranda",
  "Include debug logs": "Termasuk catatan pengawakutuan",
  "Incompatible versions": "Versi tidak kompatibel",
@@ -44,6 +46,7 @@
  "Join call now": "Bergabung ke panggilan sekarang",
  "Join existing call?": "Bergabung ke panggilan yang sudah ada?",
  "Leave": "Keluar",
+  "Loading room…": "Memuat ruangan…",
  "Loading…": "Memuat…",
  "Local volume": "Volume lokal",
  "Logging in…": "Memasuki…",
@@ -53,6 +56,7 @@
  "Microphone permissions needed to join the call.": "Izin mikrofon dibutuhkan untuk bergabung ke panggilan ini.",
  "Microphone {{n}}": "Mikrofon {{n}}",
  "More": "Lainnya",
+  "More menu": "Menu lainnya",
  "Mute microphone": "Bisukan mikrofon",
  "No": "Tidak",
  "Not now, return to home screen": "Tidak sekarang, kembali ke layar beranda",
@@ -73,6 +77,8 @@
  "Release to stop": "Lepaskan untuk berhenti",
  "Remove": "Hapus",
  "Return to home screen": "Kembali ke layar beranda",
+  "Save": "Simpan",
+  "Saving…": "Menyimpan…",
  "Select an option": "Pilih sebuah opsi",
  "Send debug logs": "Kirim catatan pengawakutuan",
  "Sending…": "Mengirimkan…",
@@ -87,6 +93,7 @@
  "Spotlight": "Sorotan",
  "Stop sharing screen": "Berhenti membagikan layar",
  "Submit feedback": "Kirim masukan",
+  "Submitting feedback…": "Mengirimkan masukan…",
  "Take me Home": "Bawa saya ke Beranda",
  "Talk over speaker": "Bicara pada pembicara",
  "Talking…": "Berbicara…",
@@ -97,6 +104,7 @@
  "Turn off camera": "Matikan kamera",
  "Turn on camera": "Nyalakan kamera",
  "Unmute microphone": "Suarakan mikrofon",
+  "User ID": "ID pengguna",
  "User menu": "Menu pengguna",
  "Username": "Nama pengguna",
  "Version: {{version}}": "Versi: {{version}}",
@@ -121,21 +129,13 @@
  "Sending debug logs…": "Mengirimkan catatan pengawakutuan…",
  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Bergabung panggilan sekarang</0><1>Atau</1><2>Salin tautan dan bergabung nanti</2>",
  "{{name}} (Connecting...)": "{{name}} (Menghubungkan...)",
+  "Allow analytics": "Perbolehkan analitik",
+  "Advanced": "Tingkat lanjut",
  "Element Call Home": "Beranda Element Call",
  "Copy": "Salin",
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Ini akan mengirimkan data anonim (seperti durasi dan jumlah peserta panggilan) ke tim Element Call untuk membantu kami mengoptimalkan aplikasi berdasarkan bagaimana penggunaannya.",
+  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Apakah pintasan papan ketik seharusnya diaktifkan, mis. 'm' untuk membisukan/menyuarakan mikrofon.",
+  "Single-key keyboard shortcuts": "Pintasan papan ketik satu tombol",
  "{{name}} (Waiting for video...)": "{{name}} (Menunggu video...)",
-  "This feature is only supported on Firefox.": "Fitur ini hanya didukung di Firefox.",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Mengirim catatan pengawakutuan akan membantu kami melacak masalahnya.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Aduh, ada yang salah.</0>",
-  "Use the upcoming grid system": "Gunakan sistem kisi yang akan segera datang",
-  "Expose developer settings in the settings window.": "Ekspos pengaturan pengembang dalam jendela pengaturan.",
-  "Developer Settings": "Pengaturan Pengembang",
-  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Dengan bergabung dalam beta ini, Anda mengizinkan kami untuk mengumpulkan data anonim, yang kami gunakan untuk meningkatkan produk ini. Anda dapat mempelajari lebih lanjut tentang data apa yang kami lacak dalam <2>Kebijakan Privasi</2> dan <5>Kebijakan Kuki</5> kami.",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Anda dapat mengurungkan kembali izin dengan mencentang kotak ini. Jika Anda saat ini dalam panggilan, pengaturan ini akan diterapkan di akhir panggilan.",
-  "Feedback": "Masukan",
-  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Jika Anda mengalami masalah atau hanya ingin memberikan masukan, silakan kirimkan kami deskripsi pendek di bawah.",
-  "Submit": "Kirim",
-  "Submitting…": "Mengirim",
-  "Thanks, we received your feedback!": "Terima kasih, kami telah menerima masukan Anda!",
-  "Your feedback": "Masukan Anda"
+  "This feature is only supported on Firefox.": "Fitur ini hanya didukung di Firefox."
 }
--- a/public/locales/ja/app.json
+++ b/public/locales/ja/app.json
@@ -1,107 +1 @@
-{
-  "{{name}} (Connecting...)": "{{name}}（接続しています…）",
-  "{{count}} people connected|other": "{{count}}人が接続済",
-  "{{count}} people connected|one": "{{count}}人が接続済",
-  "{{name}} (Waiting for video...)": "{{name}}（ビデオを待機しています…）",
-  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>既にアカウントをお持ちですか？</0><1><0>ログイン</0>または<2>ゲストとしてアクセス</2></1>",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - トランシーバー通話",
-  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>アカウントを作成</0>または<2>ゲストとしてアクセス</2>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>今すぐ通話に参加</0><1>または</1><2>通話リンクをコピーし、後で参加</2>",
-  "Accept camera/microphone permissions to join the call.": "通話に参加するには、カメラ・マイクの許可が必要です。",
-  "<0>Oops, something's gone wrong.</0>": "<0>何かがうまく行きませんでした。</0>",
-  "Camera/microphone permissions needed to join the call.": "通話に参加する場合、カメラ・マイクの許可が必要です。",
-  "Camera": "カメラ",
-  "Call link copied": "通話リンクをコピーしました",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "「今すぐ通話に参加」をクリックすると、<2>利用規約</2>に同意したとみなされます",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "「続行」をクリックすると、 <2>利用規約</2>に同意したとみなされます",
-  "Avatar": "アバター",
-  "Accept microphone permissions to join the call.": "通話に参加するには、マイクの許可が必要です。",
-  "Audio": "音声",
-  "Connection lost": "接続が切断されました",
-  "Confirm password": "パスワードを確認",
-  "Close": "閉じる",
-  "Change layout": "レイアウトを変更",
-  "Copied!": "コピーしました！",
-  "Copy and share this call link": "通話リンクをコピーし共有",
-  "Copy": "コピー",
-  "Debug log": "デバッグログ",
-  "Create account": "アカウントを作成",
-  "Go": "続行",
-  "Fetching group call timed out.": "グループ通話の取得がタイムアウトしました。",
-  "Element Call Home": "Element Call ホーム",
-  "Download debug logs": "デバッグログをダウンロード",
-  "Display name": "表示名",
-  "Developer": "開発者",
-  "Details": "詳細",
-  "Full screen": "全画面表示",
-  "Exit full screen": "全画面表示を終了",
-  "Include debug logs": "デバッグログを含める",
-  "Home": "ホーム",
-  "Incompatible versions!": "互換性のないバージョンです！",
-  "Incompatible versions": "互換性のないバージョン",
-  "Join existing call?": "既存の通話に参加しますか？",
-  "Join call now": "今すぐ通話に参加",
-  "Join call": "通話に参加",
-  "Invite": "招待",
-  "Invite people": "連絡先を招待",
-  "Not registered yet? <2>Create an account</2>": "アカウントがありませんか？ <2>アカウントを作成</2>",
-  "Mute microphone": "マイクをミュート",
-  "Microphone permissions needed to join the call.": "通話の参加にはマイクの許可が必要です。",
-  "Microphone": "マイク",
-  "Login": "ログイン",
-  "Logging in…": "ログインしています…",
-  "Loading…": "読み込んでいます…",
-  "Leave": "退出",
-  "Version: {{version}}": "バージョン：{{version}}",
-  "Username": "ユーザー名",
-  "User menu": "ユーザーメニュー",
-  "Unmute microphone": "マイクのミュートを解除",
-  "Turn on camera": "カメラをつける",
-  "Turn off camera": "カメラを切る",
-  "Submit feedback": "フィードバックを送信",
-  "Stop sharing screen": "画面共有を停止",
-  "Spotlight": "スポットライト",
-  "Send debug logs": "デバッグログを送信",
-  "Sign out": "サインアウト",
-  "Sign in": "サインイン",
-  "Share screen": "画面共有",
-  "Settings": "設定",
-  "Sending…": "送信しています…",
-  "Sending debug logs…": "デバッグログを送信しています…",
-  "Return to home screen": "ホーム画面に戻る",
-  "Registering…": "登録しています…",
-  "Register": "登録",
-  "Profile": "プロフィール",
-  "Press and hold spacebar to talk": "スペースを長押しで会話",
-  "Passwords must match": "パスワードが一致する必要があります",
-  "Password": "パスワード",
-  "Speaker": "スピーカー",
-  "Video call name": "ビデオ通話の名称",
-  "Video call": "ビデオ通話",
-  "Video": "ビデオ",
-  "Waiting for other participants…": "他の参加者を待機しています…",
-  "Waiting for network": "ネットワークを待機しています",
-  "Walkie-talkie call name": "トランシーバー通話の名称",
-  "Walkie-talkie call": "トランシーバー通話",
-  "Camera {{n}}": "カメラ {{n}}",
-  "{{name}} is talking…": "{{name}}が話しています…",
-  "Yes, join call": "はい、通話に参加",
-  "Spatial audio": "空間オーディオ",
-  "Select an option": "オプションを選択",
-  "Debug log request": "デバッグログを要求",
-  "Your recent calls": "最近の通話",
-  "You can't talk at the same time": "同時に会話することはできません",
-  "WebRTC is not supported or is being blocked in this browser.": "お使いのブラウザでWebRTCがサポートされていないか、またはブロックされています。",
-  "Login to your account": "アカウントにログイン",
-  "Freedom": "自由",
-  "{{displayName}}, your call is now ended": "{{displayName}}、通話が終了しました",
-  "Talking…": "話しています…",
-  "Remove": "削除",
-  "No": "いいえ",
-  "This feature is only supported on Firefox.": "この機能はFirefoxでのみサポートされています。",
-  "This call already exists, would you like to join?": "この通話は既に存在します。参加しますか？",
-  "Take me Home": "ホームに戻る",
-  "Press and hold to talk": "押し続けて会話",
-  "{{name}} is presenting": "{{name}}が画面を共有しています",
-  "{{names}}, {{name}}": "{{names}}、{{name}}"
-}
+{}
--- a/public/locales/pl/app.json
+++ b/public/locales/pl/app.json
@@ -1,8 +1,9 @@
 {
+  "More menu": "Menu \"więcej\"",
  "Login": "Zaloguj się",
-  "Go": "Przejdź",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Klikając \"Kontynuuj\", wyrażasz zgodę na nasze <2>Zasady i warunki</2>",
-  "{{count}} people connected|other": "{{count}} osób połączonych",
+  "Go": "Kontynuuj",
+  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Klikając \"Kontynuuj\", wyrażasz zgodę na nasze <2>Warunki</2>",
+  "{{count}} people connected|other": "{{count}} ludzi połączono",
  "Your recent calls": "Twoje ostatnie połączenia",
  "You can't talk at the same time": "Nie możesz mówić w tym samym czasie",
  "Yes, join call": "Tak, dołącz do połączenia",
@@ -17,6 +18,7 @@
  "Version: {{version}}": "Wersja: {{version}}",
  "Username": "Nazwa użytkownika",
  "User menu": "Menu użytkownika",
+  "User ID": "ID użytkownika",
  "Unmute microphone": "Wyłącz wyciszenie mikrofonu",
  "Turn on camera": "Włącz kamerę",
  "Turn off camera": "Wyłącz kamerę",
@@ -24,7 +26,8 @@
  "This call already exists, would you like to join?": "Te połączenie już istnieje, czy chcesz do niego dołączyć?",
  "Thanks! We'll get right on it.": "Dziękujemy! Zaraz się tym zajmiemy.",
  "Talking…": "Mówienie…",
-  "Take me Home": "Zabierz mnie do strony głównej",
+  "Take me Home": "Zabierz mnie do ekranu startowego",
+  "Submitting feedback…": "Przesyłanie opinii…",
  "Submit feedback": "Prześlij opinię",
  "Stop sharing screen": "Zatrzymaj udostępnianie ekranu",
  "Spotlight": "Centrum uwagi",
@@ -40,10 +43,12 @@
  "Sending debug logs…": "Wysyłanie dzienników debugowania…",
  "Send debug logs": "Wyślij dzienniki debugowania",
  "Select an option": "Wybierz opcję",
-  "Return to home screen": "Powróć do strony głównej",
+  "Saving…": "Zapisywanie…",
+  "Save": "Zapisz",
+  "Return to home screen": "Powróć do ekranu domowego",
  "Remove": "Usuń",
-  "Release to stop": "Puść przycisk, aby zatrzymać",
-  "Release spacebar key to stop": "Puść spację, aby zatrzymać",
+  "Release to stop": "Puść przycisk, aby przestać",
+  "Release spacebar key to stop": "Puść spację, aby przestać",
  "Registering…": "Rejestrowanie…",
  "Register": "Zarejestruj",
  "Recaptcha not loaded": "Recaptcha nie została załadowana",
@@ -53,7 +58,7 @@
  "Press and hold to talk": "Przytrzymaj, aby mówić",
  "Press and hold spacebar to talk over {{name}}": "Przytrzymaj spację, aby mówić wraz z {{name}}",
  "Press and hold spacebar to talk": "Przytrzymaj spację, aby mówić",
-  "Passwords must match": "Hasła muszą pasować",
+  "Passwords must match": "Hasła muszą być identyczne",
  "Password": "Hasło",
  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "Inni użytkownicy próbują dołączyć do tego połączenia przy użyciu niekompatybilnych wersji. Powinni oni upewnić się, że odświeżyli stronę w swoich przeglądarkach:<1>{userLis}</1>",
  "Not registered yet? <2>Create an account</2>": "Nie masz konta? <2>Utwórz je</2>",
@@ -66,8 +71,9 @@
  "Microphone": "Mikrofon",
  "Login to your account": "Zaloguj się do swojego konta",
  "Logging in…": "Logowanie…",
-  "Local volume": "Głośność lokalna",
+  "Local volume": "Lokalna głośność",
  "Loading…": "Ładowanie…",
+  "Loading room…": "Ładowanie pokoju…",
  "Leave": "Opuść",
  "Join existing call?": "Dołączyć do istniejącego połączenia?",
  "Join call now": "Dołącz do połączenia teraz",
@@ -79,57 +85,44 @@
  "Incompatible versions": "Niekompatybilne wersje",
  "Include debug logs": "Dołącz dzienniki debugowania",
  "Home": "Strona domowa",
+  "Having trouble? Help us fix it.": "Masz problem? Pomóż nam go naprawić.",
  "Grid layout menu": "Menu układu siatki",
-  "Full screen": "Pełny ekran",
+  "Full screen": "Pełen ekran",
  "Freedom": "Wolność",
  "Fetching group call timed out.": "Przekroczono limit czasu na uzyskanie połączenia grupowego.",
-  "Exit full screen": "Opuść pełny ekran",
+  "Exit full screen": "Zamknij pełny ekran",
  "Download debug logs": "Pobierz dzienniki debugowania",
-  "Display name": "Nazwa wyświetlana",
-  "Developer": "Programista",
+  "Display name": "Wyświetlana nazwa",
+  "Developer": "Deweloper",
  "Details": "Szczegóły",
+  "Description (optional)": "Opis (opcjonalny)",
  "Debug log request": "Prośba o dzienniki debugowania",
  "Debug log": "Dzienniki debugowania",
  "Create account": "Utwórz konto",
-  "Copy and share this call link": "Skopiuj i udostępnij link do rozmowy",
+  "Copy and share this call link": "Skopiuj i podziel się linkiem do połączenia",
  "Copied!": "Skopiowano!",
  "Connection lost": "Połączenie utracone",
  "Confirm password": "Potwierdź hasło",
  "Close": "Zamknij",
  "Change layout": "Zmień układ",
-  "Camera/microphone permissions needed to join the call.": "Wymagane są uprawnienia do kamery/mikrofonu, aby dołączyć do rozmowy.",
+  "Camera/microphone permissions needed to join the call.": "Aby dołączyć do tego połączenia, potrzebne są uprawnienia do kamery/mikrofonu.",
  "Camera {{n}}": "Kamera {{n}}",
  "Camera": "Kamera",
-  "Call type menu": "Menu typu połączenia",
+  "Call type menu": "Menu rodzaju połączenia",
  "Call link copied": "Skopiowano link do połączenia",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Klikając \"Dołącz do rozmowy\", wyrażasz zgodę na nasze <2>Zasady i warunki</2>",
+  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "Klikając \"Dołącz do rozmowy\", wyrażasz zgodę na nasze <2>Warunki</2>",
  "Avatar": "Awatar",
  "Audio": "Dźwięk",
  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Inny użytkownik w tym połączeniu napotkał problem. Aby lepiej zdiagnozować tę usterkę, chcielibyśmy zebrać dzienniki debugowania.",
-  "Accept microphone permissions to join the call.": "Akceptuj uprawnienia mikrofonu, aby dołączyć do połączenia.",
-  "Accept camera/microphone permissions to join the call.": "Akceptuj uprawnienia kamery/mikrofonu, aby dołączyć do połączenia.",
+  "Accept microphone permissions to join the call.": "Przyznaj uprawnienia do mikrofonu aby dołączyć do połączenia.",
+  "Accept camera/microphone permissions to join the call.": "Przyznaj uprawnienia do kamery/mikrofonu aby dołączyć do połączenia.",
  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Może zechcesz ustawić hasło, aby zachować swoje konto?</0><1>Będziesz w stanie utrzymać swoją nazwę i ustawić awatar do wyświetlania podczas połączeń w przyszłości</1>",
-  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Utwórz konto</0> lub <2>Dołącz jako gość</2>",
-  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Masz już konto?</0><1><0>Zaloguj się</0> lub <2>Dołącz jako gość</2></1>",
+  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Utwórz konto</0> Albo <2>Dołącz jako gość</2>",
+  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Masz już konto?</0><1><0>Zaloguj się</0> Albo <2>Dołącz jako gość</2></1>",
  "{{roomName}} - Walkie-talkie call": "{{roomName}} - połączenie walkie-talkie",
  "{{names}}, {{name}}": "{{names}}, {{name}}",
  "{{name}} is talking…": "{{name}} mówi…",
  "{{name}} is presenting": "{{name}} prezentuje",
  "{{displayName}}, your call is now ended": "{{displayName}}, twoje połączenie zostało zakończone",
-  "{{count}} people connected|one": "{{count}} osoba połączona",
-  "This feature is only supported on Firefox.": "Ta funkcjonalność jest dostępna tylko w Firefox.",
-  "Copy": "Kopiuj",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Wysłanie dzienników debuggowania pomoże nam ustalić przyczynę problemu.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Ojej, coś poszło nie tak.</0>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Dołącz do rozmowy już teraz</0><1>lub</1><2>Skopiuj link do rozmowy i dołącz później</2>",
-  "{{name}} (Waiting for video...)": "{{name}} (Oczekiwanie na wideo...)",
-  "{{name}} (Connecting...)": "{{name}} (Łączenie...)",
-  "Expose developer settings in the settings window.": "Wyświetl opcje programisty w oknie ustawień.",
-  "Element Call Home": "Strona główna Element Call",
-  "Developer Settings": "Opcje programisty",
-  "Talk over speaker": "Rozmowa przez głośnik",
-  "Use the upcoming grid system": "Użyj nadchodzącego systemu siatek",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "Ta strona jest chroniona przez ReCAPTCHA, więc obowiązują na niej <2>Polityka prywatności</2> i <6>Warunki świadczenia usług</6> Google.<9></9>Klikając \"Zarejestruj się\", zgadzasz się na nasze <12>Warunki świadczenia usług</12>",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Możesz wycofać swoją zgodę poprzez odznaczenie tego pola. Jeśli już jesteś w trakcie rozmowy, opcja zostanie zastosowana po jej zakończeniu.",
-  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Uczestnicząc w tej becie, upoważniasz nas do zbierania anonimowych danych, które wykorzystamy do ulepszenia produktu. Dowiedz się więcej na temat danych, które zbieramy w naszej <2>Polityce prywatności</2> i <5>Polityce ciasteczek</5>."
+  "{{count}} people connected|one": "{{count}} osoba połączona"
 }
--- a/public/locales/ru/app.json
+++ b/public/locales/ru/app.json
@@ -1,5 +1,6 @@
 {
  "Register": "Зарегистрироваться",
+  "Saving…": "Сохранение…",
  "Registering…": "Регистрация…",
  "Logging in…": "Вход…",
  "{{names}}, {{name}}": "{{names}}, {{name}}",
@@ -9,6 +10,7 @@
  "This call already exists, would you like to join?": "Этот звонок уже существует, хотите присоединиться?",
  "Thanks! We'll get right on it.": "Спасибо! Мы учтём ваш отзыв.",
  "Talking…": "Говорите…",
+  "Submitting feedback…": "Отправка отзыва…",
  "Submit feedback": "Отправить отзыв",
  "Sending debug logs…": "Отправка журнала отладки…",
  "Select an option": "Выберите вариант",
@@ -36,6 +38,7 @@
  "Version: {{version}}": "Версия: {{version}}",
  "Username": "Имя пользователя",
  "User menu": "Меню пользователя",
+  "User ID": "ID пользователя",
  "Unmute microphone": "Включить микрофон",
  "Turn on camera": "Включить камеру",
  "Turn off camera": "Отключить камеру",
@@ -54,6 +57,7 @@
  "Sending…": "Отправка…",
  "Local volume": "Местная громкость",
  "Call type menu": "Меню \"Тип звонка\"",
+  "More menu": "Полное меню",
  "{{roomName}} - Walkie-talkie call": "{{roomName}} - Звонок-рация",
  "Include debug logs": "Приложить журнал отладки",
  "Download debug logs": "Скачать журнал отладки",
@@ -61,6 +65,7 @@
  "Debug log": "Журнал отладки",
  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "У одного из участников звонка есть неполадки. Чтобы лучше диагностировать похожие проблемы, нам нужен журнал отладки.",
  "Send debug logs": "Отправить журнал отладки",
+  "Save": "Сохранить",
  "Return to home screen": "Вернуться в Начало",
  "Remove": "Удалить",
  "Recaptcha not loaded": "Невозможно начать проверку",
@@ -81,6 +86,7 @@
  "Login to your account": "Войдите в свой аккаунт",
  "Login": "Вход",
  "Loading…": "Загрузка…",
+  "Loading room…": "Загрузка комнаты…",
  "Leave": "Покинуть",
  "Join existing call?": "Присоединиться к существующему звонку?",
  "Join call now": "Присоединиться сейчас",
@@ -91,6 +97,7 @@
  "Incompatible versions!": "Несовместимые версии!",
  "Incompatible versions": "Несовместимые версии",
  "Home": "Начало",
+  "Having trouble? Help us fix it.": "Есть проблема? Помогите нам её устранить.",
  "Go": "Далее",
  "Full screen": "Полноэкранный режим",
  "Freedom": "Свобода",
@@ -99,6 +106,7 @@
  "Display name": "Видимое имя",
  "Developer": "Разработчику",
  "Details": "Подробности",
+  "Description (optional)": "Описание (необязательно)",
  "Create account": "Создать аккаунт",
  "Copy and share this call link": "Скопируйте и поделитесь этой ссылкой на звонок",
  "Copied!": "Скопировано!",
@@ -119,17 +127,11 @@
  "{{displayName}}, your call is now ended": "{{displayName}}, ваш звонок завершён",
  "{{count}} people connected|other": "{{count}} подключилось",
  "{{count}} people connected|one": "{{count}} подключился",
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Это даст разрешение на отправку анонимизированных данных (таких, как продолжительность звонка и количество участников) команде Element Call, чтобы помочь нам оптимизировать работу приложения на основании того как оно используется.",
  "Element Call Home": "Главная Element Call",
  "Copy": "Копировать",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Присоединиться сейчас к звонку</0><1>или<1><2>Скопировать ссылку на звонок и присоединиться позже</2>",
-  "{{name}} (Connecting...)": "{{name}} (Соединение...)",
-  "This feature is only supported on Firefox.": "Эта возможность доступна только в Firefox.",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Отправка журналов поможет нам найти и устранить проблему.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Упс, что-то пошло не так.</0>",
-  "{{name}} (Waiting for video...)": "{{name}} (Ожидание видео...)",
-  "Use the upcoming grid system": "Использовать сеточный показ",
-  "Expose developer settings in the settings window.": "Раскрыть настройки разработчика в окне настроек.",
-  "Developer Settings": "Настройки Разработчика",
-  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Участвуя в этой бета-версии, вы соглашаетесь на сбор анонимных данных, которые мы используем для улучшения продукта. Более подробную информацию о том, какие данные мы отслеживаем, вы можете найти в нашей <2> Политике конфиденциальности</2> и нашей <5> Политике использования файлов cookie</5>.",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Вы можете отозвать согласие, сняв этот флажок. Если вы в данный момент находитесь в разговоре, эта настройка вступит в силу по окончании разговора."
+  "Allow analytics": "Разрешить аналитику",
+  "Advanced": "Расширенные",
+  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Присоединиться сейчас</0><1>или<1><2>Скопировать ссылку на звонок и присоединиться позже</2>",
+  "{{name}} (Connecting...)": "{{name}} (Соединение...)"
 }
--- a/public/locales/sk/app.json
+++ b/public/locales/sk/app.json
@@ -5,21 +5,27 @@
  "Fetching group call timed out.": "Vypršal čas načítania skupinového volania.",
  "Element Call Home": "Domov Element Call",
  "You can't talk at the same time": "Nemôžete hovoriť naraz",
+  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Či chcete povoliť jednotlačidlové klávesové skratky, napr. \"m\" na stlmenie/zapnutie mikrofónu.",
  "Waiting for other participants…": "Čaká sa na ďalších účastníkov…",
  "Waiting for network": "Čakanie na sieť",
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Týmto spôsobom sa budú posielať anonymizované údaje (napríklad trvanie hovoru a počet účastníkov) tímu Element Call, aby nám pomohli optimalizovať aplikáciu na základe toho, ako sa používa.",
  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "Zvuk reproduktora tak bude vyzerať, akoby vychádzal z miesta, kde je na obrazovke umiestnená jeho ikona. (Experimentálna funkcia: môže to mať vplyv na stabilitu zvuku.)",
  "Thanks! We'll get right on it.": "Vďaka! Hneď sa do toho pustíme.",
  "Talking…": "Rozprávanie…",
  "Talk over speaker": "Hovor cez reproduktor",
  "Take me Home": "Zober ma domov",
+  "Submitting feedback…": "Odosielanie spätnej väzby…",
  "Submit feedback": "Odoslať spätnú väzbu",
  "Stop sharing screen": "Zastaviť zdieľanie obrazovky",
+  "Single-key keyboard shortcuts": "Jednotlačidlové klávesové skratky",
  "Show call inspector": "Zobraziť inšpektora hovorov",
  "Share screen": "Zdieľať obrazovku",
  "Sending…": "Odosielanie…",
  "Sending debug logs…": "Odosielanie záznamov o ladení…",
  "Send debug logs": "Odoslať záznamy o ladení",
  "Select an option": "Vyberte možnosť",
+  "Saving…": "Ukladanie…",
+  "Save": "Uložiť",
  "Return to home screen": "Návrat na domovskú obrazovku",
  "Remove": "Odstrániť",
  "Release spacebar key to stop": "Pustite medzerník pre ukončenie",
@@ -40,6 +46,7 @@
  "Not now, return to home screen": "Teraz nie, vrátiť sa na domovskú obrazovku",
  "No": "Nie",
  "Mute microphone": "Stlmiť mikrofón",
+  "More menu": "Ponuka viac",
  "More": "Viac",
  "Microphone permissions needed to join the call.": "Povolenie mikrofónu je potrebné na pripojenie k hovoru.",
  "Microphone {{n}}": "Mikrofón {{n}}",
@@ -48,6 +55,7 @@
  "Login": "Prihlásiť sa",
  "Logging in…": "Prihlasovanie…",
  "Loading…": "Načítanie…",
+  "Loading room…": "Načítanie miestnosti…",
  "Leave": "Opustiť",
  "Join existing call?": "Pripojiť sa k existujúcemu hovoru?",
  "Join call now": "Pripojiť sa k hovoru teraz",
@@ -58,6 +66,7 @@
  "Incompatible versions!": "Nekompatibilné verzie!",
  "Incompatible versions": "Nekompatibilné verzie",
  "Home": "Domov",
+  "Having trouble? Help us fix it.": "Máte problém? Pomôžte nám ho opraviť.",
  "Grid layout menu": "Ponuka rozloženia mriežky",
  "Go": "Prejsť",
  "Full screen": "Zobrazenie na celú obrazovku",
@@ -75,6 +84,7 @@
  "Version: {{version}}": "Verzia: {{version}}",
  "Username": "Meno používateľa",
  "User menu": "Používateľské menu",
+  "User ID": "ID používateľa",
  "Unmute microphone": "Zrušiť stlmenie mikrofónu",
  "Turn on camera": "Zapnúť kameru",
  "Turn off camera": "Vypnúť kameru",
@@ -89,6 +99,7 @@
  "Display name": "Zobrazované meno",
  "Developer": "Vývojár",
  "Details": "Podrobnosti",
+  "Description (optional)": "Popis (voliteľné)",
  "Debug log request": "Žiadosť o záznam ladenia",
  "Debug log": "Záznam o ladení",
  "Create account": "Vytvoriť účet",
@@ -109,6 +120,8 @@
  "Avatar": "Obrázok",
  "Audio": "Audio",
  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Ďalší používateľ v tomto hovore má problém. Aby sme mohli lepšie diagnostikovať tieto problémy, chceli by sme získať záznam o ladení.",
+  "Allow analytics": "Povoliť analytiku",
+  "Advanced": "Pokročilé",
  "Accept camera/microphone permissions to join the call.": "Prijmite povolenia kamery/mikrofónu, aby ste sa mohli pripojiť k hovoru.",
  "Accept microphone permissions to join the call.": "Prijmite povolenia mikrofónu, aby ste sa mohli pripojiť k hovoru.",
  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Prečo neskončiť nastavením hesla, aby ste si zachovali svoj účet? </0><1>Budete si môcť ponechať svoje meno a nastaviť obrázok, ktorý sa bude používať pri budúcich hovoroch</1>",
@@ -124,18 +137,5 @@
  "{{displayName}}, your call is now ended": "{{displayName}}, váš hovor je teraz ukončený",
  "{{count}} people connected|other": "{{count}} osôb pripojených",
  "{{count}} people connected|one": "{{count}} osoba pripojená",
-  "This feature is only supported on Firefox.": "Táto funkcia je podporovaná len v prehliadači Firefox.",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Odoslanie záznamov ladenia nám pomôže nájsť problém.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Hups, niečo sa pokazilo.</0>",
-  "Use the upcoming grid system": "Použiť pripravovaný systém mriežky",
-  "Expose developer settings in the settings window.": "Zobraziť nastavenia pre vývojárov v okne nastavení.",
-  "Developer Settings": "Nastavenia pre vývojárov",
-  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Účasťou v tejto beta verzii súhlasíte so zhromažďovaním anonymných údajov, ktoré použijeme na zlepšenie produktu. Viac informácií o tom, ktoré údaje sledujeme, nájdete v našich <2>Zásadách ochrany osobných údajov</2> a <5>Zásadách používania súborov cookie</5>.",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Súhlas môžete odvolať zrušením označenia tohto políčka. Ak práve prebieha hovor, toto nastavenie nadobudne platnosť po skončení hovoru.",
-  "Your feedback": "Vaša spätná väzba",
-  "Thanks, we received your feedback!": "Ďakujeme, dostali sme vašu spätnú väzbu!",
-  "Submitting…": "Odosielanie…",
-  "Submit": "Odoslať",
-  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Ak máte problémy alebo jednoducho chcete poskytnúť spätnú väzbu, pošlite nám krátky popis nižšie.",
-  "Feedback": "Spätná väzba"
+  "This feature is only supported on Firefox.": "Táto funkcia je podporovaná len v prehliadači Firefox."
 }
--- a/public/locales/tr/app.json
+++ b/public/locales/tr/app.json
@@ -21,6 +21,7 @@
  "Create account": "Hesap aç",
  "Debug log": "Hata ayıklama kütüğü",
  "Debug log request": "Hata ayıklama kütük istemi",
+  "Description (optional)": "Tanım (isteğe bağlı)",
  "Details": "Ayrıntı",
  "Developer": "Geliştirici",
  "Display name": "Ekran adı",
@@ -31,6 +32,7 @@
  "Full screen": "Tam ekran",
  "Go": "Git",
  "Grid layout menu": "Izgara plan menü",
+  "Having trouble? Help us fix it.": "Sorun mu var? Çözmemize yardım edin.",
  "Home": "Ev",
  "Include debug logs": "Hata ayıklama kütüğünü dahil et",
  "Incompatible versions": "Uyumsuz sürümler",
@@ -41,6 +43,7 @@
  "Join call now": "Aramaya katıl",
  "Join existing call?": "Mevcut aramaya katıl?",
  "Leave": "Çık",
+  "Loading room…": "Oda yükleniyor…",
  "Loading…": "Yükleniyor…",
  "Local volume": "Yerel ses seviyesi",
  "Logging in…": "Giriliyor…",
@@ -50,6 +53,7 @@
  "Microphone permissions needed to join the call.": "Aramaya katılmak için mikrofon erişim izni gerek.",
  "Microphone {{n}}": "{{n}}. mikrofon",
  "More": "Daha",
+  "More menu": "Daha fazla",
  "Mute microphone": "Mikrofonu kapat",
  "No": "Hayır",
  "Not now, return to home screen": "Şimdi değil, ev ekranına dön",
@@ -67,6 +71,8 @@
  "Release to stop": "Kesmek için bırakın",
  "Remove": "Çıkar",
  "Return to home screen": "Ev ekranına geri dön",
+  "Save": "Kaydet",
+  "Saving…": "Kaydediliyor…",
  "Select an option": "Bir seçenek seç",
  "Send debug logs": "Hata ayıklama kütüğünü gönder",
  "Sending…": "Gönderiliyor…",
@@ -78,6 +84,7 @@
  "Spatial audio": "Uzamsal ses",
  "Stop sharing screen": "Ekran paylaşmayı terk et",
  "Submit feedback": "Geri bildirim ver",
+  "Submitting feedback…": "Geri bildirimler gönderiliyor…",
  "Take me Home": "Ev ekranına gir",
  "Talking…": "Konuşuyor…",
  "Thanks! We'll get right on it.": "Sağol! Bununla ilgileneceğiz.",
--- a/public/locales/uk/app.json
+++ b/public/locales/uk/app.json
@@ -14,6 +14,7 @@
  "Version: {{version}}": "Версія: {{version}}",
  "Username": "Ім'я користувача",
  "User menu": "Меню користувача",
+  "User ID": "ID користувача",
  "Unmute microphone": "Увімкнути мікрофон",
  "Turn on camera": "Увімкнути камеру",
  "Turn off camera": "Вимкнути камеру",
@@ -24,6 +25,7 @@
  "Talking…": "Говоріть…",
  "Talk over speaker": "Говорити через динамік",
  "Take me Home": "Перейти до Домівки",
+  "Submitting feedback…": "Надсилання відгуку…",
  "Submit feedback": "Надіслати відгук",
  "Stop sharing screen": "Припинити показ екрана",
  "Spotlight": "У центрі уваги",
@@ -36,9 +38,11 @@
  "Share screen": "Поділитися екраном",
  "Settings": "Налаштування",
  "Sending…": "Надсилання…",
-  "Sending debug logs…": "Надсилання журналу налагодження…",
-  "Send debug logs": "Надіслати журнал налагодження",
+  "Sending debug logs…": "Надсилання журналу зневадження…",
+  "Send debug logs": "Надіслати журнал зневадження",
  "Select an option": "Вибрати опцію",
+  "Saving…": "Збереження…",
+  "Save": "Зберегти",
  "Return to home screen": "Повернутися на екран домівки",
  "Remove": "Вилучити",
  "Release to stop": "Відпустіть, щоб закінчити",
@@ -59,6 +63,7 @@
  "Not now, return to home screen": "Не зараз, повернутися на екран домівки",
  "No": "Ні",
  "Mute microphone": "Заглушити мікрофон",
+  "More menu": "Усе меню",
  "More": "Докладніше",
  "Microphone permissions needed to join the call.": "Для участі у виклику необхідний дозвіл на користування мікрофоном.",
  "Microphone {{n}}": "Мікрофон {{n}}",
@@ -67,6 +72,7 @@
  "Login": "Увійти",
  "Logging in…": "Вхід…",
  "Local volume": "Локальна гучність",
+  "Loading room…": "Завантаження кімнати…",
  "Leave": "Вийти",
  "Join existing call?": "Приєднатися до наявного виклику?",
  "Join call now": "Приєднатися до виклику зараз",
@@ -76,20 +82,22 @@
  "Inspector": "Інспектор",
  "Incompatible versions!": "Несумісні версії!",
  "Incompatible versions": "Несумісні версії",
-  "Include debug logs": "Долучити журнали налагодження",
+  "Include debug logs": "Долучити журнали зневадження",
  "Home": "Домівка",
+  "Having trouble? Help us fix it.": "Проблеми? Допоможіть нам це виправити.",
  "Grid layout menu": "Меню у вигляді сітки",
  "Go": "Далі",
  "Full screen": "Повноекранний режим",
  "Freedom": "Свобода",
  "Fetching group call timed out.": "Вичерпано час очікування групового виклику.",
  "Exit full screen": "Вийти з повноекранного режиму",
-  "Download debug logs": "Завантажити журнали налагодження",
+  "Download debug logs": "Завантажити журнали зневадження",
  "Display name": "Показуване ім'я",
  "Developer": "Розробнику",
  "Details": "Подробиці",
-  "Debug log request": "Запит журналу налагодження",
-  "Debug log": "Журнал налагодження",
+  "Description (optional)": "Опис (необов'язково)",
+  "Debug log request": "Запит журналу зневадження",
+  "Debug log": "Журнал зневадження",
  "Create account": "Створити обліковий запис",
  "Copy and share this call link": "Скопіювати та поділитися цим посиланням на виклик",
  "Copied!": "Скопійовано!",
@@ -106,7 +114,7 @@
  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "Натиснувши «Далі», ви погодитеся з нашими <2>Умовами та положеннями</2>",
  "Avatar": "Аватар",
  "Audio": "Звук",
-  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Інший користувач у цьому виклику має проблему. Щоб краще визначити ці проблеми, ми хотіли б зібрати журнал налагодження.",
+  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Інший користувач у цьому виклику має проблему. Щоб краще визначити ці проблеми, ми хотіли б зібрати журнал зневадження.",
  "Accept microphone permissions to join the call.": "Надайте дозволи на використання мікрофонів для приєднання до виклику.",
  "Accept camera/microphone permissions to join the call.": "Надайте дозвіл на використання камери/мікрофона для приєднання до виклику.",
  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Чому б не завершити, налаштувавши пароль для збереження свого облікового запису?</0><1>Ви зможете зберегти своє ім'я та встановити аватарку для подальшого користування під час майбутніх викликів</1>",
@@ -121,21 +129,13 @@
  "{{count}} people connected|one": "{{count}} під'єднується",
  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Приєднатися до виклику зараз</0><1>Or</1><2>Скопіювати посилання на виклик і приєднатися пізніше</2>",
  "{{name}} (Connecting...)": "{{name}} (З'єднання...)",
+  "Allow analytics": "Дозволити аналітику",
+  "Advanced": "Розширені",
  "Element Call Home": "Домівка Element Call",
  "Copy": "Копіювати",
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "Це дозволить надсилати анонімні дані (такі як тривалість виклику та кількість учасників) команді Element Call, щоб допомогти нам оптимізувати роботу застосунку на основі того, як він використовується.",
+  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Чи вмикати/вимикати мікрофон однією клавішею, наприклад, «m» для ввімкнення/вимкнення мікрофона.",
+  "Single-key keyboard shortcuts": "Одноклавішні комбінації клавіш",
  "{{name}} (Waiting for video...)": "{{name}} (Очікування на відео...)",
-  "This feature is only supported on Firefox.": "Ця функція підтримується лише в браузері Firefox.",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Надсилання журналів налагодження допоможе нам виявити проблему.</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>Йой, щось пішло не за планом.</0>",
-  "Use the upcoming grid system": "Використовувати майбутню сіткову систему",
-  "Expose developer settings in the settings window.": "Відкрийте налаштування розробника у вікні налаштувань.",
-  "Developer Settings": "Налаштування розробника",
-  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "Користуючись дочасним доступом, ви даєте згоду на збір анонімних даних, які ми використовуємо для вдосконалення продукту. Ви можете знайти більше інформації про те, які дані ми відстежуємо в нашій <2>Політиці Приватності</2> і нашій <5>Політиці про куки</5>.",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>Ви можете відкликати згоду, прибравши цей прапорець. Якщо ви зараз розмовляєте, це налаштування застосується після завершення виклику.",
-  "Your feedback": "Ваш відгук",
-  "Thanks, we received your feedback!": "Дякуємо, ми отримали ваш відгук!",
-  "Submitting…": "Надсилання…",
-  "Submit": "Надіслати",
-  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Якщо у вас виникли проблеми або ви просто хочете залишити відгук, надішліть нам короткий опис нижче.",
-  "Feedback": "Відгук"
+  "This feature is only supported on Firefox.": "Ця функція підтримується лише в браузері Firefox."
 }
--- a/public/locales/vi/app.json
+++ b/public/locales/vi/app.json
@@ -1,38 +0,0 @@
-{
-  "Login": "Đăng nhập",
-  "{{count}} people connected|other": "{{count}} người đã kết nối",
-  "{{name}} (Waiting for video...)": "{{name}} (Đang đợi truyền hình...)",
-  "Join call": "Tham gia cuộc gọi",
-  "Mute microphone": "Tắt micrô",
-  "Password": "Mật khẩu",
-  "Settings": "Cài đặt",
-  "Sending…": "Đang gửi…",
-  "Sign in": "Đăng nhập",
-  "Submit": "Gửi",
-  "Video call name": "Tên cuộc gọi truyền hình",
-  "Video call": "Gọi truyền hình",
-  "Video": "Truyền hình",
-  "Username": "Tên người dùng",
-  "Yes, join call": "Vâng, tham gia cuộc gọi",
-  "Your feedback": "Phản hồi của bạn",
-  "{{count}} people connected|one": "{{count}} người đã kết nối",
-  "{{displayName}}, your call is now ended": "{{displayName}}, cuộc gọi của bạn đã kết thúc",
-  "{{name}} (Connecting...)": "{{name}} (Đang kết nối...)",
-  "Your recent calls": "Cuộc gọi gần đây",
-  "You can't talk at the same time": "Bạn không thể nói cùng thời điểm",
-  "WebRTC is not supported or is being blocked in this browser.": "WebRTC không được hỗ trợ hay bị chặn trong trình duyệt này.",
-  "Waiting for network": "Đang đợi kết nối mạng",
-  "Waiting for other participants…": "Đang đợi những người khác…",
-  "Version: {{version}}": "Phiên bản: {{version}}",
-  "Turn on camera": "Bật máy quay",
-  "Turn off camera": "Tắt máy quay",
-  "Submit feedback": "Gửi phản hồi",
-  "Stop sharing screen": "Ngừng chia sẻ màn hình",
-  "Speaker": "Loa",
-  "Sign out": "Đăng xuất",
-  "Share screen": "Chia sẻ màn hình",
-  "No": "Không",
-  "Invite people": "Mời mọi người",
-  "Join call now": "Tham gia cuộc gọi",
-  "Create account": "Tạo tài khoản"
-}
--- a/public/locales/zh-Hans/app.json
+++ b/public/locales/zh-Hans/app.json
@@ -2,6 +2,7 @@
  "Your recent calls": "最近通话",
  "You can't talk at the same time": "你不能在同一时间发言",
  "Yes, join call": "是，加入通话",
+  "Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "是否启用单键键盘快捷键，例如，'m'可使麦克风静音/取消静音。",
  "WebRTC is not supported or is being blocked in this browser.": "此浏览器不支持WebRTC或WebRTC被浏览器阻止。",
  "Walkie-talkie call name": "对讲机通话名称",
  "Walkie-talkie call": "对讲机通话",
@@ -13,9 +14,11 @@
  "Version: {{version}}": "版本：{{version}}",
  "Username": "用户名",
  "User menu": "用户菜单",
+  "User ID": "用户ID",
  "Unmute microphone": "取消麦克风静音",
  "Turn on camera": "开启摄像头",
  "Turn off camera": "关闭摄像头",
+  "This will send anonymised data (such as the duration of a call and the number of participants) to the Element Call team to help us optimise the application based on how it is used.": "这将向Element Call团队发送匿名数据（如通话的持续时间和参与者的数量），以帮助我们根据使用方式优化应用程序。",
  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "这将使发言人的音频看起来像是来自他们在屏幕上的位置。(实验性功能：这可能影响音频的稳定性）",
  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "本网站受reCaptcha保护，并适用Google<2>隐私政策</2>和<6>服务条款</6>。<9></9>点击\"注册\"则表明您同意我们的<12>条款和条件</12>",
  "This call already exists, would you like to join?": "该通话已存在，你想加入吗？",
@@ -23,16 +26,20 @@
  "Talking…": "正在发言……",
  "Talk over speaker": "通过扬声器发言",
  "Take me Home": "返回主页",
+  "Submitting feedback…": "正在提交反馈……",
  "Submit feedback": "提交反馈",
  "Stop sharing screen": "停止屏幕共享",
  "Spotlight": "聚焦模式",
  "Speaker {{n}}": "发言人 {{n}}",
  "Speaker": "发言人",
  "Spatial audio": "空间音频",
+  "Single-key keyboard shortcuts": "单键键盘快捷方式",
  "Sign out": "注销登录",
  "Sign in": "登录",
  "Audio": "音频",
  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "这个通话中的另一个用户出现了问题。为了更好地诊断这些问题，我们想收集调试日志。",
+  "Allow analytics": "允许进行分析",
+  "Advanced": "偏好",
  "Accept microphone permissions to join the call.": "授予麦克风权限以加入通话。",
  "Accept camera/microphone permissions to join the call.": "授予摄像头/麦克风权限以加入通话。",
  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>为什么不设置一个密码来保留你的账户？</0><1>你将可以保留你的名字并设置一个头像，以便在未来的通话中使用。</1>",
@@ -56,6 +63,8 @@
  "Sending debug logs…": "正在发送调试日志……",
  "Send debug logs": "发送调试日志",
  "Select an option": "选择一个选项",
+  "Saving…": "正在保存……",
+  "Save": "保存",
  "Return to home screen": "返回主页",
  "Remove": "移除",
  "Release to stop": "松开后停止",
@@ -76,6 +85,7 @@
  "Not now, return to home screen": "暂不，先返回主页",
  "No": "否",
  "Mute microphone": "麦克风静音",
+  "More menu": "更多",
  "More": "更多",
  "Microphone permissions needed to join the call.": "加入通话需要麦克风权限。",
  "Microphone {{n}}": "麦克风 {{n}}",
@@ -85,6 +95,7 @@
  "Logging in…": "登录中……",
  "Local volume": "本地音量",
  "Loading…": "加载中……",
+  "Loading room…": "加载房间中……",
  "Leave": "离开",
  "Join existing call?": "加入现有的通话？",
  "Join call now": "现在加入通话",
@@ -95,6 +106,7 @@
  "Incompatible versions": "不兼容版本",
  "Include debug logs": "包含调试日志",
  "Home": "主页",
+  "Having trouble? Help us fix it.": "遇到麻烦？帮助我们解决问题。",
  "Grid layout menu": "网格布局菜单",
  "Go": "开始",
  "Full screen": "全屏",
@@ -106,6 +118,7 @@
  "Display name": "显示名称",
  "Developer": "开发者",
  "Details": "详情",
+  "Description (optional)": "描述（可选）",
  "Debug log request": "调试日志请求",
  "Debug log": "调试日志",
  "Create account": "创建账户",
@@ -123,7 +136,5 @@
  "Call type menu": "通话类型菜单",
  "Call link copied": "链接已复制",
  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "点击“现在加入”则表示同意我们的<2>条款与条件<2>",
-  "Avatar": "头像",
-  "<0>Oops, something's gone wrong.</0>": "<0>哎哟，出问题了。</0>",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": ""
+  "Avatar": "头像"
 }
--- a/public/locales/zh-Hant/app.json
+++ b/public/locales/zh-Hant/app.json
@@ -1,141 +1,14 @@
 {
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>現在加入通話</0><1>或</1><2>複製通話連結，稍後再加入</2>",
-  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>建立帳號</0> 或<2>以訪客身份登入</2>",
-  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>已經有帳號?</0><1><0>登入</0> 或<2>以訪客身份登入</2></1>",
-  "{{roomName}} - Walkie-talkie call": "{{roomName}} - 對講機式通話",
-  "{{names}}, {{name}}": "{{names}}, {{name}}",
-  "{{name}} is talking…": "{{name}} 正在發言…",
-  "{{name}} is presenting": "{{name}} 已上線",
-  "{{name}} (Waiting for video...)": "{{name}} (等候視訊中...)",
-  "{{name}} (Connecting...)": "{{name}} (連結中...)",
-  "{{displayName}}, your call is now ended": "{{displayName}}，您的通話已結束",
-  "{{count}} people connected|other": "{{count}} 人已連結",
-  "{{count}} people connected|one": "{{count}} 人已連結",
-  "Use the upcoming grid system": "使用即將推出的網格系統",
-  "Expose developer settings in the settings window.": "在設定視窗中顯示開發者設定。",
-  "Developer Settings": "開發者設定",
-  "<0>Submitting debug logs will help us track down the problem.</0>": "<0>送出除錯紀錄，可幫助我們修正問題。</0>",
-  "<0>Oops, something's gone wrong.</0>": "<0>喔喔，有些地方怪怪的。</0>",
-  "Your recent calls": "您最近的通話",
-  "You can't talk at the same time": "您無法在同一時間發言",
-  "Yes, join call": "是，加入對話",
-  "WebRTC is not supported or is being blocked in this browser.": "此瀏覽器未支援 WebRTC 或 WebRTC 被瀏覽器封鎖。",
-  "Walkie-talkie call name": "對講機式通話名稱",
-  "Walkie-talkie call": "即時通話",
-  "Waiting for other participants…": "等待其他參加者…",
-  "Waiting for network": "等待網路連線",
-  "Video call name": "視訊通話姓名",
-  "Video call": "視訊通話",
-  "Video": "視訊",
-  "Version: {{version}}": "版本： {{version}}",
-  "Username": "使用者名稱",
-  "User menu": "使用者選單",
-  "Unmute microphone": "取消麥克風靜音",
-  "Turn on camera": "開啟相機",
-  "Turn off camera": "關閉相機",
-  "This will make a speaker's audio seem as if it is coming from where their tile is positioned on screen. (Experimental feature: this may impact the stability of audio.)": "這會使得發言者的聲音聽起來，像從他們在畫面中的位置傳來（實驗性功能：這可能會影響語音的穩定性。）",
-  "This site is protected by ReCAPTCHA and the Google <2>Privacy Policy</2> and <6>Terms of Service</6> apply.<9></9>By clicking \"Register\", you agree to our <12>Terms and conditions</12>": "此網站使用Google 驗證碼技術保護，適用<2>隱私條款</2> 與<6>條款與細則</6> 。<9></9>按下「註冊」，表示您同意我們的<12>條款與細則</12>",
-  "This feature is only supported on Firefox.": "只有 Firefox 支援此功能。",
-  "This call already exists, would you like to join?": "通話已經開始，請問您要加入嗎？",
-  "Thanks! We'll get right on it.": "謝謝您！我們會盡快處理。",
-  "Talking…": "對話中…",
-  "Talk over speaker": "以擴音對話",
-  "Take me Home": "帶我回主畫面",
-  "Submit feedback": "遞交回覆",
-  "Stop sharing screen": "停止分享螢幕畫面",
-  "Spotlight": "聚焦",
-  "Speaker {{n}}": "發言者{{n}}",
-  "Speaker": "發言者",
-  "Spatial audio": "空間音效",
-  "Sign out": "登出",
-  "Sign in": "登入",
-  "Show call inspector": "顯示通話稽查員",
-  "Share screen": "分享畫面",
-  "Settings": "設定",
-  "Sending…": "傳送中…",
-  "Sending debug logs…": "傳送除錯記錄檔中…",
-  "Send debug logs": "傳送除錯紀錄",
-  "Select an option": "選擇一個選項",
-  "Return to home screen": "回到首頁",
-  "Remove": "移除",
-  "Release to stop": "放開以停止",
-  "Release spacebar key to stop": "放開空白鍵以停止",
-  "Registering…": "註冊中…",
-  "Register": "註冊",
-  "Recaptcha not loaded": "驗證碼未載入",
-  "Recaptcha dismissed": "略過驗證碼",
-  "Profile": "個人檔案",
-  "Press and hold to talk over {{name}}": "與{{name}}對話時，請按住按鍵",
-  "Press and hold to talk": "請按住按鍵來發言",
-  "Press and hold spacebar to talk over {{name}}": "與{{name}}對話時，請按住空白鍵",
-  "Press and hold spacebar to talk": "說話時請按住空白鍵",
-  "Passwords must match": "密碼必須相符",
-  "Password": "密碼",
-  "Other users are trying to join this call from incompatible versions. These users should ensure that they have refreshed their browsers:<1>{userLis}</1>": "有使用者試著加入通話，但他們的軟體版本不相容。這些使用者需要確認已將瀏覽器更新到最新版本：<1>{userLis}</1>",
-  "Not registered yet? <2>Create an account</2>": "還沒註冊嗎？<2>建立帳號</2>",
-  "Not now, return to home screen": "現在不行，回到首頁",
-  "No": "否",
-  "Mute microphone": "麥克風靜音",
-  "More": "更多",
-  "Microphone permissions needed to join the call.": "加入通話前需要取得麥克風的權限。",
-  "Microphone {{n}}": "麥克風 {{n}}",
-  "Microphone": "麥克風",
-  "Login to your account": "登入您的帳號",
-  "Login": "登入",
-  "Logging in…": "登入中…",
-  "Local volume": "您的音量",
-  "Loading…": "載入中…",
-  "Leave": "離開",
-  "Join existing call?": "加入已開始的通話嗎？",
-  "Join call now": "現在加入通話",
-  "Join call": "加入通話",
-  "Invite people": "邀請夥伴",
-  "Invite": "邀請",
-  "Inspector": "稽查員",
-  "Incompatible versions!": "不相容版本！",
-  "Incompatible versions": "不相容版本",
-  "Include debug logs": "包含除錯紀錄",
-  "Home": "首頁",
-  "Grid layout menu": "格框式清單",
-  "Go": "前往",
-  "Full screen": "全螢幕",
-  "Freedom": "自由",
-  "Fetching group call timed out.": "加入群組對話已逾時。",
-  "Exit full screen": "退出全螢幕",
-  "Element Call Home": "Element Call 首頁",
-  "Download debug logs": "下載偵錯報告",
-  "Display name": "顯示名稱",
-  "Developer": "開發者",
-  "Details": "詳細說明",
-  "Debug log request": "請求偵錯報告",
-  "Debug log": "除錯紀錄",
-  "Create account": "建立帳號",
-  "Copy and share this call link": "複製並分享通話連結",
-  "Copy": "複製",
-  "Copied!": "已複製！",
-  "Connection lost": "連線中斷",
-  "Confirm password": "確認密碼",
-  "Close": "關閉",
-  "Change layout": "變更排列",
-  "Camera/microphone permissions needed to join the call.": "加入通話需要取得相機/麥克風的權限。",
-  "Camera {{n}}": "相機 {{n}}",
-  "Camera": "相機",
-  "Call type menu": "通話類型選單",
-  "Call link copied": "已複製通話連結",
-  "By clicking \"Join call now\", you agree to our <2>Terms and conditions</2>": "當您按下「加入通話」，您也同時同意了我們的條款與細則",
-  "By clicking \"Go\", you agree to our <2>Terms and conditions</2>": "當您按下「前往」，你也同意了我們的條款與細則",
-  "Avatar": "大頭照",
-  "Audio": "語音",
-  "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "這通對話中的另一位使用者遇到了某些問題。為了診斷問題，我們將會建立除錯紀錄。",
-  "Accept microphone permissions to join the call.": "請授權使用您的麥克風以加入通話。",
-  "Accept camera/microphone permissions to join the call.": "請授權使用您的相機/麥克風以加入對話。",
-  "<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>何不設定密碼以保留此帳號？</0><1>您可以保留暱稱並設定頭像，以便未來通話時使用</1>",
-  "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.": "參與此測試版即表示您同意蒐集匿名資料，我們使用這些資料來改進產品。您可以在我們的<2>隱私政策</2>與我們的 <5>Cookie 政策</5> 中找到關於我們追蹤哪些資料的更多資訊。",
-  "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.": "<0></0><1></1>您可以透過取消核取此方塊來撤回同意。若您目前正在通話中，此設定將在通話結束時生效。",
-  "Your feedback": "您的回饋",
-  "Thanks, we received your feedback!": "感謝，我們已經收到您的回饋了！",
-  "Submitting…": "正在遞交……",
-  "Submit": "遞交",
-  "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "若您遇到問題或只是想提供一些回饋，請在下方傳送簡短說明給我們。",
-  "Feedback": "回饋"
+  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>加入通話</0><1>或</1><2>複製通話連結並稍候加入</2>",
+  "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>建立帳號</0> 或 <2>訪客模式</2>",
+  "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>已經有帳號了？</0><1><0>登入</0> Or <2>訪客模式登入</2></1>",
+  "{{roomName}} - Walkie-talkie call": "{{roomName}} - 無線電通話",
+  "{{names}}, {{name}}": "{{names}}，{{name}}",
+  "{{name}} is talking…": "{{name}} 正在交談中…",
+  "{{name}} is presenting": "{{name}} 正在報告",
+  "{{name}} (Waiting for video...)": "{{name}} (等待視訊畫面 ...)",
+  "{{name}} (Connecting...)": "{{name}} (連線中 ...)",
+  "{{displayName}}, your call is now ended": "{{displayName}}，您的通話現在已結束",
+  "{{count}} people connected|other": "{{count}} 人已連線",
+  "{{count}} people connected|one": "{{count}} 人已連線"
 }
--- a/scripts/reformat-release-notes.py
+++ b/scripts/reformat-release-notes.py
@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-# This script can be used to reformat the release notes generated by
-# GitHub releases into a format slightly more appropriate for our
-# project (ie. we don't really need to mention the author of every PR)
-#
-# eg. in: * OpenTelemetry by @dbkr in https://github.com/vector-im/element-call/pull/961
-#    out: * OpenTelemetry (https://github.com/vector-im/element-call/pull/961)
-
-import sys
-import re
-
-for line in sys.stdin:
-    matches = re.match(r'^\* (.*) by (\S+) in (\S+)$', line.strip())
-    print("* %s (%s)" % (matches[1], matches[3]))
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 - 2023 New Vector Ltd
+Copyright 2021 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@ import { SequenceDiagramViewerPage } from "./SequenceDiagramViewerPage";
 import { InspectorContextProvider } from "./room/GroupCallInspector";
 import { CrashView, LoadingView } from "./FullScreenView";
 import { Initializer } from "./initializer";
-import { MediaHandlerProvider } from "./settings/useMediaHandler";

 const SentryRoute = Sentry.withSentryRouting(Route);

@@ -56,34 +55,32 @@ export default function App({ history }: AppProps) {
      {loaded ? (
        <Suspense fallback={null}>
          <ClientProvider>
-            <MediaHandlerProvider>
-              <InspectorContextProvider>
-                <Sentry.ErrorBoundary fallback={errorPage}>
-                  <OverlayProvider>
-                    <Switch>
-                      <SentryRoute exact path="/">
-                        <HomePage />
-                      </SentryRoute>
-                      <SentryRoute exact path="/login">
-                        <LoginPage />
-                      </SentryRoute>
-                      <SentryRoute exact path="/register">
-                        <RegisterPage />
-                      </SentryRoute>
-                      <SentryRoute path="/room/:roomId?">
-                        <RoomPage />
-                      </SentryRoute>
-                      <SentryRoute path="/inspector">
-                        <SequenceDiagramViewerPage />
-                      </SentryRoute>
-                      <SentryRoute path="*">
-                        <RoomRedirect />
-                      </SentryRoute>
-                    </Switch>
-                  </OverlayProvider>
-                </Sentry.ErrorBoundary>
-              </InspectorContextProvider>
-            </MediaHandlerProvider>
+            <InspectorContextProvider>
+              <Sentry.ErrorBoundary fallback={errorPage}>
+                <OverlayProvider>
+                  <Switch>
+                    <SentryRoute exact path="/">
+                      <HomePage />
+                    </SentryRoute>
+                    <SentryRoute exact path="/login">
+                      <LoginPage />
+                    </SentryRoute>
+                    <SentryRoute exact path="/register">
+                      <RegisterPage />
+                    </SentryRoute>
+                    <SentryRoute path="/room/:roomId?">
+                      <RoomPage />
+                    </SentryRoute>
+                    <SentryRoute path="/inspector">
+                      <SequenceDiagramViewerPage />
+                    </SentryRoute>
+                    <SentryRoute path="*">
+                      <RoomRedirect />
+                    </SentryRoute>
+                  </Switch>
+                </OverlayProvider>
+              </Sentry.ErrorBoundary>
+            </InspectorContextProvider>
          </ClientProvider>
        </Suspense>
      ) : (
--- a/src/ClientContext.tsx
+++ b/src/ClientContext.tsx
@@ -36,10 +36,7 @@ import {
  fallbackICEServerAllowed,
 } from "./matrix-utils";
 import { widget } from "./widget";
-import {
-  PosthogAnalytics,
-  RegistrationType,
-} from "./analytics/PosthogAnalytics";
+import { PosthogAnalytics, RegistrationType } from "./PosthogAnalytics";
 import { translatedError } from "./TranslatedError";
 import { useEventTarget } from "./useEvents";
 import { Config } from "./config/Config";
@@ -342,9 +339,6 @@ export const ClientProvider: FC<Props> = ({ children }) => {
  useEffect(() => {
    window.matrixclient = client;
    window.isPasswordlessUser = isPasswordlessUser;
-
-    if (PosthogAnalytics.hasInstance())
-      PosthogAnalytics.instance.onLoginStatusChanged();
  }, [client, isPasswordlessUser]);

  if (error) {
--- a/src/Header.tsx
+++ b/src/Header.tsx
@@ -134,9 +134,7 @@ export function RoomHeaderInfo({ roomName, avatarUrl }: RoomHeaderInfo) {
        />
        <VideoIcon width={16} height={16} />
      </div>
-      <Subtitle data-testid="roomHeader_roomName" fontWeight="semiBold">
-        {roomName}
-      </Subtitle>
+      <Subtitle fontWeight="semiBold">{roomName}</Subtitle>
    </>
  );
 }
--- a/src/Modal.module.css
+++ b/src/Modal.module.css
@@ -40,7 +40,7 @@ limitations under the License.
 .modalHeader {
  display: flex;
  justify-content: space-between;
-  padding: 34px 32px 0 32px;
+  padding: 34px 34px 0 34px;
 }

 .modalHeader h3 {
@@ -72,7 +72,7 @@ limitations under the License.
  .modalHeader {
    display: flex;
    justify-content: space-between;
-    padding: 32px 20px 0 20px;
+    padding: 24px 24px 0 24px;
  }

  .modal.mobileFullScreen {
--- a/src/Modal.tsx
+++ b/src/Modal.tsx
@@ -92,7 +92,6 @@ export function Modal({
                {...closeButtonProps}
                ref={closeButtonRef}
                className={styles.closeButton}
-                data-testid="modal_close"
                title={t("Close")}
              >
                <CloseIcon />
--- a/src/analytics/PosthogAnalytics.ts
+++ b/src/analytics/PosthogAnalytics.ts
@@ -19,8 +19,8 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { MatrixClient } from "matrix-js-sdk";
 import { Buffer } from "buffer";

-import { widget } from "../widget";
-import { getSetting, setSetting, settingsBus } from "../settings/useSetting";
+import { widget } from "./widget";
+import { getSetting, setSetting, settingsBus } from "./settings/useSetting";
 import {
  CallEndedTracker,
  CallStartedTracker,
@@ -29,10 +29,9 @@ import {
  MuteCameraTracker,
  MuteMicrophoneTracker,
  UndecryptableToDeviceEventTracker,
-  QualitySurveyEventTracker,
 } from "./PosthogEvents";
-import { Config } from "../config/Config";
-import { getUrlParams } from "../UrlParams";
+import { Config } from "./config/Config";
+import { getUrlParams } from "./UrlParams";

 /* Posthog analytics tracking.
 *
@@ -95,7 +94,7 @@ export class PosthogAnalytics {
  private static ANALYTICS_EVENT_TYPE = "im.vector.analytics";

  // set true during the constructor if posthog config is present, otherwise false
-  private static internalInstance: PosthogAnalytics | null = null;
+  private static internalInstance = null;

  private identificationPromise: Promise<void>;
  private readonly enabled: boolean = false;
@@ -103,10 +102,6 @@ export class PosthogAnalytics {
  private platformSuperProperties = {};
  private registrationType: RegistrationType = RegistrationType.Guest;

-  public static hasInstance(): boolean {
-    return Boolean(this.internalInstance);
-  }
-
  public static get instance(): PosthogAnalytics {
    if (!this.internalInstance) {
      this.internalInstance = new PosthogAnalytics(posthog);
@@ -142,9 +137,6 @@ export class PosthogAnalytics {
      });
      this.enabled = true;
    } else {
-      logger.info(
-        "Posthog is not enabled because there is no api key or no host given in the config"
-      );
      this.enabled = false;
    }
    this.startListeningToSettingsChanges();
@@ -232,8 +224,10 @@ export class PosthogAnalytics {
      .join("");
  }

-  private async identifyUser(analyticsIdGenerator: () => string) {
-    if (this.anonymity == Anonymity.Pseudonymous && this.enabled) {
+  public async identifyUser(analyticsIdGenerator: () => string) {
+    // There might be a better way to get the client here.
+
+    if (this.anonymity == Anonymity.Pseudonymous) {
      // Check the user's account_data for an analytics ID to use. Storing the ID in account_data allows
      // different devices to send the same ID.
      let analyticsID = await this.getAnalyticsId();
@@ -324,12 +318,7 @@ export class PosthogAnalytics {
    this.setAnonymity(Anonymity.Disabled);
  }

-  public onLoginStatusChanged(): void {
-    const optInAnalytics = getSetting("opt-in-analytics", false);
-    this.updateAnonymityAndIdentifyUser(optInAnalytics);
-  }
-
-  private updateSuperProperties() {
+  public updateSuperProperties() {
    // Update super properties in posthog with our platform (app version, platform).
    // These properties will be subsequently passed in every event.
    //
@@ -349,7 +338,7 @@ export class PosthogAnalytics {
    return this.eventSignup.getSignupEndTime() > new Date(0);
  }

-  private async updateAnonymityAndIdentifyUser(
+  public async updateAnonymityAndIdentifyUser(
    pseudonymousOptIn: boolean
  ): Promise<void> {
    // Update this.anonymity based on the user's analytics opt-in settings
@@ -358,10 +347,6 @@ export class PosthogAnalytics {
      : Anonymity.Disabled;
    this.setAnonymity(anonymity);

-    // We may not yet have a Matrix client at this point, if not, bail. This should get
-    // triggered again by onLoginStatusChanged once we do have a client.
-    if (!window.matrixclient) return;
-
    if (anonymity === Anonymity.Pseudonymous) {
      this.setRegistrationType(
        window.matrixclient.isGuest() || window.isPasswordlessUser
@@ -399,7 +384,7 @@ export class PosthogAnalytics {
    this.capture(eventName, properties, options);
  }

-  private startListeningToSettingsChanges(): void {
+  public startListeningToSettingsChanges(): void {
    // Listen to account data changes from sync so we can observe changes to relevant flags and update.
    // This is called -
    //  * On page load, when the account data is first received by sync
@@ -432,5 +417,4 @@ export class PosthogAnalytics {
  public eventMuteMicrophone = new MuteMicrophoneTracker();
  public eventMuteCamera = new MuteCameraTracker();
  public eventUndecryptableToDevice = new UndecryptableToDeviceEventTracker();
-  public eventQualitySurvey = new QualitySurveyEventTracker();
 }
--- a/src/analytics/PosthogEvents.ts
+++ b/src/analytics/PosthogEvents.ts
@@ -163,21 +163,3 @@ export class UndecryptableToDeviceEventTracker {
    });
  }
 }
-
-interface QualitySurveyEvent {
-  eventName: "QualitySurvey";
-  callId: string;
-  feedbackText: string;
-  stars: number;
-}
-
-export class QualitySurveyEventTracker {
-  track(callId: string, feedbackText: string, stars: number) {
-    PosthogAnalytics.instance.trackEvent<QualitySurveyEvent>({
-      eventName: "QualitySurvey",
-      callId,
-      feedbackText,
-      stars,
-    });
-  }
-}
--- a/src/UrlParams.ts
+++ b/src/UrlParams.ts
@@ -79,11 +79,6 @@ export interface UrlParams {
   * The Posthog analytics ID. It is only available if the user has given consent for sharing telemetry in element web.
   */
  analyticsID: string | null;
-  /**
-   * Whether the app is allowed to use fallback STUN servers for ICE in case the
-   * user's homeserver doesn't provide any.
-   */
-  allowIceFallback: boolean;
 }

 /**
@@ -140,7 +135,6 @@ export const getUrlParams = (
    fonts: getAllParams("font"),
    fontScale: Number.isNaN(fontScale) ? null : fontScale,
    analyticsID: getParam("analyticsID"),
-    allowIceFallback: hasParam("allowIceFallback"),
  };
 };

--- a/src/UserMenu.tsx
+++ b/src/UserMenu.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 - 2023 New Vector Ltd
+Copyright 2022 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import { Menu } from "./Menu";
 import { TooltipTrigger } from "./Tooltip";
 import { Avatar, Size } from "./Avatar";
 import { ReactComponent as UserIcon } from "./icons/User.svg";
-import { ReactComponent as SettingsIcon } from "./icons/Settings.svg";
 import { ReactComponent as LoginIcon } from "./icons/Login.svg";
 import { ReactComponent as LogoutIcon } from "./icons/Logout.svg";
 import { Body } from "./typography/Typography";
@@ -59,12 +58,6 @@ export function UserMenu({
        key: "user",
        icon: UserIcon,
        label: displayName,
-        dataTestid: "usermenu_user",
-      });
-      arr.push({
-        key: "settings",
-        icon: SettingsIcon,
-        label: t("Settings"),
      });

      if (isPasswordlessUser && !preventNavigation) {
@@ -72,7 +65,6 @@ export function UserMenu({
          key: "login",
          label: t("Sign in"),
          icon: LoginIcon,
-          dataTestid: "usermenu_login",
        });
      }

@@ -81,7 +73,6 @@ export function UserMenu({
          key: "logout",
          label: t("Sign out"),
          icon: LogoutIcon,
-          dataTestid: "usermenu_logout",
        });
      }
    }
@@ -102,11 +93,7 @@ export function UserMenu({
  return (
    <PopoverMenuTrigger placement="bottom right">
      <TooltipTrigger tooltip={tooltip} placement="bottom left">
-        <Button
-          variant="icon"
-          className={styles.userButton}
-          data-testid="usermenu_open"
-        >
+        <Button variant="icon" className={styles.userButton}>
          {isAuthenticated && (!isPasswordlessUser || avatarUrl) ? (
            <Avatar
              size={Size.SM}
@@ -121,14 +108,9 @@ export function UserMenu({
      </TooltipTrigger>
      {(props) => (
        <Menu {...props} label={t("User menu")} onAction={onAction}>
-          {items.map(({ key, icon: Icon, label, dataTestid }) => (
+          {items.map(({ key, icon: Icon, label }) => (
            <Item key={key} textValue={label}>
-              <Icon
-                width={24}
-                height={24}
-                className={styles.menuIcon}
-                data-testid={dataTestid}
-              />
+              <Icon width={24} height={24} className={styles.menuIcon} />
              <Body overflowEllipsis>{label}</Body>
            </Item>
          ))}
--- a/src/UserMenuContainer.tsx
+++ b/src/UserMenuContainer.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 - 2023 New Vector Ltd
+Copyright 2022 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-import React, { useCallback, useState } from "react";
+import React, { useCallback } from "react";
 import { useHistory, useLocation } from "react-router-dom";

 import { useClient } from "./ClientContext";
 import { useProfile } from "./profile/useProfile";
 import { useModalTriggerState } from "./Modal";
-import { SettingsModal } from "./settings/SettingsModal";
+import { ProfileModal } from "./profile/ProfileModal";
 import { UserMenu } from "./UserMenu";

 interface Props {
@@ -35,17 +35,10 @@ export function UserMenuContainer({ preventNavigation = false }: Props) {
  const { displayName, avatarUrl } = useProfile(client);
  const { modalState, modalProps } = useModalTriggerState();

-  const [defaultSettingsTab, setDefaultSettingsTab] = useState<string>();
-
  const onAction = useCallback(
-    async (value: string) => {
+    (value: string) => {
      switch (value) {
        case "user":
-          setDefaultSettingsTab("profile");
-          modalState.open();
-          break;
-        case "settings":
-          setDefaultSettingsTab("audio");
          modalState.open();
          break;
        case "logout":
@@ -71,13 +64,7 @@ export function UserMenuContainer({ preventNavigation = false }: Props) {
          displayName || (userName ? userName.replace("@", "") : undefined)
        }
      />
-      {modalState.isOpen && (
-        <SettingsModal
-          client={client}
-          defaultTab={defaultSettingsTab}
-          {...modalProps}
-        />
-      )}
+      {modalState.isOpen && <ProfileModal client={client} {...modalProps} />}
    </>
  );
 }
--- a/src/analytics/AnalyticsNotice.tsx
+++ b/src/analytics/AnalyticsNotice.tsx
@@ -1,14 +0,0 @@
-import React, { FC } from "react";
-import { Trans } from "react-i18next";
-
-import { Link } from "../typography/Typography";
-
-export const AnalyticsNotice: FC = () => (
-  <Trans>
-    By participating in this beta, you consent to the collection of anonymous
-    data, which we use to improve the product. You can find more information
-    about which data we track in our{" "}
-    <Link href="https://element.io/privacy">Privacy Policy</Link> and our{" "}
-    <Link href="https://element.io/cookie-policy">Cookie Policy</Link>.
-  </Trans>
-);
--- a/src/analytics/PosthogSpanProcessor.ts
+++ b/src/analytics/PosthogSpanProcessor.ts
@@ -1,163 +0,0 @@
-/*
-Copyright 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import {
-  SpanProcessor,
-  ReadableSpan,
-  Span,
-} from "@opentelemetry/sdk-trace-base";
-import { hrTimeToMilliseconds } from "@opentelemetry/core";
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { PosthogAnalytics } from "./PosthogAnalytics";
-
-interface PrevCall {
-  callId: string;
-  hangupTs: number;
-}
-
-/**
- * The maximum time between hanging up and joining the same call that we would
- * consider a 'rejoin' on the user's part.
- */
-const maxRejoinMs = 2 * 60 * 1000; // 2 minutes
-
-/**
- * Span processor that extracts certain metrics from spans to send to PostHog
- */
-export class PosthogSpanProcessor implements SpanProcessor {
-  async forceFlush(): Promise<void> {}
-
-  onStart(span: Span): void {
-    // Hack: Yield to allow attributes to be set before processing
-    Promise.resolve().then(() => {
-      switch (span.name) {
-        case "matrix.groupCallMembership":
-          this.onGroupCallMembershipStart(span);
-          return;
-        case "matrix.groupCallMembership.summaryReport":
-          this.onSummaryReportStart(span);
-          return;
-      }
-    });
-  }
-
-  onEnd(span: ReadableSpan): void {
-    switch (span.name) {
-      case "matrix.groupCallMembership":
-        this.onGroupCallMembershipEnd(span);
-        return;
-    }
-  }
-
-  private get prevCall(): PrevCall | null {
-    // This is stored in localStorage so we can remember the previous call
-    // across app restarts
-    const data = localStorage.getItem("matrix-prev-call");
-    if (data === null) return null;
-
-    try {
-      return JSON.parse(data);
-    } catch (e) {
-      logger.warn("Invalid prev call data", data);
-      return null;
-    }
-  }
-
-  private set prevCall(data: PrevCall | null) {
-    localStorage.setItem("matrix-prev-call", JSON.stringify(data));
-  }
-
-  private onGroupCallMembershipStart(span: ReadableSpan): void {
-    const prevCall = this.prevCall;
-    const newCallId = span.attributes["matrix.confId"] as string;
-
-    // If the user joined the same call within a short time frame, log this as a
-    // rejoin. This is interesting as a call quality metric, since rejoins may
-    // indicate that users had to intervene to make the product work.
-    if (prevCall !== null && newCallId === prevCall.callId) {
-      const duration = hrTimeToMilliseconds(span.startTime) - prevCall.hangupTs;
-      if (duration <= maxRejoinMs) {
-        PosthogAnalytics.instance.trackEvent({
-          eventName: "Rejoin",
-          callId: prevCall.callId,
-          rejoinDuration: duration,
-        });
-      }
-    }
-  }
-
-  private onGroupCallMembershipEnd(span: ReadableSpan): void {
-    this.prevCall = {
-      callId: span.attributes["matrix.confId"] as string,
-      hangupTs: hrTimeToMilliseconds(span.endTime),
-    };
-  }
-
-  private onSummaryReportStart(span: ReadableSpan): void {
-    // Searching for an event like this:
-    //    matrix.stats.summary
-    //    matrix.stats.summary.percentageReceivedAudioMedia: 0.75
-    //    matrix.stats.summary.percentageReceivedMedia: 1
-    //    matrix.stats.summary.percentageReceivedVideoMedia: 0.75
-    //    matrix.stats.summary.maxJitter: 100
-    //    matrix.stats.summary.maxPacketLoss: 20
-    const event = span.events.find((e) => e.name === "matrix.stats.summary");
-    if (event !== undefined) {
-      const attributes = event.attributes;
-      if (attributes) {
-        const mediaReceived = `${attributes["matrix.stats.summary.percentageReceivedMedia"]}`;
-        const videoReceived = `${attributes["matrix.stats.summary.percentageReceivedVideoMedia"]}`;
-        const audioReceived = `${attributes["matrix.stats.summary.percentageReceivedAudioMedia"]}`;
-        const maxJitter = `${attributes["matrix.stats.summary.maxJitter"]}`;
-        const maxPacketLoss = `${attributes["matrix.stats.summary.maxPacketLoss"]}`;
-        const peerConnections = `${attributes["matrix.stats.summary.peerConnections"]}`;
-        const percentageConcealedAudio = `${attributes["matrix.stats.summary.percentageConcealedAudio"]}`;
-        const opponentUsersInCall = `${attributes["matrix.stats.summary.opponentUsersInCall"]}`;
-        const opponentDevicesInCall = `${attributes["matrix.stats.summary.opponentDevicesInCall"]}`;
-        const diffDevicesToPeerConnections = `${attributes["matrix.stats.summary.diffDevicesToPeerConnections"]}`;
-        const ratioPeerConnectionToDevices = `${attributes["matrix.stats.summary.ratioPeerConnectionToDevices"]}`;
-
-        PosthogAnalytics.instance.trackEvent(
-          {
-            eventName: "MediaReceived",
-            callId: span.attributes["matrix.confId"] as string,
-            mediaReceived: mediaReceived,
-            audioReceived: audioReceived,
-            videoReceived: videoReceived,
-            maxJitter: maxJitter,
-            maxPacketLoss: maxPacketLoss,
-            peerConnections: peerConnections,
-            percentageConcealedAudio: percentageConcealedAudio,
-            opponentUsersInCall: opponentUsersInCall,
-            opponentDevicesInCall: opponentDevicesInCall,
-            diffDevicesToPeerConnections: diffDevicesToPeerConnections,
-            ratioPeerConnectionToDevices: ratioPeerConnectionToDevices,
-          },
-          // Send instantly because the window might be closing
-          { send_instantly: true }
-        );
-      }
-    }
-  }
-
-  /**
-   * Shutdown the processor.
-   */
-  shutdown(): Promise<void> {
-    return Promise.resolve();
-  }
-}
--- a/src/analytics/RageshakeSpanProcessor.ts
+++ b/src/analytics/RageshakeSpanProcessor.ts
@@ -1,114 +0,0 @@
-import { Attributes } from "@opentelemetry/api";
-import { hrTimeToMicroseconds } from "@opentelemetry/core";
-import {
-  SpanProcessor,
-  ReadableSpan,
-  Span,
-} from "@opentelemetry/sdk-trace-base";
-
-const dumpAttributes = (attr: Attributes) =>
-  Object.entries(attr).map(([key, value]) => ({
-    key,
-    type: typeof value,
-    value,
-  }));
-
-/**
- * Exports spans on demand to the Jaeger JSON format, which can be attached to
- * rageshakes and loaded into analysis tools like Jaeger and Stalk.
- */
-export class RageshakeSpanProcessor implements SpanProcessor {
-  private readonly spans: ReadableSpan[] = [];
-
-  async forceFlush(): Promise<void> {}
-
-  onStart(span: Span): void {
-    this.spans.push(span);
-  }
-
-  onEnd(): void {}
-
-  /**
-   * Dumps the spans collected so far as Jaeger-compatible JSON.
-   */
-  public dump(): string {
-    const now = Date.now() * 1000; // Jaeger works in microseconds
-    const traces = new Map<string, ReadableSpan[]>();
-
-    // Organize spans by their trace IDs
-    for (const span of this.spans) {
-      const traceId = span.spanContext().traceId;
-      let trace = traces.get(traceId);
-
-      if (trace === undefined) {
-        trace = [];
-        traces.set(traceId, trace);
-      }
-
-      trace.push(span);
-    }
-
-    const processId = "p1";
-    const processes = {
-      [processId]: {
-        serviceName: "element-call",
-        tags: [],
-      },
-      warnings: null,
-    };
-
-    return JSON.stringify({
-      // Honestly not sure what some of these fields mean, I just know that
-      // they're present in Jaeger JSON exports
-      total: 0,
-      limit: 0,
-      offset: 0,
-      errors: null,
-      data: [...traces.entries()].map(([traceId, spans]) => ({
-        traceID: traceId,
-        warnings: null,
-        processes,
-        spans: spans.map((span) => {
-          const ctx = span.spanContext();
-          const startTime = hrTimeToMicroseconds(span.startTime);
-          // If the span has not yet ended, pretend that it ends now
-          const duration =
-            span.duration[0] === -1
-              ? now - startTime
-              : hrTimeToMicroseconds(span.duration);
-
-          return {
-            traceID: traceId,
-            spanID: ctx.spanId,
-            operationName: span.name,
-            processID: processId,
-            warnings: null,
-            startTime,
-            duration,
-            references:
-              span.parentSpanId === undefined
-                ? []
-                : [
-                    {
-                      refType: "CHILD_OF",
-                      traceID: traceId,
-                      spanID: span.parentSpanId,
-                    },
-                  ],
-            tags: dumpAttributes(span.attributes),
-            logs: span.events.map((event) => ({
-              timestamp: hrTimeToMicroseconds(event.time),
-              // The name of the event is in the "event" field, aparently.
-              fields: [
-                ...dumpAttributes(event.attributes ?? {}),
-                { key: "event", type: "string", value: event.name },
-              ],
-            })),
-          };
-        }),
-      })),
-    });
-  }
-
-  async shutdown(): Promise<void> {}
-}
--- a/src/auth/LoginPage.tsx
+++ b/src/auth/LoginPage.tsx
@@ -25,7 +25,7 @@ import { Button } from "../button";
 import styles from "./LoginPage.module.css";
 import { useInteractiveLogin } from "./useInteractiveLogin";
 import { usePageTitle } from "../usePageTitle";
-import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
+import { PosthogAnalytics } from "../PosthogAnalytics";
 import { Config } from "../config/Config";

 export const LoginPage: FC = () => {
@@ -88,7 +88,6 @@ export const LoginPage: FC = () => {
                  autoCapitalize="none"
                  prefix="@"
                  suffix={`:${Config.defaultServerName()}`}
-                  data-testid="login_username"
                />
              </FieldRow>
              <FieldRow>
@@ -97,7 +96,6 @@ export const LoginPage: FC = () => {
                  ref={passwordRef}
                  placeholder={t("Password")}
                  label={t("Password")}
-                  data-testid="login_password"
                />
              </FieldRow>
              {error && (
@@ -106,11 +104,7 @@ export const LoginPage: FC = () => {
                </FieldRow>
              )}
              <FieldRow>
-                <Button
-                  type="submit"
-                  disabled={loading}
-                  data-testid="login_login"
-                >
+                <Button type="submit" disabled={loading}>
                  {loading ? t("Logging in…") : t("Login")}
                </Button>
              </FieldRow>
--- a/src/auth/RegisterPage.tsx
+++ b/src/auth/RegisterPage.tsx
@@ -38,7 +38,7 @@ import { LoadingView } from "../FullScreenView";
 import { useRecaptcha } from "./useRecaptcha";
 import { Caption, Link } from "../typography/Typography";
 import { usePageTitle } from "../usePageTitle";
-import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
+import { PosthogAnalytics } from "../PosthogAnalytics";
 import { Config } from "../config/Config";

 export const RegisterPage: FC = () => {
@@ -166,7 +166,6 @@ export const RegisterPage: FC = () => {
                  autoCapitalize="none"
                  prefix="@"
                  suffix={`:${Config.defaultServerName()}`}
-                  data-testid="register_username"
                />
              </FieldRow>
              <FieldRow>
@@ -180,7 +179,6 @@ export const RegisterPage: FC = () => {
                  value={password}
                  placeholder={t("Password")}
                  label={t("Password")}
-                  data-testid="register_password"
                />
              </FieldRow>
              <FieldRow>
@@ -195,7 +193,6 @@ export const RegisterPage: FC = () => {
                  placeholder={t("Confirm password")}
                  label={t("Confirm password")}
                  ref={confirmPasswordRef}
-                  data-testid="register_confirm_password"
                />
              </FieldRow>
              <Caption>
@@ -220,11 +217,7 @@ export const RegisterPage: FC = () => {
                </FieldRow>
              )}
              <FieldRow>
-                <Button
-                  type="submit"
-                  disabled={registering}
-                  data-testid="register_register"
-                >
+                <Button type="submit" disabled={registering}>
                  {registering ? t("Registering…") : t("Register")}
                </Button>
              </FieldRow>
--- a/src/button/Button.module.css
+++ b/src/button/Button.module.css
@@ -39,10 +39,10 @@ limitations under the License.
 .secondaryHangup,
 .button,
 .copyButton {
-  padding: 8px 20px;
+  padding: 7px 15px;
  border-radius: 8px;
  font-size: var(--font-size-body);
-  font-weight: 600;
+  font-weight: 700;
 }

 .button {
--- a/src/button/Button.tsx
+++ b/src/button/Button.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 - 2023 New Vector Ltd
+Copyright 2022 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -238,7 +238,7 @@ export function SettingsButton({
  return (
    <TooltipTrigger tooltip={tooltip}>
      <Button variant="toolbar" {...rest}>
-        <SettingsIcon width={20} height={20} />
+        <SettingsIcon />
      </Button>
    </TooltipTrigger>
  );
@@ -246,11 +246,9 @@ export function SettingsButton({

 export function InviteButton({
  className,
-  variant = "toolbar",
  ...rest
 }: {
  className?: string;
-  variant?: string;
  // TODO: add all props for <Button>
  [index: string]: unknown;
 }) {
@@ -259,7 +257,7 @@ export function InviteButton({

  return (
    <TooltipTrigger tooltip={tooltip}>
-      <Button variant={variant} {...rest}>
+      <Button variant="toolbar" {...rest}>
        <AddUserIcon />
      </Button>
    </TooltipTrigger>
--- a/src/config/ConfigOptions.ts
+++ b/src/config/ConfigOptions.ts
@@ -36,14 +36,6 @@ export interface ConfigOptions {
    submit_url: string;
  };

-  /**
-   * Sets the URL to send opentelemetry data to. If unset, opentelemetry will
-   * be disabled.
-   */
-  opentelemetry?: {
-    collector_url: string;
-  };
-
  // Describes the default homeserver to use. The same format as Element Web
  // (without identity servers as we don't use them).
  default_server_config?: {
@@ -52,14 +44,6 @@ export interface ConfigOptions {
      server_name: string;
    };
  };
-
-  /**
-   * Allow to join a group calls without audio and video.
-   * TEMPORARY: Is a feature that's not proved and experimental
-   */
-  features?: {
-    feature_group_calls_without_video_and_audio: boolean;
-  };
 }

 // Overrides members from ConfigOptions that are always provided by the
--- a/src/form/Form.tsx
+++ b/src/form/Form.tsx
@@ -15,14 +15,14 @@ limitations under the License.
 */

 import classNames from "classnames";
-import React, { FormEventHandler, forwardRef, ReactNode } from "react";
+import React, { FormEventHandler, forwardRef } from "react";

 import styles from "./Form.module.css";

 interface FormProps {
  className: string;
  onSubmit: FormEventHandler<HTMLFormElement>;
-  children: ReactNode[];
+  children: JSX.Element[];
 }

 export const Form = forwardRef<HTMLFormElement, FormProps>(
--- a/src/home/JoinExistingCallModal.tsx
+++ b/src/home/JoinExistingCallModal.tsx
@@ -43,9 +43,7 @@ export function JoinExistingCallModal({ onJoin, onClose, ...rest }: Props) {
        <p>{t("This call already exists, would you like to join?")}</p>
        <FieldRow rightAlign className={styles.buttons}>
          <Button onPress={onClose}>{t("No")}</Button>
-          <Button onPress={onJoin} data-testid="home_joinExistingRoom">
-            {t("Yes, join call")}
-          </Button>
+          <Button onPress={onJoin}>{t("Yes, join call")}</Button>
        </FieldRow>
      </ModalContent>
    </Modal>
--- a/src/home/RegisteredView.module.css
+++ b/src/home/RegisteredView.module.css
@@ -37,7 +37,3 @@ limitations under the License.
 .recentCallsTitle {
  margin-bottom: 32px;
 }
-
-.notice {
-  color: var(--secondary-content);
-}
--- a/src/home/RegisteredView.tsx
+++ b/src/home/RegisteredView.tsx
@@ -24,11 +24,7 @@ import { useHistory } from "react-router-dom";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { useTranslation } from "react-i18next";

-import {
-  createRoom,
-  roomAliasLocalpartFromRoomName,
-  sanitiseRoomNameInput,
-} from "../matrix-utils";
+import { createRoom, roomAliasLocalpartFromRoomName } from "../matrix-utils";
 import { useGroupCallRooms } from "./useGroupCallRooms";
 import { Header, HeaderLogo, LeftNav, RightNav } from "../Header";
 import commonStyles from "./common.module.css";
@@ -39,11 +35,9 @@ import { CallList } from "./CallList";
 import { UserMenuContainer } from "../UserMenuContainer";
 import { useModalTriggerState } from "../Modal";
 import { JoinExistingCallModal } from "./JoinExistingCallModal";
-import { Caption, Title } from "../typography/Typography";
+import { Title } from "../typography/Typography";
 import { Form } from "../form/Form";
 import { CallType, CallTypeDropdown } from "./CallTypeDropdown";
-import { useOptInAnalytics } from "../settings/useSetting";
-import { AnalyticsNotice } from "../analytics/AnalyticsNotice";

 interface Props {
  client: MatrixClient;
@@ -54,7 +48,6 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) {
  const [callType, setCallType] = useState(CallType.Video);
  const [loading, setLoading] = useState(false);
  const [error, setError] = useState<Error>();
-  const [optInAnalytics] = useOptInAnalytics();
  const history = useHistory();
  const { t } = useTranslation();
  const { modalState, modalProps } = useModalTriggerState();
@@ -64,10 +57,7 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) {
      e.preventDefault();
      const data = new FormData(e.target as HTMLFormElement);
      const roomNameData = data.get("callName");
-      const roomName =
-        typeof roomNameData === "string"
-          ? sanitiseRoomNameInput(roomNameData)
-          : "";
+      const roomName = typeof roomNameData === "string" ? roomNameData : "";
      const ptt = callType === CallType.Radio;

      async function submit() {
@@ -133,7 +123,6 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) {
                type="text"
                required
                autoComplete="off"
-                data-testid="home_callName"
              />

              <Button
@@ -141,16 +130,10 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) {
                size="lg"
                className={styles.button}
                disabled={loading}
-                data-testid="home_go"
              >
                {loading ? t("Loading…") : t("Go")}
              </Button>
            </FieldRow>
-            {optInAnalytics === null && (
-              <Caption className={styles.notice}>
-                <AnalyticsNotice />
-              </Caption>
-            )}
            {error && (
              <FieldRow className={styles.fieldRow}>
                <ErrorMessage error={error} />
--- a/src/home/UnauthenticatedView.module.css
+++ b/src/home/UnauthenticatedView.module.css
@@ -45,7 +45,3 @@ limitations under the License.
    display: none;
  }
 }
-
-.notice {
-  color: var(--secondary-content);
-}
--- a/src/home/UnauthenticatedView.tsx
+++ b/src/home/UnauthenticatedView.tsx
@@ -24,11 +24,7 @@ import { Header, HeaderLogo, LeftNav, RightNav } from "../Header";
 import { UserMenuContainer } from "../UserMenuContainer";
 import { FieldRow, InputField, ErrorMessage } from "../input/Input";
 import { Button } from "../button";
-import {
-  createRoom,
-  roomAliasLocalpartFromRoomName,
-  sanitiseRoomNameInput,
-} from "../matrix-utils";
+import { createRoom, roomAliasLocalpartFromRoomName } from "../matrix-utils";
 import { useInteractiveRegistration } from "../auth/useInteractiveRegistration";
 import { useModalTriggerState } from "../Modal";
 import { JoinExistingCallModal } from "./JoinExistingCallModal";
@@ -39,15 +35,12 @@ import { CallType, CallTypeDropdown } from "./CallTypeDropdown";
 import styles from "./UnauthenticatedView.module.css";
 import commonStyles from "./common.module.css";
 import { generateRandomName } from "../auth/generateRandomName";
-import { AnalyticsNotice } from "../analytics/AnalyticsNotice";
-import { useOptInAnalytics } from "../settings/useSetting";

 export const UnauthenticatedView: FC = () => {
  const { setClient } = useClient();
  const [callType, setCallType] = useState(CallType.Video);
  const [loading, setLoading] = useState(false);
  const [error, setError] = useState<Error>();
-  const [optInAnalytics] = useOptInAnalytics();
  const [privacyPolicyUrl, recaptchaKey, register] =
    useInteractiveRegistration();
  const { execute, reset, recaptchaId } = useRecaptcha(recaptchaKey);
@@ -61,7 +54,7 @@ export const UnauthenticatedView: FC = () => {
    (e) => {
      e.preventDefault();
      const data = new FormData(e.target as HTMLFormElement);
-      const roomName = sanitiseRoomNameInput(data.get("callName") as string);
+      const roomName = data.get("callName") as string;
      const displayName = data.get("displayName") as string;
      const ptt = callType === CallType.Radio;

@@ -142,7 +135,6 @@ export const UnauthenticatedView: FC = () => {
                type="text"
                required
                autoComplete="off"
-                data-testid="home_callName"
              />
            </FieldRow>
            <FieldRow>
@@ -153,16 +145,10 @@ export const UnauthenticatedView: FC = () => {
                placeholder={t("Display name")}
                type="text"
                required
-                data-testid="home_displayName"
                autoComplete="off"
              />
            </FieldRow>
-            {optInAnalytics === null && (
-              <Caption className={styles.notice}>
-                <AnalyticsNotice />
-              </Caption>
-            )}
-            <Caption className={styles.notice}>
+            <Caption>
              <Trans>
                By clicking "Go", you agree to our{" "}
                <Link href={privacyPolicyUrl}>Terms and conditions</Link>
@@ -173,12 +159,7 @@ export const UnauthenticatedView: FC = () => {
                <ErrorMessage error={error} />
              </FieldRow>
            )}
-            <Button
-              type="submit"
-              size="lg"
-              disabled={loading}
-              data-testid="home_go"
-            >
+            <Button type="submit" size="lg" disabled={loading}>
              {loading ? t("Loading…") : t("Go")}
            </Button>
            <div id={recaptchaId} />
@@ -186,14 +167,14 @@ export const UnauthenticatedView: FC = () => {
        </main>
        <footer className={styles.footer}>
          <Body className={styles.mobileLoginLink}>
-            <Link color="primary" to="/login" data-testid="home_login">
+            <Link color="primary" to="/login">
              {t("Login to your account")}
            </Link>
          </Body>
          <Body>
            <Trans>
              Not registered yet?{" "}
-              <Link color="primary" to="/register" data-testid="home_register">
+              <Link color="primary" to="/register">
                Create an account
              </Link>
            </Trans>
--- a/src/icons/StarSelected.svg
+++ b/src/icons/StarSelected.svg
@@ -1,3 +0,0 @@
-<svg width="28" height="26" viewBox="0 0 28 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14 21.0267L22.24 26.0001L20.0533 16.6267L27.3333 10.3201L17.7466 9.50675L14 0.666748L10.2533 9.50675L0.666626 10.3201L7.94663 16.6267L5.75996 26.0001L14 21.0267Z" fill="white"/>
-</svg>
--- a/src/icons/StarUnselected.svg
+++ b/src/icons/StarUnselected.svg
@@ -1,4 +0,0 @@
-<svg width="28" height="26" viewBox="0 0 28 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path id="Vector" d="M14 7.50675L15.2933 10.5601L15.92 12.0401L17.52 12.1734L20.8133 12.4534L18.3066 14.6267L17.0933 15.6801L17.4533 17.2534L18.2 20.4667L15.3733 18.7601L14 17.9067L12.6266 18.7334L9.79996 20.4401L10.5466 17.2267L10.9066 15.6534L9.69329 14.6001L7.18663 12.4267L10.48 12.1467L12.08 12.0134L12.7066 10.5334L14 7.50675M14 0.666748L10.2533 9.50675L0.666626 10.3201L7.94663 16.6267L5.75996 26.0001L14 21.0267L22.24 26.0001L20.0533 16.6267L27.3333 10.3201L17.7466 9.50675L14 0.666748Z" fill="white"/>
-  </svg>
-  
--- a/src/icons/VideoMuted.svg
+++ b/src/icons/VideoMuted.svg
@@ -1,4 +1,4 @@
-<svg data-testid="videoTile_muted" width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M0.20333 0.963373C0.474437 0.690007 0.913989 0.690007 1.1851 0.963373L11.5983 11.4633C11.8694 11.7367 11.8694 12.1799 11.5983 12.4533C11.3272 12.7267 10.8876 12.7267 10.6165 12.4533L0.20333 1.95332C-0.0677768 1.67995 -0.0677768 1.23674 0.20333 0.963373Z" fill="white"/>
 <path d="M0.418261 3.63429C0.226267 3.95219 0.115674 4.32557 0.115674 4.725V9.85832C0.115674 11.0181 1.0481 11.9583 2.19831 11.9583H8.65411L0.447396 3.66596C0.437225 3.65568 0.427513 3.64511 0.418261 3.63429Z" fill="white"/>
 <path d="M9.95036 4.725V8.33212L4.30219 2.625H7.86772C9.01793 2.625 9.95036 3.5652 9.95036 4.725Z" fill="white"/>
--- a/src/index.css
+++ b/src/index.css
@@ -180,16 +180,10 @@ h2 {

 /* Subtitle */
 h3 {
-  font-weight: 600;
+  font-weight: 400;
  font-size: var(--font-size-subtitle);
 }

-/* Body Semi Bold */
-h4 {
-  font-weight: 600;
-  font-size: var(--font-size-body);
-}
-
 h1,
 h2,
 h3 {
--- a/src/initializer.tsx
+++ b/src/initializer.tsx
@@ -23,7 +23,6 @@ import * as Sentry from "@sentry/react";

 import { getUrlParams } from "./UrlParams";
 import { Config } from "./config/Config";
-import { ElementCallOpenTelemetry } from "./otel/otel";

 enum LoadState {
  None,
@@ -36,7 +35,6 @@ class DependencyLoadStates {
  // olm: LoadState = LoadState.None;
  config: LoadState = LoadState.None;
  sentry: LoadState = LoadState.None;
-  openTelemetry: LoadState = LoadState.None;

  allDepsAreLoaded() {
    return !Object.values(this).some((s) => s !== LoadState.Loaded);
@@ -211,19 +209,10 @@ export class Initializer {
      this.loadStates.sentry = LoadState.Loaded;
    }

-    // OpenTelemetry (also only after config loaded)
-    if (
-      this.loadStates.openTelemetry === LoadState.None &&
-      this.loadStates.config === LoadState.Loaded
-    ) {
-      ElementCallOpenTelemetry.globalInit();
-      this.loadStates.openTelemetry = LoadState.Loaded;
-    }
-
    if (this.loadStates.allDepsAreLoaded()) {
      // resolve if there is no dependency that is not loaded
      resolve();
    }
  }
-  private initPromise: Promise<void> | null;
+  private initPromise: Promise<void>;
 }
--- a/src/input/AvatarInputField.module.css
+++ b/src/input/AvatarInputField.module.css
@@ -54,6 +54,4 @@ limitations under the License.

 .removeButton {
  color: var(--accent);
-  font-size: var(--font-size-caption);
-  padding: 6px 0;
 }
--- a/src/input/FeedbackInput.module.css
+++ b/src/input/FeedbackInput.module.css
@@ -1,23 +0,0 @@
-/*
-Copyright 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.feedback textarea {
-  height: 75px;
-  border-radius: 8px;
-}
-.feedback {
-  border-radius: 8px;
-}
--- a/src/input/Input.module.css
+++ b/src/input/Input.module.css
@@ -209,7 +209,3 @@ limitations under the License.
  margin-left: 26px;
  width: 100%; /* Ensure that it breaks onto the next row */
 }
-
-.description.noLabel {
-  margin-top: -20px; /* Ensures that there is no weired spacing if the checkbox doesn't have a label */
-}
--- a/src/input/Input.tsx
+++ b/src/input/Input.tsx
@@ -55,14 +55,14 @@ export function Field({ children, className }: FieldProps): JSX.Element {
 }

 interface InputFieldProps {
-  label?: string;
+  label: string;
  type: string;
  prefix?: string;
  suffix?: string;
  id?: string;
  checked?: boolean;
  className?: string;
-  description?: string | ReactNode;
+  description?: string;
  disabled?: boolean;
  required?: boolean;
  // this is a hack. Those variables should be part of `HTMLAttributes<HTMLInputElement> | HTMLAttributes<HTMLTextAreaElement>`
@@ -72,7 +72,6 @@ interface InputFieldProps {
  autoCorrect?: string;
  autoCapitalize?: string;
  value?: string;
-  defaultValue?: string;
  placeholder?: string;
  defaultChecked?: boolean;
  onChange?: (event: ChangeEvent) => void;
@@ -141,14 +140,7 @@ export const InputField = forwardRef<
        </label>
        {suffix && <span>{suffix}</span>}
        {description && (
-          <p
-            id={descriptionId}
-            className={
-              label
-                ? styles.description
-                : classNames(styles.description, styles.noLabel)
-            }
-          >
+          <p id={descriptionId} className={styles.description}>
            {description}
          </p>
        )}
--- a/src/input/SelectInput.module.css
+++ b/src/input/SelectInput.module.css
@@ -22,6 +22,8 @@ limitations under the License.
 }

 .label {
+  font-weight: 600;
+  font-size: var(--font-size-subtitle);
  margin-top: 0;
  margin-bottom: 12px;
 }
--- a/src/input/StarRatingInput.module.css
+++ b/src/input/StarRatingInput.module.css
@@ -1,41 +0,0 @@
-/*
-Copyright 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-.starIcon {
-  cursor: pointer;
-}
-
-.starRating {
-  display: flex;
-  justify-content: center;
-  flex: 1;
-}
-
-.inputContainer {
-  display: inline-block;
-}
-
-.hideElement {
-  border: 0;
-  clip-path: content-box;
-  height: 0px;
-  width: 0px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  width: 1px;
-  display: inline-block;
-}
--- a/src/input/StarRatingInput.tsx
+++ b/src/input/StarRatingInput.tsx
@@ -1,85 +0,0 @@
-/*
-Copyright 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-
-import styles from "./StarRatingInput.module.css";
-import { ReactComponent as StarSelected } from "../icons/StarSelected.svg";
-import { ReactComponent as StarUnselected } from "../icons/StarUnselected.svg";
-
-interface Props {
-  starCount: number;
-  onChange: (stars: number) => void;
-  required?: boolean;
-}
-
-export function StarRatingInput({
-  starCount,
-  onChange,
-  required,
-}: Props): JSX.Element {
-  const [rating, setRating] = useState(0);
-  const [hover, setHover] = useState(0);
-  const { t } = useTranslation();
-  return (
-    <div className={styles.starRating}>
-      {[...Array(starCount)].map((_star, index) => {
-        index += 1;
-        return (
-          <div
-            className={styles.inputContainer}
-            onMouseEnter={() => setHover(index)}
-            onMouseLeave={() => setHover(rating)}
-            key={index}
-          >
-            <input
-              className={styles.hideElement}
-              type="radio"
-              id={"starInput" + String(index)}
-              value={String(index) + "Star"}
-              name="star rating"
-              onChange={(_ev) => {
-                setRating(index);
-                onChange(index);
-              }}
-              required
-            />
-            <label
-              className={styles.hideElement}
-              id={"starInvisibleLabel" + String(index)}
-              htmlFor={"starInput" + String(index)}
-            >
-              {t("{{count}} stars", {
-                count: index,
-              })}
-            </label>
-            <label
-              className={styles.starIcon}
-              id={"starIcon" + String(index)}
-              htmlFor={"starInput" + String(index)}
-            >
-              {index <= (hover || rating) ? (
-                <StarSelected />
-              ) : (
-                <StarUnselected />
-              )}
-            </label>
-          </div>
-        );
-      })}
-    </div>
-  );
-}
--- a/src/matrix-utils.ts
+++ b/src/matrix-utils.ts
@@ -92,14 +92,10 @@ export async function initClient(
    indexedDB = window.indexedDB;
  } catch (e) {}

-  const baseOpts = {
-    fallbackICEServerAllowed: fallbackICEServerAllowed,
-    isVoipWithNoMediaAllowed:
-      Config.get().features?.feature_group_calls_without_video_and_audio,
-  } as ICreateClientOpts;
+  const storeOpts = {} as ICreateClientOpts;

  if (indexedDB && localStorage) {
-    baseOpts.store = new IndexedDBStore({
+    storeOpts.store = new IndexedDBStore({
      indexedDB: window.indexedDB,
      localStorage,
      dbName: SYNC_STORE_NAME,
@@ -111,7 +107,7 @@ export async function initClient(
        : () => new IndexedDBWorker(),
    });
  } else if (localStorage) {
-    baseOpts.store = new MemoryStore({ localStorage });
+    storeOpts.store = new MemoryStore({ localStorage });
  }

  // Check whether we have crypto data store. If we are restoring a session
@@ -143,14 +139,14 @@ export async function initClient(
  }

  if (indexedDB) {
-    baseOpts.cryptoStore = new IndexedDBCryptoStore(
+    storeOpts.cryptoStore = new IndexedDBCryptoStore(
      indexedDB,
      CRYPTO_STORE_NAME
    );
  } else if (localStorage) {
-    baseOpts.cryptoStore = new LocalStorageCryptoStore(localStorage);
+    storeOpts.cryptoStore = new LocalStorageCryptoStore(localStorage);
  } else {
-    baseOpts.cryptoStore = new MemoryCryptoStore();
+    storeOpts.cryptoStore = new MemoryCryptoStore();
  }

  // XXX: we read from the URL params in RoomPage too:
@@ -164,7 +160,7 @@ export async function initClient(
  }

  const client = createClient({
-    ...baseOpts,
+    ...storeOpts,
    ...clientOptions,
    useAuthorizationHeader: true,
    // Use a relatively low timeout for API calls: this is a realtime app
@@ -215,37 +211,6 @@ export function fullAliasFromRoomName(
  return `#${roomAliasLocalpartFromRoomName(roomName)}:${client.getDomain()}`;
 }

-/**
- * Applies some basic sanitisation to a room name that the user
- * has given us
- * @param input The room name from the user
- * @param client A matrix client object
- */
-export function sanitiseRoomNameInput(input: string): string {
-  // check to see if the user has enetered a fully qualified room
-  // alias. If so, turn it into just the localpart because that's what
-  // we use
-  const parts = input.split(":", 2);
-  if (parts.length === 2 && parts[0][0] === "#") {
-    // looks like a room alias
-    if (parts[1] === Config.defaultServerName()) {
-      // it's local to our own homeserver
-      return parts[0];
-    } else {
-      throw new Error("Unsupported remote room alias");
-    }
-  }
-
-  // that's all we do here right now
-  return input;
-}
-
-/**
- * XXX: What is this trying to do? It looks like it's getting the localpart from
- * a room alias, but why is it splitting on hyphens and then putting spaces in??
- * @param roomId
- * @returns
- */
 export function roomNameFromRoomId(roomId: string): string {
  return roomId
    .match(/([^:]+):.*$/)[1]
--- a/src/media-utils.ts
+++ b/src/media-utils.ts
@@ -47,7 +47,7 @@ export async function findDeviceByName(
 *
 * @return The available media devices
 */
-export async function getNamedDevices(): Promise<MediaDeviceInfo[]> {
+export async function getDevices(): Promise<MediaDeviceInfo[]> {
  // First get the devices without their labels, to learn what kinds of streams
  // we can request
  let devices: MediaDeviceInfo[];
--- a/src/otel/OTelCall.ts
+++ b/src/otel/OTelCall.ts
@@ -1,197 +0,0 @@
-/*
-Copyright 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { Span } from "@opentelemetry/api";
-import { MatrixCall } from "matrix-js-sdk";
-import { CallEvent } from "matrix-js-sdk/src/webrtc/call";
-import {
-  TransceiverStats,
-  CallFeedStats,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";
-
-import { ObjectFlattener } from "./ObjectFlattener";
-import { ElementCallOpenTelemetry } from "./otel";
-import { OTelCallAbstractMediaStreamSpan } from "./OTelCallAbstractMediaStreamSpan";
-import { OTelCallTransceiverMediaStreamSpan } from "./OTelCallTransceiverMediaStreamSpan";
-import { OTelCallFeedMediaStreamSpan } from "./OTelCallFeedMediaStreamSpan";
-
-type StreamId = string;
-type MID = string;
-
-/**
- * Tracks an individual call within a group call, either to a full-mesh peer or a focus
- */
-export class OTelCall {
-  private readonly trackFeedSpan = new Map<
-    StreamId,
-    OTelCallAbstractMediaStreamSpan
-  >();
-  private readonly trackTransceiverSpan = new Map<
-    MID,
-    OTelCallAbstractMediaStreamSpan
-  >();
-
-  constructor(
-    public userId: string,
-    public deviceId: string,
-    public call: MatrixCall,
-    public span: Span
-  ) {
-    if (call.peerConn) {
-      this.addCallPeerConnListeners();
-    } else {
-      this.call.once(
-        CallEvent.PeerConnectionCreated,
-        this.addCallPeerConnListeners
-      );
-    }
-  }
-
-  public dispose() {
-    this.call.peerConn.removeEventListener(
-      "connectionstatechange",
-      this.onCallConnectionStateChanged
-    );
-    this.call.peerConn.removeEventListener(
-      "signalingstatechange",
-      this.onCallSignalingStateChanged
-    );
-    this.call.peerConn.removeEventListener(
-      "iceconnectionstatechange",
-      this.onIceConnectionStateChanged
-    );
-    this.call.peerConn.removeEventListener(
-      "icegatheringstatechange",
-      this.onIceGatheringStateChanged
-    );
-    this.call.peerConn.removeEventListener(
-      "icecandidateerror",
-      this.onIceCandidateError
-    );
-  }
-
-  private addCallPeerConnListeners = (): void => {
-    this.call.peerConn.addEventListener(
-      "connectionstatechange",
-      this.onCallConnectionStateChanged
-    );
-    this.call.peerConn.addEventListener(
-      "signalingstatechange",
-      this.onCallSignalingStateChanged
-    );
-    this.call.peerConn.addEventListener(
-      "iceconnectionstatechange",
-      this.onIceConnectionStateChanged
-    );
-    this.call.peerConn.addEventListener(
-      "icegatheringstatechange",
-      this.onIceGatheringStateChanged
-    );
-    this.call.peerConn.addEventListener(
-      "icecandidateerror",
-      this.onIceCandidateError
-    );
-  };
-
-  public onCallConnectionStateChanged = (): void => {
-    this.span.addEvent("matrix.call.callConnectionStateChange", {
-      callConnectionState: this.call.peerConn.connectionState,
-    });
-  };
-
-  public onCallSignalingStateChanged = (): void => {
-    this.span.addEvent("matrix.call.callSignalingStateChange", {
-      callSignalingState: this.call.peerConn.signalingState,
-    });
-  };
-
-  public onIceConnectionStateChanged = (): void => {
-    this.span.addEvent("matrix.call.iceConnectionStateChange", {
-      iceConnectionState: this.call.peerConn.iceConnectionState,
-    });
-  };
-
-  public onIceGatheringStateChanged = (): void => {
-    this.span.addEvent("matrix.call.iceGatheringStateChange", {
-      iceGatheringState: this.call.peerConn.iceGatheringState,
-    });
-  };
-
-  public onIceCandidateError = (ev: Event): void => {
-    const flatObject = {};
-    ObjectFlattener.flattenObjectRecursive(ev, flatObject, "error.", 0);
-
-    this.span.addEvent("matrix.call.iceCandidateError", flatObject);
-  };
-
-  public onCallFeedStats(callFeeds: CallFeedStats[]): void {
-    let prvFeeds: StreamId[] = [...this.trackFeedSpan.keys()];
-
-    callFeeds.forEach((feed) => {
-      if (!this.trackFeedSpan.has(feed.stream)) {
-        this.trackFeedSpan.set(
-          feed.stream,
-          new OTelCallFeedMediaStreamSpan(
-            ElementCallOpenTelemetry.instance,
-            this.span,
-            feed
-          )
-        );
-      }
-      this.trackFeedSpan.get(feed.stream)?.update(feed);
-      prvFeeds = prvFeeds.filter((prvStreamId) => prvStreamId !== feed.stream);
-    });
-
-    prvFeeds.forEach((prvStreamId) => {
-      this.trackFeedSpan.get(prvStreamId)?.end();
-      this.trackFeedSpan.delete(prvStreamId);
-    });
-  }
-
-  public onTransceiverStats(transceiverStats: TransceiverStats[]): void {
-    let prvTransSpan: MID[] = [...this.trackTransceiverSpan.keys()];
-
-    transceiverStats.forEach((transStats) => {
-      if (!this.trackTransceiverSpan.has(transStats.mid)) {
-        this.trackTransceiverSpan.set(
-          transStats.mid,
-          new OTelCallTransceiverMediaStreamSpan(
-            ElementCallOpenTelemetry.instance,
-            this.span,
-            transStats
-          )
-        );
-      }
-      this.trackTransceiverSpan.get(transStats.mid)?.update(transStats);
-      prvTransSpan = prvTransSpan.filter(
-        (prvStreamId) => prvStreamId !== transStats.mid
-      );
-    });
-
-    prvTransSpan.forEach((prvMID) => {
-      this.trackTransceiverSpan.get(prvMID)?.end();
-      this.trackTransceiverSpan.delete(prvMID);
-    });
-  }
-
-  public end(): void {
-    this.trackFeedSpan.forEach((feedSpan) => feedSpan.end());
-    this.trackTransceiverSpan.forEach((transceiverSpan) =>
-      transceiverSpan.end()
-    );
-    this.span.end();
-  }
-}
--- a/src/otel/OTelCallAbstractMediaStreamSpan.ts
+++ b/src/otel/OTelCallAbstractMediaStreamSpan.ts
@@ -1,62 +0,0 @@
-import opentelemetry, { Span } from "@opentelemetry/api";
-import { TrackStats } from "matrix-js-sdk/src/webrtc/stats/statsReport";
-
-import { ElementCallOpenTelemetry } from "./otel";
-import { OTelCallMediaStreamTrackSpan } from "./OTelCallMediaStreamTrackSpan";
-
-type TrackId = string;
-
-export abstract class OTelCallAbstractMediaStreamSpan {
-  protected readonly trackSpans = new Map<
-    TrackId,
-    OTelCallMediaStreamTrackSpan
-  >();
-  public readonly span;
-
-  public constructor(
-    readonly oTel: ElementCallOpenTelemetry,
-    readonly callSpan: Span,
-    protected readonly type: string
-  ) {
-    const ctx = opentelemetry.trace.setSpan(
-      opentelemetry.context.active(),
-      callSpan
-    );
-    const options = {
-      links: [
-        {
-          context: callSpan.spanContext(),
-        },
-      ],
-    };
-    this.span = oTel.tracer.startSpan(this.type, options, ctx);
-  }
-
-  protected upsertTrackSpans(tracks: TrackStats[]) {
-    let prvTracks: TrackId[] = [...this.trackSpans.keys()];
-    tracks.forEach((t) => {
-      if (!this.trackSpans.has(t.id)) {
-        this.trackSpans.set(
-          t.id,
-          new OTelCallMediaStreamTrackSpan(this.oTel, this.span, t)
-        );
-      }
-      this.trackSpans.get(t.id)?.update(t);
-      prvTracks = prvTracks.filter((prvTrackId) => prvTrackId !== t.id);
-    });
-
-    prvTracks.forEach((prvTrackId) => {
-      this.trackSpans.get(prvTrackId)?.end();
-      this.trackSpans.delete(prvTrackId);
-    });
-  }
-
-  public abstract update(data: Object): void;
-
-  public end(): void {
-    this.trackSpans.forEach((tSpan) => {
-      tSpan.end();
-    });
-    this.span.end();
-  }
-}
--- a/src/otel/OTelCallFeedMediaStreamSpan.ts
+++ b/src/otel/OTelCallFeedMediaStreamSpan.ts
@@ -1,57 +0,0 @@
-import { Span } from "@opentelemetry/api";
-import {
-  CallFeedStats,
-  TrackStats,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";
-
-import { ElementCallOpenTelemetry } from "./otel";
-import { OTelCallAbstractMediaStreamSpan } from "./OTelCallAbstractMediaStreamSpan";
-
-export class OTelCallFeedMediaStreamSpan extends OTelCallAbstractMediaStreamSpan {
-  private readonly prev: { isAudioMuted: boolean; isVideoMuted: boolean };
-
-  constructor(
-    readonly oTel: ElementCallOpenTelemetry,
-    readonly callSpan: Span,
-    callFeed: CallFeedStats
-  ) {
-    const postFix =
-      callFeed.type === "local" && callFeed.prefix === "from-call-feed"
-        ? "(clone)"
-        : "";
-    super(oTel, callSpan, `matrix.call.feed.${callFeed.type}${postFix}`);
-    this.span.setAttribute("feed.streamId", callFeed.stream);
-    this.span.setAttribute("feed.type", callFeed.type);
-    this.span.setAttribute("feed.readFrom", callFeed.prefix);
-    this.span.setAttribute("feed.purpose", callFeed.purpose);
-    this.prev = {
-      isAudioMuted: callFeed.isAudioMuted,
-      isVideoMuted: callFeed.isVideoMuted,
-    };
-    this.span.addEvent("matrix.call.feed.initState", this.prev);
-  }
-
-  public update(callFeed: CallFeedStats): void {
-    if (this.prev.isAudioMuted !== callFeed.isAudioMuted) {
-      this.span.addEvent("matrix.call.feed.audioMuted", {
-        isAudioMuted: callFeed.isAudioMuted,
-      });
-      this.prev.isAudioMuted = callFeed.isAudioMuted;
-    }
-    if (this.prev.isVideoMuted !== callFeed.isVideoMuted) {
-      this.span.addEvent("matrix.call.feed.isVideoMuted", {
-        isVideoMuted: callFeed.isVideoMuted,
-      });
-      this.prev.isVideoMuted = callFeed.isVideoMuted;
-    }
-
-    const trackStats: TrackStats[] = [];
-    if (callFeed.video) {
-      trackStats.push(callFeed.video);
-    }
-    if (callFeed.audio) {
-      trackStats.push(callFeed.audio);
-    }
-    this.upsertTrackSpans(trackStats);
-  }
-}
--- a/src/otel/OTelCallMediaStreamTrackSpan.ts
+++ b/src/otel/OTelCallMediaStreamTrackSpan.ts
@@ -1,62 +0,0 @@
-import { TrackStats } from "matrix-js-sdk/src/webrtc/stats/statsReport";
-import opentelemetry, { Span } from "@opentelemetry/api";
-
-import { ElementCallOpenTelemetry } from "./otel";
-
-export class OTelCallMediaStreamTrackSpan {
-  private readonly span: Span;
-  private prev: TrackStats;
-
-  public constructor(
-    readonly oTel: ElementCallOpenTelemetry,
-    readonly streamSpan: Span,
-    data: TrackStats
-  ) {
-    const ctx = opentelemetry.trace.setSpan(
-      opentelemetry.context.active(),
-      streamSpan
-    );
-    const options = {
-      links: [
-        {
-          context: streamSpan.spanContext(),
-        },
-      ],
-    };
-    const type = `matrix.call.track.${data.label}.${data.kind}`;
-    this.span = oTel.tracer.startSpan(type, options, ctx);
-    this.span.setAttribute("track.trackId", data.id);
-    this.span.setAttribute("track.kind", data.kind);
-    this.span.setAttribute("track.constrainDeviceId", data.constrainDeviceId);
-    this.span.setAttribute("track.settingDeviceId", data.settingDeviceId);
-    this.span.setAttribute("track.label", data.label);
-
-    this.span.addEvent("matrix.call.track.initState", {
-      readyState: data.readyState,
-      muted: data.muted,
-      enabled: data.enabled,
-    });
-    this.prev = data;
-  }
-
-  public update(data: TrackStats): void {
-    if (this.prev.muted !== data.muted) {
-      this.span.addEvent("matrix.call.track.muted", { muted: data.muted });
-    }
-    if (this.prev.enabled !== data.enabled) {
-      this.span.addEvent("matrix.call.track.enabled", {
-        enabled: data.enabled,
-      });
-    }
-    if (this.prev.readyState !== data.readyState) {
-      this.span.addEvent("matrix.call.track.readyState", {
-        readyState: data.readyState,
-      });
-    }
-    this.prev = data;
-  }
-
-  public end(): void {
-    this.span.end();
-  }
-}
--- a/src/otel/OTelCallTransceiverMediaStreamSpan.ts
+++ b/src/otel/OTelCallTransceiverMediaStreamSpan.ts
@@ -1,54 +0,0 @@
-import { Span } from "@opentelemetry/api";
-import {
-  TrackStats,
-  TransceiverStats,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";
-
-import { ElementCallOpenTelemetry } from "./otel";
-import { OTelCallAbstractMediaStreamSpan } from "./OTelCallAbstractMediaStreamSpan";
-
-export class OTelCallTransceiverMediaStreamSpan extends OTelCallAbstractMediaStreamSpan {
-  private readonly prev: {
-    direction: string;
-    currentDirection: string;
-  };
-
-  constructor(
-    readonly oTel: ElementCallOpenTelemetry,
-    readonly callSpan: Span,
-    stats: TransceiverStats
-  ) {
-    super(oTel, callSpan, `matrix.call.transceiver.${stats.mid}`);
-    this.span.setAttribute("transceiver.mid", stats.mid);
-
-    this.prev = {
-      direction: stats.direction,
-      currentDirection: stats.currentDirection,
-    };
-    this.span.addEvent("matrix.call.transceiver.initState", this.prev);
-  }
-
-  public update(stats: TransceiverStats): void {
-    if (this.prev.currentDirection !== stats.currentDirection) {
-      this.span.addEvent("matrix.call.transceiver.currentDirection", {
-        currentDirection: stats.currentDirection,
-      });
-      this.prev.currentDirection = stats.currentDirection;
-    }
-    if (this.prev.direction !== stats.direction) {
-      this.span.addEvent("matrix.call.transceiver.direction", {
-        direction: stats.direction,
-      });
-      this.prev.direction = stats.direction;
-    }
-
-    const trackStats: TrackStats[] = [];
-    if (stats.sender) {
-      trackStats.push(stats.sender);
-    }
-    if (stats.receiver) {
-      trackStats.push(stats.receiver);
-    }
-    this.upsertTrackSpans(trackStats);
-  }
-}
--- a/src/otel/OTelGroupCallMembership.ts
+++ b/src/otel/OTelGroupCallMembership.ts
@@ -1,474 +0,0 @@
-/*
-Copyright 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import opentelemetry, { Span, Attributes, Context } from "@opentelemetry/api";
-import {
-  GroupCall,
-  MatrixClient,
-  MatrixEvent,
-  RoomMember,
-} from "matrix-js-sdk";
-import { logger } from "matrix-js-sdk/src/logger";
-import {
-  CallError,
-  CallState,
-  MatrixCall,
-  VoipEvent,
-} from "matrix-js-sdk/src/webrtc/call";
-import {
-  CallsByUserAndDevice,
-  GroupCallError,
-  GroupCallEvent,
-  GroupCallStatsReport,
-} from "matrix-js-sdk/src/webrtc/groupCall";
-import {
-  ConnectionStatsReport,
-  ByteSentStatsReport,
-  SummaryStatsReport,
-  CallFeedReport,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";
-import { setSpan } from "@opentelemetry/api/build/esm/trace/context-utils";
-
-import { ElementCallOpenTelemetry } from "./otel";
-import { ObjectFlattener } from "./ObjectFlattener";
-import { OTelCall } from "./OTelCall";
-
-/**
- * Represent the span of time which we intend to be joined to a group call
- */
-export class OTelGroupCallMembership {
-  private callMembershipSpan?: Span;
-  private groupCallContext?: Context;
-  private myUserId = "unknown";
-  private myDeviceId: string;
-  private myMember?: RoomMember;
-  private callsByCallId = new Map<string, OTelCall>();
-  private statsReportSpan: {
-    span: Span | undefined;
-    stats: OTelStatsReportEvent[];
-  };
-  private readonly speakingSpans = new Map<RoomMember, Map<string, Span>>();
-
-  constructor(private groupCall: GroupCall, client: MatrixClient) {
-    const clientId = client.getUserId();
-    if (clientId) {
-      this.myUserId = clientId;
-      const myMember = groupCall.room.getMember(clientId);
-      if (myMember) {
-        this.myMember = myMember;
-      }
-    }
-    this.myDeviceId = client.getDeviceId() || "unknown";
-    this.statsReportSpan = { span: undefined, stats: [] };
-    this.groupCall.on(GroupCallEvent.CallsChanged, this.onCallsChanged);
-  }
-
-  dispose() {
-    this.groupCall.removeListener(
-      GroupCallEvent.CallsChanged,
-      this.onCallsChanged
-    );
-  }
-
-  public onJoinCall() {
-    if (!ElementCallOpenTelemetry.instance) return;
-    if (this.callMembershipSpan !== undefined) {
-      logger.warn("Call membership span is already started");
-      return;
-    }
-
-    // Create the main span that tracks the time we intend to be in the call
-    this.callMembershipSpan =
-      ElementCallOpenTelemetry.instance.tracer.startSpan(
-        "matrix.groupCallMembership"
-      );
-    this.callMembershipSpan.setAttribute(
-      "matrix.confId",
-      this.groupCall.groupCallId
-    );
-    this.callMembershipSpan.setAttribute("matrix.userId", this.myUserId);
-    this.callMembershipSpan.setAttribute("matrix.deviceId", this.myDeviceId);
-    this.callMembershipSpan.setAttribute(
-      "matrix.displayName",
-      this.myMember ? this.myMember.name : "unknown-name"
-    );
-
-    this.groupCallContext = opentelemetry.trace.setSpan(
-      opentelemetry.context.active(),
-      this.callMembershipSpan
-    );
-
-    this.callMembershipSpan?.addEvent("matrix.joinCall");
-  }
-
-  public onLeaveCall() {
-    if (this.callMembershipSpan === undefined) {
-      logger.warn("Call membership span is already ended");
-      return;
-    }
-
-    this.callMembershipSpan.addEvent("matrix.leaveCall");
-    // and end the span to indicate we've left
-    this.callMembershipSpan.end();
-    this.callMembershipSpan = undefined;
-    this.groupCallContext = undefined;
-  }
-
-  public onUpdateRoomState(event: MatrixEvent) {
-    if (
-      !event ||
-      (!event.getType().startsWith("m.call") &&
-        !event.getType().startsWith("org.matrix.msc3401.call"))
-    ) {
-      return;
-    }
-
-    this.callMembershipSpan?.addEvent(
-      `matrix.roomStateEvent_${event.getType()}`,
-      ObjectFlattener.flattenVoipEvent(event.getContent())
-    );
-  }
-
-  public onCallsChanged = (calls: CallsByUserAndDevice) => {
-    for (const [userId, userCalls] of calls.entries()) {
-      for (const [deviceId, call] of userCalls.entries()) {
-        if (!this.callsByCallId.has(call.callId)) {
-          if (ElementCallOpenTelemetry.instance) {
-            const span = ElementCallOpenTelemetry.instance.tracer.startSpan(
-              `matrix.call`,
-              undefined,
-              this.groupCallContext
-            );
-            // XXX: anonymity
-            span.setAttribute("matrix.call.target.userId", userId);
-            span.setAttribute("matrix.call.target.deviceId", deviceId);
-            const displayName =
-              this.groupCall.room.getMember(userId)?.name ?? "unknown";
-            span.setAttribute("matrix.call.target.displayName", displayName);
-            this.callsByCallId.set(
-              call.callId,
-              new OTelCall(userId, deviceId, call, span)
-            );
-          }
-        }
-      }
-    }
-
-    for (const callTrackingInfo of this.callsByCallId.values()) {
-      const userCalls = calls.get(callTrackingInfo.userId);
-      if (
-        !userCalls ||
-        !userCalls.has(callTrackingInfo.deviceId) ||
-        userCalls.get(callTrackingInfo.deviceId).callId !==
-          callTrackingInfo.call.callId
-      ) {
-        callTrackingInfo.end();
-        this.callsByCallId.delete(callTrackingInfo.call.callId);
-      }
-    }
-  };
-
-  public onCallStateChange(call: MatrixCall, newState: CallState) {
-    const callTrackingInfo = this.callsByCallId.get(call.callId);
-    if (!callTrackingInfo) {
-      logger.error(`Got call state change for unknown call ID ${call.callId}`);
-      return;
-    }
-
-    callTrackingInfo.span.addEvent("matrix.call.stateChange", {
-      state: newState,
-    });
-  }
-
-  public onSendEvent(call: MatrixCall, event: VoipEvent) {
-    const eventType = event.eventType as string;
-    if (
-      !eventType.startsWith("m.call") &&
-      !eventType.startsWith("org.matrix.call")
-    )
-      return;
-
-    const callTrackingInfo = this.callsByCallId.get(call.callId);
-    if (!callTrackingInfo) {
-      logger.error(`Got call send event for unknown call ID ${call.callId}`);
-      return;
-    }
-
-    if (event.type === "toDevice") {
-      callTrackingInfo.span.addEvent(
-        `matrix.sendToDeviceEvent_${event.eventType}`,
-        ObjectFlattener.flattenVoipEvent(event)
-      );
-    } else if (event.type === "sendEvent") {
-      callTrackingInfo.span.addEvent(
-        `matrix.sendToRoomEvent_${event.eventType}`,
-        ObjectFlattener.flattenVoipEvent(event)
-      );
-    }
-  }
-
-  public onReceivedVoipEvent(event: MatrixEvent) {
-    // These come straight from CallEventHandler so don't have
-    // a call already associated (in principle we could receive
-    // events for calls we don't know about).
-    const callId = event.getContent().call_id;
-    if (!callId) {
-      this.callMembershipSpan?.addEvent("matrix.receive_voip_event_no_callid", {
-        "sender.userId": event.getSender(),
-      });
-      logger.error("Received call event with no call ID!");
-      return;
-    }
-
-    const call = this.callsByCallId.get(callId);
-    if (!call) {
-      this.callMembershipSpan?.addEvent(
-        "matrix.receive_voip_event_unknown_callid",
-        {
-          "sender.userId": event.getSender(),
-        }
-      );
-      logger.error("Received call event for unknown call ID " + callId);
-      return;
-    }
-
-    call.span.addEvent("matrix.receive_voip_event", {
-      "sender.userId": event.getSender(),
-      ...ObjectFlattener.flattenVoipEvent(event.getContent()),
-    });
-  }
-
-  public onToggleMicrophoneMuted(newValue: boolean) {
-    this.callMembershipSpan?.addEvent("matrix.toggleMicMuted", {
-      "matrix.microphone.muted": newValue,
-    });
-  }
-
-  public onSetMicrophoneMuted(setMuted: boolean) {
-    this.callMembershipSpan?.addEvent("matrix.setMicMuted", {
-      "matrix.microphone.muted": setMuted,
-    });
-  }
-
-  public onToggleLocalVideoMuted(newValue: boolean) {
-    this.callMembershipSpan?.addEvent("matrix.toggleVidMuted", {
-      "matrix.video.muted": newValue,
-    });
-  }
-
-  public onSetLocalVideoMuted(setMuted: boolean) {
-    this.callMembershipSpan?.addEvent("matrix.setVidMuted", {
-      "matrix.video.muted": setMuted,
-    });
-  }
-
-  public onToggleScreensharing(newValue: boolean) {
-    this.callMembershipSpan?.addEvent("matrix.setVidMuted", {
-      "matrix.screensharing.enabled": newValue,
-    });
-  }
-
-  public onSpeaking(member: RoomMember, deviceId: string, speaking: boolean) {
-    if (speaking) {
-      // Ensure that there's an audio activity span for this speaker
-      let deviceMap = this.speakingSpans.get(member);
-      if (deviceMap === undefined) {
-        deviceMap = new Map();
-        this.speakingSpans.set(member, deviceMap);
-      }
-
-      if (!deviceMap.has(deviceId)) {
-        const span = ElementCallOpenTelemetry.instance.tracer.startSpan(
-          "matrix.audioActivity",
-          undefined,
-          this.groupCallContext
-        );
-        span.setAttribute("matrix.userId", member.userId);
-        span.setAttribute("matrix.displayName", member.rawDisplayName);
-
-        deviceMap.set(deviceId, span);
-      }
-    } else {
-      // End the audio activity span for this speaker, if any
-      const deviceMap = this.speakingSpans.get(member);
-      deviceMap?.get(deviceId)?.end();
-      deviceMap?.delete(deviceId);
-
-      if (deviceMap?.size === 0) this.speakingSpans.delete(member);
-    }
-  }
-
-  public onCallError(error: CallError, call: MatrixCall) {
-    const callTrackingInfo = this.callsByCallId.get(call.callId);
-    if (!callTrackingInfo) {
-      logger.error(`Got error for unknown call ID ${call.callId}`);
-      return;
-    }
-
-    callTrackingInfo.span.recordException(error);
-  }
-
-  public onGroupCallError(error: GroupCallError) {
-    this.callMembershipSpan?.recordException(error);
-  }
-
-  public onUndecryptableToDevice(event: MatrixEvent) {
-    this.callMembershipSpan?.addEvent("matrix.toDevice.undecryptable", {
-      "sender.userId": event.getSender(),
-    });
-  }
-
-  public onCallFeedStatsReport(report: GroupCallStatsReport<CallFeedReport>) {
-    if (!ElementCallOpenTelemetry.instance) return;
-    let call: OTelCall | undefined;
-    const callId = report.report?.callId;
-
-    if (callId) {
-      call = this.callsByCallId.get(callId);
-    }
-
-    if (!call) {
-      this.callMembershipSpan?.addEvent(
-        OTelStatsReportType.CallFeedReport + "_unknown_callId",
-        {
-          "call.callId": callId,
-          "call.opponentMemberId": report.report?.opponentMemberId
-            ? report.report?.opponentMemberId
-            : "unknown",
-        }
-      );
-      logger.error(
-        `Received ${OTelStatsReportType.CallFeedReport} with unknown call ID: ${callId}`
-      );
-      return;
-    } else {
-      call.onCallFeedStats(report.report.callFeeds);
-      call.onTransceiverStats(report.report.transceiver);
-    }
-  }
-
-  public onConnectionStatsReport(
-    statsReport: GroupCallStatsReport<ConnectionStatsReport>
-  ) {
-    this.buildCallStatsSpan(
-      OTelStatsReportType.ConnectionReport,
-      statsReport.report
-    );
-  }
-
-  public onByteSentStatsReport(
-    statsReport: GroupCallStatsReport<ByteSentStatsReport>
-  ) {
-    this.buildCallStatsSpan(
-      OTelStatsReportType.ByteSentReport,
-      statsReport.report
-    );
-  }
-
-  public buildCallStatsSpan(
-    type: OTelStatsReportType,
-    report: ByteSentStatsReport | ConnectionStatsReport
-  ): void {
-    if (!ElementCallOpenTelemetry.instance) return;
-    let call: OTelCall | undefined;
-    const callId = report?.callId;
-
-    if (callId) {
-      call = this.callsByCallId.get(callId);
-    }
-
-    if (!call) {
-      this.callMembershipSpan?.addEvent(type + "_unknown_callid", {
-        "call.callId": callId,
-        "call.opponentMemberId": report.opponentMemberId
-          ? report.opponentMemberId
-          : "unknown",
-      });
-      logger.error(`Received ${type} with unknown call ID: ${callId}`);
-      return;
-    }
-    const data = ObjectFlattener.flattenReportObject(type, report);
-    const ctx = opentelemetry.trace.setSpan(
-      opentelemetry.context.active(),
-      call.span
-    );
-
-    const options = {
-      links: [
-        {
-          context: call.span.spanContext(),
-        },
-      ],
-    };
-
-    const span = ElementCallOpenTelemetry.instance.tracer.startSpan(
-      type,
-      options,
-      ctx
-    );
-
-    span.setAttribute("matrix.callId", callId);
-    span.setAttribute(
-      "matrix.opponentMemberId",
-      report.opponentMemberId ? report.opponentMemberId : "unknown"
-    );
-    span.addEvent("matrix.call.connection_stats_event", data);
-    span.end();
-  }
-
-  public onSummaryStatsReport(
-    statsReport: GroupCallStatsReport<SummaryStatsReport>
-  ) {
-    if (!ElementCallOpenTelemetry.instance) return;
-
-    const type = OTelStatsReportType.SummaryReport;
-    const data = ObjectFlattener.flattenSummaryStatsReportObject(statsReport);
-    if (this.statsReportSpan.span === undefined && this.callMembershipSpan) {
-      const ctx = setSpan(
-        opentelemetry.context.active(),
-        this.callMembershipSpan
-      );
-      const span = ElementCallOpenTelemetry.instance?.tracer.startSpan(
-        "matrix.groupCallMembership.summaryReport",
-        undefined,
-        ctx
-      );
-      if (span === undefined) {
-        return;
-      }
-      span.setAttribute("matrix.confId", this.groupCall.groupCallId);
-      span.setAttribute("matrix.userId", this.myUserId);
-      span.setAttribute(
-        "matrix.displayName",
-        this.myMember ? this.myMember.name : "unknown-name"
-      );
-      span.addEvent(type, data);
-      span.end();
-    }
-  }
-}
-
-interface OTelStatsReportEvent {
-  type: OTelStatsReportType;
-  data: Attributes;
-}
-
-enum OTelStatsReportType {
-  ConnectionReport = "matrix.call.stats.connection",
-  ByteSentReport = "matrix.call.stats.byteSent",
-  SummaryReport = "matrix.stats.summary",
-  CallFeedReport = "matrix.stats.call_feed",
-}
--- a/src/otel/ObjectFlattener.ts
+++ b/src/otel/ObjectFlattener.ts
@@ -1,109 +0,0 @@
-/*
-Copyright 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-import { Attributes } from "@opentelemetry/api";
-import { VoipEvent } from "matrix-js-sdk/src/webrtc/call";
-import { GroupCallStatsReport } from "matrix-js-sdk/src/webrtc/groupCall";
-import {
-  ByteSentStatsReport,
-  ConnectionStatsReport,
-  SummaryStatsReport,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";
-
-export class ObjectFlattener {
-  public static flattenReportObject(
-    prefix: string,
-    report: ConnectionStatsReport | ByteSentStatsReport
-  ): Attributes {
-    const flatObject = {};
-    ObjectFlattener.flattenObjectRecursive(report, flatObject, `${prefix}.`, 0);
-    return flatObject;
-  }
-
-  public static flattenByteSentStatsReportObject(
-    statsReport: GroupCallStatsReport<ByteSentStatsReport>
-  ): Attributes {
-    const flatObject = {};
-    ObjectFlattener.flattenObjectRecursive(
-      statsReport.report,
-      flatObject,
-      "matrix.stats.bytesSent.",
-      0
-    );
-    return flatObject;
-  }
-
-  static flattenSummaryStatsReportObject(
-    statsReport: GroupCallStatsReport<SummaryStatsReport>
-  ) {
-    const flatObject = {};
-    ObjectFlattener.flattenObjectRecursive(
-      statsReport.report,
-      flatObject,
-      "matrix.stats.summary.",
-      0
-    );
-    return flatObject;
-  }
-
-  /* Flattens out an object into a single layer with components
-   * of the key separated by dots
-   */
-  public static flattenVoipEvent(event: VoipEvent): Attributes {
-    const flatObject = {};
-    ObjectFlattener.flattenObjectRecursive(
-      event as unknown as Record<string, unknown>, // XXX Types
-      flatObject,
-      "matrix.event.",
-      0
-    );
-
-    return flatObject;
-  }
-
-  public static flattenObjectRecursive(
-    obj: Object,
-    flatObject: Attributes,
-    prefix: string,
-    depth: number
-  ): void {
-    if (depth > 10)
-      throw new Error(
-        "Depth limit exceeded: aborting VoipEvent recursion. Prefix is " +
-          prefix
-      );
-    let entries;
-    if (obj instanceof Map) {
-      entries = obj.entries();
-    } else {
-      entries = Object.entries(obj);
-    }
-    for (const [k, v] of entries) {
-      if (["string", "number", "boolean"].includes(typeof v) || v === null) {
-        let value;
-        value = v === null ? "null" : v;
-        value = typeof v === "number" && Number.isNaN(v) ? "NaN" : value;
-        flatObject[prefix + k] = value;
-      } else if (typeof v === "object") {
-        ObjectFlattener.flattenObjectRecursive(
-          v,
-          flatObject,
-          prefix + k + ".",
-          depth + 1
-        );
-      }
-    }
-  }
-}
--- a/src/otel/otel.ts
+++ b/src/otel/otel.ts
@@ -1,122 +0,0 @@
-/*
-Copyright 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base";
-import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
-import { WebTracerProvider } from "@opentelemetry/sdk-trace-web";
-import opentelemetry, { Tracer } from "@opentelemetry/api";
-import { Resource } from "@opentelemetry/resources";
-import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions";
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { PosthogSpanProcessor } from "../analytics/PosthogSpanProcessor";
-import { Anonymity } from "../analytics/PosthogAnalytics";
-import { Config } from "../config/Config";
-import { RageshakeSpanProcessor } from "../analytics/RageshakeSpanProcessor";
-
-const SERVICE_NAME = "element-call";
-
-let sharedInstance: ElementCallOpenTelemetry;
-
-export class ElementCallOpenTelemetry {
-  private _provider: WebTracerProvider;
-  private _tracer: Tracer;
-  private _anonymity: Anonymity;
-  private otlpExporter: OTLPTraceExporter;
-  public readonly rageshakeProcessor?: RageshakeSpanProcessor;
-
-  static globalInit(): void {
-    const config = Config.get();
-    // we always enable opentelemetry in general. We only enable the OTLP
-    // collector if a URL is defined (and in future if another setting is defined)
-    // Posthog reporting is enabled or disabled
-    // within the posthog code.
-    const shouldEnableOtlp = Boolean(config.opentelemetry?.collector_url);
-
-    if (!sharedInstance || sharedInstance.isOtlpEnabled !== shouldEnableOtlp) {
-      logger.info("(Re)starting OpenTelemetry debug reporting");
-      sharedInstance?.dispose();
-
-      sharedInstance = new ElementCallOpenTelemetry(
-        config.opentelemetry?.collector_url,
-        config.rageshake?.submit_url
-      );
-    }
-  }
-
-  static get instance(): ElementCallOpenTelemetry {
-    return sharedInstance;
-  }
-
-  constructor(
-    collectorUrl: string | undefined,
-    rageshakeUrl: string | undefined
-  ) {
-    // This is how we can make Jaeger show a reasonable service in the dropdown on the left.
-    const providerConfig = {
-      resource: new Resource({
-        [SemanticResourceAttributes.SERVICE_NAME]: SERVICE_NAME,
-      }),
-    };
-    this._provider = new WebTracerProvider(providerConfig);
-
-    if (collectorUrl) {
-      logger.info("Enabling OTLP collector with URL " + collectorUrl);
-      this.otlpExporter = new OTLPTraceExporter({
-        url: collectorUrl,
-      });
-      this._provider.addSpanProcessor(
-        new SimpleSpanProcessor(this.otlpExporter)
-      );
-    } else {
-      logger.info("OTLP collector disabled");
-    }
-
-    if (rageshakeUrl) {
-      this.rageshakeProcessor = new RageshakeSpanProcessor();
-      this._provider.addSpanProcessor(this.rageshakeProcessor);
-    }
-
-    this._provider.addSpanProcessor(new PosthogSpanProcessor());
-    opentelemetry.trace.setGlobalTracerProvider(this._provider);
-
-    this._tracer = opentelemetry.trace.getTracer(
-      // This is not the serviceName shown in jaeger
-      "my-element-call-otl-tracer"
-    );
-  }
-
-  public dispose(): void {
-    opentelemetry.trace.setGlobalTracerProvider(null);
-    this._provider?.shutdown();
-  }
-
-  public get isOtlpEnabled(): boolean {
-    return Boolean(this.otlpExporter);
-  }
-
-  public get tracer(): Tracer {
-    return this._tracer;
-  }
-
-  public get provider(): WebTracerProvider {
-    return this._provider;
-  }
-
-  public get anonymity(): Anonymity {
-    return this._anonymity;
-  }
-}
--- a/src/settings/ProfileSettingsTab.module.css
+++ b/src/settings/ProfileSettingsTab.module.css
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 - 2023 New Vector Ltd
+Copyright 2022 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,12 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-.content {
-  width: 100%;
-  max-width: 350px;
-  align-self: center;
-}
-
 .avatarFieldRow {
  justify-content: center;
 }
--- a/src/profile/ProfileModal.tsx
+++ b/src/profile/ProfileModal.tsx
@@ -0,0 +1,141 @@
+/*
+Copyright 2022 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { ChangeEvent, useCallback, useEffect, useState } from "react";
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { useTranslation } from "react-i18next";
+
+import { Button } from "../button";
+import { useProfile } from "./useProfile";
+import { FieldRow, InputField, ErrorMessage } from "../input/Input";
+import { Modal, ModalContent } from "../Modal";
+import { AvatarInputField } from "../input/AvatarInputField";
+import styles from "./ProfileModal.module.css";
+
+interface Props {
+  client: MatrixClient;
+  onClose: () => void;
+  [rest: string]: unknown;
+}
+export function ProfileModal({ client, ...rest }: Props) {
+  const { onClose } = rest;
+  const { t } = useTranslation();
+  const {
+    success,
+    error,
+    loading,
+    displayName: initialDisplayName,
+    avatarUrl,
+    saveProfile,
+  } = useProfile(client);
+  const [displayName, setDisplayName] = useState(initialDisplayName || "");
+  const [removeAvatar, setRemoveAvatar] = useState(false);
+
+  const onRemoveAvatar = useCallback(() => {
+    setRemoveAvatar(true);
+  }, []);
+
+  const onChangeDisplayName = useCallback(
+    (e: ChangeEvent<HTMLInputElement>) => {
+      setDisplayName(e.target.value);
+    },
+    [setDisplayName]
+  );
+
+  const onSubmit = useCallback(
+    (e) => {
+      e.preventDefault();
+      const data = new FormData(e.target);
+      const displayNameDataEntry = data.get("displayName");
+      const avatar: File | string = data.get("avatar");
+
+      const avatarSize =
+        typeof avatar == "string" ? avatar.length : avatar.size;
+      const displayName =
+        typeof displayNameDataEntry == "string"
+          ? displayNameDataEntry
+          : displayNameDataEntry.name;
+
+      saveProfile({
+        displayName,
+        avatar: avatar && avatarSize > 0 ? avatar : undefined,
+        removeAvatar: removeAvatar && (!avatar || avatarSize === 0),
+      });
+    },
+    [saveProfile, removeAvatar]
+  );
+
+  useEffect(() => {
+    if (success) {
+      onClose();
+    }
+  }, [success, onClose]);
+
+  return (
+    <Modal title={t("Profile")} isDismissable {...rest}>
+      <ModalContent>
+        <form onSubmit={onSubmit}>
+          <FieldRow className={styles.avatarFieldRow}>
+            <AvatarInputField
+              id="avatar"
+              name="avatar"
+              label={t("Avatar")}
+              avatarUrl={avatarUrl}
+              displayName={displayName}
+              onRemoveAvatar={onRemoveAvatar}
+            />
+          </FieldRow>
+          <FieldRow>
+            <InputField
+              id="userId"
+              name="userId"
+              label={t("User ID")}
+              type="text"
+              disabled
+              value={client.getUserId()}
+            />
+          </FieldRow>
+          <FieldRow>
+            <InputField
+              id="displayName"
+              name="displayName"
+              label={t("Display name")}
+              type="text"
+              required
+              autoComplete="off"
+              placeholder={t("Display name")}
+              value={displayName}
+              onChange={onChangeDisplayName}
+            />
+          </FieldRow>
+          {error && (
+            <FieldRow>
+              <ErrorMessage error={error} />
+            </FieldRow>
+          )}
+          <FieldRow rightAlign>
+            <Button type="button" variant="secondary" onPress={onClose}>
+              Cancel
+            </Button>
+            <Button type="submit" disabled={loading}>
+              {loading ? t("Saving…") : t("Save")}
+            </Button>
+          </FieldRow>
+        </form>
+      </ModalContent>
+    </Modal>
+  );
+}
--- a/src/room/CallEndedView.module.css
+++ b/src/room/CallEndedView.module.css
@@ -17,31 +17,20 @@ limitations under the License.
 .headline {
  text-align: center;
  margin-bottom: 60px;
-  white-space: pre;
 }

 .callEndedContent {
  text-align: center;
-  max-width: 450px;
-}
-.callEndedContent p {
-  font-size: var(--font-size-subtitle);
+  max-width: 360px;
 }
+
 .callEndedContent h3 {
  margin-bottom: 32px;
 }

 .callEndedButton {
-  margin-top: 54px;
-  margin-left: 30px;
-  margin-right: 30px !important;
-}
-
-.submitButton {
  width: 100%;
  margin-top: 54px;
-  margin-left: 30px;
-  margin-right: 30px !important;
 }

 .container {
--- a/src/room/CallEndedView.tsx
+++ b/src/room/CallEndedView.tsx
@@ -14,130 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-import React, { FormEventHandler, useCallback, useState } from "react";
+import React from "react";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { Trans, useTranslation } from "react-i18next";
-import { useHistory } from "react-router-dom";

 import styles from "./CallEndedView.module.css";
-import feedbackStyle from "../input/FeedbackInput.module.css";
-import { Button, LinkButton } from "../button";
+import { LinkButton } from "../button";
 import { useProfile } from "../profile/useProfile";
-import { Body, Link, Headline } from "../typography/Typography";
+import { Subtitle, Body, Link, Headline } from "../typography/Typography";
 import { Header, HeaderLogo, LeftNav, RightNav } from "../Header";
-import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
-import { FieldRow, InputField } from "../input/Input";
-import { StarRatingInput } from "../input/StarRatingInput";

-export function CallEndedView({
-  client,
-  isPasswordlessUser,
-  endedCallId,
-}: {
-  client: MatrixClient;
-  isPasswordlessUser: boolean;
-  endedCallId: string;
-}) {
+export function CallEndedView({ client }: { client: MatrixClient }) {
  const { t } = useTranslation();
-  const history = useHistory();
-
  const { displayName } = useProfile(client);
-  const [surveySubmitted, setSurverySubmitted] = useState(false);
-  const [starRating, setStarRating] = useState(0);
-  const [submitting, setSubmitting] = useState(false);
-  const [submitDone, setSubmitDone] = useState(false);
-  const submitSurvery: FormEventHandler<HTMLFormElement> = useCallback(
-    (e) => {
-      e.preventDefault();
-      const data = new FormData(e.target as HTMLFormElement);
-      const feedbackText = data.get("feedbackText") as string;
-
-      PosthogAnalytics.instance.eventQualitySurvey.track(
-        endedCallId,
-        feedbackText,
-        starRating
-      );
-
-      setSubmitting(true);
-
-      setTimeout(() => {
-        setSubmitDone(true);
-
-        setTimeout(() => {
-          if (isPasswordlessUser) {
-            // setting this renders the callEndedView with the invitation to create an account
-            setSurverySubmitted(true);
-          } else {
-            // if the user already has an account immediately go back to the home screen
-            history.push("/");
-          }
-        }, 1000);
-      }, 1000);
-    },
-    [endedCallId, history, isPasswordlessUser, starRating]
-  );
-  const createAccountDialog = isPasswordlessUser && (
-    <div className={styles.callEndedContent}>
-      <Trans>
-        <p>Why not finish by setting up a password to keep your account?</p>
-        <p>
-          You'll be able to keep your name and set an avatar for use on future
-          calls
-        </p>
-      </Trans>
-      <LinkButton
-        className={styles.callEndedButton}
-        size="lg"
-        variant="default"
-        to="/register"
-      >
-        {t("Create account")}
-      </LinkButton>
-    </div>
-  );
-
-  const qualitySurveyDialog = (
-    <div className={styles.callEndedContent}>
-      <Trans>
-        <p>
-          We'd love to hear your feedback so we can improve your experience.
-        </p>
-      </Trans>
-      <form onSubmit={submitSurvery}>
-        <FieldRow>
-          <StarRatingInput starCount={5} onChange={setStarRating} required />
-        </FieldRow>
-        <FieldRow>
-          <InputField
-            className={feedbackStyle.feedback}
-            id="feedbackText"
-            name="feedbackText"
-            label={t("Your feedback")}
-            placeholder={t("Your feedback")}
-            type="textarea"
-            required
-          />
-        </FieldRow>{" "}
-        <FieldRow>
-          {submitDone ? (
-            <Trans>
-              <p>Thanks for your feedback!</p>
-            </Trans>
-          ) : (
-            <Button
-              type="submit"
-              className={styles.submitButton}
-              size="lg"
-              variant="default"
-              data-testid="home_go"
-            >
-              {submitting ? t("Submitting…") : t("Submit")}
-            </Button>
-          )}
-        </FieldRow>
-      </form>
-    </div>
-  );

  return (
    <>
@@ -150,19 +39,27 @@ export function CallEndedView({
      <div className={styles.container}>
        <main className={styles.main}>
          <Headline className={styles.headline}>
-            {surveySubmitted
-              ? t("{{displayName}}, your call has ended.", {
-                  displayName,
-                })
-              : t("{{displayName}}, your call has ended.", {
-                  displayName,
-                }) +
-                "\n" +
-                t("How did it go?")}
+            {t("{{displayName}}, your call is now ended", { displayName })}
          </Headline>
-          {!surveySubmitted && PosthogAnalytics.instance.isEnabled()
-            ? qualitySurveyDialog
-            : createAccountDialog}
+          <div className={styles.callEndedContent}>
+            <Trans>
+              <Subtitle>
+                Why not finish by setting up a password to keep your account?
+              </Subtitle>
+              <Subtitle>
+                You'll be able to keep your name and set an avatar for use on
+                future calls
+              </Subtitle>
+            </Trans>
+            <LinkButton
+              className={styles.callEndedButton}
+              size="lg"
+              variant="default"
+              to="/register"
+            >
+              {t("Create account")}
+            </LinkButton>
+          </div>
        </main>
        <Body className={styles.footer}>
          <Link color="primary" to="/">
--- a/src/settings/FeedbackSettingsTab.tsx
+++ b/src/settings/FeedbackSettingsTab.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 - 2023 New Vector Ltd
+Copyright 2022 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,22 +14,28 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-import React, { useCallback } from "react";
+import React, { useCallback, useEffect } from "react";
 import { randomString } from "matrix-js-sdk/src/randomstring";
 import { useTranslation } from "react-i18next";

+import { Modal, ModalContent } from "../Modal";
 import { Button } from "../button";
 import { FieldRow, InputField, ErrorMessage } from "../input/Input";
-import { useSubmitRageshake, useRageshakeRequest } from "./submit-rageshake";
+import {
+  useSubmitRageshake,
+  useRageshakeRequest,
+} from "../settings/submit-rageshake";
 import { Body } from "../typography/Typography";
-import styles from "../input/SelectInput.module.css";
-import feedbackStyles from "../input/FeedbackInput.module.css";

 interface Props {
-  roomId?: string;
+  inCall: boolean;
+  roomId: string;
+  onClose?: () => void;
+  // TODO: add all props for for <Modal>
+  [index: string]: unknown;
 }

-export function FeedbackSettingsTab({ roomId }: Props) {
+export function FeedbackModal({ inCall, roomId, onClose, ...rest }: Props) {
  const { t } = useTranslation();
  const { submitRageshake, sending, sent, error } = useSubmitRageshake();
  const sendRageshakeRequest = useRageshakeRequest();
@@ -51,36 +57,37 @@ export function FeedbackSettingsTab({ roomId }: Props) {
        roomId,
      });

-      if (roomId && sendLogs) {
+      if (inCall && sendLogs) {
        sendRageshakeRequest(roomId, rageshakeRequestId);
      }
    },
-    [submitRageshake, roomId, sendRageshakeRequest]
+    [inCall, submitRageshake, roomId, sendRageshakeRequest]
  );

+  useEffect(() => {
+    if (sent) {
+      onClose();
+    }
+  }, [sent, onClose]);
+
  return (
-    <div>
-      <h4 className={styles.label}>{t("Submit feedback")}</h4>
-      <Body>
-        {t(
-          "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below."
-        )}
-      </Body>
-      <form onSubmit={onSubmitFeedback}>
-        <FieldRow>
-          <InputField
-            className={feedbackStyles.feedback}
-            id="description"
-            name="description"
-            label={t("Your feedback")}
-            placeholder={t("Your feedback")}
-            type="textarea"
-            disabled={sending || sent}
-          />
-        </FieldRow>
-        {sent ? (
-          <Body> {t("Thanks, we received your feedback!")}</Body>
-        ) : (
+    <Modal
+      title={t("Submit feedback")}
+      isDismissable
+      onClose={onClose}
+      {...rest}
+    >
+      <ModalContent>
+        <Body>{t("Having trouble? Help us fix it.")}</Body>
+        <form onSubmit={onSubmitFeedback}>
+          <FieldRow>
+            <InputField
+              id="description"
+              name="description"
+              label={t("Description (optional)")}
+              type="textarea"
+            />
+          </FieldRow>
          <FieldRow>
            <InputField
              id="sendLogs"
@@ -89,17 +96,19 @@ export function FeedbackSettingsTab({ roomId }: Props) {
              type="checkbox"
              defaultChecked
            />
-            {error && (
-              <FieldRow>
-                <ErrorMessage error={error} />
-              </FieldRow>
-            )}
+          </FieldRow>
+          {error && (
+            <FieldRow>
+              <ErrorMessage error={error} />
+            </FieldRow>
+          )}
+          <FieldRow>
            <Button type="submit" disabled={sending}>
-              {sending ? t("Submitting…") : t("Submit")}
+              {sending ? t("Submitting feedback…") : t("Submit feedback")}
            </Button>
          </FieldRow>
-        )}
-      </form>
-    </div>
+        </form>
+      </ModalContent>
+    </Modal>
  );
 }
--- a/src/room/GroupCallInspector.tsx
+++ b/src/room/GroupCallInspector.tsx
@@ -28,25 +28,14 @@ import ReactJson, { CollapsedFieldProps } from "react-json-view";
 import mermaid from "mermaid";
 import { Item } from "@react-stately/collections";
 import { MatrixEvent, IContent } from "matrix-js-sdk/src/models/event";
-import {
-  GroupCall,
-  GroupCallError,
-  GroupCallEvent,
-} from "matrix-js-sdk/src/webrtc/groupCall";
+import { GroupCall } from "matrix-js-sdk/src/webrtc/groupCall";
 import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client";
 import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
-import {
-  CallEvent,
-  CallState,
-  CallError,
-  MatrixCall,
-  VoipEvent,
-} from "matrix-js-sdk/src/webrtc/call";
+import { CallEvent } from "matrix-js-sdk/src/webrtc/call";

 import styles from "./GroupCallInspector.module.css";
 import { SelectInput } from "../input/SelectInput";
-import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
-import { OTelGroupCallMembership } from "../otel/OTelGroupCallMembership";
+import { PosthogAnalytics } from "../PosthogAnalytics";

 interface InspectorContextState {
  eventsByUserId?: { [userId: string]: SequenceDiagramMatrixEvent[] };
@@ -246,7 +235,7 @@ function reducer(
  action: {
    type?: CallEvent | ClientEvent | RoomStateEvent;
    event?: MatrixEvent;
-    rawEvent?: VoipEvent;
+    rawEvent?: Record<string, unknown>;
    callStateEvent?: MatrixEvent;
    memberStateEvents?: MatrixEvent[];
  }
@@ -364,7 +353,7 @@ function reducer(
 function useGroupCallState(
  client: MatrixClient,
  groupCall: GroupCall,
-  otelGroupCallMembership: OTelGroupCallMembership
+  showPollCallStats: boolean
 ): InspectorContextState {
  const [state, dispatch] = useReducer(reducer, {
    localUserId: client.getUserId(),
@@ -392,55 +381,28 @@ function useGroupCallState(
        callStateEvent,
        memberStateEvents,
      });
-
-      otelGroupCallMembership?.onUpdateRoomState(event);
    }

    function onReceivedVoipEvent(event: MatrixEvent) {
      dispatch({ type: ClientEvent.ReceivedVoipEvent, event });
-
-      otelGroupCallMembership?.onReceivedVoipEvent(event);
    }

-    function onSendVoipEvent(event: VoipEvent, call: MatrixCall) {
+    function onSendVoipEvent(event: Record<string, unknown>) {
      dispatch({ type: CallEvent.SendVoipEvent, rawEvent: event });
-
-      otelGroupCallMembership?.onSendEvent(call, event);
-    }
-
-    function onCallStateChange(
-      newState: CallState,
-      _: CallState,
-      call: MatrixCall
-    ) {
-      otelGroupCallMembership?.onCallStateChange(call, newState);
-    }
-
-    function onCallError(error: CallError, call: MatrixCall) {
-      otelGroupCallMembership.onCallError(error, call);
-    }
-
-    function onGroupCallError(error: GroupCallError) {
-      otelGroupCallMembership.onGroupCallError(error);
    }

    function onUndecryptableToDevice(event: MatrixEvent) {
      dispatch({ type: ClientEvent.ReceivedVoipEvent, event });

      Sentry.captureMessage("Undecryptable to-device Event");
-      // probably unnecessary if it's now captured via otel?
      PosthogAnalytics.instance.eventUndecryptableToDevice.track(
        groupCall.groupCallId
      );
-
-      otelGroupCallMembership.onUndecryptableToDevice(event);
    }

    client.on(RoomStateEvent.Events, onUpdateRoomState);
+    //groupCall.on("calls_changed", onCallsChanged);
    groupCall.on(CallEvent.SendVoipEvent, onSendVoipEvent);
-    groupCall.on(CallEvent.State, onCallStateChange);
-    groupCall.on(CallEvent.Error, onCallError);
-    groupCall.on(GroupCallEvent.Error, onGroupCallError);
    //client.on("state", onCallsChanged);
    //client.on("hangup", onCallHangup);
    client.on(ClientEvent.ReceivedVoipEvent, onReceivedVoipEvent);
@@ -450,10 +412,8 @@ function useGroupCallState(

    return () => {
      client.removeListener(RoomStateEvent.Events, onUpdateRoomState);
+      //groupCall.removeListener("calls_changed", onCallsChanged);
      groupCall.removeListener(CallEvent.SendVoipEvent, onSendVoipEvent);
-      groupCall.removeListener(CallEvent.State, onCallStateChange);
-      groupCall.removeListener(CallEvent.Error, onCallError);
-      groupCall.removeListener(GroupCallEvent.Error, onGroupCallError);
      //client.removeListener("state", onCallsChanged);
      //client.removeListener("hangup", onCallHangup);
      client.removeListener(ClientEvent.ReceivedVoipEvent, onReceivedVoipEvent);
@@ -462,7 +422,7 @@ function useGroupCallState(
        onUndecryptableToDevice
      );
    };
-  }, [client, groupCall, otelGroupCallMembership]);
+  }, [client, groupCall]);

  return state;
 }
@@ -470,19 +430,17 @@ function useGroupCallState(
 interface GroupCallInspectorProps {
  client: MatrixClient;
  groupCall: GroupCall;
-  otelGroupCallMembership: OTelGroupCallMembership;
  show: boolean;
 }

 export function GroupCallInspector({
  client,
  groupCall,
-  otelGroupCallMembership,
  show,
 }: GroupCallInspectorProps) {
  const [currentTab, setCurrentTab] = useState("sequence-diagrams");
  const [selectedUserId, setSelectedUserId] = useState<string>();
-  const state = useGroupCallState(client, groupCall, otelGroupCallMembership);
+  const state = useGroupCallState(client, groupCall, show);

  // eslint-disable-next-line @typescript-eslint/no-unused-vars
  const [_, setState] = useContext(InspectorContext);
--- a/src/room/GroupCallLoader.tsx
+++ b/src/room/GroupCallLoader.tsx
@@ -51,7 +51,7 @@ export function GroupCallLoader({
  if (loading) {
    return (
      <FullScreenView>
-        <h1>{t("Loading…")}</h1>
+        <h1>{t("Loading room…")}</h1>
      </FullScreenView>
    );
  }
--- a/src/room/GroupCallView.tsx
+++ b/src/room/GroupCallView.tsx
@@ -32,9 +32,9 @@ import { CallEndedView } from "./CallEndedView";
 import { useRoomAvatar } from "./useRoomAvatar";
 import { useSentryGroupCallHandler } from "./useSentryGroupCallHandler";
 import { useLocationNavigation } from "../useLocationNavigation";
-import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
+import { PosthogAnalytics } from "../PosthogAnalytics";
 import { useMediaHandler } from "../settings/useMediaHandler";
-import { findDeviceByName, getNamedDevices } from "../media-utils";
+import { findDeviceByName, getDevices } from "../media-utils";

 declare global {
  interface Window {
@@ -81,8 +81,7 @@ export function GroupCallView({
    screenshareFeeds,
    participants,
    unencryptedEventsFromUsers,
-    otelGroupCallMembership,
-  } = useGroupCall(groupCall, client);
+  } = useGroupCall(groupCall);

  const { t } = useTranslation();
  const { setAudioInput, setVideoInput } = useMediaHandler();
@@ -102,7 +101,7 @@ export function GroupCallView({
        // Get the available devices so we can match the selected device
        // to its ID. This involves getting a media stream (see docs on
        // the function) so we only do it once and re-use the result.
-        const devices = await getNamedDevices();
+        const devices = await getDevices();

        const { audioInput, videoInput } = ev.detail
          .data as unknown as JoinCallData;
@@ -143,7 +142,8 @@ export function GroupCallView({
          groupCall.setLocalVideoMuted(videoInput === null),
        ]);

-        await enter();
+        await groupCall.enter();
+
        PosthogAnalytics.instance.eventCallEnded.cacheStartCall(new Date());
        PosthogAnalytics.instance.eventCallStarted.track(groupCall.groupCallId);

@@ -158,17 +158,17 @@ export function GroupCallView({
        widget.lazyActions.off(ElementWidgetActions.JoinCall, onJoin);
      };
    }
-  }, [groupCall, preload, setAudioInput, setVideoInput, enter]);
+  }, [groupCall, preload, setAudioInput, setVideoInput]);

  useEffect(() => {
    if (isEmbedded && !preload) {
      // In embedded mode, bypass the lobby and just enter the call straight away
-      enter();
+      groupCall.enter();

      PosthogAnalytics.instance.eventCallEnded.cacheStartCall(new Date());
      PosthogAnalytics.instance.eventCallStarted.track(groupCall.groupCallId);
    }
-  }, [groupCall, isEmbedded, preload, enter]);
+  }, [groupCall, isEmbedded, preload]);

  useSentryGroupCallHandler(groupCall);

@@ -203,11 +203,7 @@ export function GroupCallView({
      widget.api.transport.send(ElementWidgetActions.HangupCall, {});
    }

-    if (
-      !isPasswordlessUser &&
-      !isEmbedded &&
-      !PosthogAnalytics.instance.isEnabled()
-    ) {
+    if (!isPasswordlessUser && !isEmbedded) {
      history.push("/");
    }
  }, [groupCall, leave, isPasswordlessUser, isEmbedded, history]);
@@ -242,7 +238,6 @@ export function GroupCallView({
          onLeave={onLeave}
          isEmbedded={isEmbedded}
          hideHeader={hideHeader}
-          otelGroupCallMembership={otelGroupCallMembership}
        />
      );
    } else {
@@ -267,28 +262,12 @@ export function GroupCallView({
          roomIdOrAlias={roomIdOrAlias}
          unencryptedEventsFromUsers={unencryptedEventsFromUsers}
          hideHeader={hideHeader}
-          otelGroupCallMembership={otelGroupCallMembership}
        />
      );
    }
  } else if (left) {
-    // The call ended view is shown for two reasons: prompting guests to create
-    // an account, and prompting users that have opted into analytics to provide
-    // feedback. We don't show a feedback prompt to widget users however (at
-    // least for now), because we don't yet have designs that would allow widget
-    // users to dismiss the feedback prompt and close the call window without
-    // submitting anything.
-    if (
-      isPasswordlessUser ||
-      (PosthogAnalytics.instance.isEnabled() && !isEmbedded)
-    ) {
-      return (
-        <CallEndedView
-          endedCallId={groupCall.groupCallId}
-          client={client}
-          isPasswordlessUser={isPasswordlessUser}
-        />
-      );
+    if (isPasswordlessUser) {
+      return <CallEndedView client={client} />;
    } else {
      // If the user is a regular user, we'll have sent them back to the homepage,
      // so just sit here & do nothing: otherwise we would (briefly) mount the
@@ -300,7 +279,7 @@ export function GroupCallView({
  } else if (isEmbedded) {
    return (
      <FullScreenView>
-        <h1>{t("Loading…")}</h1>
+        <h1>{t("Loading room…")}</h1>
      </FullScreenView>
    );
  } else {
--- a/src/room/InCallView.module.css
+++ b/src/room/InCallView.module.css
@@ -15,20 +15,14 @@ limitations under the License.
 */

 .inRoom {
+  position: relative;
  display: flex;
  flex-direction: column;
  overflow: hidden;
  min-height: 100%;
+  position: fixed;
  height: 100%;
  width: 100%;
-  --footerPadding: 8px;
-  --footerHeight: calc(50px + 2 * var(--footerPadding));
-}
-
-.controlsOverlay {
-  position: relative;
-  flex: 1;
-  display: flex;
 }

 .centerMessage {
@@ -45,27 +39,11 @@ limitations under the License.
 }

 .footer {
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  width: 100%;
+  position: relative;
  display: flex;
  justify-content: center;
  align-items: center;
-  padding: var(--footerPadding) 0;
-  /* TODO: Un-hardcode these colors */
-  background: linear-gradient(
-    360deg,
-    #15191e 0%,
-    rgba(21, 25, 30, 0.9) 37%,
-    rgba(21, 25, 30, 0.8) 49.68%,
-    rgba(21, 25, 30, 0.7) 56.68%,
-    rgba(21, 25, 30, 0.427397) 72.92%,
-    rgba(21, 25, 30, 0.257534) 81.06%,
-    rgba(21, 25, 30, 0.136986) 87.29%,
-    rgba(21, 25, 30, 0.0658079) 92.4%,
-    rgba(21, 25, 30, 0) 100%
-  );
+  height: calc(50px + 2 * 8px);
 }

 .footer > * {
@@ -87,22 +65,16 @@ limitations under the License.
  top: 50%;
  left: 50%;
  transform: translate(-50%, -50%);
-  /* To make avatars scale smoothly with their tiles during animations, we
-  override the styles set on the element */
-  --avatarSize: calc(min(var(--tileWidth), var(--tileHeight)) / 2);
-  width: var(--avatarSize) !important;
-  height: var(--avatarSize) !important;
-  border-radius: 10000px !important;
 }

@media (min-height: 300px) {
-  .inRoom {
-    --footerPadding: 24px;
+  .footer {
+    height: calc(50px + 2 * 24px);
  }
 }

@media (min-width: 800px) {
-  .inRoom {
-    --footerPadding: 32px;
+  .footer {
+    height: calc(50px + 2 * 32px);
  }
 }
--- a/src/room/InCallView.tsx
+++ b/src/room/InCallView.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 - 2023 New Vector Ltd
+Copyright 2022 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import { GroupCall } from "matrix-js-sdk/src/webrtc/groupCall";
 import { CallFeed } from "matrix-js-sdk/src/webrtc/callFeed";
 import classNames from "classnames";
 import { useTranslation } from "react-i18next";
-import { OverlayTriggerState } from "@react-stately/overlays";
 import { JoinRule } from "matrix-js-sdk/src/@types/partials";

 import type { IWidgetApiRequest } from "matrix-widget-api";
@@ -34,8 +33,6 @@ import {
  MicButton,
  VideoButton,
  ScreenshareButton,
-  SettingsButton,
-  InviteButton,
 } from "../button";
 import {
  Header,
@@ -44,25 +41,21 @@ import {
  RoomHeaderInfo,
  VersionMismatchWarning,
 } from "../Header";
-import {
-  VideoGrid,
-  useVideoGridLayout,
-  ChildrenProperties,
-} from "../video-grid/VideoGrid";
+import { VideoGrid, useVideoGridLayout } from "../video-grid/VideoGrid";
 import { VideoTileContainer } from "../video-grid/VideoTileContainer";
 import { GroupCallInspector } from "./GroupCallInspector";
+import { OverflowMenu } from "./OverflowMenu";
 import { GridLayoutMenu } from "./GridLayoutMenu";
 import { Avatar } from "../Avatar";
+import { UserMenuContainer } from "../UserMenuContainer";
+import { useRageshakeRequestModal } from "../settings/submit-rageshake";
+import { RageshakeRequestModal } from "./RageshakeRequestModal";
 import { useMediaHandler } from "../settings/useMediaHandler";
-import {
-  useNewGrid,
-  useShowInspector,
-  useSpatialAudio,
-} from "../settings/useSetting";
+import { useShowInspector, useSpatialAudio } from "../settings/useSetting";
 import { useModalTriggerState } from "../Modal";
 import { useAudioContext } from "../video-grid/useMediaStream";
 import { useFullscreen } from "../video-grid/useFullscreen";
-import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
+import { PosthogAnalytics } from "../PosthogAnalytics";
 import { widget, ElementWidgetActions } from "../widget";
 import { useJoinRule } from "./useJoinRule";
 import { useUrlParams } from "../UrlParams";
@@ -71,12 +64,6 @@ import { ParticipantInfo } from "./useGroupCall";
 import { TileDescriptor } from "../video-grid/TileDescriptor";
 import { AudioSink } from "../video-grid/AudioSink";
 import { useCallViewKeyboardShortcuts } from "../useCallViewKeyboardShortcuts";
-import { NewVideoGrid } from "../video-grid/NewVideoGrid";
-import { OTelGroupCallMembership } from "../otel/OTelGroupCallMembership";
-import { SettingsModal } from "../settings/SettingsModal";
-import { InviteModal } from "./InviteModal";
-import { useRageshakeRequestModal } from "../settings/submit-rageshake";
-import { RageshakeRequestModal } from "./RageshakeRequestModal";

 const canScreenshare = "getDisplayMedia" in (navigator.mediaDevices ?? {});
 // There is currently a bug in Safari our our code with cloning and sending MediaStreams
@@ -104,7 +91,6 @@ interface Props {
  roomIdOrAlias: string;
  unencryptedEventsFromUsers: Set<string>;
  hideHeader: boolean;
-  otelGroupCallMembership: OTelGroupCallMembership;
 }

 export function InCallView({
@@ -127,10 +113,10 @@ export function InCallView({
  roomIdOrAlias,
  unencryptedEventsFromUsers,
  hideHeader,
-  otelGroupCallMembership,
 }: Props) {
  const { t } = useTranslation();
  usePreventScroll();
+  const joinRule = useJoinRule(groupCall.room);

  const containerRef1 = useRef<HTMLDivElement | null>(null);
  const [containerRef2, bounds] = useMeasure({ polyfill: ResizeObserver });
@@ -153,12 +139,13 @@ export function InCallView({
  const [audioContext, audioDestination] = useAudioContext();
  const [showInspector] = useShowInspector();

+  const { modalState: feedbackModalState, modalProps: feedbackModalProps } =
+    useModalTriggerState();
+
  const { hideScreensharing } = useUrlParams();

-  const joinRule = useJoinRule(groupCall.room);
-
  useCallViewKeyboardShortcuts(
-    containerRef1,
+    !feedbackModalState.isOpen,
    toggleMicrophoneMuted,
    toggleLocalVideoMuted,
    setMicrophoneMuted
@@ -289,8 +276,6 @@ export function InCallView({
    []
  );

-  const [newGrid] = useNewGrid();
-  const Grid = newGrid ? NewVideoGrid : VideoGrid;
  const prefersReducedMotion = usePrefersReducedMotion();

  const renderContent = (): JSX.Element => {
@@ -304,8 +289,8 @@ export function InCallView({
    if (maximisedParticipant) {
      return (
        <VideoTileContainer
-          targetHeight={bounds.height}
-          targetWidth={bounds.width}
+          height={bounds.height}
+          width={bounds.width}
          key={maximisedParticipant.id}
          item={maximisedParticipant}
          getAvatar={renderAvatar}
@@ -320,13 +305,20 @@ export function InCallView({
    }

    return (
-      <Grid
+      <VideoGrid
        items={items}
        layout={layout}
        disableAnimations={prefersReducedMotion || isSafari}
      >
-        {({ item, ...rest }: ChildrenProperties) => (
+        {({
+          item,
+          ...rest
+        }: {
+          item: TileDescriptor;
+          [x: string]: unknown;
+        }) => (
          <VideoTileContainer
+            key={item.id}
            item={item}
            getAvatar={renderAvatar}
            audioContext={audioContext}
@@ -338,7 +330,7 @@ export function InCallView({
            {...rest}
          />
        )}
-      </Grid>
+      </VideoGrid>
    );
  };

@@ -347,36 +339,6 @@ export function InCallView({
    modalProps: rageshakeRequestModalProps,
  } = useRageshakeRequestModal(groupCall.room.roomId);

-  const {
-    modalState: settingsModalState,
-    modalProps: settingsModalProps,
-  }: {
-    modalState: OverlayTriggerState;
-    modalProps: {
-      isOpen: boolean;
-      onClose: () => void;
-    };
-  } = useModalTriggerState();
-
-  const openSettings = useCallback(() => {
-    settingsModalState.open();
-  }, [settingsModalState]);
-
-  const {
-    modalState: inviteModalState,
-    modalProps: inviteModalProps,
-  }: {
-    modalState: OverlayTriggerState;
-    modalProps: {
-      isOpen: boolean;
-      onClose: () => void;
-    };
-  } = useModalTriggerState();
-
-  const openInvite = useCallback(() => {
-    inviteModalState.open();
-  }, [inviteModalState]);
-
  const containerClasses = classNames(styles.inRoom, {
    [styles.maximised]: maximisedParticipant,
  });
@@ -391,11 +353,11 @@ export function InCallView({
  const audioElements: JSX.Element[] = [];
  if (!spatialAudio || maximisedParticipant) {
    for (const item of items) {
+      if (item.isLocal) continue; // We don't want to render own audio
      audioElements.push(
        <AudioSink
          tileDescriptor={item}
          audioOutput={audioOutput}
-          otelGroupCallMembership={otelGroupCallMembership}
          key={item.id}
        />
      );
@@ -406,44 +368,38 @@ export function InCallView({

  if (noControls) {
    footer = null;
-  } else {
-    const buttons: JSX.Element[] = [];
-
-    buttons.push(
-      <MicButton
-        key="1"
-        muted={microphoneMuted}
-        onPress={toggleMicrophoneMuted}
-        data-testid="incall_mute"
-      />,
-      <VideoButton
-        key="2"
-        muted={localVideoMuted}
-        onPress={toggleLocalVideoMuted}
-        data-testid="incall_videomute"
-      />
+  } else if (reducedControls) {
+    footer = (
+      <div className={styles.footer}>
+        <MicButton muted={microphoneMuted} onPress={toggleMicrophoneMuted} />
+        <VideoButton muted={localVideoMuted} onPress={toggleLocalVideoMuted} />
+        <HangupButton onPress={onLeave} />
+      </div>
    );
-
-    if (!reducedControls) {
-      if (canScreenshare && !hideScreensharing && !isSafari) {
-        buttons.push(
+  } else {
+    footer = (
+      <div className={styles.footer}>
+        <MicButton muted={microphoneMuted} onPress={toggleMicrophoneMuted} />
+        <VideoButton muted={localVideoMuted} onPress={toggleLocalVideoMuted} />
+        {canScreenshare && !hideScreensharing && !isSafari && (
          <ScreenshareButton
-            key="3"
            enabled={isScreensharing}
            onPress={toggleScreensharing}
-            data-testid="incall_screenshare"
          />
-        );
-      }
-      if (!maximisedParticipant) {
-        buttons.push(<SettingsButton key="4" onPress={openSettings} />);
-      }
-    }
-
-    buttons.push(
-      <HangupButton key="6" onPress={onLeave} data-testid="incall_leave" />
+        )}
+        {!maximisedParticipant && (
+          <OverflowMenu
+            inCall
+            roomIdOrAlias={roomIdOrAlias}
+            groupCall={groupCall}
+            showInvite={joinRule === JoinRule.Public}
+            feedbackModalState={feedbackModalState}
+            feedbackModalProps={feedbackModalProps}
+          />
+        )}
+        <HangupButton onPress={onLeave} />
+      </div>
    );
-    footer = <div className={styles.footer}>{buttons}</div>;
  }

  return (
@@ -460,38 +416,23 @@ export function InCallView({
          </LeftNav>
          <RightNav>
            <GridLayoutMenu layout={layout} setLayout={setLayout} />
-            {joinRule === JoinRule.Public && (
-              <InviteButton variant="icon" onClick={openInvite} />
-            )}
+            <UserMenuContainer preventNavigation />
          </RightNav>
        </Header>
      )}
-      <div className={styles.controlsOverlay}>
-        {renderContent()}
-        {footer}
-      </div>
+      {renderContent()}
+      {footer}
      <GroupCallInspector
        client={client}
        groupCall={groupCall}
-        otelGroupCallMembership={otelGroupCallMembership}
        show={showInspector}
      />
-      {rageshakeRequestModalState.isOpen && !noControls && (
+      {rageshakeRequestModalState.isOpen && (
        <RageshakeRequestModal
          {...rageshakeRequestModalProps}
          roomIdOrAlias={roomIdOrAlias}
        />
      )}
-      {settingsModalState.isOpen && (
-        <SettingsModal
-          client={client}
-          roomId={groupCall.room.roomId}
-          {...settingsModalProps}
-        />
-      )}
-      {inviteModalState.isOpen && (
-        <InviteModal roomIdOrAlias={roomIdOrAlias} {...inviteModalProps} />
-      )}
    </div>
  );
 }
--- a/src/room/InviteModal.tsx
+++ b/src/room/InviteModal.tsx
@@ -41,7 +41,6 @@ export const InviteModal: FC<Props> = ({ roomIdOrAlias, ...rest }) => {
        <CopyButton
          className={styles.copyButton}
          value={getRoomUrl(roomIdOrAlias)}
-          data-testid="modal_inviteLink"
        />
      </ModalContent>
    </Modal>
--- a/src/room/LobbyView.tsx
+++ b/src/room/LobbyView.tsx
@@ -137,7 +137,6 @@ export function LobbyView({
              size="lg"
              disabled={state !== GroupCallState.LocalCallFeedInitialized}
              onPress={onEnter}
-              data-testid="lobby_joinCall"
            >
              Join call now
            </Button>
@@ -147,7 +146,6 @@ export function LobbyView({
              value={getRoomUrl(roomIdOrAlias)}
              className={styles.copyButton}
              copiedMessage={t("Call link copied")}
-              data-testid="lobby_inviteLink"
            >
              Copy call link and join later
            </CopyButton>
--- a/src/room/OverflowMenu.tsx
+++ b/src/room/OverflowMenu.tsx
@@ -0,0 +1,143 @@
+/*
+Copyright 2022 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { useCallback } from "react";
+import { Item } from "@react-stately/collections";
+import { GroupCall } from "matrix-js-sdk/src/webrtc/groupCall";
+import { OverlayTriggerState } from "@react-stately/overlays";
+import { useTranslation } from "react-i18next";
+
+import { Button } from "../button";
+import { Menu } from "../Menu";
+import { PopoverMenuTrigger } from "../popover/PopoverMenu";
+import { ReactComponent as SettingsIcon } from "../icons/Settings.svg";
+import { ReactComponent as AddUserIcon } from "../icons/AddUser.svg";
+import { ReactComponent as OverflowIcon } from "../icons/Overflow.svg";
+import { ReactComponent as FeedbackIcon } from "../icons/Feedback.svg";
+import { useModalTriggerState } from "../Modal";
+import { SettingsModal } from "../settings/SettingsModal";
+import { InviteModal } from "./InviteModal";
+import { TooltipTrigger } from "../Tooltip";
+import { FeedbackModal } from "./FeedbackModal";
+import { Config } from "../config/Config";
+
+interface Props {
+  roomIdOrAlias: string;
+  inCall: boolean;
+  groupCall: GroupCall;
+  showInvite: boolean;
+  feedbackModalState: OverlayTriggerState;
+  feedbackModalProps: {
+    isOpen: boolean;
+    onClose: () => void;
+  };
+}
+
+export function OverflowMenu({
+  roomIdOrAlias,
+  inCall,
+  groupCall,
+  showInvite,
+  feedbackModalState,
+  feedbackModalProps,
+}: Props) {
+  const { t } = useTranslation();
+
+  const {
+    modalState: inviteModalState,
+    modalProps: inviteModalProps,
+  }: {
+    modalState: OverlayTriggerState;
+    modalProps: {
+      isOpen: boolean;
+      onClose: () => void;
+    };
+  } = useModalTriggerState();
+  const {
+    modalState: settingsModalState,
+    modalProps: settingsModalProps,
+  }: {
+    modalState: OverlayTriggerState;
+    modalProps: {
+      isOpen: boolean;
+      onClose: () => void;
+    };
+  } = useModalTriggerState();
+
+  // TODO: On closing modal, focus should be restored to the trigger button
+  // https://github.com/adobe/react-spectrum/issues/2444
+  const onAction = useCallback(
+    (key) => {
+      switch (key) {
+        case "invite":
+          inviteModalState.open();
+          break;
+        case "settings":
+          settingsModalState.open();
+          break;
+        case "feedback":
+          feedbackModalState.open();
+          break;
+      }
+    },
+    [feedbackModalState, inviteModalState, settingsModalState]
+  );
+
+  const tooltip = useCallback(() => t("More"), [t]);
+
+  return (
+    <>
+      <PopoverMenuTrigger disableOnState>
+        <TooltipTrigger tooltip={tooltip} placement="top">
+          <Button variant="toolbar">
+            <OverflowIcon />
+          </Button>
+        </TooltipTrigger>
+        {(props: JSX.IntrinsicAttributes) => (
+          <Menu {...props} label={t("More menu")} onAction={onAction}>
+            {showInvite && (
+              <Item key="invite" textValue={t("Invite people")}>
+                <AddUserIcon />
+                <span>{t("Invite people")}</span>
+              </Item>
+            )}
+            <Item key="settings" textValue={t("Settings")}>
+              <SettingsIcon />
+              <span>{t("Settings")}</span>
+            </Item>
+            {Config.get().rageshake?.submit_url && (
+              <Item key="feedback" textValue={t("Submit feedback")}>
+                <FeedbackIcon />
+                <span>{t("Submit feedback")}</span>
+              </Item>
+            )}
+          </Menu>
+        )}
+      </PopoverMenuTrigger>
+      {settingsModalState.isOpen && <SettingsModal {...settingsModalProps} />}
+      {inviteModalState.isOpen && (
+        <InviteModal roomIdOrAlias={roomIdOrAlias} {...inviteModalProps} />
+      )}
+      {feedbackModalState.isOpen && (
+        <FeedbackModal
+          {...feedbackModalProps}
+          roomId={groupCall?.room.roomId}
+          inCall={inCall}
+        />
+      )}
+    </>
+  );
+}
--- a/src/room/PTTButton.tsx
+++ b/src/room/PTTButton.tsx
@@ -17,7 +17,6 @@ limitations under the License.
 import React, { useCallback, useState, useRef } from "react";
 import classNames from "classnames";
 import { useSpring, animated } from "@react-spring/web";
-import { logger } from "@sentry/utils";

 import styles from "./PTTButton.module.css";
 import { ReactComponent as MicIcon } from "../icons/Mic.svg";
@@ -69,23 +68,11 @@ export const PTTButton: React.FC<Props> = ({
    enqueueNetworkWaiting(true, 100);
    startTalking();
  }, [enqueueNetworkWaiting, startTalking, buttonHeld]);
-
  const unhold = useCallback(() => {
-    if (!buttonHeld) return;
    setButtonHeld(false);
    setNetworkWaiting(false);
    stopTalking();
-  }, [setNetworkWaiting, stopTalking, buttonHeld]);
-
-  const onMouseUp = useCallback(() => {
-    logger.info("Mouse up event: unholding PTT button");
-    unhold();
-  }, [unhold]);
-
-  const onBlur = useCallback(() => {
-    logger.info("Blur event: unholding PTT button");
-    unhold();
-  }, [unhold]);
+  }, [setNetworkWaiting, stopTalking]);

  const onButtonMouseDown = useCallback(
    (e: React.MouseEvent<HTMLButtonElement>) => {
@@ -98,7 +85,7 @@ export const PTTButton: React.FC<Props> = ({
  // These listeners go on the window so even if the user's cursor / finger
  // leaves the button while holding it, the button stays pushed until
  // they stop clicking / tapping.
-  useEventTarget(window, "mouseup", onMouseUp);
+  useEventTarget(window, "mouseup", unhold);
  useEventTarget(
    window,
    "touchend",
@@ -116,8 +103,6 @@ export const PTTButton: React.FC<Props> = ({
        }
        if (!touchFound) return;

-        logger.info("Touch event ended: unholding PTT button");
-
        e.preventDefault();
        unhold();
        setActiveTouchId(null);
@@ -178,8 +163,6 @@ export const PTTButton: React.FC<Props> = ({

          e.preventDefault();

-          logger.info("Keyup event for spacebar: unholding PTT button");
-
          unhold();
        }
      },
@@ -188,7 +171,7 @@ export const PTTButton: React.FC<Props> = ({
  );

  // TODO: We will need to disable this for a global PTT hotkey to work
-  useEventTarget(window, "blur", onBlur);
+  useEventTarget(window, "blur", unhold);

  const prefersReducedMotion = usePrefersReducedMotion();
  const { shadow } = useSpring({
--- a/src/room/PTTCallView.tsx
+++ b/src/room/PTTCallView.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 - 2023 New Vector Ltd
+Copyright 2022 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import { useTranslation } from "react-i18next";
 import { useDelayedState } from "../useDelayedState";
 import { useModalTriggerState } from "../Modal";
 import { InviteModal } from "./InviteModal";
-import { HangupButton, InviteButton, SettingsButton } from "../button";
+import { HangupButton, InviteButton } from "../button";
 import { Header, LeftNav, RightNav, RoomSetupHeaderInfo } from "../Header";
 import styles from "./PTTCallView.module.css";
 import { Facepile } from "../Facepile";
@@ -41,10 +41,9 @@ import { ReactComponent as AudioIcon } from "../icons/Audio.svg";
 import { usePTTSounds } from "../sound/usePttSounds";
 import { PTTClips } from "../sound/PTTClips";
 import { GroupCallInspector } from "./GroupCallInspector";
+import { OverflowMenu } from "./OverflowMenu";
 import { Size } from "../Avatar";
 import { ParticipantInfo } from "./useGroupCall";
-import { OTelGroupCallMembership } from "../otel/OTelGroupCallMembership";
-import { SettingsModal } from "../settings/SettingsModal";

 function getPromptText(
  networkWaiting: boolean,
@@ -107,7 +106,6 @@ interface Props {
  onLeave: () => void;
  isEmbedded: boolean;
  hideHeader: boolean;
-  otelGroupCallMembership: OTelGroupCallMembership;
 }

 export const PTTCallView: React.FC<Props> = ({
@@ -121,14 +119,12 @@ export const PTTCallView: React.FC<Props> = ({
  onLeave,
  isEmbedded,
  hideHeader,
-  otelGroupCallMembership,
 }) => {
  const { t } = useTranslation();
  const { modalState: inviteModalState, modalProps: inviteModalProps } =
    useModalTriggerState();
-  const { modalState: settingsModalState, modalProps: settingsModalProps } =
+  const { modalState: feedbackModalState, modalProps: feedbackModalProps } =
    useModalTriggerState();
-
  const [containerRef, bounds] = useMeasure({ polyfill: ResizeObserver });
  const facepileSize = bounds.width < 800 ? Size.SM : Size.MD;
  const showControls = bounds.height > 500;
@@ -196,7 +192,6 @@ export const PTTCallView: React.FC<Props> = ({
      <GroupCallInspector
        client={client}
        groupCall={groupCall}
-        otelGroupCallMembership={otelGroupCallMembership}
        // Never shown in PTT mode, but must be present to collect call state
        // https://github.com/vector-im/element-call/issues/328
        show={false}
@@ -215,29 +210,36 @@ export const PTTCallView: React.FC<Props> = ({
        </Header>
      )}
      <div className={styles.center}>
-        {/* Always render this because the window will become shorter when the on-screen
-            keyboard appears, so if we don't render it, the dialog will unmount. */}
-        <div style={{ display: showControls ? "block" : "none" }}>
-          <div className={styles.participants}>
-            <p>
-              {t("{{count}} people connected", {
-                count: participatingMembers.length,
-              })}
-            </p>
-            <Facepile
-              size={facepileSize}
-              max={8}
-              className={styles.facepile}
-              client={client}
-              members={participatingMembers}
-            />
-          </div>
-          <div className={styles.footer}>
-            <SettingsButton onPress={() => settingsModalState.open()} />
-            {!isEmbedded && <HangupButton onPress={onLeave} />}
-            <InviteButton onPress={() => inviteModalState.open()} />
-          </div>
-        </div>
+        {showControls && (
+          <>
+            <div className={styles.participants}>
+              <p>
+                {t("{{count}} people connected", {
+                  count: participatingMembers.length,
+                })}
+              </p>
+              <Facepile
+                size={facepileSize}
+                max={8}
+                className={styles.facepile}
+                client={client}
+                members={participatingMembers}
+              />
+            </div>
+            <div className={styles.footer}>
+              <OverflowMenu
+                inCall
+                roomIdOrAlias={roomIdOrAlias}
+                groupCall={groupCall}
+                showInvite={false}
+                feedbackModalState={feedbackModalState}
+                feedbackModalProps={feedbackModalProps}
+              />
+              {!isEmbedded && <HangupButton onPress={onLeave} />}
+              <InviteButton onPress={() => inviteModalState.open()} />
+            </div>
+          </>
+        )}

        <div className={styles.pttButtonContainer}>
          {showControls &&
@@ -259,7 +261,7 @@ export const PTTCallView: React.FC<Props> = ({
              <div className={styles.talkingInfo} />
            ))}
          <PTTButton
-            enabled={!inviteModalState.isOpen && !settingsModalState.isOpen}
+            enabled={!feedbackModalState.isOpen}
            showTalkOverError={showTalkOverError}
            activeSpeakerUserId={activeSpeakerUserId}
            activeSpeakerDisplayName={activeSpeakerDisplayName}
@@ -306,13 +308,6 @@ export const PTTCallView: React.FC<Props> = ({
        </div>
      </div>

-      {settingsModalState.isOpen && (
-        <SettingsModal
-          client={client}
-          roomId={groupCall.room.roomId}
-          {...settingsModalProps}
-        />
-      )}
      {inviteModalState.isOpen && showControls && (
        <InviteModal roomIdOrAlias={roomIdOrAlias} {...inviteModalProps} />
      )}
--- a/src/room/RoomAuthView.tsx
+++ b/src/room/RoomAuthView.tsx
@@ -74,7 +74,6 @@ export function RoomAuthView() {
                name="displayName"
                label={t("Display name")}
                placeholder={t("Display name")}
-                data-testid="joincall_displayName"
                type="text"
                required
                autoComplete="off"
@@ -91,12 +90,7 @@ export function RoomAuthView() {
                <ErrorMessage error={error} />
              </FieldRow>
            )}
-            <Button
-              type="submit"
-              size="lg"
-              disabled={loading}
-              data-testid="joincall_joincall"
-            >
+            <Button type="submit" size="lg" disabled={loading}>
              {loading ? t("Loading…") : t("Join call now")}
            </Button>
            <div id={recaptchaId} />
--- a/src/room/RoomPage.tsx
+++ b/src/room/RoomPage.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2021-2023 New Vector Ltd
+Copyright 2021-2022 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@ import { RoomAuthView } from "./RoomAuthView";
 import { GroupCallLoader } from "./GroupCallLoader";
 import { GroupCallView } from "./GroupCallView";
 import { useUrlParams } from "../UrlParams";
+import { MediaHandlerProvider } from "../settings/useMediaHandler";
 import { useRegisterPasswordlessUser } from "../auth/useRegisterPasswordlessUser";
 import { translatedError } from "../TranslatedError";
-import { useOptInAnalytics } from "../settings/useSetting";

 export const RoomPage: FC = () => {
  const { t } = useTranslation();
@@ -46,19 +46,13 @@ export const RoomPage: FC = () => {
  const roomIdOrAlias = roomId ?? roomAlias;
  if (!roomIdOrAlias) throw translatedError("No room specified", t);

-  const [optInAnalytics, setOptInAnalytics] = useOptInAnalytics();
  const { registerPasswordlessUser } = useRegisterPasswordlessUser();
  const [isRegistering, setIsRegistering] = useState(false);

  useEffect(() => {
-    // During the beta, opt into analytics by default
-    if (optInAnalytics === null) setOptInAnalytics(true);
-  }, [optInAnalytics, setOptInAnalytics]);
-
-  useEffect(() => {
-    // If we've finished loading, are not already authed and we've been given a display name as
+    // If we're not already authed and we've been given a display name as
    // a URL param, automatically register a passwordless user
-    if (!loading && !isAuthenticated && displayName) {
+    if (!isAuthenticated && displayName) {
      setIsRegistering(true);
      registerPasswordlessUser(displayName).finally(() => {
        setIsRegistering(false);
@@ -69,7 +63,6 @@ export const RoomPage: FC = () => {
    displayName,
    setIsRegistering,
    registerPasswordlessUser,
-    loading,
  ]);

  const groupCallView = useCallback(
@@ -100,13 +93,15 @@ export const RoomPage: FC = () => {
  }

  return (
-    <GroupCallLoader
-      client={client}
-      roomIdOrAlias={roomIdOrAlias}
-      viaServers={viaServers}
-      createPtt={isPtt}
-    >
-      {groupCallView}
-    </GroupCallLoader>
+    <MediaHandlerProvider client={client}>
+      <GroupCallLoader
+        client={client}
+        roomIdOrAlias={roomIdOrAlias}
+        viaServers={viaServers}
+        createPtt={isPtt}
+      >
+        {groupCallView}
+      </GroupCallLoader>
+    </MediaHandlerProvider>
  );
 };
--- a/src/room/VideoPreview.tsx
+++ b/src/room/VideoPreview.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 - 2023 New Vector Ltd
+Copyright 2022 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,22 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-import React, { useCallback } from "react";
+import React from "react";
 import useMeasure from "react-use-measure";
 import { ResizeObserver } from "@juggle/resize-observer";
 import { GroupCallState } from "matrix-js-sdk/src/webrtc/groupCall";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { useTranslation } from "react-i18next";
-import { OverlayTriggerState } from "@react-stately/overlays";

-import { MicButton, SettingsButton, VideoButton } from "../button";
+import { MicButton, VideoButton } from "../button";
 import { useMediaStream } from "../video-grid/useMediaStream";
+import { OverflowMenu } from "./OverflowMenu";
 import { Avatar } from "../Avatar";
 import { useProfile } from "../profile/useProfile";
 import styles from "./VideoPreview.module.css";
 import { Body } from "../typography/Typography";
 import { useModalTriggerState } from "../Modal";
-import { SettingsModal } from "../settings/SettingsModal";

 interface Props {
  client: MatrixClient;
@@ -60,30 +59,12 @@ export function VideoPreview({
  const [previewRef, previewBounds] = useMeasure({ polyfill: ResizeObserver });
  const avatarSize = (previewBounds.height - 66) / 2;

-  const {
-    modalState: settingsModalState,
-    modalProps: settingsModalProps,
-  }: {
-    modalState: OverlayTriggerState;
-    modalProps: {
-      isOpen: boolean;
-      onClose: () => void;
-    };
-  } = useModalTriggerState();
-
-  const openSettings = useCallback(() => {
-    settingsModalState.open();
-  }, [settingsModalState]);
+  const { modalState: feedbackModalState, modalProps: feedbackModalProps } =
+    useModalTriggerState();

  return (
    <div className={styles.preview} ref={previewRef}>
-      <video
-        ref={videoRef}
-        muted
-        playsInline
-        disablePictureInPicture
-        data-testid="preview_video"
-      />
+      <video ref={videoRef} muted playsInline disablePictureInPicture />
      {state === GroupCallState.LocalCallFeedUninitialized && (
        <Body fontWeight="semiBold" className={styles.cameraPermissions}>
          {t("Camera/microphone permissions needed to join the call.")}
@@ -114,13 +95,17 @@ export function VideoPreview({
              muted={localVideoMuted}
              onPress={toggleLocalVideoMuted}
            />
-            <SettingsButton onPress={openSettings} />
+            <OverflowMenu
+              roomIdOrAlias={roomIdOrAlias}
+              feedbackModalState={feedbackModalState}
+              feedbackModalProps={feedbackModalProps}
+              inCall={false}
+              groupCall={undefined}
+              showInvite={false}
+            />
          </div>
        </>
      )}
-      {settingsModalState.isOpen && (
-        <SettingsModal client={client} {...settingsModalProps} />
-      )}
    </div>
  );
 }
--- a/src/room/checkForParallelCalls.ts
+++ b/src/room/checkForParallelCalls.ts
@@ -1,65 +0,0 @@
-/*
-Copyright 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { EventType } from "matrix-js-sdk/src/@types/event";
-import { RoomState } from "matrix-js-sdk/src/models/room-state";
-
-import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
-
-function isObject(x: unknown): x is Record<string, unknown> {
-  return typeof x === "object" && x !== null;
-}
-
-/**
- * Checks the state of a room for multiple calls happening in parallel, sending
- * the details to PostHog if that is indeed what's happening. (This is unwanted
- * as it indicates a split-brain scenario.)
- */
-export function checkForParallelCalls(state: RoomState): void {
-  const now = Date.now();
-  const participantsPerCall = new Map<string, number>();
-
-  // For each participant in each call, increment the participant count
-  for (const e of state.getStateEvents(EventType.GroupCallMemberPrefix)) {
-    const content = e.getContent<Record<string, unknown>>();
-    const calls: unknown[] = Array.isArray(content["m.calls"])
-      ? content["m.calls"]
-      : [];
-
-    for (const call of calls) {
-      if (isObject(call) && typeof call["m.call_id"] === "string") {
-        const devices: unknown[] = Array.isArray(call["m.devices"])
-          ? call["m.devices"]
-          : [];
-
-        for (const device of devices) {
-          if (isObject(device) && (device["expires_ts"] as number) > now) {
-            const participantCount =
-              participantsPerCall.get(call["m.call_id"]) ?? 0;
-            participantsPerCall.set(call["m.call_id"], participantCount + 1);
-          }
-        }
-      }
-    }
-  }
-
-  if (participantsPerCall.size > 1) {
-    PosthogAnalytics.instance.trackEvent({
-      eventName: "ParallelCalls",
-      participantsPerCall: Object.fromEntries(participantsPerCall),
-    });
-  }
-}
--- a/src/room/useGroupCall.ts
+++ b/src/room/useGroupCall.ts
@@ -22,28 +22,16 @@ import {
  GroupCallErrorCode,
  GroupCallUnknownDeviceError,
  GroupCallError,
-  GroupCallStatsReportEvent,
-  GroupCallStatsReport,
 } from "matrix-js-sdk/src/webrtc/groupCall";
 import { CallFeed, CallFeedEvent } from "matrix-js-sdk/src/webrtc/callFeed";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { useTranslation } from "react-i18next";
 import { IWidgetApiRequest } from "matrix-widget-api";
-import { MatrixClient, RoomStateEvent } from "matrix-js-sdk";
-import {
-  ByteSentStatsReport,
-  ConnectionStatsReport,
-  SummaryStatsReport,
-  CallFeedReport,
-} from "matrix-js-sdk/src/webrtc/stats/statsReport";

 import { usePageUnload } from "./usePageUnload";
-import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
+import { PosthogAnalytics } from "../PosthogAnalytics";
 import { TranslatedError, translatedError } from "../TranslatedError";
 import { ElementWidgetActions, ScreenshareStartData, widget } from "../widget";
-import { OTelGroupCallMembership } from "../otel/OTelGroupCallMembership";
-import { ElementCallOpenTelemetry } from "../otel/otel";
-import { checkForParallelCalls } from "./checkForParallelCalls";

 export enum ConnectionState {
  EstablishingCall = "establishing call", // call hasn't been established yet
@@ -78,7 +66,6 @@ export interface UseGroupCallReturnType {
  participants: Map<RoomMember, Map<string, ParticipantInfo>>;
  hasLocalParticipant: boolean;
  unencryptedEventsFromUsers: Set<string>;
-  otelGroupCallMembership: OTelGroupCallMembership;
 }

 interface State {
@@ -97,13 +84,6 @@ interface State {
  hasLocalParticipant: boolean;
 }

-// This is a bit of a hack, but we keep the opentelemetry tracker object at the file
-// level so that it doesn't pop in & out of existence as react mounts & unmounts
-// components. The right solution is probably for this to live in the js-sdk and have
-// the same lifetime as groupcalls themselves.
-let groupCallOTelMembership: OTelGroupCallMembership;
-let groupCallOTelMembershipGroupCallId: string;
-
 function getParticipants(
  groupCall: GroupCall
 ): Map<RoomMember, Map<string, ParticipantInfo>> {
@@ -118,24 +98,12 @@ function getParticipants(
        (f) => f.userId === member.userId && f.deviceId === deviceId
      );

-      let connectionState: ConnectionState;
-      // If we allow calls without media, we have no feeds and cannot read the connection status from them.
-      // @TODO: The connection state should generally not be determined by the feed.
-      if (
-        groupCall.allowCallWithoutVideoAndAudio &&
-        !feed &&
-        !participant.screensharing
-      ) {
-        connectionState = ConnectionState.Connected;
-      } else {
-        connectionState = feed
+      participantInfoMap.set(deviceId, {
+        connectionState: feed
          ? feed.connected
            ? ConnectionState.Connected
            : ConnectionState.WaitMedia
-          : ConnectionState.EstablishingCall;
-      }
-      participantInfoMap.set(deviceId, {
-        connectionState,
+          : ConnectionState.EstablishingCall,
        presenter: participant.screensharing,
      });
    }
@@ -144,10 +112,7 @@ function getParticipants(
  return participants;
 }

-export function useGroupCall(
-  groupCall: GroupCall,
-  client: MatrixClient
-): UseGroupCallReturnType {
+export function useGroupCall(groupCall: GroupCall): UseGroupCallReturnType {
  const [
    {
      state,
@@ -181,19 +146,6 @@ export function useGroupCall(
    hasLocalParticipant: false,
  });

-  if (groupCallOTelMembershipGroupCallId !== groupCall.groupCallId) {
-    if (groupCallOTelMembership) groupCallOTelMembership.dispose();
-
-    // If the user disables analytics, this will stay around until they leave the call
-    // so analytics will be disabled once they leave.
-    if (ElementCallOpenTelemetry.instance) {
-      groupCallOTelMembership = new OTelGroupCallMembership(groupCall, client);
-      groupCallOTelMembershipGroupCallId = groupCall.groupCallId;
-    } else {
-      groupCallOTelMembership = undefined;
-    }
-  }
-
  const [unencryptedEventsFromUsers, addUnencryptedEventUser] = useReducer(
    (state: Set<string>, newVal: string) => {
      return new Set(state).add(newVal);
@@ -206,43 +158,6 @@ export function useGroupCall(
    [setState]
  );

-  const doNothingMediaActionCallback = useCallback(
-    (details: MediaSessionActionDetails) => {},
-    []
-  );
-
-  const leaveCall = useCallback(() => {
-    groupCallOTelMembership?.onLeaveCall();
-    groupCall.leave();
-  }, [groupCall]);
-
-  useEffect(() => {
-    // disable the media action keys, otherwise audio elements get paused when
-    // the user presses media keys or unplugs headphones, etc.
-    // Note there are actions for muting / unmuting a microphone & hanging up
-    // which we could wire up.
-    const mediaActions: MediaSessionAction[] = [
-      "play",
-      "pause",
-      "stop",
-      "nexttrack",
-      "previoustrack",
-    ];
-
-    for (const mediaAction of mediaActions) {
-      navigator.mediaSession?.setActionHandler(
-        mediaAction,
-        doNothingMediaActionCallback
-      );
-    }
-
-    return () => {
-      for (const mediaAction of mediaActions) {
-        navigator.mediaSession?.setActionHandler(mediaAction, null);
-      }
-    };
-  }, [doNothingMediaActionCallback]);
-
  useEffect(() => {
    function onGroupCallStateChanged() {
      updateState({
@@ -346,30 +261,6 @@ export function useGroupCall(
      }
    }

-    function onConnectionStatsReport(
-      report: GroupCallStatsReport<ConnectionStatsReport>
-    ): void {
-      groupCallOTelMembership?.onConnectionStatsReport(report);
-    }
-
-    function onByteSentStatsReport(
-      report: GroupCallStatsReport<ByteSentStatsReport>
-    ): void {
-      groupCallOTelMembership?.onByteSentStatsReport(report);
-    }
-
-    function onSummaryStatsReport(
-      report: GroupCallStatsReport<SummaryStatsReport>
-    ): void {
-      groupCallOTelMembership?.onSummaryStatsReport(report);
-    }
-
-    function onCallFeedStatsReport(
-      report: GroupCallStatsReport<CallFeedReport>
-    ): void {
-      groupCallOTelMembership?.onCallFeedStatsReport(report);
-    }
-
    groupCall.on(GroupCallEvent.GroupCallStateChanged, onGroupCallStateChanged);
    groupCall.on(GroupCallEvent.UserMediaFeedsChanged, onUserMediaFeedsChanged);
    groupCall.on(
@@ -385,24 +276,6 @@ export function useGroupCall(
    groupCall.on(GroupCallEvent.CallsChanged, onCallsChanged);
    groupCall.on(GroupCallEvent.ParticipantsChanged, onParticipantsChanged);
    groupCall.on(GroupCallEvent.Error, onError);
-    groupCall.on(
-      GroupCallStatsReportEvent.ConnectionStats,
-      onConnectionStatsReport
-    );
-    groupCall.on(
-      GroupCallStatsReportEvent.ByteSentStats,
-      onByteSentStatsReport
-    );
-    groupCall.on(GroupCallStatsReportEvent.SummaryStats, onSummaryStatsReport);
-    groupCall.on(
-      GroupCallStatsReportEvent.CallFeedStats,
-      onCallFeedStatsReport
-    );
-
-    groupCall.room.currentState.on(
-      RoomStateEvent.Update,
-      checkForParallelCalls
-    );

    updateState({
      error: null,
@@ -450,32 +323,12 @@ export function useGroupCall(
        onParticipantsChanged
      );
      groupCall.removeListener(GroupCallEvent.Error, onError);
-      groupCall.removeListener(
-        GroupCallStatsReportEvent.ConnectionStats,
-        onConnectionStatsReport
-      );
-      groupCall.removeListener(
-        GroupCallStatsReportEvent.ByteSentStats,
-        onByteSentStatsReport
-      );
-      groupCall.removeListener(
-        GroupCallStatsReportEvent.SummaryStats,
-        onSummaryStatsReport
-      );
-      groupCall.removeListener(
-        GroupCallStatsReportEvent.CallFeedStats,
-        onCallFeedStatsReport
-      );
-      groupCall.room.currentState.off(
-        RoomStateEvent.Update,
-        checkForParallelCalls
-      );
-      leaveCall();
+      groupCall.leave();
    };
-  }, [groupCall, updateState, leaveCall]);
+  }, [groupCall, updateState]);

  usePageUnload(() => {
-    leaveCall();
+    groupCall.leave();
  });

  const initLocalCallFeed = useCallback(
@@ -494,21 +347,17 @@ export function useGroupCall(
    PosthogAnalytics.instance.eventCallEnded.cacheStartCall(new Date());
    PosthogAnalytics.instance.eventCallStarted.track(groupCall.groupCallId);

-    // This must be called before we start trying to join the call, as we need to
-    // have started tracking by the time calls start getting created.
-    groupCallOTelMembership?.onJoinCall();
-
    groupCall.enter().catch((error) => {
      console.error(error);
      updateState({ error });
    });
  }, [groupCall, updateState]);

+  const leave = useCallback(() => groupCall.leave(), [groupCall]);
+
  const toggleLocalVideoMuted = useCallback(() => {
    const toggleToMute = !groupCall.isLocalVideoMuted();
    groupCall.setLocalVideoMuted(toggleToMute);
-    groupCallOTelMembership?.onToggleLocalVideoMuted(toggleToMute);
-    // TODO: These explict posthog calls should be unnecessary now with the posthog otel exporter?
    PosthogAnalytics.instance.eventMuteCamera.track(
      toggleToMute,
      groupCall.groupCallId
@@ -518,7 +367,6 @@ export function useGroupCall(
  const setMicrophoneMuted = useCallback(
    (setMuted) => {
      groupCall.setMicrophoneMuted(setMuted);
-      groupCallOTelMembership?.onSetMicrophoneMuted(setMuted);
      PosthogAnalytics.instance.eventMuteMicrophone.track(
        setMuted,
        groupCall.groupCallId
@@ -529,13 +377,10 @@ export function useGroupCall(

  const toggleMicrophoneMuted = useCallback(() => {
    const toggleToMute = !groupCall.isMicrophoneMuted();
-    groupCallOTelMembership?.onToggleMicrophoneMuted(toggleToMute);
    setMicrophoneMuted(toggleToMute);
  }, [groupCall, setMicrophoneMuted]);

  const toggleScreensharing = useCallback(async () => {
-    groupCallOTelMembership?.onToggleScreensharing(!groupCall.isScreensharing);
-
    if (!groupCall.isScreensharing()) {
      // toggling on
      updateState({ requestingScreenshare: true });
@@ -636,7 +481,7 @@ export function useGroupCall(
    error,
    initLocalCallFeed,
    enter,
-    leave: leaveCall,
+    leave,
    toggleLocalVideoMuted,
    toggleMicrophoneMuted,
    toggleScreensharing,
@@ -648,6 +493,5 @@ export function useGroupCall(
    participants,
    hasLocalParticipant,
    unencryptedEventsFromUsers,
-    otelGroupCallMembership: groupCallOTelMembership,
  };
 }
--- a/src/room/useLoadGroupCall.ts
+++ b/src/room/useLoadGroupCall.ts
@@ -32,8 +32,6 @@ import { isLocalRoomId, createRoom, roomNameFromRoomId } from "../matrix-utils";
 import { translatedError } from "../TranslatedError";
 import { widget } from "../widget";

-const STATS_COLLECT_INTERVAL_TIME_MS = 10000;
-
 export interface GroupCallLoadState {
  loading: boolean;
  error?: Error;
@@ -54,22 +52,12 @@ export const useLoadGroupCall = (

    const fetchOrCreateRoom = async (): Promise<Room> => {
      try {
-        // We lowercase the localpart when we create the room, so we must lowercase
-        // it here too (we just do the whole alias). We can't do the same to room IDs
-        // though.
-        const sanitisedIdOrAlias =
-          roomIdOrAlias[0] === "#"
-            ? roomIdOrAlias.toLowerCase()
-            : roomIdOrAlias;
-
-        const room = await client.joinRoom(sanitisedIdOrAlias, {
-          viaServers,
-        });
+        const room = await client.joinRoom(roomIdOrAlias, { viaServers });
        logger.info(
-          `Joined ${sanitisedIdOrAlias}, waiting room to be ready for group calls`
+          `Joined ${roomIdOrAlias}, waiting room to be ready for group calls`
        );
        await client.waitUntilRoomReadyForGroupCalls(room.roomId);
-        logger.info(`${sanitisedIdOrAlias}, is ready for group calls`);
+        logger.info(`${roomIdOrAlias}, is ready for group calls`);
        return room;
      } catch (error) {
        if (
@@ -96,13 +84,10 @@ export const useLoadGroupCall = (
    const fetchOrCreateGroupCall = async (): Promise<GroupCall> => {
      const room = await fetchOrCreateRoom();
      logger.debug(`Fetched / joined room ${roomIdOrAlias}`);
-      let groupCall = client.getGroupCallForRoom(room.roomId);
+      const groupCall = client.getGroupCallForRoom(room.roomId);
      logger.debug("Got group call", groupCall?.groupCallId);

-      if (groupCall) {
-        groupCall.setGroupCallStatsInterval(STATS_COLLECT_INTERVAL_TIME_MS);
-        return groupCall;
-      }
+      if (groupCall) return groupCall;

      if (
        !widget &&
@@ -117,14 +102,12 @@ export const useLoadGroupCall = (
            createPtt ? "PTT" : "video"
          } call`
        );
-        groupCall = await client.createGroupCall(
+        return await client.createGroupCall(
          room.roomId,
          createPtt ? GroupCallType.Voice : GroupCallType.Video,
          createPtt,
          GroupCallIntent.Room
        );
-        groupCall.setGroupCallStatsInterval(STATS_COLLECT_INTERVAL_TIME_MS);
-        return groupCall;
      }

      // We don't have permission to create the call, so all we can do is wait
@@ -133,7 +116,6 @@ export const useLoadGroupCall = (
        const onGroupCallIncoming = (groupCall: GroupCall) => {
          if (groupCall?.room.roomId === room.roomId) {
            clearTimeout(timeout);
-            groupCall.setGroupCallStatsInterval(STATS_COLLECT_INTERVAL_TIME_MS);
            client.off(
              GroupCallEventHandlerEvent.Incoming,
              onGroupCallIncoming
--- a/src/room/usePTT.ts
+++ b/src/room/usePTT.ts
@@ -113,14 +113,12 @@ export const usePTT = (
    },
    setState,
  ] = useState(() => {
-    // slightly concerningly, this can end up null as we seem to sometimes get
-    // here before the room state contains our own member event
    const roomMember = groupCall.room.getMember(client.getUserId());

    const activeSpeakerFeed = getActiveSpeakerFeed(userMediaFeeds, groupCall);

    return {
-      isAdmin: roomMember ? roomMember.powerLevel >= 100 : false,
+      isAdmin: roomMember.powerLevel >= 100,
      talkOverEnabled: false,
      pttButtonHeld: false,
      activeSpeakerUserId: activeSpeakerFeed ? activeSpeakerFeed.userId : null,
--- a/src/settings/ProfileSettingsTab.tsx
+++ b/src/settings/ProfileSettingsTab.tsx
@@ -1,113 +0,0 @@
-/*
-Copyright 2022 - 2023 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React, { useCallback, useEffect, useRef } from "react";
-import { MatrixClient } from "matrix-js-sdk/src/client";
-import { useTranslation } from "react-i18next";
-
-import { useProfile } from "../profile/useProfile";
-import { FieldRow, InputField, ErrorMessage } from "../input/Input";
-import { AvatarInputField } from "../input/AvatarInputField";
-import styles from "./ProfileSettingsTab.module.css";
-
-interface Props {
-  client: MatrixClient;
-}
-export function ProfileSettingsTab({ client }: Props) {
-  const { t } = useTranslation();
-  const { error, displayName, avatarUrl, saveProfile } = useProfile(client);
-
-  const formRef = useRef<HTMLFormElement | null>(null);
-
-  const formChanged = useRef(false);
-  const onFormChange = useCallback(() => {
-    formChanged.current = true;
-  }, []);
-
-  const removeAvatar = useRef(false);
-  const onRemoveAvatar = useCallback(() => {
-    removeAvatar.current = true;
-    formChanged.current = true;
-  }, []);
-
-  useEffect(() => {
-    const form = formRef.current!;
-    // Auto-save when the user dismisses this component
-    return () => {
-      if (formChanged.current) {
-        const data = new FormData(form);
-        const displayNameDataEntry = data.get("displayName");
-        const avatar = data.get("avatar");
-
-        const avatarSize =
-          typeof avatar == "string" ? avatar.length : avatar?.size ?? 0;
-        const displayName =
-          typeof displayNameDataEntry == "string"
-            ? displayNameDataEntry
-            : displayNameDataEntry?.name ?? null;
-
-        saveProfile({
-          displayName,
-          avatar: avatar && avatarSize > 0 ? avatar : undefined,
-          removeAvatar: removeAvatar.current && (!avatar || avatarSize === 0),
-        });
-      }
-    };
-  }, [saveProfile]);
-
-  return (
-    <form onChange={onFormChange} ref={formRef} className={styles.content}>
-      <FieldRow className={styles.avatarFieldRow}>
-        <AvatarInputField
-          id="avatar"
-          name="avatar"
-          label={t("Avatar")}
-          avatarUrl={avatarUrl}
-          displayName={displayName}
-          onRemoveAvatar={onRemoveAvatar}
-        />
-      </FieldRow>
-      <FieldRow>
-        <InputField
-          id="userId"
-          name="userId"
-          label={t("Username")}
-          type="text"
-          disabled
-          value={client.getUserId()!}
-        />
-      </FieldRow>
-      <FieldRow>
-        <InputField
-          id="displayName"
-          name="displayName"
-          label={t("Display name")}
-          type="text"
-          required
-          autoComplete="off"
-          placeholder={t("Display name")}
-          defaultValue={displayName}
-          data-testid="profile_displayname"
-        />
-      </FieldRow>
-      {error && (
-        <FieldRow>
-          <ErrorMessage error={error} />
-        </FieldRow>
-      )}
-    </form>
-  );
-}
--- a/src/settings/SettingsModal.module.css
+++ b/src/settings/SettingsModal.module.css
@@ -19,12 +19,8 @@ limitations under the License.
  height: 480px;
 }

-.settingsModal p {
-  color: var(--secondary-content);
-}
-
 .tabContainer {
-  padding: 27px 20px;
+  margin: 27px 16px;
 }

 .fieldRowText {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
David Baker	69b1b3076c	Update js-sdk	2023-01-17 11:15:39 +00:00
David Baker	4ec7749631	Add units to constant	2023-01-17 11:15:12 +00:00
David Baker	3340ba96dc	Change rageshake persistence to throttled flushing Rather than every 30 seconds. This way we'll save logs for sessions lasting less than 30 seconds which we previously didn't. Also save on window unload just in case that doesn't catch everything. Plus remove some more unused params.	2023-01-17 11:15:00 +00:00
David Baker	756e03758f	Mostly cosmetic fixes to rageshake * Remove duplicate copyright header * Remove ts-ignores by just using the objects directly rather than via event.target * Use error.message rather than errorCode which TS doesn't know about and may or may not exist. * Remove some unused things like the skip rageshake function and the option to init rageshakes without storage. * Turn single function with a boolean param to make it take two entirely separate code paths into two functions.	2023-01-17 11:13:40 +00:00
David Baker	ec4e50693f	Log undecryptable to-device events Listen for the new undecryptable to-device event event and log events for it in Posthog & Sentry, and make it visible in the call flow diagram.	2023-01-17 11:11:39 +00:00
David Baker	fe575990f5	Rename to useCallViewKeyboardShortcuts	2023-01-17 11:11:13 +00:00
David Baker	c9baa2d9dc	Prevent mute event spam from key repeats	2023-01-17 11:10:55 +00:00
David Baker	9b3a7cd219	Disable keyboard shortcuts when feedback modal is open	2023-01-17 11:10:45 +00:00
David Baker	f58590fc70	Fix caching headers on Docker image	2023-01-17 11:10:37 +00:00
David Baker	71a1c5d24b	Use IndexedDB storage in dev mode, just without the worker As per comment, we can't use workers in Vite dev mode. We previously fell back to the memory store but this ends up with it working significantly differently in dev mode to production, eg. dev mode would always start by doing an initial sync, so old to-device messages would arrive again. There's no need to fall all the way back to the memory store though, we can use the IndexedDB store without the worker.	2023-01-17 11:10:01 +00:00