Add nightly & main app to assetlinks

Translations update from Weblate

.eslintrc.cjs

@@ -24,7 +24,7 @@ module.exports = {
   },
   overrides: [
     {
-      files: ["src/**/*.{ts,tsx}"],
+      files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}"],
       extends: [
         "plugin:matrix-org/typescript",
         "plugin:matrix-org/react",

package.json

@@ -29,8 +29,9 @@
     "@opentelemetry/instrumentation-document-load": "^0.33.0",
     "@opentelemetry/instrumentation-user-interaction": "^0.33.0",
     "@opentelemetry/sdk-trace-web": "^1.9.1",
+    "@radix-ui/react-dialog": "^1.0.4",
+    "@radix-ui/react-visually-hidden": "^1.0.3",
     "@react-aria/button": "^3.3.4",
-    "@react-aria/dialog": "^3.1.4",
     "@react-aria/focus": "^3.5.0",
     "@react-aria/menu": "^3.3.0",
     "@react-aria/overlays": "^3.7.3",
@@ -40,7 +41,6 @@
     "@react-aria/utils": "^3.10.0",
     "@react-spring/web": "^9.4.4",
     "@react-stately/collections": "^3.3.4",
-    "@react-stately/overlays": "^3.1.3",
     "@react-stately/select": "^3.1.3",
     "@react-stately/tooltip": "^3.0.5",
     "@react-stately/tree": "^3.2.0",
@@ -52,7 +52,6 @@
     "@vitejs/plugin-basic-ssl": "^1.0.1",
     "@vitejs/plugin-react": "^4.0.1",
     "classnames": "^2.3.1",
-    "color-hash": "^2.0.1",
     "events": "^3.3.0",
     "i18next": "^21.10.0",
     "i18next-browser-languagedetector": "^6.1.8",
@@ -77,12 +76,14 @@
     "sdp-transform": "^2.14.1",
     "tinyqueue": "^2.0.3",
     "unique-names-generator": "^4.6.0",
-    "uuid": "9"
+    "uuid": "9",
+    "vaul": "^0.6.1"
   },
   "devDependencies": {
     "@babel/core": "^7.16.5",
     "@react-spring/rafz": "^9.7.3",
-    "@sentry/vite-plugin": "^0.3.0",
+    "@react-types/dialog": "^3.5.5",
+    "@sentry/vite-plugin": "^0.7.0",
     "@storybook/react": "^6.5.0-alpha.5",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",

public/.well-known/assetlinks.json

@@ -8,5 +8,25 @@
         "B0:B0:51:DC:56:5C:81:2F:E1:7F:6F:3E:94:5B:4D:79:04:71:23:AB:0D:A6:12:86:76:9E:B2:94:91:97:13:0E"
       ]
     }
+  },
+  {
+    "relation": ["delegate_permission/common.handle_all_urls"],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "io.element.android.x.nightly",
+      "sha256_cert_fingerprints": [
+        "CA:D3:85:16:84:3A:05:CC:EB:00:AB:7B:D3:80:0F:01:BA:8F:E0:4B:38:86:F3:97:D8:F7:9A:1B:C4:54:E4:0F"
+      ]
+    }
+  },
+  {
+    "relation": ["delegate_permission/common.handle_all_urls"],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "io.element.android.x",
+      "sha256_cert_fingerprints": [
+        "C6:DB:9B:9C:8C:BD:D6:5D:16:E8:EC:8C:8B:91:C8:31:B9:EF:C9:5C:BF:98:AE:41:F6:A9:D8:35:15:1A:7E:16"
+      ]
+    }
   }
 ]

public/locales/bg/app.json

@@ -5,8 +5,6 @@
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Друг потребител в този разговор има проблем. За да диагностицираме този проблем по-добре ни се иска да съберем debug логове.",
   "Audio": "Звук",
   "Avatar": "Аватар",
-  "Call link copied": "Връзка към разговора бе копирана",
-  "Call type menu": "Меню \"тип на разговора\"",
   "Camera": "Камера",
   "Close": "Затвори",
   "Confirm password": "Потвърди паролата",
@@ -57,17 +55,11 @@
   "Speaker": "Говорител",
   "Spotlight": "Прожектор",
   "Submit feedback": "Изпрати обратна връзка",
-  "Take me Home": "Отиди в Начало",
   "This call already exists, would you like to join?": "Този разговор вече съществува, искате ли да се присъедините?",
   "User menu": "Потребителско меню",
   "Username": "Потребителско име",
   "Version: {{version}}": "Версия: {{version}}",
   "Video": "Видео",
-  "Video call": "Видео разговор",
-  "Video call name": "Име на видео разговора",
   "Waiting for other participants…": "Изчакване на други участници…",
-  "Walkie-talkie call": "Уоки-токи разговор",
-  "Walkie-talkie call name": "Име на уоки-токи разговора",
-  "Yes, join call": "Да, присъедини се",
-  "Your recent calls": "Скорошните ви разговори"
+  "Yes, join call": "Да, присъедини се"
 }

public/locales/cs/app.json

@@ -4,21 +4,16 @@
   "Confirm password": "Potvrdit heslo",
   "Close": "Zavřít",
   "Camera": "Kamera",
-  "Call link copied": "Odkaz na hovor zkopírován",
   "Avatar": "Avatar",
   "Audio": "Audio",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Vytvořit účet</0> Or <2>Jako host</2>",
-  "Your recent calls": "Vaše nedávné hovory",
   "Yes, join call": "Ano, připojit se",
   "Waiting for other participants…": "Čekání na další účastníky…",
-  "Video call name": "Jméno videohovoru",
-  "Video call": "Videohovor",
   "Video": "Video",
   "Version: {{version}}": "Verze: {{version}}",
   "Username": "Uživatelské jméno",
   "User menu": "Uživatelské menu",
   "This call already exists, would you like to join?": "Tento hovor již existuje, chcete se připojit?",
-  "Take me Home": "Domovská obrazovka",
   "Submit feedback": "Dát feedback",
   "Speaker": "Reproduktor",
   "Sign out": "Odhlásit se",
@@ -49,8 +44,6 @@
   "Join call now": "Připojit se k hovoru",
   "Join call": "Připojit se k hovoru",
   "Inspector": "Insepktor",
-  "Walkie-talkie call name": "Jméno vysílačkového hovoru",
-  "Walkie-talkie call": "Vysílačkový hovor",
   "Spotlight": "Soustředěný mód",
   "Recaptcha not loaded": "Recaptcha se nenačetla",
   "Recaptcha dismissed": "Recaptcha byla zamítnuta",
@@ -69,10 +62,8 @@
   "Debug log": "Protokoly ladění",
   "Create account": "Vytvořit účet",
   "Copy": "Kopírovat",
-  "Call type menu": "Menu typu hovoru",
   "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í.",
   "<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>",
   "<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>",

public/locales/de/app.json

@@ -5,8 +5,6 @@
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Ein anderer Benutzer dieses Anrufs hat ein Problem. Um es besser diagnostizieren zu können, würden wir gerne ein Debug-Protokoll erstellen.",
   "Audio": "Audio",
   "Avatar": "Avatar",
-  "Call link copied": "Anruflink kopiert",
-  "Call type menu": "Anruftyp Menü",
   "Camera": "Kamera",
   "Close": "Schließen",
   "Confirm password": "Passwort bestätigen",
@@ -57,21 +55,14 @@
   "Speaker": "Wiedergabegerät",
   "Spotlight": "Rampenlicht",
   "Submit feedback": "Rückmeldung geben",
-  "Take me Home": "Zurück zur Startseite",
   "This call already exists, would you like to join?": "Dieser Aufruf existiert bereits, möchtest Du teilnehmen?",
   "User menu": "Benutzermenü",
   "Username": "Benutzername",
   "Version: {{version}}": "Version: {{version}}",
   "Video": "Video",
-  "Video call": "Videoanruf",
-  "Video call name": "Name des Videoanrufs",
   "Waiting for other participants…": "Warte auf weitere Teilnehmer …",
-  "Walkie-talkie call": "Walkie-Talkie-Anruf",
   "Yes, join call": "Ja, Anruf beitreten",
-  "Your recent calls": "Deine letzten Anrufe",
-  "Walkie-talkie call name": "Name des Walkie-Talkie-Anrufs",
   "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>Link kopieren und später beitreten</2>",
   "Copy": "Kopieren",
   "Element Call Home": "Element Call-Startseite",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Übermittelte Problemberichte helfen uns, Fehler zu beheben.</0>",
@@ -116,8 +107,6 @@
   "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
   "Share": "Teilen",
   "Share this call": "Diesen Anruf teilen",
-  "Video off": "Video aus",
-  "Video on": "Video an",
   "Sharing screen": "Bildschirm wird geteilt",
   "You": "Du"
 }

public/locales/el/app.json

@@ -16,18 +16,12 @@
   "Display name": "Εμφανιζόμενο όνομα",
   "Developer Settings": "Ρυθμίσεις προγραμματιστή",
   "Debug log request": "Αίτημα αρχείου καταγραφής",
-  "Call link copied": "Ο σύνδεσμος κλήσης αντιγράφηκε",
   "Avatar": "Avatar",
   "<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>",
-  "Your recent calls": "Οι πρόσφατες κλήσεις σας",
   "Yes, join call": "Ναι, συμμετοχή στην κλήση",
-  "Walkie-talkie call name": "Όνομα κλήσης walkie-talkie",
-  "Walkie-talkie call": "Κλήση walkie-talkie",
   "Waiting for other participants…": "Αναμονή για άλλους συμμετέχοντες…",
-  "Video call name": "Όνομα βίντεο κλήσης",
-  "Video call": "Βίντεο κλήση",
   "Video": "Βίντεο",
   "Username": "Όνομα χρήστη",
   "This call already exists, would you like to join?": "Αυτή η κλήση υπάρχει ήδη, θα θέλατε να συμμετάσχετε;",
@@ -62,14 +56,11 @@
   "Send debug logs": "Αποστολή αρχείων καταγραφής",
   "Recaptcha dismissed": "Το recaptcha απορρίφθηκε",
   "<0>Thanks for your feedback!</0>": "<0>Ευχαριστώ για τα σχόλιά σας!</0>",
-  "Call type menu": "Μενού είδους κλήσης",
   "Local volume": "Τοπική ένταση",
   "Home": "Αρχική",
   "Show connection stats": "Εμφάνιση στατιστικών σύνδεσης",
-  "Take me Home": "Μετάβαση στην Αρχική",
   "{{displayName}} is presenting": "{{displayName}} παρουσιάζει",
   "<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>Μπορείτε να ανακαλέσετε τη συγκατάθεσή σας αποεπιλέγοντας αυτό το πλαίσιο. Εάν βρίσκεστε σε κλήση, η ρύθμιση αυτή θα τεθεί σε ισχύ στο τέλος της.",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Συμμετοχή στην κλήση τώρα</0><1>Or</1><2>Αντιγραφή συνδέσμου κλήσης και συμμετοχή αργότερα</2>",
   "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Θα θέλαμε να ακούσουμε τα σχόλιά σας ώστε να βελτιώσουμε την εμπειρία σας.</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>Γιατί να μην ολοκληρώσετε με τη δημιουργία ενός κωδικού πρόσβασης για τη διατήρηση του λογαριασμού σας;</0><1>Θα μπορείτε να διατηρήσετε το όνομά σας και να ορίσετε ένα avatar για χρήση σε μελλοντικές κλήσεις.</1>",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Ένας άλλος χρήστης σε αυτή την κλήση έχει ένα πρόβλημα. Για την καλύτερη διάγνωση αυτών των προβλημάτων θα θέλαμε να συλλέξουμε ένα αρχείο καταγραφής σφαλμάτων.",

public/locales/en-GB/app.json

@@ -9,7 +9,6 @@
   "<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>",
@@ -18,15 +17,15 @@
   "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",
+  "Back to recents": "Back to recents",
   "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>",
   "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</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",
   "Close": "Close",
   "Confirm password": "Confirm password",
   "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
+  "Continue in browser": "Continue in browser",
   "Copied!": "Copied!",
   "Copy": "Copy",
   "Copy and share this call link": "Copy and share this call link",
@@ -66,13 +65,17 @@
   "Microphone off": "Microphone off",
   "Microphone on": "Microphone on",
   "More": "More",
+  "Mute microphone": "Mute microphone",
+  "Name of call": "Name of call",
   "No": "No",
   "Not encrypted": "Not encrypted",
   "Not now, return to home screen": "Not now, return to home screen",
   "Not registered yet? <2>Create an account</2>": "Not registered yet? <2>Create an account</2>",
+  "Open in the app": "Open in the app",
   "Password": "Password",
   "Passwords must match": "Passwords must match",
   "Profile": "Profile",
+  "Ready to join?": "Ready to join?",
   "Recaptcha dismissed": "Recaptcha dismissed",
   "Recaptcha not loaded": "Recaptcha not loaded",
   "Reconnect": "Reconnect",
@@ -82,6 +85,7 @@
   "Retry sending logs": "Retry sending logs",
   "Return to home screen": "Return to home screen",
   "Select an option": "Select an option",
+  "Select app": "Select app",
   "Send debug logs": "Send debug logs",
   "Sending debug logs…": "Sending debug logs…",
   "Sending…": "Sending…",
@@ -96,28 +100,24 @@
   "Sign out": "Sign out",
   "Speaker": "Speaker",
   "Spotlight": "Spotlight",
+  "Start new call": "Start new call",
+  "Start video": "Start video",
+  "Stop video": "Stop video",
   "Submit": "Submit",
   "Submit feedback": "Submit feedback",
   "Submitting…": "Submitting…",
-  "Take me Home": "Take me Home",
   "Thanks, we received your feedback!": "Thanks, we received your feedback!",
   "Thanks!": "Thanks!",
   "This call already exists, would you like to join?": "This call already exists, would you like to join?",
   "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>End User Licensing Agreement (EULA)</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>End User Licensing Agreement (EULA)</12>",
+  "Unmute microphone": "Unmute microphone",
   "User menu": "User menu",
   "Username": "Username",
   "Version: {{version}}": "Version: {{version}}",
   "Video": "Video",
-  "Video call": "Video call",
-  "Video call name": "Video call name",
-  "Video off": "Video off",
-  "Video on": "Video on",
   "Waiting for other participants…": "Waiting for other participants…",
-  "Walkie-talkie call": "Walkie-talkie call",
-  "Walkie-talkie call name": "Walkie-talkie call name",
   "Yes, join call": "Yes, join call",
   "You": "You",
   "You were disconnected from the call": "You were disconnected from the call",
-  "Your feedback": "Your feedback",
-  "Your recent calls": "Your recent calls"
+  "Your feedback": "Your feedback"
 }

public/locales/es/app.json

@@ -1,21 +1,15 @@
 {
   "<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>¿Por qué no mantienes tu cuenta estableciendo una contraseña?</0><1>Podrás mantener tu nombre y establecer un avatar para usarlo en futuras llamadas</1>",
-  "Your recent calls": "Tus llamadas recientes",
   "This call already exists, would you like to join?": "Esta llamada ya existe, ¿te gustaría unirte?",
   "Register": "Registrarse",
   "Not registered yet? <2>Create an account</2>": "¿No estás registrado todavía? <2>Crear una cuenta</2>",
   "Login to your account": "Iniciar sesión en tu cuenta",
   "Yes, join call": "Si, unirse a la llamada",
-  "Walkie-talkie call name": "Nombre de la llamada Walkie-talkie",
-  "Walkie-talkie call": "Llamada Walkie-talkie",
   "Waiting for other participants…": "Esperando a los otros participantes…",
-  "Video call name": "Nombre de la videollamada",
-  "Video call": "Videollamada",
   "Video": "Video",
   "Version: {{version}}": "Versión: {{version}}",
   "Username": "Nombre de usuario",
   "User menu": "Menú de usuario",
-  "Take me Home": "Volver al inicio",
   "Submit feedback": "Enviar comentarios",
   "Spotlight": "Foco",
   "Speaker": "Altavoz",
@@ -64,13 +58,10 @@
   "Confirm password": "Confirmar contraseña",
   "Close": "Cerrar",
   "Camera": "Cámara",
-  "Call type menu": "Menú de tipo de llamada",
-  "Call link copied": "Enlace de la llamada copiado",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Otro usuario en esta llamada está teniendo problemas. Para diagnosticar estos problemas nos gustaría recopilar un registro de depuración.",
   "Audio": "Audio",
   "Avatar": "Avatar",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Crear una cuenta</0> o <2>Acceder como invitado</2>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Unirse ahora</0><1>Or</1><2>Copiar el enlace y unirse más tarde</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>¿Ya tienes una cuenta?</0><1><0>Iniciar sesión</0> o <2>Acceder como invitado</2></1>",
   "Element Call Home": "Inicio de Element Call",
   "Copy": "Copiar",

public/locales/et/app.json

@@ -1,6 +1,5 @@
 {
   "<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>Kas soovid salasõna seadistada ja sellega oma kasutajakonto alles jätta?</0><1>Nii saad säilitada oma nime ja määrata profiilipildi, mida saad kasutada tulevastes kõnedes</1>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Liitu kõnega kohe</0><1> Või</1><2>Kopeeri kõne link ja liitu hiljem</2>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Loo konto</0> Või <2>Sisene külalisena</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>On sul juba konto?</0><1><0>Logi sisse</0> Või <2>Logi sisse külalisena</2></1>",
   "Inspector": "Inspektor",
@@ -20,8 +19,6 @@
   "Confirm password": "Kinnita salasõna",
   "Close": "Sulge",
   "Camera": "Kaamera",
-  "Call type menu": "Kõnetüübi valik",
-  "Call link copied": "Kõne link on kopeeritud",
   "Avatar": "Tunnuspilt",
   "Audio": "Heli",
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Ühel teisel selles kõnes osalejal on lahenduse kasutamisel tekkinud probleem ning selle põhjuse leidmiseks me sooviksime koguda silumislogisid.",
@@ -30,7 +27,6 @@
   "Not registered yet? <2>Create an account</2>": "Sa pole veel registreerunud? <2>Loo kasutajakonto</2>",
   "Not now, return to home screen": "Mitte praegu, mine tagasi avalehele",
   "No": "Ei",
-  "Your recent calls": "Hiljutised kõned",
   "More": "Rohkem",
   "Microphone": "Mikrofon",
   "Login to your account": "Logi oma kontosse sisse",
@@ -41,7 +37,6 @@
   "Join existing call?": "Liitu juba käimasoleva kõnega?",
   "Join call now": "Liitu kõnega kohe",
   "Join call": "Kõnega liitumine",
-  "Take me Home": "Mine avalehele",
   "Submit feedback": "Jaga tagasisidet",
   "Spotlight": "Rambivalgus",
   "Speaker": "Kõlar",
@@ -62,16 +57,12 @@
   "Recaptcha dismissed": "Robotilõks on vahele jäetud",
   "Profile": "Profiil",
   "Waiting for other participants…": "Ootame teiste osalejate lisandumist…",
-  "Video call name": "Videokõne nimi",
-  "Video call": "Videokõne",
   "Video": "Video",
   "Version: {{version}}": "Versioon: {{version}}",
   "Username": "Kasutajanimi",
   "This call already exists, would you like to join?": "See kõne on juba olemas, kas soovid liituda?",
   "User menu": "Kasutajamenüü",
   "Yes, join call": "Jah, liitu kõnega",
-  "Walkie-talkie call": "Walkie-talkie stiilis kõne",
-  "Walkie-talkie call name": "Walkie-talkie stiilis kõne nimi",
   "Element Call Home": "Element Call Home",
   "Copy": "Kopeeri",
   "<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>",
@@ -114,9 +105,7 @@
   "Share": "Jaga",
   "Share this call": "Jaga seda kõnet",
   "Sharing screen": "Ekraanivaade on jagamisel",
-  "Video on": "Video on kasutusel",
   "{{count, number}}|one": "{{count, number}}",
   "{{count, number}}|other": "{{count, number}}",
-  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
-  "Video off": "Video ei ole kasutusel"
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}"
 }

public/locales/fa/app.json

@@ -1,9 +1,6 @@
 {
-  "Your recent calls": "تماس‌های اخیر شما",
-  "Video call": "تماس تصویری",
   "Video": "ویدیو",
   "Username": "نام کاربری",
-  "Take me Home": "مرا به خانه ببر",
   "Speaker": "بلندگو",
   "Sign out": "خروج",
   "Sign in": "ورود",
@@ -34,8 +31,6 @@
   "Confirm password": "تایید رمزعبور",
   "Close": "بستن",
   "Camera": "دوربین",
-  "Call type menu": "منوی نوع تماس",
-  "Call link copied": "لینک تماس کپی شد",
   "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.": "کاربر دیگری در این تماس مشکلی دارد. برای تشخیص بهتر مشکل، بهتر است ما لاگ عیب‌یابی را جمع‌آوری کنیم.",
@@ -63,15 +58,11 @@
   "Logging in…": "ورود…",
   "Include debug logs": "شامل لاگ‌های عیب‌یابی",
   "Yes, join call": "بله، به تماس بپیوندید",
-  "Walkie-talkie call name": "نامِ تماسِ واکی-تاکی",
-  "Walkie-talkie call": "تماسِ واکی-تاکی",
   "Waiting for other participants…": "در انتظار برای دیگر شرکت‌کنندگان…",
-  "Video call name": "نامِ تماسِ تصویری",
   "Version: {{version}}": "نسخه: {{نسخه}}",
   "User menu": "فهرست کاربر",
   "This call already exists, would you like to join?": "این تماس از قبل وجود دارد، می‌خواهید بپیوندید؟",
   "Submit feedback": "بازخورد ارائه دهید",
   "Element Call Home": "خانهٔ تماس المنت",
-  "Copy": "رونوشت",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>اکنون به تماس پیوسته</0><1>یا</1><2>پیوند تماس را رونوشت کرده و بعداً بپیوندید</2>"
+  "Copy": "رونوشت"
 }

public/locales/fr/app.json

@@ -4,8 +4,6 @@
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Un autre utilisateur dans cet appel a un problème. Pour nous permettre de résoudre le problème, nous aimerions récupérer un journal de débogage.",
   "Audio": "Audio",
   "Avatar": "Avatar",
-  "Call link copied": "Lien de l’appel copié",
-  "Call type menu": "Menu de type d’appel",
   "Camera": "Caméra",
   "Close": "Fermer",
   "Confirm password": "Confirmer le mot de passe",
@@ -55,15 +53,9 @@
   "Sign out": "Déconnexion",
   "Spotlight": "Premier plan",
   "Submit feedback": "Envoyer des retours",
-  "Take me Home": "Retouner à l’accueil",
   "This call already exists, would you like to join?": "Cet appel existe déjà, voulez-vous le rejoindre ?",
-  "Your recent calls": "Appels récents",
   "Yes, join call": "Oui, rejoindre l’appel",
-  "Walkie-talkie call name": "Nom de l’appel talkie-walkie",
-  "Walkie-talkie call": "Appel talkie-walkie",
   "Waiting for other participants…": "En attente d’autres participants…",
-  "Video call name": "Nom de l’appel vidéo",
-  "Video call": "Appel vidéo",
   "Video": "Vidéo",
   "Version: {{version}}": "Version : {{version}}",
   "Username": "Nom d’utilisateur",
@@ -71,7 +63,6 @@
   "Speaker": "Intervenant",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Vous avez déjà un compte ?</0><1><0>Se connecter</0> Ou <2>Accès invité</2></1>",
   "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>",
   "Element Call Home": "Accueil Element Call",
   "Copy": "Copier",
   "<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>",
@@ -115,8 +106,6 @@
   "Share": "Partager",
   "Share this call": "Partager cet appel",
   "Sharing screen": "L’écran est partagé",
-  "Video off": "Vidéo éteinte",
-  "Video on": "Vidéo allumée",
   "{{count, number}}|one": "{{count, number}}",
   "Not encrypted": "Non chiffré",
   "You": "Vous"

public/locales/id/app.json

@@ -5,8 +5,6 @@
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Pengguna yang lain di panggilan ini sedang mengalami masalah. Supaya dapat mendiagnosa masalah ini, kami ingin mengumpulkan sebuah catatan pengawakutuan.",
   "Audio": "Audio",
   "Avatar": "Avatar",
-  "Call link copied": "Tautan panggilan disalin",
-  "Call type menu": "Menu jenis panggilan",
   "Camera": "Kamera",
   "Close": "Tutup",
   "Confirm password": "Konfirmasi kata sandi",
@@ -57,21 +55,14 @@
   "Speaker": "Pembicara",
   "Spotlight": "Sorotan",
   "Submit feedback": "Kirim masukan",
-  "Take me Home": "Bawa saya ke Beranda",
   "This call already exists, would you like to join?": "Panggilan ini sudah ada, apakah Anda ingin bergabung?",
   "User menu": "Menu pengguna",
   "Username": "Nama pengguna",
   "Version: {{version}}": "Versi: {{version}}",
   "Video": "Video",
-  "Video call": "Panggilan video",
-  "Video call name": "Nama panggilan video",
   "Waiting for other participants…": "Menunggu peserta lain…",
-  "Walkie-talkie call": "Panggilan protofon",
-  "Walkie-talkie call name": "Nama panggilan protofon",
   "Yes, join call": "Ya, bergabung ke panggilan",
-  "Your recent calls": "Panggilan Anda terkini",
   "Sending debug logs…": "Mengirimkan catatan pengawakutuan…",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Bergabung ke panggilan sekarang</0><1>Atau</1><2>Salin tautan dan bergabung nanti</2>",
   "Element Call Home": "Beranda Element Call",
   "Copy": "Salin",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Mengirim catatan pengawakutuan akan membantu kami melacak masalahnya.</0>",
@@ -115,8 +106,7 @@
   "Share": "Bagikan",
   "Share this call": "Bagikan panggilan ini",
   "Sharing screen": "Berbagi layar",
-  "Video off": "Video dinonaktifkan",
-  "Video on": "Video diaktifkan",
   "{{count, number}}|one": "{{count, number}}",
-  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}"
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
+  "You": "Anda"
 }

public/locales/it/app.json

@@ -7,7 +7,6 @@
   "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Hai già un profilo?</0><1><0>Accedi</0> o <2>Accedi come ospite</2></1>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Crea un profilo</0> o <2>Accedi come ospite</2>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Entra nella chiamata</0><1>o</1><2>Copia il collegamento ed entra dopo</2>",
   "<0>Oops, something's gone wrong.</0>": "<0>Ops, qualcosa è andato storto.</0>",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>L'invio di registri di debug ci aiuterà ad individuare il problema.</0>",
   "<0>Thanks for your feedback!</0>": "<0>Grazie per la tua opinione!</0>",
@@ -15,8 +14,6 @@
   "Audio": "Audio",
   "Avatar": "Avatar",
   "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Cliccando \"Vai\", accetti il nostro <2>accordo di licenza con l'utente finale (EULA)</2>",
-  "Call link copied": "Collegamento alla chiamata copiato",
-  "Call type menu": "Menu del tipo di chiamata",
   "Camera": "Fotocamera",
   "Close": "Chiudi",
   "Confirm password": "Conferma password",
@@ -86,7 +83,6 @@
   "Speaker": "Altoparlante",
   "Submit": "Invia",
   "Submit feedback": "Invia commento",
-  "Take me Home": "Portami all'inizio",
   "Show call inspector": "Mostra ispettore della chiamata",
   "Spotlight": "In primo piano",
   "Thanks, we received your feedback!": "Grazie, abbiamo ricevuto il tuo commento!",
@@ -97,17 +93,10 @@
   "Username": "Nome utente",
   "Version: {{version}}": "Versione: {{version}}",
   "Video": "Video",
-  "Video call": "Videochiamata",
-  "Video call name": "Nome della videochiamata",
-  "Video off": "Video spento",
-  "Video on": "Video acceso",
   "Waiting for other participants…": "In attesa di altri partecipanti…",
-  "Walkie-talkie call": "Chiamata walkie-talkie",
-  "Walkie-talkie call name": "Nome della chiamata walkie-talkie",
   "Yes, join call": "Sì, entra in chiamata",
   "You were disconnected from the call": "Sei stato disconnesso dalla chiamata",
   "Your feedback": "Il tuo commento",
-  "Your recent calls": "Le tue chiamate recenti",
   "{{displayName}}, your call has ended.": "{{displayName}}, la chiamata è terminata.",
   "<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>Puoi revocare il consenso deselezionando questa casella. Se attualmente sei in una chiamata, avrà effetto al termine di essa.",
   "<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>Ti va di terminare impostando una password per mantenere il profilo?</0><1>Potrai mantenere il tuo nome e impostare un avatar da usare in chiamate future</1>",
@@ -118,5 +107,6 @@
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Un altro utente in questa chiamata sta avendo problemi. Per diagnosticare meglio questi problemi, vorremmo raccogliere un registro di debug.",
   "End-to-end encryption isn't supported on your browser.": "La crittografia end-to-end non è supportata nel tuo browser.",
   "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Cliccando \"Entra in chiamata ora\", accetti il nostro <2>accordo di licenza con l'utente finale (EULA)</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>.": "Partecipando a questa beta, acconsenti alla raccolta di dati anonimi che usiamo per migliorare il prodotto. Puoi trovare più informazioni su quali dati monitoriamo nella nostra <2>informativa sulla privacy</2> e nell'<5>informativa sui cookie</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>.": "Partecipando a questa beta, acconsenti alla raccolta di dati anonimi che usiamo per migliorare il prodotto. Puoi trovare più informazioni su quali dati monitoriamo nella nostra <2>informativa sulla privacy</2> e nell'<5>informativa sui cookie</5>.",
+  "You": "Tu"
 }

public/locales/ja/app.json

@@ -1,10 +1,8 @@
 {
   "<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>",
   "<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>",
   "<0>Oops, something's gone wrong.</0>": "<0>何かがうまく行きませんでした。</0>",
   "Camera": "カメラ",
-  "Call link copied": "通話リンクをコピーしました",
   "Avatar": "アバター",
   "Audio": "音声",
   "Confirm password": "パスワードを確認",
@@ -50,19 +48,13 @@
   "Passwords must match": "パスワードが一致する必要があります",
   "Password": "パスワード",
   "Speaker": "スピーカー",
-  "Video call name": "ビデオ通話の名称",
-  "Video call": "ビデオ通話",
   "Video": "ビデオ",
   "Waiting for other participants…": "他の参加者を待機しています…",
-  "Walkie-talkie call name": "トランシーバー通話の名称",
-  "Walkie-talkie call": "トランシーバー通話",
   "Yes, join call": "はい、通話に参加",
   "Select an option": "オプションを選択",
   "Debug log request": "デバッグログを要求",
-  "Your recent calls": "最近の通話",
   "Login to your account": "アカウントにログイン",
   "Remove": "削除",
   "No": "いいえ",
-  "This call already exists, would you like to join?": "この通話は既に存在します。参加しますか？",
-  "Take me Home": "ホームに戻る"
+  "This call already exists, would you like to join?": "この通話は既に存在します。参加しますか？"
 }

public/locales/lv/app.json

@@ -3,7 +3,6 @@
   "{{count}} stars|other": "{{count}} zvaigznes",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Jau ir konts?</0><1><0>Pieteikties</0> vai <2>Piekļūt kā viesim</2></1>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Izveidot kontu</0> vai <2>Piekļūt kā viesim</2>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Pievienoties zvanam tagad</0><1>vai</1><2>ievietot zvana saiti starpliktuvē un pievienoties vēlāk</2>",
   "<0>Oops, something's gone wrong.</0>": "<0>Ak vai, kaut kas nogāja greizi!</0>",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Atkļūdošanas žurnāla ierakstu iesūtīšana palīdzēs mums atklāt nepilnību.</0>",
   "<0>We'd love to hear your feedback so we can improve your experience.</0>": "<0>Mums patiktu saņemt Tavu atsauksmi, lai mēs varētu uzlabot Tavu pieredzi.</0>",
@@ -11,8 +10,6 @@
   "Audio": "Skaņa",
   "Avatar": "Attēls",
   "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>": "Klikšķināšana uz \"Aiziet\" apliecina piekrišanu mūsu <2>galalietotāja licencēšanas nolīgumam (GLLN)</2>",
-  "Call link copied": "Zvana saite ievietota starpliktuvē",
-  "Call type menu": "Zvana veida izvēlne",
   "Camera": "Kamera",
   "Close": "Aizvērt",
   "Confirm password": "Apstiprināt paroli",
@@ -45,10 +42,8 @@
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Citam lietotājam šajā zvanā ir sarežģījumi. Lai labāk atklātu šīs nepilnības, mēs gribētu iegūt atkļūdošanas žurnālu.",
   "Home": "Sākums",
   "Waiting for other participants…": "Gaida citus dalībniekus…",
-  "Walkie-talkie call": "Rācijas zvans",
   "Yes, join call": "Jā, pievienoties zvanam",
   "Your feedback": "Tava atsauksme",
-  "Your recent calls": "Nesenie zvani",
   "How did it go?": "Kā Tev veicās?",
   "Include debug logs": "Iekļaut atkļūdošanas žurnāla ierakstus",
   "Inspector": "Inspektors",
@@ -90,7 +85,6 @@
   "Submit": "Iesniegt",
   "Submit feedback": "Iesniegt atsauksmi",
   "Submitting…": "Iesniedz…",
-  "Take me Home": "Aizvest uz sākumu",
   "Thanks, we received your feedback!": "Paldies, mēs saņēmām atsauksmi!",
   "Thanks!": "Paldies!",
   "This call already exists, would you like to join?": "Šis zvans jau pastāv. Vai vēlies pievienoties?",
@@ -98,11 +92,8 @@
   "User menu": "Lietotāja izvēlne",
   "Username": "Lietotājvārds",
   "Video": "Video",
-  "Video call": "Video zvans",
-  "Video call name": "Video zvana nosaukums",
   "You were disconnected from the call": "Tu tiki atvienots no zvana",
   "Version: {{version}}": "Versija: {{version}}",
-  "Walkie-talkie call name": "Rācijas zvana nosaukums",
   "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.": "Ja tiek piedzīvoti sarežģījumi vai vienkārši ir vēlme sniegt kādu atsauksmi, lūgums zemāk nosūtīt mums īsu aprakstu.",
   "Not registered yet? <2>Create an account</2>": "Vēl neesi reģistrējies? <2>Izveidot kontu</2>"
 }

public/locales/pl/app.json

@@ -1,19 +1,13 @@
 {
   "Login": "Zaloguj się",
   "Go": "Przejdź",
-  "Your recent calls": "Twoje ostatnie połączenia",
   "Yes, join call": "Tak, dołącz do połączenia",
-  "Walkie-talkie call name": "Nazwa połączenia walkie-talkie",
-  "Walkie-talkie call": "Połączenie walkie-talkie",
   "Waiting for other participants…": "Oczekiwanie na pozostałych uczestników…",
-  "Video call name": "Nazwa połączenia wideo",
-  "Video call": "Połączenie wideo",
   "Video": "Wideo",
   "Version: {{version}}": "Wersja: {{version}}",
   "Username": "Nazwa użytkownika",
   "User menu": "Menu użytkownika",
   "This call already exists, would you like to join?": "Te połączenie już istnieje, czy chcesz do niego dołączyć?",
-  "Take me Home": "Zabierz mnie do strony głównej",
   "Submit feedback": "Prześlij opinię",
   "Spotlight": "Centrum uwagi",
   "Speaker": "Głośnik",
@@ -63,8 +57,6 @@
   "Confirm password": "Potwierdź hasło",
   "Close": "Zamknij",
   "Camera": "Kamera",
-  "Call type menu": "Menu typu połączenia",
-  "Call link copied": "Skopiowano link do połączenia",
   "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.",
@@ -74,7 +66,6 @@
   "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>",
   "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",
@@ -115,8 +106,6 @@
   "Share": "Udostępnij",
   "Share this call": "Udostępnij to połączenie",
   "Sharing screen": "Udostępnianie ekranu",
-  "Video off": "Wideo wyłączone",
   "{{count, number}}|one": "{{count, number}}",
-  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",
-  "Video on": "Wideo włączone"
+  "{{names, list(style: short;)}}": "{{names, list(style: short;)}}"
 }

public/locales/ru/app.json

@@ -10,17 +10,11 @@
   "<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>",
   "<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>",
-  "Your recent calls": "Ваши недавние звонки",
   "Yes, join call": "Да, присоединиться",
-  "Walkie-talkie call name": "Название звонка-рации",
-  "Walkie-talkie call": "Звонок-рация",
-  "Video call name": "Название видео-звонка",
-  "Video call": "Видео-звонок",
   "Video": "Видео",
   "Version: {{version}}": "Версия: {{version}}",
   "Username": "Имя пользователя",
   "User menu": "Меню пользователя",
-  "Take me Home": "Перейти в Начало",
   "Spotlight": "Внимание",
   "Speaker": "Динамик",
   "Sign out": "Выйти",
@@ -30,7 +24,6 @@
   "Settings": "Настройки",
   "Sending…": "Отправка…",
   "Local volume": "Местная громкость",
-  "Call type menu": "Меню \"Тип звонка\"",
   "Include debug logs": "Приложить журнал отладки",
   "Download debug logs": "Скачать журнал отладки",
   "Debug log request": "Запрос журнала отладки",
@@ -68,12 +61,10 @@
   "Confirm password": "Подтвердите пароль",
   "Close": "Закрыть",
   "Camera": "Камера",
-  "Call link copied": "Ссылка на звонок скопирована",
   "Avatar": "Аватар",
   "Audio": "Аудио",
   "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>",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Отправка журналов поможет нам найти и устранить проблему.</0>",
   "<0>Oops, something's gone wrong.</0>": "<0>Упс, что-то пошло не так.</0>",
   "Expose developer settings in the settings window.": "Раскрыть настройки разработчика в окне настроек.",

public/locales/sk/app.json

@@ -4,7 +4,6 @@
   "Include debug logs": "Zahrnúť záznamy o ladení",
   "Element Call Home": "Domov Element Call",
   "Waiting for other participants…": "Čaká sa na ďalších účastníkov…",
-  "Take me Home": "Zober ma domov",
   "Submit feedback": "Odoslať spätnú väzbu",
   "Show call inspector": "Zobraziť inšpektora hovorov",
   "Share screen": "Zdieľať obrazovku",
@@ -39,12 +38,7 @@
   "Full screen": "Zobrazenie na celú obrazovku",
   "Exit full screen": "Ukončiť zobrazenie na celú obrazovku",
   "Download debug logs": "Stiahnuť záznamy ladenia",
-  "Your recent calls": "Vaše nedávne hovory",
   "Yes, join call": "Áno, pripojiť sa k hovoru",
-  "Walkie-talkie call name": "Názov vysielačkového hovoru",
-  "Walkie-talkie call": "Vysielačkový hovor",
-  "Video call name": "Názov video hovoru",
-  "Video call": "Video hovor",
   "Video": "Video",
   "Version: {{version}}": "Verzia: {{version}}",
   "Username": "Meno používateľa",
@@ -65,13 +59,10 @@
   "Confirm password": "Potvrdiť heslo",
   "Close": "Zatvoriť",
   "Camera": "Kamera",
-  "Call type menu": "Ponuka typu hovoru",
-  "Call link copied": "Odkaz na hovor skopírovaný",
   "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í.",
   "<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>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Pripojiť sa k hovoru teraz</0><1>alebo</1><2>Kopírovať odkaz na hovor a pripojiť sa neskôr</2>",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Vytvoriť konto</0> Alebo <2>Prihlásiť sa ako hosť</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Už máte konto?</0><1><0>Prihláste sa</0> Alebo <2>Prihlásiť sa ako hosť</2></1>",
   "<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>",
@@ -114,8 +105,6 @@
   "Not encrypted": "Nie je zašifrované",
   "Share": "Zdieľať",
   "Sharing screen": "Zdieľanie obrazovky",
-  "Video off": "Video vypnuté",
-  "Video on": "Video zapnuté",
   "{{count, number}}|one": "{{count, number}}",
   "Share this call": "Zdieľať tento hovor",
   "{{names, list(style: short;)}}": "{{names, list(style: short;)}}",

public/locales/tr/app.json

@@ -3,8 +3,6 @@
   "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.": "Bu aramadaki başka bir kullanıcı sorun yaşıyor. Sorunu daha iyi çözebilmemiz için hata ayıklama kütüğünü almak isteriz.",
   "Audio": "Ses",
   "Avatar": "Avatar",
-  "Call link copied": "Arama bağlantısı kopyalandı",
-  "Call type menu": "Arama tipi menüsü",
   "Camera": "Kamera",
   "Close": "Kapat",
   "Confirm password": "Parolayı tekrar edin",
@@ -52,7 +50,6 @@
   "Sign in": "Gir",
   "Sign out": "Çık",
   "Submit feedback": "Geri bildirim ver",
-  "Take me Home": "Ev ekranına gir",
   "This call already exists, would you like to join?": "Bu arama zaten var, katılmak ister misiniz?",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Hesap oluştur</0> yahut <2>Konuk olarak gir</2>",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Mevcut hesabınız mı var?</0><1><0>Gir</0> yahut <2>Konuk girişi</2></1>"

public/locales/uk/app.json

@@ -1,18 +1,12 @@
 {
   "Loading…": "Завантаження…",
-  "Your recent calls": "Ваші недавні виклики",
   "Yes, join call": "Так, приєднатися до виклику",
-  "Walkie-talkie call name": "Назва виклику-рації",
-  "Walkie-talkie call": "Виклик-рація",
   "Waiting for other participants…": "Очікування на інших учасників…",
-  "Video call name": "Назва відеовиклику",
-  "Video call": "Відеовиклик",
   "Video": "Відео",
   "Version: {{version}}": "Версія: {{version}}",
   "Username": "Ім'я користувача",
   "User menu": "Меню користувача",
   "This call already exists, would you like to join?": "Цей виклик уже існує, бажаєте приєднатися?",
-  "Take me Home": "Перейти до Домівки",
   "Submit feedback": "Надіслати відгук",
   "Spotlight": "У центрі уваги",
   "Speaker": "Динамік",
@@ -63,15 +57,12 @@
   "Confirm password": "Підтвердити пароль",
   "Close": "Закрити",
   "Camera": "Камера",
-  "Call type menu": "Меню типу виклику",
-  "Call link copied": "Посилання на виклик скопійовано",
   "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.": "Інший користувач у цьому виклику має проблему. Щоб краще визначити ці проблеми, ми хотіли б зібрати журнал налагодження.",
   "<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>",
   "<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>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Приєднатися до виклику зараз</0><1>Or</1><2>Скопіювати посилання на виклик і приєднатися пізніше</2>",
   "Element Call Home": "Домівка Element Call",
   "Copy": "Копіювати",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Надсилання журналів налагодження допоможе нам виявити проблему.</0>",
@@ -112,12 +103,20 @@
   "Not encrypted": "Не зашифровано",
   "Share": "Поділитися",
   "Sharing screen": "Презентація екрана",
-  "Video off": "Відео вимкнено",
-  "Video on": "Відео ввімкнено",
   "{{count, number}}|one": "{{count, number}}",
   "End call": "Завершити виклик",
   "Grid": "Сітка",
   "Microphone off": "Мікрофон вимкнено",
   "Share this call": "Поділитися цим викликом",
-  "You": "Ви"
+  "You": "Ви",
+  "Mute microphone": "Вимкнути мікрофон",
+  "Open in the app": "Відкрити у застосунку",
+  "Ready to join?": "Готові приєднатися?",
+  "Select app": "Вибрати застосунок",
+  "Start video": "Розпочати відео",
+  "Stop video": "Зупинити відео",
+  "Unmute microphone": "Увімкнути мікрофон",
+  "Continue in browser": "Продовжити у браузері",
+  "Name of call": "Назва виклику",
+  "Start new call": "Розпочати новий виклик"
 }

public/locales/vi/app.json

@@ -6,13 +6,10 @@
   "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",
-  "Your recent calls": "Cuộc gọi gần đây",
   "Waiting for other participants…": "Đang đợi những người khác…",
   "Version: {{version}}": "Phiên bản: {{version}}",
   "Submit feedback": "Gửi phản hồi",
@@ -23,12 +20,10 @@
   "Join call now": "Tham gia cuộc gọi",
   "Create account": "Tạo tài khoản",
   "<0>Create an account</0> Or <2>Access as a guest</2>": "<0>Tạo tài khoản</0> Hay <2>Tham gia dưới tên khác</2>",
-  "<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Tham gia cuộc gọi</0><1>hay</1><2>Sao chép liên kết cuộc gọi và tham gia sau</2>",
   "<0>Submitting debug logs will help us track down the problem.</0>": "<0>Gửi nhật ký gỡ lỗi sẽ giúp chúng tôi theo dõi vấn đề.</0>",
   "Avatar": "Ảnh đại diện",
   "Audio": "Âm thanh",
   "Camera": "Máy quay",
-  "Call link copied": "Đã sao chép liên kết cuộc gọi",
   "Copied!": "Đã sao chép!",
   "Confirm password": "Xác nhận mật khẩu",
   "Close": "Đóng",
@@ -53,8 +48,6 @@
   "Spotlight": "Tiêu điểm",
   "Submitting…": "Đang gửi…",
   "Thanks, we received your feedback!": "Cảm ơn, chúng tôi đã nhận được phản hồi!",
-  "Walkie-talkie call": "Cuộc gọi thoại",
-  "Walkie-talkie call name": "Tên cuộc gọi thoại",
   "<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Đã có tài khoản?</0><1><0>Đăng nhập</0> Hay <2>Tham gia dưới tên Khách</2></1>",
   "Exit full screen": "Rời chế độ toàn màn hình",
   "Profile": "Hồ sơ",

public/locales/zh-Hans/app.json

@@ -1,17 +1,11 @@
 {
-  "Your recent calls": "最近通话",
   "Yes, join call": "是，加入通话",
-  "Walkie-talkie call name": "对讲机通话名称",
-  "Walkie-talkie call": "对讲机通话",
   "Waiting for other participants…": "等待其他参与者……",
-  "Video call name": "视频通话名称",
-  "Video call": "视频通话",
   "Video": "视频",
   "Version: {{version}}": "版本：{{version}}",
   "Username": "用户名",
   "User menu": "用户菜单",
   "This call already exists, would you like to join?": "该通话已存在，你想加入吗？",
-  "Take me Home": "返回主页",
   "Submit feedback": "提交反馈",
   "Spotlight": "聚焦模式",
   "Speaker": "发言人",
@@ -20,7 +14,6 @@
   "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.": "这个通话中的另一个用户出现了问题。为了更好地诊断这些问题，我们想收集调试日志。",
   "<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>",
-  "<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> Or <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>",
   "Inspector": "检查器",
@@ -71,8 +64,6 @@
   "Confirm password": "确认密码",
   "Close": "关闭",
   "Camera": "摄像头",
-  "Call type menu": "通话类型菜单",
-  "Call link copied": "链接已复制",
   "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.": ""

public/locales/zh-Hant/app.json

@@ -1,24 +1,17 @@
 {
-  "<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>",
   "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": "您最近的通話",
   "Yes, join call": "是，加入對話",
-  "Walkie-talkie call name": "對講機式通話名稱",
-  "Walkie-talkie call": "即時通話",
   "Waiting for other participants…": "等待其他參加者…",
-  "Video call name": "視訊通話姓名",
-  "Video call": "視訊通話",
   "Video": "視訊",
   "Version: {{version}}": "版本： {{version}}",
   "Username": "使用者名稱",
   "User menu": "使用者選單",
   "This call already exists, would you like to join?": "通話已經開始，請問您要加入嗎？",
-  "Take me Home": "帶我回主畫面",
   "Submit feedback": "遞交回覆",
   "Spotlight": "聚焦",
   "Speaker": "發言者",
@@ -72,8 +65,6 @@
   "Confirm password": "確認密碼",
   "Close": "關閉",
   "Camera": "相機",
-  "Call type menu": "通話類型選單",
-  "Call link copied": "已複製通話連結",
   "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.": "這通對話中的另一位使用者遇到了某些問題。為了診斷問題，我們將會建立除錯紀錄。",
@@ -117,6 +108,16 @@
   "Share": "分享",
   "Share this call": "分享此通話",
   "Sharing screen": "分享畫面",
-  "Video off": "視訊關閉",
-  "Video on": "視訊開啟"
+  "You": "您",
+  "Continue in browser": "在瀏覽器中繼續",
+  "Mute microphone": "將麥克風靜音",
+  "Name of call": "通話名稱",
+  "Open in the app": "在應用程式中開啟",
+  "Ready to join?": "準備好加入了？",
+  "Select app": "選取應用程式",
+  "Start new call": "開始新通話",
+  "Start video": "開始影片",
+  "Back to recents": "回到最近的通話",
+  "Stop video": "停止影片",
+  "Unmute microphone": "將麥克風取消靜音"
 }

src/Glass.module.css

@@ -0,0 +1,31 @@
+/*
+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.
+*/
+
+.glass {
+  border-radius: 36px;
+  padding: 11px;
+  border: 1px solid var(--cpd-color-alpha-gray-400);
+  background: var(--cpd-color-alpha-gray-400);
+  backdrop-filter: blur(10px);
+}
+
+.glass > * {
+  border-radius: 24px;
+}
+
+.glass.frosted {
+  backdrop-filter: blur(20px);
+}

src/Glass.tsx

@@ -0,0 +1,52 @@
+/*
+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 {
+  ComponentPropsWithoutRef,
+  ReactNode,
+  forwardRef,
+  Children,
+} from "react";
+import classNames from "classnames";
+
+import styles from "./Glass.module.css";
+
+interface Props extends ComponentPropsWithoutRef<"div"> {
+  children: ReactNode;
+  className?: string;
+  /**
+   * Increases the blur effect.
+   * @default false
+   */
+  frosted?: boolean;
+}
+
+/**
+ * Adds a border of glass around a child component.
+ */
+export const Glass = forwardRef<HTMLDivElement, Props>(
+  ({ frosted = false, children, className, ...rest }, ref) => (
+    <div
+      ref={ref}
+      className={classNames(className, styles.glass, {
+        [styles.frosted]: frosted,
+      })}
+      {...rest}
+    >
+      {Children.only(children)}
+    </div>
+  )
+);

src/Header.module.css

@@ -21,6 +21,7 @@ limitations under the License.
   align-items: center;
   user-select: none;
   flex-shrink: 0;
+  padding-inline: var(--inline-content-inset);
 }
 
 .nav {
@@ -28,7 +29,6 @@ limitations under the License.
   flex: 1;
   align-items: center;
   white-space: nowrap;
-  padding-inline: var(--inline-content-inset);
   height: 80px;
 }
 

src/Modal.module.css

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
+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.
@@ -14,77 +14,210 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.modalOverlay {
+.overlay {
   position: fixed;
   z-index: 100;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  background: rgba(23, 25, 28, 0.5);
-  display: flex;
-  align-items: center;
-  justify-content: center;
+  inset: 0;
+  background: rgba(3, 12, 27, 0.528);
+}
+
+@keyframes fade-in {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+.dialogOverlay[data-state="open"] {
+  animation: fade-in 200ms;
+}
+
+@keyframes fade-out {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+.dialogOverlay[data-state="closed"] {
+  animation: fade-out 130ms;
 }
 
 .modal {
-  background: var(--cpd-color-bg-subtle-secondary);
-  box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.15);
-  border-radius: 8px;
-  max-width: 90vw;
-  width: 600px;
+  position: fixed;
+  z-index: 101;
   display: flex;
   flex-direction: column;
 }
 
-.modalHeader {
-  display: flex;
-  justify-content: space-between;
-  padding: 34px 32px 0 32px;
+.dialog {
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  box-sizing: border-box;
+  inline-size: 520px;
+  max-inline-size: 90%;
+  max-block-size: 600px;
 }
 
-.modalHeader h3 {
-  font-weight: 600;
-  font-size: var(--font-size-title);
-  margin: 0;
+@keyframes zoom-in {
+  from {
+    opacity: 0;
+    transform: translate(-50%, -50%) scale(80%);
+  }
+  to {
+    opacity: 1;
+    transform: translate(-50%, -50%) scale(100%);
+  }
 }
 
-.closeButton {
-  position: relative;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: transparent;
-  padding: 0;
-  border: none;
-  cursor: pointer;
+@keyframes zoom-out {
+  from {
+    opacity: 1;
+    transform: translate(-50%, -50%) scale(100%);
+  }
+  to {
+    opacity: 0;
+    transform: translate(-50%, -50%) scale(80%);
+  }
+}
+
+.dialog[data-state="open"] {
+  animation: zoom-in 200ms;
+}
+
+.dialog[data-state="closed"] {
+  animation: zoom-out 130ms;
+}
+
+@media (prefers-reduced-motion) {
+  .dialog[data-state="open"] {
+    animation-name: fade-in;
+  }
+
+  .dialog[data-state="closed"] {
+    animation-name: fade-out;
+  }
 }
 
 .content {
-  padding: 24px 32px;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
 }
 
-.content p {
-  margin-top: 0;
+.dialog .content {
+  flex-grow: 1;
+  background: var(--cpd-color-bg-canvas-default);
 }
 
-@media (max-width: 799px) {
-  .modalHeader {
-    display: flex;
-    justify-content: space-between;
-    padding: 32px 20px 0 20px;
-  }
+.drawer .content {
+  overflow: auto;
+}
 
-  .modal.mobileFullScreen {
-    position: fixed;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    width: 100%;
-    height: 100%;
-    max-width: none;
-    max-height: none;
-    border-radius: 0;
+.drawer {
+  background: var(--cpd-color-bg-canvas-default);
+  inset-block-end: 0;
+  inset-inline: max(0px, calc((100% - 520px) / 2));
+  max-block-size: 90%;
+  border-start-start-radius: var(--border-radius);
+  border-start-end-radius: var(--border-radius);
+  /* Drawer comes in the Android style by default */
+  --border-radius: 28px;
+  --handle-block-size: 4px;
+  --handle-inline-size: 32px;
+  --handle-inset-block-start: var(--cpd-space-4x);
+  --handle-inset-block-end: var(--cpd-space-4x);
+}
+
+body[data-platform="ios"] .drawer {
+  --border-radius: 10px;
+  --handle-block-size: 5px;
+  --handle-inline-size: 36px;
+  --handle-inset-block-start: var(--cpd-space-1-5x);
+  --handle-inset-block-end: calc(var(--cpd-space-1x) / 4);
+}
+
+.close {
+  cursor: pointer;
+  color: var(--cpd-color-icon-secondary);
+  border-radius: var(--cpd-radius-pill-effect);
+  padding: var(--cpd-space-1x);
+  background: var(--cpd-color-bg-subtle-secondary);
+  border: none;
+}
+
+.close svg {
+  display: block;
+}
+
+@media (hover: hover) {
+  .close:hover {
+    background: var(--cpd-color-bg-subtle-primary);
+    color: var(--cpd-color-icon-primary);
   }
 }
+
+.close:active {
+  background: var(--cpd-color-bg-subtle-primary);
+  color: var(--cpd-color-icon-primary);
+}
+
+.header {
+  background: var(--cpd-color-bg-subtle-secondary);
+  display: grid;
+}
+
+.dialog .header {
+  padding-block-start: var(--cpd-space-4x);
+  grid-template-columns:
+    var(--cpd-space-10x) 1fr minmax(var(--cpd-space-6x), auto)
+    var(--cpd-space-4x);
+  grid-template-rows: auto minmax(var(--cpd-space-4x), auto);
+  /* TODO: Support tabs */
+  grid-template-areas: ". title close ." "tabs tabs tabs tabs";
+  align-items: center;
+}
+
+.dialog .header h2 {
+  grid-area: title;
+  margin: 0;
+}
+
+.drawer .header {
+  grid-template-areas: "tabs";
+  position: relative;
+}
+
+.close {
+  grid-area: close;
+}
+
+.body {
+  flex-grow: 1;
+}
+
+.dialog .body {
+  padding-inline: var(--cpd-space-10x);
+  padding-block: var(--cpd-space-10x) var(--cpd-space-12x);
+  overflow: auto;
+}
+
+.drawer .body {
+  padding-inline: var(--cpd-space-4x);
+  padding-block: var(--cpd-space-9x) var(--cpd-space-10x);
+}
+
+.handle {
+  content: "";
+  position: absolute;
+  block-size: var(--handle-block-size);
+  inset-inline: calc((100% - var(--handle-inline-size)) / 2);
+  inset-block-start: var(--handle-inset-block-start);
+  background: var(--cpd-color-icon-secondary);
+  border-radius: var(--cpd-radius-pill-effect);
+}

src/Modal.tsx

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
+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.
@@ -14,123 +14,128 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-/* eslint-disable jsx-a11y/no-autofocus */
-
-import { useRef, useMemo, ReactNode } from "react";
-import {
-  useOverlay,
-  usePreventScroll,
-  useModal,
-  OverlayContainer,
-  OverlayProps,
-} from "@react-aria/overlays";
-import {
-  OverlayTriggerState,
-  useOverlayTriggerState,
-} from "@react-stately/overlays";
-import { useDialog } from "@react-aria/dialog";
-import { FocusScope } from "@react-aria/focus";
-import { useButton } from "@react-aria/button";
-import classNames from "classnames";
+import { ReactNode, useCallback } from "react";
 import { AriaDialogProps } from "@react-types/dialog";
 import { useTranslation } from "react-i18next";
+import {
+  Root as DialogRoot,
+  Portal as DialogPortal,
+  Overlay as DialogOverlay,
+  Content as DialogContent,
+  Title as DialogTitle,
+  Close as DialogClose,
+} from "@radix-ui/react-dialog";
+import { Drawer } from "vaul";
+import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
+import { ReactComponent as CloseIcon } from "@vector-im/compound-design-tokens/icons/close.svg";
+import classNames from "classnames";
+import { Heading } from "@vector-im/compound-web";
 
-import { ReactComponent as CloseIcon } from "./icons/Close.svg";
 import styles from "./Modal.module.css";
+import { useMediaQuery } from "./useMediaQuery";
+import { Glass } from "./Glass";
 
-export interface ModalProps extends OverlayProps, AriaDialogProps {
+// TODO: Support tabs
+export interface ModalProps extends AriaDialogProps {
   title: string;
   children: ReactNode;
   className?: string;
-  mobileFullScreen?: boolean;
-  onClose: () => void;
+  /**
+   * The controlled open state of the modal.
+   */
+  // An option to leave the open state uncontrolled is intentionally not
+  // provided, since modals are always opened due to external triggers, and it
+  // is the author's belief that controlled components lead to more obvious code.
+  open: boolean;
+  /**
+   * Callback for when the user dismisses the modal. If undefined, the modal
+   * will be non-dismissable.
+   */
+  onDismiss?: () => void;
 }
 
+/**
+ * A modal, taking the form of a drawer / bottom sheet on touchscreen devices,
+ * and a dialog box on desktop.
+ */
 export function Modal({
   title,
   children,
   className,
-  mobileFullScreen,
-  onClose,
+  open,
+  onDismiss,
   ...rest
 }: ModalProps) {
   const { t } = useTranslation();
-  const modalRef = useRef(null);
-  const { overlayProps, underlayProps } = useOverlay(
-    { ...rest, onClose },
-    modalRef
-  );
-  usePreventScroll();
-  const { modalProps } = useModal();
-  const { dialogProps, titleProps } = useDialog(rest, modalRef);
-  const closeButtonRef = useRef(null);
-  const { buttonProps: closeButtonProps } = useButton(
-    {
-      onPress: () => onClose(),
+  const touchscreen = useMediaQuery("(hover: none)");
+  const onOpenChange = useCallback(
+    (open: boolean) => {
+      if (!open) onDismiss?.();
     },
-    closeButtonRef
+    [onDismiss]
   );
 
-  return (
-    <OverlayContainer>
-      <div className={styles.modalOverlay} {...underlayProps}>
-        <FocusScope contain restoreFocus autoFocus>
-          <div
-            {...overlayProps}
-            {...dialogProps}
-            {...modalProps}
-            ref={modalRef}
-            className={classNames(
-              styles.modal,
-              { [styles.mobileFullScreen]: mobileFullScreen },
-              className
-            )}
+  if (touchscreen) {
+    return (
+      <Drawer.Root
+        open={open}
+        onOpenChange={onOpenChange}
+        dismissible={onDismiss !== undefined}
+      >
+        <Drawer.Portal>
+          <Drawer.Overlay className={styles.overlay} />
+          <Drawer.Content
+            className={classNames(className, styles.modal, styles.drawer)}
+            {...rest}
           >
-            <div className={styles.modalHeader}>
-              <h3 {...titleProps}>{title}</h3>
-              <button
-                {...closeButtonProps}
-                ref={closeButtonRef}
-                className={styles.closeButton}
-                data-testid="modal_close"
-                title={t("Close")}
-              >
-                <CloseIcon />
-              </button>
+            <div className={styles.content}>
+              <div className={styles.header}>
+                <div className={styles.handle} />
+                <VisuallyHidden asChild>
+                  <Drawer.Title>{title}</Drawer.Title>
+                </VisuallyHidden>
+              </div>
+              <div className={styles.body}>{children}</div>
             </div>
-            {children}
-          </div>
-        </FocusScope>
-      </div>
-    </OverlayContainer>
-  );
-}
-
-interface ModalContentProps {
-  children: ReactNode;
-  className?: string;
-}
-
-export function ModalContent({
-  children,
-  className,
-  ...rest
-}: ModalContentProps) {
-  return (
-    <div className={classNames(styles.content, className)} {...rest}>
-      {children}
-    </div>
-  );
-}
-
-export function useModalTriggerState(): {
-  modalState: OverlayTriggerState;
-  modalProps: { isOpen: boolean; onClose: () => void };
-} {
-  const modalState = useOverlayTriggerState({});
-  const modalProps = useMemo(
-    () => ({ isOpen: modalState.isOpen, onClose: modalState.close }),
-    [modalState]
-  );
-  return { modalState, modalProps };
+          </Drawer.Content>
+        </Drawer.Portal>
+      </Drawer.Root>
+    );
+  } else {
+    return (
+      <DialogRoot open={open} onOpenChange={onOpenChange}>
+        <DialogPortal>
+          <DialogOverlay
+            className={classNames(styles.overlay, styles.dialogOverlay)}
+          />
+          <DialogContent asChild {...rest}>
+            <Glass
+              frosted
+              className={classNames(className, styles.modal, styles.dialog)}
+            >
+              <div className={styles.content}>
+                <div className={styles.header}>
+                  <DialogTitle asChild>
+                    <Heading as="h2" weight="semibold" size="md">
+                      {title}
+                    </Heading>
+                  </DialogTitle>
+                  {onDismiss !== undefined && (
+                    <DialogClose
+                      className={styles.close}
+                      data-testid="modal_close"
+                      aria-label={t("Close")}
+                    >
+                      <CloseIcon width={20} height={20} />
+                    </DialogClose>
+                  )}
+                </div>
+                <div className={styles.body}>{children}</div>
+              </div>
+            </Glass>
+          </DialogContent>
+        </DialogPortal>
+      </DialogRoot>
+    );
+  }
 }

src/Platform.ts

@@ -0,0 +1,38 @@
+/*
+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.
+*/
+
+/**
+ * The platform on which the application is running.
+ */
+// The granularity of this value is kind of arbitrary: it distinguishes exactly
+// the platforms that the app needs to know about in order to correctly
+// implement the designs and work around platform-specific browser weirdness.
+// Feel free to increase or decrease that granularity in the future as project
+// requirements change.
+export let platform: "android" | "ios" | "desktop";
+
+if (/android/i.test(navigator.userAgent)) {
+  platform = "android";
+  // We include 'Mac' here and double-check for touch support because iPads on
+  // iOS 13 pretend to be a MacOS desktop
+} else if (
+  /iPad|iPhone|iPod|Mac/.test(navigator.userAgent) &&
+  "ontouchend" in document
+) {
+  platform = "ios";
+} else {
+  platform = "desktop";
+}

src/UrlParams.ts

@@ -21,10 +21,21 @@ import { Config } from "./config/Config";
 
 export const PASSWORD_STRING = "password=";
 
-interface UrlParams {
+interface RoomIdentifier {
   roomAlias: string | null;
   roomId: string | null;
   viaServers: string[];
+}
+
+interface UrlParams {
+  /**
+   * Anything about what room we're pointed to should be from useRoomIdentifier which
+   * parses the path and resolves alias with respect to the default server name, however
+   * roomId is an exception as we need the room ID in embedded (matroyska) mode, and not
+   * the room alias (or even the via params because we are not trying to join it). This
+   * is also not validated, where it is in useRoomIdentifier().
+   */
+  roomId: string | null;
   /**
    * Whether the app is running in embedded mode, and should keep the user
    * confined to the current room.
@@ -43,10 +54,6 @@ interface UrlParams {
    * Whether to hide the screen-sharing button.
    */
   hideScreensharing: boolean;
-  /**
-   * Whether to start a walkie-talkie call instead of a video call.
-   */
-  isPtt: boolean;
   /**
    * Whether to use end-to-end encryption.
    */
@@ -94,76 +101,140 @@ interface UrlParams {
   password: string | null;
 }
 
-/**
- * Gets the app parameters for the current URL.
- * @param ignoreRoomAlias If true, does not try to parse a room alias from the URL
- * @param search The URL search string
- * @param pathname The URL path name
- * @param hash The URL hash
- * @returns The app parameters encoded in the URL
- */
-export const getUrlParams = (
-  ignoreRoomAlias?: boolean,
-  search = window.location.search,
-  pathname = window.location.pathname,
-  hash = window.location.hash
-): UrlParams => {
-  // This is legacy code - we're moving away from using aliases
-  let roomAlias: string | null = null;
-  if (!ignoreRoomAlias) {
-    // Here we handle the beginning of the alias and make sure it starts with a
-    // "#"
-    if (hash === "" || hash.startsWith("#?")) {
-      roomAlias = pathname.substring(1); // Strip the "/"
-
-      // Delete "/room/", if present
-      if (roomAlias.startsWith("room/")) {
-        roomAlias = roomAlias.substring("room/".length);
-      }
-      // Add "#", if not present
-      if (!roomAlias.startsWith("#")) {
-        roomAlias = `#${roomAlias}`;
-      }
-    } else {
-      roomAlias = hash;
-    }
-
-    // Delete "?" and what comes afterwards
-    roomAlias = roomAlias.split("?")[0];
-
-    if (roomAlias.length <= 1) {
-      // Make roomAlias is null, if it only is a "#"
-      roomAlias = null;
-    } else {
-      // Add server part, if not present
-      if (!roomAlias.includes(":")) {
-        roomAlias = `${roomAlias}:${Config.defaultServerName()}`;
-      }
-    }
-  }
-
+export function editFragmentQuery(
+  hash: string,
+  edit: (params: URLSearchParams) => URLSearchParams
+): string {
   const fragmentQueryStart = hash.indexOf("?");
-  const fragmentParams = new URLSearchParams(
-    fragmentQueryStart === -1 ? "" : hash.substring(fragmentQueryStart)
+  const fragmentParams = edit(
+    new URLSearchParams(
+      fragmentQueryStart === -1 ? "" : hash.substring(fragmentQueryStart)
+    )
   );
-  const queryParams = new URLSearchParams(search);
+  return `${hash.substring(
+    0,
+    fragmentQueryStart
+  )}?${fragmentParams.toString()}`;
+}
+
+class ParamParser {
+  private fragmentParams: URLSearchParams;
+  private queryParams: URLSearchParams;
+
+  constructor(search: string, hash: string) {
+    this.queryParams = new URLSearchParams(search);
+
+    const fragmentQueryStart = hash.indexOf("?");
+    this.fragmentParams = new URLSearchParams(
+      fragmentQueryStart === -1 ? "" : hash.substring(fragmentQueryStart)
+    );
+  }
 
   // Normally, URL params should be encoded in the fragment so as to avoid
   // leaking them to the server. However, we also check the normal query
   // string for backwards compatibility with versions that only used that.
-  const hasParam = (name: string): boolean =>
-    fragmentParams.has(name) || queryParams.has(name);
-  const getParam = (name: string): string | null =>
-    fragmentParams.get(name) ?? queryParams.get(name);
-  const getAllParams = (name: string): string[] => [
-    ...fragmentParams.getAll(name),
-    ...queryParams.getAll(name),
-  ];
+  hasParam(name: string): boolean {
+    return this.fragmentParams.has(name) || this.queryParams.has(name);
+  }
 
-  const fontScale = parseFloat(getParam("fontScale") ?? "");
+  getParam(name: string): string | null {
+    return this.fragmentParams.get(name) ?? this.queryParams.get(name);
+  }
+
+  getAllParams(name: string): string[] {
+    return [
+      ...this.fragmentParams.getAll(name),
+      ...this.queryParams.getAll(name),
+    ];
+  }
+}
+
+/**
+ * Gets the app parameters for the current URL.
+ * @param search The URL search string
+ * @param hash The URL hash
+ * @returns The app parameters encoded in the URL
+ */
+export const getUrlParams = (
+  search = window.location.search,
+  hash = window.location.hash
+): UrlParams => {
+  const parser = new ParamParser(search, hash);
+
+  const fontScale = parseFloat(parser.getParam("fontScale") ?? "");
+
+  return {
+    // NB. we don't validate roomId here as we do in getRoomIdentifierFromUrl:
+    // what would we do if it were invalid? If the widget API says that's what
+    // the room ID is, then that's what it is.
+    roomId: parser.getParam("roomId"),
+    password: parser.getParam("password"),
+    isEmbedded: parser.hasParam("embed"),
+    preload: parser.hasParam("preload"),
+    hideHeader: parser.hasParam("hideHeader"),
+    hideScreensharing: parser.hasParam("hideScreensharing"),
+    e2eEnabled: parser.getParam("enableE2e") !== "false", // Defaults to true
+    userId: parser.getParam("userId"),
+    displayName: parser.getParam("displayName"),
+    deviceId: parser.getParam("deviceId"),
+    baseUrl: parser.getParam("baseUrl"),
+    lang: parser.getParam("lang"),
+    fonts: parser.getAllParams("font"),
+    fontScale: Number.isNaN(fontScale) ? null : fontScale,
+    analyticsID: parser.getParam("analyticsID"),
+    allowIceFallback: parser.hasParam("allowIceFallback"),
+  };
+};
+
+/**
+ * Hook to simplify use of getUrlParams.
+ * @returns The app parameters for the current URL
+ */
+export const useUrlParams = (): UrlParams => {
+  const { search, hash } = useLocation();
+  return useMemo(() => getUrlParams(search, hash), [search, hash]);
+};
+
+export function getRoomIdentifierFromUrl(
+  pathname: string,
+  search: string,
+  hash: string
+): RoomIdentifier {
+  let roomAlias: string | null = null;
+
+  // Here we handle the beginning of the alias and make sure it starts with a "#"
+  if (hash === "" || hash.startsWith("#?")) {
+    roomAlias = pathname.substring(1); // Strip the "/"
+
+    // Delete "/room/", if present
+    if (roomAlias.startsWith("room/")) {
+      roomAlias = roomAlias.substring("room/".length);
+    }
+    // Add "#", if not present
+    if (!roomAlias.startsWith("#")) {
+      roomAlias = `#${roomAlias}`;
+    }
+  } else {
+    roomAlias = hash;
+  }
+
+  // Delete "?" and what comes afterwards
+  roomAlias = roomAlias.split("?")[0];
+
+  if (roomAlias.length <= 1) {
+    // Make roomAlias is null, if it only is a "#"
+    roomAlias = null;
+  } else {
+    // Add server part, if not present
+    if (!roomAlias.includes(":")) {
+      roomAlias = `${roomAlias}:${Config.defaultServerName()}`;
+    }
+  }
+
+  const parser = new ParamParser(search, hash);
 
   // Make sure roomId is valid
-  let roomId: string | null = getParam("roomId");
+  let roomId: string | null = parser.getParam("roomId");
   if (!roomId?.startsWith("!")) {
     roomId = null;
   } else if (!roomId.includes("")) {
@@ -173,34 +244,14 @@ export const getUrlParams = (
   return {
     roomAlias,
     roomId,
-    password: getParam("password"),
-    viaServers: getAllParams("via"),
-    isEmbedded: hasParam("embed"),
-    preload: hasParam("preload"),
-    hideHeader: hasParam("hideHeader"),
-    hideScreensharing: hasParam("hideScreensharing"),
-    isPtt: hasParam("ptt"),
-    e2eEnabled: getParam("enableE2e") !== "false", // Defaults to true
-    userId: getParam("userId"),
-    displayName: getParam("displayName"),
-    deviceId: getParam("deviceId"),
-    baseUrl: getParam("baseUrl"),
-    lang: getParam("lang"),
-    fonts: getAllParams("font"),
-    fontScale: Number.isNaN(fontScale) ? null : fontScale,
-    analyticsID: getParam("analyticsID"),
-    allowIceFallback: hasParam("allowIceFallback"),
+    viaServers: parser.getAllParams("viaServers"),
   };
-};
+}
 
-/**
- * Hook to simplify use of getUrlParams.
- * @returns The app parameters for the current URL
- */
-export const useUrlParams = (): UrlParams => {
-  const { search, pathname, hash } = useLocation();
+export const useRoomIdentifier = (): RoomIdentifier => {
+  const { pathname, search, hash } = useLocation();
   return useMemo(
-    () => getUrlParams(false, search, pathname, hash),
-    [search, pathname, hash]
+    () => getRoomIdentifierFromUrl(pathname, search, hash),
+    [pathname, search, hash]
   );
 };

src/UserMenuContainer.tsx

@@ -19,7 +19,6 @@ import { useHistory, useLocation } from "react-router-dom";
 
 import { useClientLegacy } from "./ClientContext";
 import { useProfile } from "./profile/useProfile";
-import { useModalTriggerState } from "./Modal";
 import { SettingsModal } from "./settings/SettingsModal";
 import { UserMenu } from "./UserMenu";
 
@@ -32,7 +31,11 @@ export function UserMenuContainer({ preventNavigation = false }: Props) {
   const history = useHistory();
   const { client, logout, authenticated, passwordlessUser } = useClientLegacy();
   const { displayName, avatarUrl } = useProfile(client);
-  const { modalState, modalProps } = useModalTriggerState();
+  const [settingsModalOpen, setSettingsModalOpen] = useState(false);
+  const onDismissSettingsModal = useCallback(
+    () => setSettingsModalOpen(false),
+    [setSettingsModalOpen]
+  );
 
   const [defaultSettingsTab, setDefaultSettingsTab] = useState<string>();
 
@@ -41,11 +44,11 @@ export function UserMenuContainer({ preventNavigation = false }: Props) {
       switch (value) {
         case "user":
           setDefaultSettingsTab("profile");
-          modalState.open();
+          setSettingsModalOpen(true);
           break;
         case "settings":
           setDefaultSettingsTab("audio");
-          modalState.open();
+          setSettingsModalOpen(true);
           break;
         case "logout":
           logout?.();
@@ -55,7 +58,7 @@ export function UserMenuContainer({ preventNavigation = false }: Props) {
           break;
       }
     },
-    [history, location, logout, modalState]
+    [history, location, logout, setSettingsModalOpen]
   );
 
   const userName = client?.getUserIdLocalpart() ?? "";
@@ -70,11 +73,12 @@ export function UserMenuContainer({ preventNavigation = false }: Props) {
         userId={client?.getUserId() ?? ""}
         displayName={displayName || (userName ? userName.replace("@", "") : "")}
       />
-      {modalState.isOpen && client && (
+      {client && (
         <SettingsModal
           client={client}
           defaultTab={defaultSettingsTab}
-          {...modalProps}
+          open={settingsModalOpen}
+          onDismiss={onDismissSettingsModal}
         />
       )}
     </>

src/button/Button.tsx

@@ -145,11 +145,11 @@ export function MicButton({
 }) {
   const { t } = useTranslation();
   const Icon = muted ? MicOffSolidIcon : MicOnSolidIcon;
-  const label = muted ? t("Microphone off") : t("Microphone on");
+  const label = muted ? t("Unmute microphone") : t("Mute microphone");
 
   return (
     <Tooltip label={label}>
-      <Button variant="toolbar" {...rest} on={!muted}>
+      <Button variant="toolbar" {...rest} on={muted}>
         <Icon aria-label={label} />
       </Button>
     </Tooltip>
@@ -166,11 +166,11 @@ export function VideoButton({
 }) {
   const { t } = useTranslation();
   const Icon = muted ? VideoCallOffIcon : VideoCallIcon;
-  const label = muted ? t("Video off") : t("Video on");
+  const label = muted ? t("Start video") : t("Stop video");
 
   return (
     <Tooltip label={label}>
-      <Button variant="toolbar" {...rest} on={!muted}>
+      <Button variant="toolbar" {...rest} on={muted}>
         <Icon aria-label={label} />
       </Button>
     </Tooltip>

src/home/CallTypeDropdown.tsx

@@ -1,85 +0,0 @@
-/*
-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 { FC } from "react";
-import { Item } from "@react-stately/collections";
-import { useTranslation } from "react-i18next";
-
-import { Headline } from "../typography/Typography";
-import { Button } from "../button";
-import { PopoverMenuTrigger } from "../popover/PopoverMenu";
-import { ReactComponent as VideoIcon } from "../icons/Video.svg";
-import { ReactComponent as MicIcon } from "../icons/Mic.svg";
-import { ReactComponent as CheckIcon } from "../icons/Check.svg";
-import styles from "./CallTypeDropdown.module.css";
-import commonStyles from "./common.module.css";
-import menuStyles from "../Menu.module.css";
-import { Menu } from "../Menu";
-
-export enum CallType {
-  Video = "video",
-  Radio = "radio",
-}
-
-interface Props {
-  callType: CallType;
-  setCallType: (value: CallType) => void;
-}
-
-export const CallTypeDropdown: FC<Props> = ({ callType, setCallType }) => {
-  const { t } = useTranslation();
-
-  const onAction = (key: React.Key) => {
-    setCallType(key.toString() as CallType);
-  };
-
-  const onClose = () => {};
-
-  return (
-    <PopoverMenuTrigger placement="bottom">
-      <Button variant="dropdown" className={commonStyles.headline}>
-        <Headline className={styles.label}>
-          {callType === CallType.Video
-            ? t("Video call")
-            : t("Walkie-talkie call")}
-        </Headline>
-      </Button>
-      {(props: JSX.IntrinsicAttributes) => (
-        <Menu
-          {...props}
-          label={t("Call type menu")}
-          onAction={onAction}
-          onClose={onClose}
-        >
-          <Item key={CallType.Video} textValue={t("Video call")}>
-            <VideoIcon />
-            <span>{t("Video call")}</span>
-            {callType === CallType.Video && (
-              <CheckIcon className={menuStyles.checkIcon} />
-            )}
-          </Item>
-          <Item key={CallType.Radio} textValue={t("Walkie-talkie call")}>
-            <MicIcon />
-            <span>{t("Walkie-talkie call")}</span>
-            {callType === CallType.Radio && (
-              <CheckIcon className={menuStyles.checkIcon} />
-            )}
-          </Item>
-        </Menu>
-      )}
-    </PopoverMenuTrigger>
-  );
-};

src/home/HomePage.tsx

@@ -34,10 +34,7 @@ export function HomePage() {
     return <ErrorView error={clientState.error} />;
   } else {
     return clientState.authenticated ? (
-      <RegisteredView
-        isPasswordlessUser={clientState.authenticated.isPasswordlessUser}
-        client={clientState.authenticated.client}
-      />
+      <RegisteredView client={clientState.authenticated.client} />
     ) : (
       <UnauthenticatedView />
     );

src/home/JoinExistingCallModal.tsx

@@ -17,36 +17,29 @@ limitations under the License.
 import { PressEvent } from "@react-types/shared";
 import { useTranslation } from "react-i18next";
 
-import { Modal, ModalContent } from "../Modal";
+import { Modal } from "../Modal";
 import { Button } from "../button";
 import { FieldRow } from "../input/Input";
 import styles from "./JoinExistingCallModal.module.css";
 
 interface Props {
+  open: boolean;
+  onDismiss: () => void;
   onJoin: (e: PressEvent) => void;
-  onClose: () => void;
-  // TODO: add used parameters for <Modal>
-  [index: string]: unknown;
 }
-export function JoinExistingCallModal({ onJoin, onClose, ...rest }: Props) {
+
+export function JoinExistingCallModal({ onJoin, open, onDismiss }: Props) {
   const { t } = useTranslation();
 
   return (
-    <Modal
-      title={t("Join existing call?")}
-      isDismissable
-      {...rest}
-      onClose={onClose}
-    >
-      <ModalContent>
-        <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>
-        </FieldRow>
-      </ModalContent>
+    <Modal title={t("Join existing call?")} open={open} onDismiss={onDismiss}>
+      <p>{t("This call already exists, would you like to join?")}</p>
+      <FieldRow rightAlign className={styles.buttons}>
+        <Button onPress={onDismiss}>{t("No")}</Button>
+        <Button onPress={onJoin} data-testid="home_joinExistingRoom">
+          {t("Yes, join call")}
+        </Button>
+      </FieldRow>
     </Modal>
   );
 }

src/home/RegisteredView.tsx

@@ -19,6 +19,7 @@ import { useHistory } from "react-router-dom";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import { randomString } from "matrix-js-sdk/src/randomstring";
 import { useTranslation } from "react-i18next";
+import { Heading } from "@vector-im/compound-web";
 
 import {
   createRoom,
@@ -33,11 +34,9 @@ import { FieldRow, InputField, ErrorMessage } from "../input/Input";
 import { Button } from "../button";
 import { CallList } from "./CallList";
 import { UserMenuContainer } from "../UserMenuContainer";
-import { useModalTriggerState } from "../Modal";
 import { JoinExistingCallModal } from "./JoinExistingCallModal";
-import { Caption, Title } from "../typography/Typography";
+import { Caption } from "../typography/Typography";
 import { Form } from "../form/Form";
-import { CallType, CallTypeDropdown } from "./CallTypeDropdown";
 import { useEnableE2EE, useOptInAnalytics } from "../settings/useSetting";
 import { AnalyticsNotice } from "../analytics/AnalyticsNotice";
 import { E2EEBanner } from "../E2EEBanner";
@@ -46,17 +45,20 @@ import { getRoomSharedKeyLocalStorageKey } from "../e2ee/sharedKeyManagement";
 
 interface Props {
   client: MatrixClient;
-  isPasswordlessUser: boolean;
 }
 
-export function RegisteredView({ client, isPasswordlessUser }: Props) {
-  const [callType, setCallType] = useState(CallType.Video);
+export function RegisteredView({ client }: Props) {
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<Error>();
   const [optInAnalytics] = useOptInAnalytics();
   const history = useHistory();
   const { t } = useTranslation();
-  const { modalState, modalProps } = useModalTriggerState();
+  const [joinExistingCallModalOpen, setJoinExistingCallModalOpen] =
+    useState(false);
+  const onDismissJoinExistingCallModal = useCallback(
+    () => setJoinExistingCallModalOpen(false),
+    [setJoinExistingCallModalOpen]
+  );
   const [e2eeEnabled] = useEnableE2EE();
 
   const onSubmit: FormEventHandler<HTMLFormElement> = useCallback(
@@ -68,14 +70,13 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) {
         typeof roomNameData === "string"
           ? sanitiseRoomNameInput(roomNameData)
           : "";
-      const ptt = callType === CallType.Radio;
 
       async function submit() {
         setError(undefined);
         setLoading(true);
 
         const roomId = (
-          await createRoom(client, roomName, ptt, e2eeEnabled ?? false)
+          await createRoom(client, roomName, e2eeEnabled ?? false)
         )[1];
 
         if (e2eeEnabled) {
@@ -93,7 +94,7 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) {
           setExistingAlias(roomAliasLocalpartFromRoomName(roomName));
           setLoading(false);
           setError(undefined);
-          modalState.open();
+          setJoinExistingCallModalOpen(true);
         } else {
           console.error(error);
           setLoading(false);
@@ -101,7 +102,7 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) {
         }
       });
     },
-    [client, history, modalState, callType, e2eeEnabled]
+    [client, history, setJoinExistingCallModalOpen, e2eeEnabled]
   );
 
   const recentRooms = useGroupCallRooms(client);
@@ -111,32 +112,29 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) {
     history.push(`/${existingAlias}`);
   }, [history, existingAlias]);
 
-  const callNameLabel =
-    callType === CallType.Video
-      ? t("Video call name")
-      : t("Walkie-talkie call name");
-
   return (
     <>
-      <Header>
-        <LeftNav>
-          <HeaderLogo />
-        </LeftNav>
-        <RightNav>
-          <UserMenuContainer />
-        </RightNav>
-      </Header>
       <div className={commonStyles.container}>
+        <Header>
+          <LeftNav>
+            <HeaderLogo />
+          </LeftNav>
+          <RightNav>
+            <UserMenuContainer />
+          </RightNav>
+        </Header>
         <main className={commonStyles.main}>
           <HeaderLogo className={commonStyles.logo} />
-          <CallTypeDropdown callType={callType} setCallType={setCallType} />
+          <Heading size="lg" weight="semibold">
+            {t("Start new call")}
+          </Heading>
           <Form className={styles.form} onSubmit={onSubmit}>
             <FieldRow className={styles.fieldRow}>
               <InputField
                 id="callName"
                 name="callName"
-                label={callNameLabel}
-                placeholder={callNameLabel}
+                label={t("Name of call")}
+                placeholder={t("Name of call")}
                 type="text"
                 required
                 autoComplete="off"
@@ -166,18 +164,15 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) {
             )}
           </Form>
           {recentRooms.length > 0 && (
-            <>
-              <Title className={styles.recentCallsTitle}>
-                {t("Your recent calls")}
-              </Title>
-              <CallList rooms={recentRooms} client={client} />
-            </>
+            <CallList rooms={recentRooms} client={client} />
           )}
         </main>
       </div>
-      {modalState.isOpen && (
-        <JoinExistingCallModal onJoin={onJoinExistingRoom} {...modalProps} />
-      )}
+      <JoinExistingCallModal
+        onJoin={onJoinExistingRoom}
+        open={joinExistingCallModalOpen}
+        onDismiss={onDismissJoinExistingCallModal}
+      />
     </>
   );
 }

src/home/UnauthenticatedView.tsx

@@ -18,6 +18,7 @@ import { FC, useCallback, useState, FormEventHandler } from "react";
 import { useHistory } from "react-router-dom";
 import { randomString } from "matrix-js-sdk/src/randomstring";
 import { Trans, useTranslation } from "react-i18next";
+import { Heading } from "@vector-im/compound-web";
 
 import { useClient } from "../ClientContext";
 import { Header, HeaderLogo, LeftNav, RightNav } from "../Header";
@@ -30,12 +31,10 @@ import {
   sanitiseRoomNameInput,
 } from "../matrix-utils";
 import { useInteractiveRegistration } from "../auth/useInteractiveRegistration";
-import { useModalTriggerState } from "../Modal";
 import { JoinExistingCallModal } from "./JoinExistingCallModal";
 import { useRecaptcha } from "../auth/useRecaptcha";
 import { Body, Caption, Link } from "../typography/Typography";
 import { Form } from "../form/Form";
-import { CallType, CallTypeDropdown } from "./CallTypeDropdown";
 import styles from "./UnauthenticatedView.module.css";
 import commonStyles from "./common.module.css";
 import { generateRandomName } from "../auth/generateRandomName";
@@ -48,14 +47,18 @@ import { setLocalStorageItem } from "../useLocalStorage";
 
 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 { recaptchaKey, register } = useInteractiveRegistration();
   const { execute, reset, recaptchaId } = useRecaptcha(recaptchaKey);
 
-  const { modalState, modalProps } = useModalTriggerState();
+  const [joinExistingCallModalOpen, setJoinExistingCallModalOpen] =
+    useState(false);
+  const onDismissJoinExistingCallModal = useCallback(
+    () => setJoinExistingCallModalOpen(false),
+    [setJoinExistingCallModalOpen]
+  );
   const [onFinished, setOnFinished] = useState<() => void>();
   const history = useHistory();
   const { t } = useTranslation();
@@ -68,7 +71,6 @@ export const UnauthenticatedView: FC = () => {
       const data = new FormData(e.target as HTMLFormElement);
       const roomName = sanitiseRoomNameInput(data.get("callName") as string);
       const displayName = data.get("displayName") as string;
-      const ptt = callType === CallType.Radio;
 
       async function submit() {
         setError(undefined);
@@ -86,7 +88,7 @@ export const UnauthenticatedView: FC = () => {
         let roomId: string;
         try {
           roomId = (
-            await createRoom(client, roomName, ptt, e2eeEnabled ?? false)
+            await createRoom(client, roomName, e2eeEnabled ?? false)
           )[1];
 
           if (e2eeEnabled) {
@@ -110,7 +112,7 @@ export const UnauthenticatedView: FC = () => {
             });
 
             setLoading(false);
-            modalState.open();
+            setJoinExistingCallModalOpen(true);
             return;
           } else {
             throw error;
@@ -138,39 +140,35 @@ export const UnauthenticatedView: FC = () => {
       reset,
       execute,
       history,
-      callType,
-      modalState,
+      setJoinExistingCallModalOpen,
       setClient,
       e2eeEnabled,
     ]
   );
 
-  const callNameLabel =
-    callType === CallType.Video
-      ? t("Video call name")
-      : t("Walkie-talkie call name");
-
   return (
     <>
-      <Header>
-        <LeftNav>
-          <HeaderLogo />
-        </LeftNav>
-        <RightNav hideMobile>
-          <UserMenuContainer />
-        </RightNav>
-      </Header>
       <div className={commonStyles.container}>
+        <Header>
+          <LeftNav>
+            <HeaderLogo />
+          </LeftNav>
+          <RightNav hideMobile>
+            <UserMenuContainer />
+          </RightNav>
+        </Header>
         <main className={commonStyles.main}>
           <HeaderLogo className={commonStyles.logo} />
-          <CallTypeDropdown callType={callType} setCallType={setCallType} />
+          <Heading size="lg" weight="semibold">
+            {t("Start new call")}
+          </Heading>
           <Form className={styles.form} onSubmit={onSubmit}>
             <FieldRow>
               <InputField
                 id="callName"
                 name="callName"
-                label={callNameLabel}
-                placeholder={callNameLabel}
+                label={t("Name of call")}
+                placeholder={t("Name of call")}
                 type="text"
                 required
                 autoComplete="off"
@@ -235,8 +233,12 @@ export const UnauthenticatedView: FC = () => {
           </Body>
         </footer>
       </div>
-      {modalState.isOpen && onFinished && (
-        <JoinExistingCallModal onJoin={onFinished} {...modalProps} />
+      {onFinished && (
+        <JoinExistingCallModal
+          onJoin={onFinished}
+          open={joinExistingCallModalOpen}
+          onDismiss={onDismissJoinExistingCallModal}
+        />
       )}
     </>
   );

src/home/common.module.css

@@ -16,7 +16,7 @@ limitations under the License.
 
 .container {
   display: flex;
-  min-height: calc(100% - 64px);
+  min-height: 100%;
   flex-direction: column;
   justify-content: space-between;
 }
@@ -42,8 +42,4 @@ limitations under the License.
   .logo {
     display: none;
   }
-
-  .container {
-    min-height: calc(100% - 76px);
-  }
 }

src/index.css

@@ -25,12 +25,6 @@ limitations under the License.
 @import "@vector-im/compound-web/dist/style.css";
 
 :root {
-  --font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI",
-    "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
-    "Helvetica Neue", sans-serif;
-  --inter-unicode-range: U+0000-20e2, U+20e4-23ce, U+23d0-24c1, U+24c3-259f,
-    U+25c2-2664, U+2666-2763, U+2765-2b05, U+2b07-2b1b, U+2b1d-10FFFF;
-
   --font-scale: 1;
   --font-size-micro: calc(10px * var(--font-scale));
   --font-size-caption: calc(12px * var(--font-scale));
@@ -149,7 +143,6 @@ body {
   color: var(--cpd-color-text-primary);
   color-scheme: dark;
   margin: 0;
-  font-family: var(--font-family);
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
@@ -157,7 +150,9 @@ body {
 html,
 body,
 #root {
-  height: 100%;
+  /* We use !important here to override vaul drawers, which have a side effect
+  of setting height: auto; on the body element and messing up our layouts */
+  height: 100% !important;
 }
 
 #root {
@@ -165,6 +160,21 @@ body,
   flex-direction: column;
 }
 
+/* On Android and iOS, prefer native system fonts. The global.css file of
+Compound Web is where these variables ultimately get consumed to set the page's
+font-family. */
+body[data-platform="android"] {
+  --cpd-font-family-sans: "Roboto", "Noto", "Inter", sans-serif;
+}
+
+body[data-platform="ios"] {
+  --cpd-font-family-sans: -apple-system, BlinkMacSystemFont, "Inter", sans-serif;
+}
+
+body[data-platform="desktop"] {
+  --cpd-font-family-sans: "Inter", sans-serif;
+}
+
 h1,
 h2,
 h3,

src/initializer.tsx

@@ -24,6 +24,7 @@ import * as Sentry from "@sentry/react";
 import { getUrlParams } from "./UrlParams";
 import { Config } from "./config/Config";
 import { ElementCallOpenTelemetry } from "./otel/otel";
+import { platform } from "./Platform";
 
 enum LoadState {
   None,
@@ -61,7 +62,7 @@ export class Initializer {
     languageDetector.addDetector({
       name: "urlFragment",
       // Look for a language code in the URL's fragment
-      lookup: () => getUrlParams(true).lang ?? undefined,
+      lookup: () => getUrlParams().lang ?? undefined,
     });
 
     i18n
@@ -94,7 +95,7 @@ export class Initializer {
     }
 
     // Custom fonts
-    const { fonts, fontScale } = getUrlParams(true);
+    const { fonts, fontScale } = getUrlParams();
     if (fontScale !== null) {
       document.documentElement.style.setProperty(
         "--font-scale",
@@ -107,6 +108,9 @@ export class Initializer {
         fonts.map((f) => `"${f}"`).join(", ")
       );
     }
+
+    // Add the platform to the DOM, so CSS can query it
+    document.body.setAttribute("data-platform", platform);
   }
 
   public static init(): Promise<void> | null {

src/livekit/MediaDevicesContext.tsx

@@ -200,8 +200,10 @@ export const useMediaDevices = () => useContext(MediaDevicesContext);
  * default because it may involve requesting additional permissions from the
  * user.
  */
-export const useMediaDeviceNames = (context: MediaDevices) =>
+export const useMediaDeviceNames = (context: MediaDevices, enabled = true) =>
   useEffect(() => {
-    context.startUsingDeviceNames();
-    return context.stopUsingDeviceNames;
-  }, [context]);
+    if (enabled) {
+      context.startUsingDeviceNames();
+      return context.stopUsingDeviceNames;
+    }
+  }, [context, enabled]);

src/matrix-utils.ts

@@ -272,7 +272,6 @@ export function isLocalRoomId(roomId: string, client: MatrixClient): boolean {
 export async function createRoom(
   client: MatrixClient,
   name: string,
-  ptt: boolean,
   e2ee: boolean
 ): Promise<[string, string]> {
   logger.log(`Creating room for group call`);
@@ -327,14 +326,12 @@ export async function createRoom(
 
   const result = await createPromise;
 
-  logger.log(
-    `Creating ${ptt ? "PTT" : "video"} group call in ${result.room_id}`
-  );
+  logger.log(`Creating group call in ${result.room_id}`);
 
   await client.createGroupCall(
     result.room_id,
-    ptt ? GroupCallType.Voice : GroupCallType.Video,
-    ptt,
+    GroupCallType.Video,
+    false,
     GroupCallIntent.Room,
     true
   );

src/room/AppSelectionModal.module.css

@@ -1,11 +1,11 @@
 /*
-Copyright 2022 New Vector Ltd
+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
+    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,
@@ -14,6 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.label {
-  margin-bottom: 0;
+.modal p {
+  text-align: center;
+  margin-block-end: var(--cpd-space-8x);
+}
+
+.modal button,
+.modal a {
+  width: 100%;
+}
+
+.modal button {
+  margin-block-end: var(--cpd-space-6x);
+}
+
+.modal a {
+  box-sizing: border-box;
 }

src/room/AppSelectionModal.tsx

@@ -0,0 +1,80 @@
+/*
+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 { FC, MouseEvent, useCallback, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Button, Text } from "@vector-im/compound-web";
+import { ReactComponent as PopOutIcon } from "@vector-im/compound-design-tokens/icons/pop-out.svg";
+
+import { Modal } from "../Modal";
+import { useRoomSharedKey } from "../e2ee/sharedKeyManagement";
+import { getRoomUrl } from "../matrix-utils";
+import styles from "./AppSelectionModal.module.css";
+import { editFragmentQuery } from "../UrlParams";
+
+interface Props {
+  roomId: string | null;
+}
+
+export const AppSelectionModal: FC<Props> = ({ roomId }) => {
+  const { t } = useTranslation();
+
+  const [open, setOpen] = useState(true);
+  const onBrowserClick = useCallback(
+    (e: MouseEvent) => {
+      e.preventDefault();
+      e.stopPropagation();
+      setOpen(false);
+    },
+    [setOpen]
+  );
+
+  const roomSharedKey = useRoomSharedKey(roomId ?? "");
+  const appUrl = useMemo(() => {
+    // If the room ID is not known, fall back to the URL of the current page
+    const url = new URL(
+      roomId === null
+        ? window.location.href
+        : getRoomUrl(roomId, roomSharedKey ?? undefined)
+    );
+    // Edit the URL so that it opens in embedded mode. We do this for two
+    // reasons: It causes the mobile app to limit the user to only visiting the
+    // room in question, and it prevents this app selection prompt from being
+    // shown a second time.
+    url.hash = editFragmentQuery(url.hash, (params) => {
+      params.set("embed", "");
+      return params;
+    });
+
+    const result = new URL("element://call");
+    result.searchParams.set("url", url.toString());
+    return result.toString();
+  }, [roomId, roomSharedKey]);
+
+  return (
+    <Modal className={styles.modal} title={t("Select app")} open={open}>
+      <Text size="md" weight="semibold">
+        {t("Ready to join?")}
+      </Text>
+      <Button kind="secondary" onClick={onBrowserClick}>
+        {t("Continue in browser")}
+      </Button>
+      <Button as="a" href={appUrl} Icon={PopOutIcon}>
+        {t("Open in the app")}
+      </Button>
+    </Modal>
+  );
+};

src/room/CallEndedView.module.css

@@ -17,7 +17,8 @@ limitations under the License.
 .headline {
   text-align: center;
   margin-bottom: 60px;
-  white-space: pre;
+  white-space: pre-wrap;
+  overflow-wrap: break-word;
 }
 
 .callEndedContent {
@@ -66,6 +67,7 @@ limitations under the License.
   flex: 1;
   flex-direction: column;
   align-items: center;
+  padding-inline: var(--inline-content-inset);
 }
 
 .logo {

src/room/GroupCallLoader.tsx

@@ -27,7 +27,6 @@ interface Props {
   roomIdOrAlias: string;
   viaServers: string[];
   children: (rtcSession: MatrixRTCSession) => ReactNode;
-  createPtt: boolean;
 }
 
 export function GroupCallLoader({
@@ -35,15 +34,9 @@ export function GroupCallLoader({
   roomIdOrAlias,
   viaServers,
   children,
-  createPtt,
 }: Props): JSX.Element {
   const { t } = useTranslation();
-  const groupCallState = useLoadGroupCall(
-    client,
-    roomIdOrAlias,
-    viaServers,
-    createPtt
-  );
+  const groupCallState = useLoadGroupCall(client, roomIdOrAlias, viaServers);
 
   switch (groupCallState.kind) {
     case "loading":

src/room/GroupCallView.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useHistory } from "react-router-dom";
 import { MatrixClient } from "matrix-js-sdk/src/client";
-import { useTranslation } from "react-i18next";
 import { Room } from "livekit-client";
 import { logger } from "matrix-js-sdk/src/logger";
 import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
@@ -25,7 +24,7 @@ import { JoinRule, RoomMember } from "matrix-js-sdk/src/matrix";
 
 import type { IWidgetApiRequest } from "matrix-widget-api";
 import { widget, ElementWidgetActions, JoinCallData } from "../widget";
-import { ErrorView, FullScreenView } from "../FullScreenView";
+import { ErrorView } from "../FullScreenView";
 import { LobbyView } from "./LobbyView";
 import { MatrixInfo } from "./VideoPreview";
 import { CallEndedView } from "./CallEndedView";
@@ -45,7 +44,6 @@ import {
 import { useEnableE2EE } from "../settings/useSetting";
 import { useRoomAvatar } from "./useRoomAvatar";
 import { useRoomName } from "./useRoomName";
-import { useModalTriggerState } from "../Modal";
 import { useJoinRule } from "./useJoinRule";
 import { ShareModal } from "./ShareModal";
 
@@ -78,8 +76,6 @@ export function GroupCallView({
   const e2eeSharedKey = useManageRoomSharedKey(rtcSession.room.roomId);
   const isRoomE2EE = useIsRoomE2EE(rtcSession.room.roomId);
 
-  const { t } = useTranslation();
-
   useEffect(() => {
     window.rtcSession = rtcSession;
     return () => {
@@ -208,17 +204,6 @@ export function GroupCallView({
     }
   }, [rtcSession, preload]);
 
-  useEffect(() => {
-    if (isEmbedded && !preload) {
-      // In embedded mode, bypass the lobby and just enter the call straight away
-      enterRTCSession(rtcSession);
-
-      PosthogAnalytics.instance.eventCallEnded.cacheStartCall(new Date());
-      // use the room ID as above
-      PosthogAnalytics.instance.eventCallStarted.track(rtcSession.room.roomId);
-    }
-  }, [rtcSession, isEmbedded, preload]);
-
   const [left, setLeft] = useState(false);
   const [leaveError, setLeaveError] = useState<Error | undefined>(undefined);
   const history = useHistory();
@@ -286,12 +271,15 @@ export function GroupCallView({
 
   const joinRule = useJoinRule(rtcSession.room);
 
-  const { modalState: shareModalState, modalProps: shareModalProps } =
-    useModalTriggerState();
+  const [shareModalOpen, setShareModalOpen] = useState(false);
+  const onDismissShareModal = useCallback(
+    () => setShareModalOpen(false),
+    [setShareModalOpen]
+  );
 
   const onShareClickFn = useCallback(
-    () => shareModalState.open(),
-    [shareModalState]
+    () => setShareModalOpen(true),
+    [setShareModalOpen]
   );
   const onShareClick = joinRule === JoinRule.Public ? onShareClickFn : null;
 
@@ -311,8 +299,12 @@ export function GroupCallView({
     return <ErrorView error={new Error("You need to enable E2EE to join.")} />;
   }
 
-  const shareModal = shareModalState.isOpen && (
-    <ShareModal roomId={rtcSession.room.roomId} {...shareModalProps} />
+  const shareModal = (
+    <ShareModal
+      roomId={rtcSession.room.roomId}
+      open={shareModalOpen}
+      onDismiss={onDismissShareModal}
+    />
   );
 
   if (isJoined) {
@@ -362,12 +354,6 @@ export function GroupCallView({
     }
   } else if (preload) {
     return null;
-  } else if (isEmbedded) {
-    return (
-      <FullScreenView>
-        <h1>{t("Loading…")}</h1>
-      </FullScreenView>
-    );
   } else {
     return (
       <>

src/room/InCallView.module.css

@@ -21,7 +21,7 @@ limitations under the License.
   min-height: 100%;
   height: 100%;
   width: 100%;
-  --footerPadding: 8px;
+  --footerPadding: var(--cpd-space-4x);
   --footerHeight: calc(50px + 2 * var(--footerPadding));
 }
 
@@ -83,17 +83,19 @@ limitations under the License.
   justify-self: end;
 }
 
-@media (min-height: 300px) {
+@media (min-height: 400px) {
   .inRoom {
-    --footerPadding: 40px;
+    --footerPadding: var(--cpd-space-10x);
+  }
+}
+
+@media (min-height: 800px) {
+  .inRoom {
+    --footerPadding: var(--cpd-space-15x);
   }
 }
 
 @media (min-width: 800px) {
-  .inRoom {
-    --footerPadding: 60px;
-  }
-
   .buttons {
     gap: var(--cpd-space-4x);
   }

src/room/InCallView.tsx

@@ -30,7 +30,6 @@ import { Room as MatrixRoom } from "matrix-js-sdk/src/models/room";
 import { Ref, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import useMeasure from "react-use-measure";
-import { OverlayTriggerState } from "@react-stately/overlays";
 import { logger } from "matrix-js-sdk/src/logger";
 import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
 
@@ -51,7 +50,6 @@ import {
   VideoGrid,
 } from "../video-grid/VideoGrid";
 import { useShowConnectionStats } from "../settings/useSetting";
-import { useModalTriggerState } from "../Modal";
 import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
 import { useUrlParams } from "../UrlParams";
 import { useCallViewKeyboardShortcuts } from "../useCallViewKeyboardShortcuts";
@@ -313,25 +311,20 @@ export function InCallView({
     );
   };
 
-  const {
-    modalState: rageshakeRequestModalState,
-    modalProps: rageshakeRequestModalProps,
-  } = useRageshakeRequestModal(rtcSession.room.roomId);
+  const rageshakeRequestModalProps = useRageshakeRequestModal(
+    rtcSession.room.roomId
+  );
 
-  const {
-    modalState: settingsModalState,
-    modalProps: settingsModalProps,
-  }: {
-    modalState: OverlayTriggerState;
-    modalProps: {
-      isOpen: boolean;
-      onClose: () => void;
-    };
-  } = useModalTriggerState();
+  const [settingsModalOpen, setSettingsModalOpen] = useState(false);
 
-  const openSettings = useCallback(() => {
-    settingsModalState.open();
-  }, [settingsModalState]);
+  const openSettings = useCallback(
+    () => setSettingsModalOpen(true),
+    [setSettingsModalOpen]
+  );
+  const closeSettings = useCallback(
+    () => setSettingsModalOpen(false),
+    [setSettingsModalOpen]
+  );
 
   const toggleScreensharing = useCallback(async () => {
     exitFullscreen();
@@ -442,19 +435,13 @@ export function InCallView({
           show={showInspector}
         />
       )*/}
-      {rageshakeRequestModalState.isOpen && !noControls && (
-        <RageshakeRequestModal
-          {...rageshakeRequestModalProps}
-          roomId={rtcSession.room.roomId}
-        />
-      )}
-      {settingsModalState.isOpen && (
-        <SettingsModal
-          client={client}
-          roomId={rtcSession.room.roomId}
-          {...settingsModalProps}
-        />
-      )}
+      {!noControls && <RageshakeRequestModal {...rageshakeRequestModalProps} />}
+      <SettingsModal
+        client={client}
+        roomId={rtcSession.room.roomId}
+        open={settingsModalOpen}
+        onDismiss={closeSettings}
+      />
     </div>
   );
 }

src/room/LobbyView.module.css

@@ -14,61 +14,26 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.room {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  min-height: 100%;
-}
-
-.joinRoom {
+.content {
   display: flex;
   flex-direction: column;
   align-items: center;
+  justify-content: center;
+  gap: var(--cpd-space-6x);
   flex: 1;
   overflow: hidden;
   height: 100%;
+  padding-block-end: var(--footerHeight);
 }
 
-.joinRoomContent {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  flex: 1;
+@media (max-width: 500px) {
+  .join {
+    width: 100%;
+  }
 }
 
-.joinRoomFooter {
-  margin: 20px 0;
-}
-
-.homeLink {
-  margin-top: 50px;
-}
-
-.joinCallButton {
-  position: absolute;
-  width: 100%;
-  max-width: 222px;
-  height: 40px;
-  bottom: 86px;
-  left: 50%;
-  font-weight: 600;
-  font-size: var(--font-size-body);
-  transform: translateX(-50%);
-}
-
-.copyButton {
-  width: 320px !important;
-  margin-bottom: 15px;
-}
-
-.copyButton:last-child {
-  margin-bottom: 0;
-}
-
-.passwordField {
-  width: 320px !important;
-  margin-bottom: 20px;
-  flex: 0;
+@media (min-height: 650px) {
+  .content {
+    gap: var(--cpd-space-10x);
+  }
 }

src/room/LobbyView.tsx

@@ -14,20 +14,28 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { useRef, useEffect, FC } from "react";
-import { Trans, useTranslation } from "react-i18next";
+import { FC, useCallback, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix";
+import { Button, Link } from "@vector-im/compound-web";
+import classNames from "classnames";
+import { useHistory } from "react-router-dom";
 
 import styles from "./LobbyView.module.css";
-import { Button, CopyButton } from "../button";
+import inCallStyles from "./InCallView.module.css";
 import { Header, LeftNav, RightNav, RoomHeaderInfo } from "../Header";
-import { getRoomUrl } from "../matrix-utils";
-import { Body, Link } from "../typography/Typography";
 import { useLocationNavigation } from "../useLocationNavigation";
 import { MatrixInfo, VideoPreview } from "./VideoPreview";
 import { MuteStates } from "./MuteStates";
-import { useRoomSharedKey } from "../e2ee/sharedKeyManagement";
 import { ShareButton } from "../button/ShareButton";
+import {
+  HangupButton,
+  MicButton,
+  SettingsButton,
+  VideoButton,
+} from "../button/Button";
+import { SettingsModal } from "../settings/SettingsModal";
+import { useMediaQuery } from "../useMediaQuery";
 
 interface Props {
   client: MatrixClient;
@@ -51,68 +59,98 @@ export const LobbyView: FC<Props> = ({
   onShareClick,
 }) => {
   const { t } = useTranslation();
-  const roomSharedKey = useRoomSharedKey(matrixInfo.roomId);
   useLocationNavigation();
 
-  const joinCallButtonRef = useRef<HTMLButtonElement>(null);
-  useEffect(() => {
-    if (joinCallButtonRef.current) {
-      joinCallButtonRef.current.focus();
-    }
-  }, [joinCallButtonRef]);
+  const onAudioPress = useCallback(
+    () => muteStates.audio.setEnabled?.((e) => !e),
+    [muteStates]
+  );
+  const onVideoPress = useCallback(
+    () => muteStates.video.setEnabled?.((e) => !e),
+    [muteStates]
+  );
 
+  const [settingsModalOpen, setSettingsModalOpen] = useState(false);
+
+  const openSettings = useCallback(
+    () => setSettingsModalOpen(true),
+    [setSettingsModalOpen]
+  );
+  const closeSettings = useCallback(
+    () => setSettingsModalOpen(false),
+    [setSettingsModalOpen]
+  );
+
+  const history = useHistory();
+  const onLeaveClick = useCallback(() => history.push("/"), [history]);
+
+  const recentsButtonInFooter = useMediaQuery("(max-height: 500px)");
+  const recentsButton = !isEmbedded && (
+    <Link className={styles.recents} href="#" onClick={onLeaveClick}>
+      {t("Back to recents")}
+    </Link>
+  );
+
+  // TODO: Unify this component with InCallView, so we can get slick joining
+  // animations and don't have to feel bad about reusing its CSS
   return (
-    <div className={styles.room}>
-      {!hideHeader && (
-        <Header>
-          <LeftNav>
-            <RoomHeaderInfo
-              id={matrixInfo.roomId}
-              name={matrixInfo.roomName}
-              avatarUrl={matrixInfo.roomAvatar}
-              encrypted={matrixInfo.roomEncrypted}
-              participants={participatingMembers}
-              client={client}
-            />
-          </LeftNav>
-          <RightNav>
-            {onShareClick !== null && <ShareButton onClick={onShareClick} />}
-          </RightNav>
-        </Header>
-      )}
-      <div className={styles.joinRoom}>
-        <div className={styles.joinRoomContent}>
-          <VideoPreview matrixInfo={matrixInfo} muteStates={muteStates} />
-          <Trans>
+    <>
+      <div className={classNames(styles.room, inCallStyles.inRoom)}>
+        {!hideHeader && (
+          <Header>
+            <LeftNav>
+              <RoomHeaderInfo
+                id={matrixInfo.roomId}
+                name={matrixInfo.roomName}
+                avatarUrl={matrixInfo.roomAvatar}
+                encrypted={matrixInfo.roomEncrypted}
+                participants={participatingMembers}
+                client={client}
+              />
+            </LeftNav>
+            <RightNav>
+              {onShareClick !== null && <ShareButton onClick={onShareClick} />}
+            </RightNav>
+          </Header>
+        )}
+        <div className={styles.content}>
+          <VideoPreview matrixInfo={matrixInfo} muteStates={muteStates}>
             <Button
-              ref={joinCallButtonRef}
-              className={styles.copyButton}
+              className={styles.join}
               size="lg"
-              onPress={() => onEnter()}
+              onClick={onEnter}
               data-testid="lobby_joinCall"
             >
-              Join call now
+              {t("Join call")}
             </Button>
-            <Body>Or</Body>
-            <CopyButton
-              variant="secondaryCopy"
-              value={getRoomUrl(matrixInfo.roomId, roomSharedKey ?? undefined)}
-              className={styles.copyButton}
-              copiedMessage={t("Call link copied")}
-              data-testid="lobby_inviteLink"
-            >
-              Copy call link and join later
-            </CopyButton>
-          </Trans>
+          </VideoPreview>
+          {!recentsButtonInFooter && recentsButton}
+        </div>
+        <div className={inCallStyles.footer}>
+          {recentsButtonInFooter && recentsButton}
+          <div className={inCallStyles.buttons}>
+            <VideoButton
+              muted={!muteStates.video.enabled}
+              onPress={onVideoPress}
+              disabled={muteStates.video.setEnabled === null}
+            />
+            <MicButton
+              muted={!muteStates.audio.enabled}
+              onPress={onAudioPress}
+              disabled={muteStates.audio.setEnabled === null}
+            />
+            <SettingsButton onPress={openSettings} />
+            {!isEmbedded && <HangupButton onPress={onLeaveClick} />}
+          </div>
         </div>
-        {!isEmbedded && (
-          <Body className={styles.joinRoomFooter}>
-            <Link color="primary" to="/">
-              {t("Take me Home")}
-            </Link>
-          </Body>
-        )}
       </div>
-    </div>
+      {client && (
+        <SettingsModal
+          client={client}
+          open={settingsModalOpen}
+          onDismiss={closeSettings}
+        />
+      )}
+    </>
   );
 };

src/room/RageshakeRequestModal.tsx

@@ -17,7 +17,7 @@ limitations under the License.
 import { FC, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 
-import { Modal, ModalContent, ModalProps } from "../Modal";
+import { Modal, ModalProps } from "../Modal";
 import { Button } from "../button";
 import { FieldRow, ErrorMessage } from "../input/Input";
 import { useSubmitRageshake } from "../settings/submit-rageshake";
@@ -26,51 +26,49 @@ import { Body } from "../typography/Typography";
 interface Props extends Omit<ModalProps, "title" | "children"> {
   rageshakeRequestId: string;
   roomId: string;
-  onClose: () => void;
+  open: boolean;
+  onDismiss: () => void;
 }
 
 export const RageshakeRequestModal: FC<Props> = ({
   rageshakeRequestId,
   roomId,
-  ...rest
+  open,
+  onDismiss,
 }) => {
   const { t } = useTranslation();
   const { submitRageshake, sending, sent, error } = useSubmitRageshake();
 
   useEffect(() => {
-    if (sent) {
-      rest.onClose();
-    }
-  }, [sent, rest]);
+    if (sent) onDismiss();
+  }, [sent, onDismiss]);
 
   return (
-    <Modal title={t("Debug log request")} isDismissable {...rest}>
-      <ModalContent>
-        <Body>
-          {t(
-            "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log."
-          )}
-        </Body>
-        <FieldRow>
-          <Button
-            onPress={() =>
-              submitRageshake({
-                sendLogs: true,
-                rageshakeRequestId,
-                roomId,
-              })
-            }
-            disabled={sending}
-          >
-            {sending ? t("Sending debug logs…") : t("Send debug logs")}
-          </Button>
-        </FieldRow>
-        {error && (
-          <FieldRow>
-            <ErrorMessage error={error} />
-          </FieldRow>
+    <Modal title={t("Debug log request")} open={open} onDismiss={onDismiss}>
+      <Body>
+        {t(
+          "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log."
         )}
-      </ModalContent>
+      </Body>
+      <FieldRow>
+        <Button
+          onPress={() =>
+            submitRageshake({
+              sendLogs: true,
+              rageshakeRequestId,
+              roomId,
+            })
+          }
+          disabled={sending}
+        >
+          {sending ? t("Sending debug logs…") : t("Send debug logs")}
+        </Button>
+      </FieldRow>
+      {error && (
+        <FieldRow>
+          <ErrorMessage error={error} />
+        </FieldRow>
+      )}
     </Modal>
   );
 };

src/room/RoomPage.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { FC, useEffect, useState, useCallback } from "react";
+import { FC, useEffect, useState, useCallback, ReactNode } from "react";
 import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
 
 import { useClientLegacy } from "../ClientContext";
@@ -22,22 +22,18 @@ import { ErrorView, LoadingView } from "../FullScreenView";
 import { RoomAuthView } from "./RoomAuthView";
 import { GroupCallLoader } from "./GroupCallLoader";
 import { GroupCallView } from "./GroupCallView";
-import { useUrlParams } from "../UrlParams";
+import { useRoomIdentifier, useUrlParams } from "../UrlParams";
 import { useRegisterPasswordlessUser } from "../auth/useRegisterPasswordlessUser";
 import { useOptInAnalytics } from "../settings/useSetting";
 import { HomePage } from "../home/HomePage";
+import { platform } from "../Platform";
+import { AppSelectionModal } from "./AppSelectionModal";
 
 export const RoomPage: FC = () => {
-  const {
-    roomAlias,
-    roomId,
-    viaServers,
-    isEmbedded,
-    preload,
-    hideHeader,
-    isPtt,
-    displayName,
-  } = useUrlParams();
+  const { isEmbedded, preload, hideHeader, displayName } = useUrlParams();
+
+  const { roomAlias, roomId, viaServers } = useRoomIdentifier();
+
   const roomIdOrAlias = roomId ?? roomAlias;
   if (!roomIdOrAlias) {
     console.error("No room specified");
@@ -86,30 +82,36 @@ export const RoomPage: FC = () => {
     [client, passwordlessUser, isEmbedded, preload, hideHeader]
   );
 
+  let content: ReactNode;
   if (loading || isRegistering) {
-    return <LoadingView />;
-  }
-
-  if (error) {
-    return <ErrorView error={error} />;
-  }
-
-  if (!client) {
-    return <RoomAuthView />;
-  }
-
-  if (!roomIdOrAlias) {
-    return <HomePage />;
+    content = <LoadingView />;
+  } else if (error) {
+    content = <ErrorView error={error} />;
+  } else if (!client) {
+    content = <RoomAuthView />;
+  } else if (!roomIdOrAlias) {
+    // TODO: This doesn't belong here, the app routes need to be reworked
+    content = <HomePage />;
+  } else {
+    content = (
+      <GroupCallLoader
+        client={client}
+        roomIdOrAlias={roomIdOrAlias}
+        viaServers={viaServers}
+      >
+        {groupCallView}
+      </GroupCallLoader>
+    );
   }
 
   return (
-    <GroupCallLoader
-      client={client}
-      roomIdOrAlias={roomIdOrAlias}
-      viaServers={viaServers}
-      createPtt={isPtt}
-    >
-      {groupCallView}
-    </GroupCallLoader>
+    <>
+      {content}
+      {/* On mobile, show a prompt to launch the mobile app. If in embedded mode,
+    that means we *are* in the mobile app and should show no further prompt. */}
+      {(platform === "android" || platform === "ios") && !isEmbedded && (
+        <AppSelectionModal roomId={roomId} />
+      )}
+    </>
   );
 };

src/room/ShareModal.module.css

@@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.inviteModal {
-  max-width: 413px;
-}
-
 .copyButton {
   width: 100%;
 }

src/room/ShareModal.tsx

@@ -17,35 +17,30 @@ limitations under the License.
 import { FC } from "react";
 import { useTranslation } from "react-i18next";
 
-import { Modal, ModalContent, ModalProps } from "../Modal";
+import { Modal } from "../Modal";
 import { CopyButton } from "../button";
 import { getRoomUrl } from "../matrix-utils";
 import styles from "./ShareModal.module.css";
 import { useRoomSharedKey } from "../e2ee/sharedKeyManagement";
 
-interface Props extends Omit<ModalProps, "title" | "children"> {
+interface Props {
   roomId: string;
+  open: boolean;
+  onDismiss: () => void;
 }
 
-export const ShareModal: FC<Props> = ({ roomId, ...rest }) => {
+export const ShareModal: FC<Props> = ({ roomId, open, onDismiss }) => {
   const { t } = useTranslation();
   const roomSharedKey = useRoomSharedKey(roomId);
 
   return (
-    <Modal
-      title={t("Share this call")}
-      isDismissable
-      className={styles.inviteModal}
-      {...rest}
-    >
-      <ModalContent>
-        <p>{t("Copy and share this call link")}</p>
-        <CopyButton
-          className={styles.copyButton}
-          value={getRoomUrl(roomId, roomSharedKey ?? undefined)}
-          data-testid="modal_inviteLink"
-        />
-      </ModalContent>
+    <Modal title={t("Share this call")} open={open} onDismiss={onDismiss}>
+      <p>{t("Copy and share this call link")}</p>
+      <CopyButton
+        className={styles.copyButton}
+        value={getRoomUrl(roomId, roomSharedKey ?? undefined)}
+        data-testid="modal_inviteLink"
+      />
     </Modal>
   );
 };

src/room/VideoPreview.module.css

@@ -15,21 +15,29 @@ limitations under the License.
 */
 
 .preview {
-  position: relative;
-  min-height: 280px;
-  height: 50vh;
-  border-radius: 24px;
-  overflow: hidden;
-  background-color: var(--stopgap-bgColor3);
-  margin: 20px;
+  margin-inline: var(--inline-content-inset);
+  min-block-size: 0;
+  block-size: 50vh;
 }
 
-.preview video {
+.preview.content {
+  margin-inline: 0;
+}
+
+.content {
+  position: relative;
+  block-size: 100%;
+  inline-size: 100%;
+  overflow: hidden;
+}
+
+.content video {
   width: 100%;
   height: 100%;
-  object-fit: contain;
+  object-fit: cover;
   background-color: black;
   transform: scaleX(-1);
+  background-color: var(--cpd-color-bg-subtle-primary);
 }
 
 .avatarContainer {
@@ -41,40 +49,32 @@ limitations under the License.
   display: flex;
   justify-content: center;
   align-items: center;
-  background-color: var(--stopgap-bgColor3);
+  background-color: var(--cpd-color-bg-subtle-secondary);
 }
 
-.cameraPermissions {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  margin: 0;
-  text-align: center;
-}
-
-.previewButtons {
+.buttonBar {
   position: absolute;
   bottom: 0;
   left: 0;
   right: 0;
-  height: 66px;
+  height: calc(30 * var(--cpd-space-1x));
   display: flex;
   justify-content: center;
   align-items: center;
-  background-color: var(--stopgap-background-85);
+  gap: var(--cpd-space-4x);
+  background: linear-gradient(
+    180deg,
+    rgba(0, 0, 0, 0) 0%,
+    var(--cpd-color-bg-canvas-default) 100%
+  );
 }
 
-.previewButtons > * {
-  margin-right: 30px;
+.preview.content .buttonBar {
+  padding-inline: var(--inline-content-inset);
 }
 
-.previewButtons > :last-child {
-  margin-right: 0px;
-}
-
-@media (min-width: 800px) {
-  .preview {
-    margin-top: 40px;
+@media (min-aspect-ratio: 1 / 1) {
+  .preview video {
+    aspect-ratio: 16 / 9;
   }
 }

src/room/VideoPreview.tsx

@@ -14,25 +14,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { useEffect, useCallback, useMemo, useRef, FC } from "react";
+import { useEffect, useMemo, useRef, FC, ReactNode } from "react";
 import useMeasure from "react-use-measure";
 import { ResizeObserver } from "@juggle/resize-observer";
-import { OverlayTriggerState } from "@react-stately/overlays";
 import { usePreviewTracks } from "@livekit/components-react";
 import {
   CreateLocalTracksOptions,
   LocalVideoTrack,
   Track,
 } from "livekit-client";
+import classNames from "classnames";
 
-import { MicButton, SettingsButton, VideoButton } from "../button";
 import { Avatar } from "../Avatar";
 import styles from "./VideoPreview.module.css";
-import { useModalTriggerState } from "../Modal";
-import { SettingsModal } from "../settings/SettingsModal";
-import { useClient } from "../ClientContext";
 import { useMediaDevices } from "../livekit/MediaDevicesContext";
 import { MuteStates } from "./MuteStates";
+import { Glass } from "../Glass";
+import { useMediaQuery } from "../useMediaQuery";
 
 export type MatrixInfo = {
   userId: string;
@@ -48,27 +46,16 @@ export type MatrixInfo = {
 interface Props {
   matrixInfo: MatrixInfo;
   muteStates: MuteStates;
+  children: ReactNode;
 }
 
-export const VideoPreview: FC<Props> = ({ matrixInfo, muteStates }) => {
-  const { client } = useClient();
+export const VideoPreview: FC<Props> = ({
+  matrixInfo,
+  muteStates,
+  children,
+}) => {
   const [previewRef, previewBounds] = useMeasure({ polyfill: ResizeObserver });
 
-  const {
-    modalState: settingsModalState,
-    modalProps: settingsModalProps,
-  }: {
-    modalState: OverlayTriggerState;
-    modalProps: {
-      isOpen: boolean;
-      onClose: () => void;
-    };
-  } = useModalTriggerState();
-
-  const openSettings = useCallback(() => {
-    settingsModalState.open();
-  }, [settingsModalState]);
-
   const devices = useMediaDevices();
 
   // Capture the audio options as they were when we first mounted, because
@@ -116,46 +103,35 @@ export const VideoPreview: FC<Props> = ({ matrixInfo, muteStates }) => {
     };
   }, [videoTrack]);
 
-  const onAudioPress = useCallback(
-    () => muteStates.audio.setEnabled?.((e) => !e),
-    [muteStates]
-  );
-  const onVideoPress = useCallback(
-    () => muteStates.video.setEnabled?.((e) => !e),
-    [muteStates]
+  const content = (
+    <>
+      <video ref={videoEl} muted playsInline disablePictureInPicture />
+      {!muteStates.video.enabled && (
+        <div className={styles.avatarContainer}>
+          <Avatar
+            id={matrixInfo.userId}
+            name={matrixInfo.displayName}
+            size={Math.min(previewBounds.width, previewBounds.height) / 2}
+            src={matrixInfo.avatarUrl}
+          />
+        </div>
+      )}
+      <div className={styles.buttonBar}>{children}</div>
+    </>
   );
 
-  return (
-    <div className={styles.preview} ref={previewRef}>
-      <video ref={videoEl} muted playsInline disablePictureInPicture />
-      <>
-        {!muteStates.video.enabled && (
-          <div className={styles.avatarContainer}>
-            <Avatar
-              id={matrixInfo.userId}
-              name={matrixInfo.displayName}
-              size={(previewBounds.height - 66) / 2}
-              src={matrixInfo.avatarUrl}
-            />
-          </div>
-        )}
-        <div className={styles.previewButtons}>
-          <VideoButton
-            muted={!muteStates.video.enabled}
-            onPress={onVideoPress}
-            disabled={muteStates.video.setEnabled === null}
-          />
-          <MicButton
-            muted={!muteStates.audio.enabled}
-            onPress={onAudioPress}
-            disabled={muteStates.audio.setEnabled === null}
-          />
-          <SettingsButton onPress={openSettings} />
-        </div>
-      </>
-      {settingsModalState.isOpen && client && (
-        <SettingsModal client={client} {...settingsModalProps} />
-      )}
+  return useMediaQuery("(max-width: 550px)") ? (
+    <div
+      className={classNames(styles.preview, styles.content)}
+      ref={previewRef}
+    >
+      {content}
     </div>
+  ) : (
+    <Glass className={styles.preview}>
+      <div className={styles.content} ref={previewRef}>
+        {content}
+      </div>
+    </Glass>
   );
 };

src/room/useLoadGroupCall.ts

@@ -56,8 +56,7 @@ export interface GroupCallLoadState {
 export const useLoadGroupCall = (
   client: MatrixClient,
   roomIdOrAlias: string,
-  viaServers: string[],
-  createPtt: boolean
+  viaServers: string[]
 ): GroupCallStatus => {
   const { t } = useTranslation();
   const [state, setState] = useState<GroupCallStatus>({ kind: "loading" });
@@ -101,7 +100,6 @@ export const useLoadGroupCall = (
           const [, roomId] = await createRoom(
             client,
             roomNameFromRoomId(roomIdOrAlias),
-            createPtt,
             e2eeEnabled ?? false
           );
 
@@ -151,7 +149,7 @@ export const useLoadGroupCall = (
       .then(fetchOrCreateGroupCall)
       .then((rtcSession) => setState({ kind: "loaded", rtcSession }))
       .catch((error) => setState({ kind: "failed", error }));
-  }, [client, roomIdOrAlias, viaServers, createPtt, t, e2eeEnabled]);
+  }, [client, roomIdOrAlias, viaServers, t, e2eeEnabled]);
 
   return state;
 };

src/room/usePageUnload.ts

@@ -16,21 +16,7 @@ limitations under the License.
 
 import { useEffect } from "react";
 
-// https://stackoverflow.com/a/9039885
-function isIOS() {
-  return (
-    [
-      "iPad Simulator",
-      "iPhone Simulator",
-      "iPod Simulator",
-      "iPad",
-      "iPhone",
-      "iPod",
-    ].includes(navigator.platform) ||
-    // iPad on iOS 13 detection
-    (navigator.userAgent.includes("Mac") && "ontouchend" in document)
-  );
-}
+import { platform } from "../Platform";
 
 export function usePageUnload(callback: () => void) {
   useEffect(() => {
@@ -53,7 +39,7 @@ export function usePageUnload(callback: () => void) {
     }
 
     // iOS doesn't fire beforeunload event, so leave the call when you hide the page.
-    if (isIOS()) {
+    if (platform === "ios") {
       window.addEventListener("pagehide", onBeforeUnload);
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore

src/settings/SettingsModal.module.css

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 New Vector Ltd
+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.
@@ -15,18 +15,13 @@ limitations under the License.
 */
 
 .settingsModal {
-  width: 774px;
-  height: 480px;
+  block-size: 550px;
 }
 
 .settingsModal p {
   color: var(--cpd-color-text-secondary);
 }
 
-.tabContainer {
-  padding: 27px 20px;
-}
-
 .fieldRowText {
   margin-bottom: 0;
 }

src/settings/SettingsModal.tsx

@@ -51,11 +51,11 @@ import {
 } from "../livekit/MediaDevicesContext";
 
 interface Props {
-  isOpen: boolean;
+  open: boolean;
+  onDismiss: () => void;
   client: MatrixClient;
   roomId?: string;
   defaultTab?: string;
-  onClose: () => void;
 }
 
 export const SettingsModal = (props: Props) => {
@@ -119,7 +119,7 @@ export const SettingsModal = (props: Props) => {
   );
 
   const devices = useMediaDevices();
-  useMediaDeviceNames(devices);
+  useMediaDeviceNames(devices, props.open);
 
   const audioTab = (
     <TabItem
@@ -289,10 +289,9 @@ export const SettingsModal = (props: Props) => {
   return (
     <Modal
       title={t("Settings")}
-      isDismissable
-      mobileFullScreen
       className={styles.settingsModal}
-      {...props}
+      open={props.open}
+      onDismiss={props.onDismiss}
     >
       <TabContainer
         onSelectionChange={onSelectedTabChanged}

src/settings/submit-rageshake.ts

@@ -14,20 +14,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { useCallback, useContext, useEffect, useState } from "react";
+import {
+  ComponentProps,
+  useCallback,
+  useContext,
+  useEffect,
+  useState,
+} from "react";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import pako from "pako";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-import { OverlayTriggerState } from "@react-stately/overlays";
 import { ClientEvent } from "matrix-js-sdk/src/client";
 
 import { getLogsForReport } from "./rageshake";
 import { useClient } from "../ClientContext";
 import { InspectorContext } from "../room/GroupCallInspector";
-import { useModalTriggerState } from "../Modal";
 import { Config } from "../config/Config";
 import { ElementCallOpenTelemetry } from "../otel/otel";
+import { RageshakeRequestModal } from "../room/RageshakeRequestModal";
 
 const gzip = (text: string): Blob => {
   // encode as UTF-8
@@ -343,22 +348,12 @@ export function useRageshakeRequest(): (
 
   return sendRageshakeRequest;
 }
-interface ModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-}
-interface ModalPropsWithId extends ModalProps {
-  rageshakeRequestId: string;
-}
 
-export function useRageshakeRequestModal(roomId: string): {
-  modalState: OverlayTriggerState;
-  modalProps: ModalPropsWithId;
-} {
-  const { modalState, modalProps } = useModalTriggerState() as {
-    modalState: OverlayTriggerState;
-    modalProps: ModalProps;
-  };
+export function useRageshakeRequestModal(
+  roomId: string
+): ComponentProps<typeof RageshakeRequestModal> {
+  const [open, setOpen] = useState(false);
+  const onDismiss = useCallback(() => setOpen(false), [setOpen]);
   const { client } = useClient();
   const [rageshakeRequestId, setRageshakeRequestId] = useState<string>();
 
@@ -374,7 +369,7 @@ export function useRageshakeRequestModal(roomId: string): {
         client.getUserId() !== event.getSender()
       ) {
         setRageshakeRequestId(event.getContent().request_id);
-        modalState.open();
+        setOpen(true);
       }
     };
 
@@ -383,10 +378,12 @@ export function useRageshakeRequestModal(roomId: string): {
     return () => {
       client.removeListener(ClientEvent.Event, onEvent);
     };
-  }, [modalState.open, roomId, client, modalState]);
+  }, [setOpen, roomId, client]);
 
   return {
-    modalState,
-    modalProps: { ...modalProps, rageshakeRequestId: rageshakeRequestId ?? "" },
+    rageshakeRequestId: rageshakeRequestId ?? "",
+    roomId,
+    open,
+    onDismiss,
   };
 }

src/tabs/Tabs.module.css

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 .tabContainer {
+  min-height: 100%;
   display: flex;
-  flex: 1;
   flex-direction: column;
 }
 
@@ -78,32 +78,3 @@ limitations under the License.
   padding: 0;
   overflow-y: auto;
 }
-
-@media (min-width: 800px) {
-  .tab {
-    width: 200px;
-    padding: 0 16px;
-  }
-
-  .tab > * {
-    margin: 0 12px 0 0;
-  }
-
-  .tabContainer {
-    width: 100%;
-    flex-direction: row;
-    padding: 20px 18px;
-    box-sizing: border-box;
-    overflow: hidden;
-  }
-
-  .tabList {
-    flex-direction: column;
-    margin-bottom: 0;
-    gap: 0;
-  }
-
-  .tabPanel {
-    padding: 0 40px;
-  }
-}

src/video-grid/VideoTile.module.css

@@ -35,7 +35,7 @@ limitations under the License.
   width: 100%;
   height: 100%;
   object-fit: cover;
-  background-color: #444;
+  background-color: var(--cpd-color-bg-subtle-primary);
 }
 
 .videoTile.isLocal:not(.screenshare) video {

src/video-grid/VideoTile.tsx

@@ -14,7 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ComponentProps, forwardRef, useCallback, useEffect } from "react";
+import {
+  ComponentProps,
+  forwardRef,
+  useCallback,
+  useEffect,
+  useState,
+} from "react";
 import { animated } from "@react-spring/web";
 import classNames from "classnames";
 import { useTranslation } from "react-i18next";
@@ -36,7 +42,6 @@ import { Avatar } from "../Avatar";
 import styles from "./VideoTile.module.css";
 import { useReactiveState } from "../useReactiveState";
 import { AudioButton, FullscreenButton } from "../button/Button";
-import { useModalTriggerState } from "../Modal";
 import { VideoTileSettingsModal } from "./VideoTileSettingsModal";
 
 export interface ItemData {
@@ -117,11 +122,16 @@ export const VideoTile = forwardRef<HTMLDivElement, Props>(
       onToggleFullscreen(data.id);
     }, [data, onToggleFullscreen]);
 
-    const {
-      modalState: videoTileSettingsModalState,
-      modalProps: videoTileSettingsModalProps,
-    } = useModalTriggerState();
-    const onOptionsPress = videoTileSettingsModalState.open;
+    const [videoTileSettingsModalOpen, setVideoTileSettingsModalOpen] =
+      useState(false);
+    const openVideoTileSettingsModal = useCallback(
+      () => setVideoTileSettingsModalOpen(true),
+      [setVideoTileSettingsModalOpen]
+    );
+    const closeVideoTileSettingsModal = useCallback(
+      () => setVideoTileSettingsModalOpen(false),
+      [setVideoTileSettingsModalOpen]
+    );
 
     const toolbarButtons: JSX.Element[] = [];
     if (!sfuParticipant.isLocal) {
@@ -130,7 +140,7 @@ export const VideoTile = forwardRef<HTMLDivElement, Props>(
           key="localVolume"
           className={styles.button}
           volume={(sfuParticipant as RemoteParticipant).getVolume() ?? 0}
-          onPress={onOptionsPress}
+          onPress={openVideoTileSettingsModal}
         />
       );
 
@@ -167,19 +177,20 @@ export const VideoTile = forwardRef<HTMLDivElement, Props>(
         {toolbarButtons.length > 0 && (!maximised || fullscreen) && (
           <div className={classNames(styles.toolbar)}>{toolbarButtons}</div>
         )}
-        {content === TileContent.UserMedia && !sfuParticipant.isCameraEnabled && (
-          <>
-            <div className={styles.videoMutedOverlay} />
-            <Avatar
-              key={member?.userId}
-              id={member?.userId ?? displayName}
-              name={displayName}
-              size={Math.round(Math.min(targetWidth, targetHeight) / 2)}
-              src={member?.getMxcAvatarUrl()}
-              className={styles.avatar}
-            />
-          </>
-        )}
+        {content === TileContent.UserMedia &&
+          !sfuParticipant.isCameraEnabled && (
+            <>
+              <div className={styles.videoMutedOverlay} />
+              <Avatar
+                key={member?.userId}
+                id={member?.userId ?? displayName}
+                name={displayName}
+                size={Math.round(Math.min(targetWidth, targetHeight) / 2)}
+                src={member?.getMxcAvatarUrl()}
+                className={styles.avatar}
+              />
+            </>
+          )}
         {content === TileContent.ScreenShare ? (
           <div className={styles.presenterLabel}>
             <span>{t("{{displayName}} is presenting", { displayName })}</span>
@@ -208,10 +219,11 @@ export const VideoTile = forwardRef<HTMLDivElement, Props>(
               : Track.Source.ScreenShare
           }
         />
-        {videoTileSettingsModalState.isOpen && !maximised && (
+        {!maximised && (
           <VideoTileSettingsModal
-            {...videoTileSettingsModalProps}
             data={data}
+            open={videoTileSettingsModalOpen}
+            onDismiss={closeVideoTileSettingsModal}
           />
         )}
       </animated.div>

src/video-grid/VideoTileSettingsModal.tsx

@@ -66,23 +66,21 @@ const LocalVolume: React.FC<LocalVolumeProps> = ({
   );
 };
 
-// TODO: Extend ModalProps
 interface Props {
   data: ItemData;
-  onClose: () => void;
+  open: boolean;
+  onDismiss: () => void;
 }
 
-export const VideoTileSettingsModal = ({ data, onClose, ...rest }: Props) => {
+export const VideoTileSettingsModal = ({ data, open, onDismiss }: Props) => {
   const { t } = useTranslation();
 
   return (
     <Modal
       className={styles.videoTileSettingsModal}
       title={t("Local volume")}
-      isDismissable
-      mobileFullScreen
-      onClose={onClose}
-      {...rest}
+      open={open}
+      onDismiss={onDismiss}
     >
       <div className={styles.content}>
         <LocalVolume

src/widget.ts

@@ -109,7 +109,7 @@ export const widget: WidgetHelpers | null = (() => {
         baseUrl,
         e2eEnabled,
         allowIceFallback,
-      } = getUrlParams(true);
+      } = getUrlParams();
       if (!roomId) throw new Error("Room ID must be supplied");
       if (!userId) throw new Error("User ID must be supplied");
       if (!deviceId) throw new Error("Device ID must be supplied");

test/UrlParams-test.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { mocked } from "jest-mock";
-import { getUrlParams } from "../src/UrlParams";
+
+import { getRoomIdentifierFromUrl } from "../src/UrlParams";
 import { Config } from "../src/config/Config";
 
 const ROOM_NAME = "roomNameHere";
@@ -32,27 +33,28 @@ describe("UrlParams", () => {
 
   describe("handles URL with /room/", () => {
     it("and nothing else", () => {
-      expect(getUrlParams(false, "", `/room/${ROOM_NAME}`, "").roomAlias).toBe(
-        `#${ROOM_NAME}:${HOMESERVER}`
-      );
+      expect(
+        getRoomIdentifierFromUrl(`/room/${ROOM_NAME}`, "", "").roomAlias
+      ).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
     });
 
     it("and #", () => {
       expect(
-        getUrlParams(false, "", `${ORIGIN}/room/`, `#${ROOM_NAME}`).roomAlias
+        getRoomIdentifierFromUrl("", `${ORIGIN}/room/`, `#${ROOM_NAME}`)
+          .roomAlias
       ).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
     });
 
     it("and # and server part", () => {
       expect(
-        getUrlParams(false, "", `/room/`, `#${ROOM_NAME}:${HOMESERVER}`)
+        getRoomIdentifierFromUrl("", `/room/`, `#${ROOM_NAME}:${HOMESERVER}`)
           .roomAlias
       ).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
     });
 
     it("and server part", () => {
       expect(
-        getUrlParams(false, "", `/room/${ROOM_NAME}:${HOMESERVER}`, "")
+        getRoomIdentifierFromUrl(`/room/${ROOM_NAME}:${HOMESERVER}`, "", "")
           .roomAlias
       ).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
     });
@@ -60,39 +62,44 @@ describe("UrlParams", () => {
 
   describe("handles URL without /room/", () => {
     it("and nothing else", () => {
-      expect(getUrlParams(false, "", `/${ROOM_NAME}`, "").roomAlias).toBe(
+      expect(getRoomIdentifierFromUrl(`/${ROOM_NAME}`, "", "").roomAlias).toBe(
         `#${ROOM_NAME}:${HOMESERVER}`
       );
     });
 
     it("and with #", () => {
-      expect(getUrlParams(false, "", "", `#${ROOM_NAME}`).roomAlias).toBe(
+      expect(getRoomIdentifierFromUrl("", "", `#${ROOM_NAME}`).roomAlias).toBe(
         `#${ROOM_NAME}:${HOMESERVER}`
       );
     });
 
     it("and with # and server part", () => {
       expect(
-        getUrlParams(false, "", "", `#${ROOM_NAME}:${HOMESERVER}`).roomAlias
+        getRoomIdentifierFromUrl("", "", `#${ROOM_NAME}:${HOMESERVER}`)
+          .roomAlias
       ).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
     });
 
     it("and with server part", () => {
       expect(
-        getUrlParams(false, "", `/${ROOM_NAME}:${HOMESERVER}`, "").roomAlias
+        getRoomIdentifierFromUrl(`/${ROOM_NAME}:${HOMESERVER}`, "", "")
+          .roomAlias
       ).toBe(`#${ROOM_NAME}:${HOMESERVER}`);
     });
   });
 
   describe("handles search params", () => {
     it("(roomId)", () => {
-      expect(getUrlParams(true, `?roomId=${ROOM_ID}`).roomId).toBe(ROOM_ID);
+      expect(
+        getRoomIdentifierFromUrl("", `?roomId=${ROOM_ID}`, "").roomId
+      ).toBe(ROOM_ID);
     });
   });
 
   it("ignores room alias", () => {
     expect(
-      getUrlParams(true, "", `/room/${ROOM_NAME}:${HOMESERVER}`).roomAlias
+      getRoomIdentifierFromUrl("", `/room/${ROOM_NAME}:${HOMESERVER}`, "")
+        .roomAlias
     ).toBeFalsy();
   });
 });

vite.config.js

@@ -17,7 +17,7 @@ limitations under the License.
 import { defineConfig, loadEnv } from "vite";
 import svgrPlugin from "vite-plugin-svgr";
 import htmlTemplate from "vite-plugin-html-template";
-import sentryVitePlugin from "@sentry/vite-plugin";
+import { sentryVitePlugin } from "@sentry/vite-plugin";
 import react from "@vitejs/plugin-react";
 import basicSsl from "@vitejs/plugin-basic-ssl";