Merge pull request #4071 from element-hq/johannes/url-params-backport

Restrain logging of URL properties

.eslintrc.cjs

@@ -0,0 +1,116 @@
+const COPYRIGHT_HEADER = `/*
+Copyright %%CURRENT_YEAR%% New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE in the repository root for full details.
+*/
+
+`;
+
+module.exports = {
+  plugins: ["matrix-org", "rxjs", "jsdoc"],
+  extends: [
+    "plugin:matrix-org/react",
+    "plugin:matrix-org/a11y",
+    "plugin:matrix-org/typescript",
+    "prettier",
+    "plugin:rxjs/recommended",
+    "plugin:storybook/recommended",
+  ],
+  parserOptions: {
+    ecmaVersion: "latest",
+    sourceType: "module",
+    project: ["./tsconfig.json"],
+  },
+  env: {
+    browser: true,
+    node: true,
+  },
+  rules: {
+    "jsdoc/no-types": "error",
+    "jsdoc/empty-tags": "error",
+    "jsdoc/check-property-names": "error",
+    "jsdoc/check-values": "error",
+    "jsdoc/check-param-names": "warn",
+    // "jsdoc/require-param": "warn",
+    "jsdoc/require-param-description": "warn",
+    "matrix-org/require-copyright-header": ["error", COPYRIGHT_HEADER],
+    "jsx-a11y/media-has-caption": "off",
+    "react/display-name": "error",
+    // Encourage proper usage of Promises:
+    "@typescript-eslint/no-floating-promises": "error",
+    "@typescript-eslint/no-misused-promises": "error",
+    "@typescript-eslint/promise-function-async": "error",
+    "@typescript-eslint/require-await": "error",
+    "@typescript-eslint/await-thenable": "error",
+    // To help ensure that we get proper vite/rollup lazy loading (e.g. for matrix-js-sdk):
+    "@typescript-eslint/consistent-type-imports": [
+      "error",
+      { fixStyle: "inline-type-imports" },
+    ],
+    // To encourage good usage of RxJS:
+    "rxjs/no-exposed-subjects": "error",
+    "rxjs/finnish": ["error", { names: { "^this$": false } }],
+    "no-restricted-imports": [
+      "error",
+      {
+        paths: ["matrix-widget-api", "matrix-js-sdk"].flatMap((lib) =>
+          ["src", "src/", "src/index", "lib", "lib/", "lib/index"]
+            .map((path) => `${lib}/${path}`)
+            .map((name) => ({ name, message: `Please use ${lib} instead` })),
+        ),
+        patterns: [
+          ...["matrix-widget-api"].map((lib) => ({
+            group: ["src", "src/", "src/**", "lib", "lib/", "lib/**"].map(
+              (path) => `${lib}/${path}`,
+            ),
+            message: `Please use ${lib} instead`,
+          })),
+          // XXX: We use /lib in lots of places, so allow for now.
+          ...["matrix-js-sdk"].map((lib) => ({
+            group: ["src", "src/", "src/**"].map((path) => `${lib}/${path}`),
+            message: `Please use ${lib} instead`,
+          })),
+        ],
+      },
+    ],
+  },
+  overrides: [
+    {
+      files: ["src/*/**"],
+      rules: {
+        // In application code we should use the js-sdk logger, never console directly.
+        "no-console": ["error"],
+      },
+    },
+    {
+      files: [
+        "**/*.test.ts",
+        "**/*.test.tsx",
+        "**/test.ts",
+        "**/test.tsx",
+        "**/test-**",
+      ],
+      rules: {
+        "jsdoc/no-types": "off",
+        "jsdoc/empty-tags": "off",
+        "jsdoc/check-property-names": "off",
+        "jsdoc/check-values": "off",
+        "jsdoc/check-param-names": "off",
+        "jsdoc/require-param-description": "off",
+      },
+    },
+    {
+      files: ["playwright/**"],
+      rules: {
+        // Playwright as a `use` function that has nothing to do with React hooks.
+        "react-hooks/rules-of-hooks": "off",
+      },
+    },
+  ],
+  settings: {
+    react: {
+      version: "detect",
+    },
+  },
+};

.github/labels.yml

@@ -1,253 +0,0 @@
-- name: "A-1:1"
-  description: "Calls between two people"
-  color: "bfd4f2"
-- name: "A-Big-Grid"
-  description: "The freedom layout system used for >12 participants"
-  color: "bfd4f2"
-- name: "A-Developer-Experience"
-  description: "Workflow of developing: building, linting, debugging, profiling, etc."
-  color: "c5def5"
-- name: "A-E2EE"
-  description: "End-to-end encryption"
-  color: "bfd4f2"
-- name: "A-Embedded"
-  description: "Using the app embedded within other Matrix clients (as a widget)"
-  color: "bfd4f2"
-- name: "A-Feedback-Reporting"
-  description: "Reporting process for bugs, debug logs (rageshakes), suggestions"
-  color: "bfd4f2"
-- name: "A-Freedom"
-  description: "Freedom layout, where participants can be rearranged and resized"
-  color: "bfd4f2"
-- name: "A-Handset"
-  description: "Audio playback through the earpiece of a phone. Also known as 'earpiece mode' or 'handset mode'."
-  color: "bfd4f2"
-- name: "A-Huddle"
-  description: "Ad-hoc calls in a room notifying others"
-  color: "bfd4f2"
-- name: "A-Lobby"
-  description: "The page before joining a call"
-  color: "bfd4f2"
-- name: "A-Login"
-  color: "bfd4f2"
-- name: "A-Matrix2.0"
-  description: "Issues relating to the Matrix 2.0 / MSC4143 work, such as sticky events and multi-sfu"
-  color: "bfd4f2"
-- name: "A-Media-Devices"
-  color: "BFD4F2"
-- name: "A-Media-Quality"
-  description: "Distortions or glitches in audio/video"
-  color: "bfd4f2"
-- name: "A-Meeting"
-  description: "Scheduled call on the calendar"
-  color: "bfd4f2"
-- name: "A-Mobile"
-  description: "Using the app on a mobile device"
-  color: "bfd4f2"
-- name: "A-Moderation"
-  description: "Access to calls and powers within calls"
-  color: "bfd4f2"
-- name: "A-Performance"
-  color: "bfd4f2"
-- name: "A-Reactions"
-  color: "bfd4f2"
-- name: "A-Registration"
-  color: "bfd4f2"
-- name: "A-Screen-Sharing"
-  color: "bfd4f2"
-- name: "A-SDK"
-  description: "SDK for building MatrixRTC + LiveKit widgets"
-  color: "c5def5"
-- name: "A-Settings"
-  color: "bfd4f2"
-- name: "A-SFU"
-  description: "Routing calls through a selective forwarding unit"
-  color: "bfd4f2"
-- name: "A-Signaling"
-  description: "Call signaling"
-  color: "bfd4f2"
-- name: "A-Simulcast"
-  description: "Automatic selection of variable video resolutions"
-  color: "bfd4f2"
-- name: "A-SPA"
-  description: "Standalone application accessed via call links"
-  color: "bfd4f2"
-- name: "A-Spatial-Audio"
-  description: "Directional audio based on where a speaker appears on screen"
-  color: "bfd4f2"
-- name: "A-Speech-Enhancement"
-  description: "Techniques to enhance the intelligibility of speech in calls"
-  color: "c5def5"
-- name: "A-Split-Grid"
-  description: "The freedom layout system used for ≤12 participants"
-  color: "bfd4f2"
-- name: "A-Spotlight"
-  description: "Spotlight layout, where the active speaker is foregrounded"
-  color: "bfd4f2"
-- name: "A-Telemetry-Posthog"
-  description: "Share opt in usage data for optimizing the app via posthog"
-  color: "bfd4f2"
-- name: "A-Testing"
-  description: "Integration tests, unit tests, etc."
-  color: "bfd4f2"
-- name: "A-Video-Rooms"
-  description: "Rooms reserved exclusively for calling"
-  color: "bfd4f2"
-- name: "A-Walkie-Talkie"
-  description: "Walkie-talkie / PTT (push-to-talk) mode"
-  color: "bfd4f2"
-- name: "A11y"
-  description: "Accessibility"
-  color: "4ADEC0"
-- name: "backport-candidate"
-  description: "Something that is a candidate for backport to a particular release branch"
-  color: "0B8D85"
-- name: "customer-retainer"
-  color: "F44A5F"
-- name: "dependencies"
-  description: "Pull requests that update a dependency file"
-  color: "0366d6"
-- name: "development build"
-  description: "runs yarn build process in development mode"
-  color: "1d76db"
-- name: "Discord"
-  description: "Use case familiar to Discord users"
-  color: "3670d2"
-- name: "docker build"
-  description: "Creates a docker image for this PR"
-  color: "0e8a16"
-- name: "EPIC"
-  color: "5319E7"
-- name: "good first issue"
-  description: "Good for newcomers"
-  color: "7057ff"
-- name: "Help Wanted"
-  description: "Community contributions are welcome!"
-  color: "159818"
-- name: "I18n"
-  description: "Internationalisation"
-  color: "d4c5f9"
-- name: "O-Frequent"
-  description: "Affects or can be seen by most users regularly or impacts most users' first experience"
-  color: "0052CC"
-- name: "O-Occasional"
-  description: "Affects or can be seen by some users regularly or most users rarely"
-  color: "1D76DB"
-- name: "O-Uncommon"
-  description: "Most users are unlikely to come across this or unexpected workflow"
-  color: "C5DEF5"
-- name: "p1"
-  description: "Must fix/implement before this is usable as a product"
-  color: "D93F0B"
-- name: "p2"
-  description: "Should fix/implement, but not at the expense of p1s"
-  color: "FBCA04"
-- name: "p3"
-  description: "Could fix/implement when time allows"
-  color: "0E8A16"
-- name: "PR-Breaking-Change"
-  description: "A Pull request that changes EC in a way that is incompatible to the previous version."
-  color: "D93F0B"
-- name: "PR-Bug-Fix"
-  description: "Release note category. A PR that fixes a bug."
-  color: "C2E0C6"
-- name: "PR-Developer-Experience"
-  description: "Release note category. A PR that does not change EC but improves working with the repository."
-  color: "C2E0C6"
-- name: "PR-Documentation"
-  description: "Release note category. A PR that improves the documentation."
-  color: "C2E0C6"
-- name: "PR-Feature"
-  description: "Release note category. A PR that introduces a new user facing feature."
-  color: "C2E0C6"
-- name: "PR-Improvement"
-  description: "Release note category. A PR that improves EC's performance or stability."
-  color: "C2E0C6"
-- name: "PR-Task"
-  description: "Release note category. A PR that is hidden from release note."
-  color: "C2E0C6"
-- name: "Privacy"
-  color: "f41192"
-- name: "Roadmap"
-  color: "57457E"
-- name: "S-Critical"
-  description: "Prevents work, causes data loss and/or has no workaround"
-  color: "bd0026"
-- name: "S-Major"
-  description: "Severely degrades major functionality or product features, with no satisfactory workaround"
-  color: "fc4e2a"
-- name: "S-Minor"
-  description: "Impairs non-critical functionality or suitable workarounds exist"
-  color: "feb24c"
-- name: "S-Tolerable"
-  description: "Low/no impact on users"
-  color: "ffeda0"
-- name: "Security"
-  color: "b3e5fc"
-- name: "storybook build"
-  description: "Build and deploy the storybook frontend to netlify."
-  color: "45cd61"
-- name: "T-Defect"
-  description: "Something isn't working: bugs, crashes, hangs, vulnerabilities, or other reported problems"
-  color: "98e6ae"
-- name: "T-Enhancement"
-  description: "New features, changes in functionality, performance boosts, user-facing improvements"
-  color: "98e6ae"
-- name: "T-Other"
-  description: "Questions, user support, anything else"
-  color: "98e6ae"
-- name: "T-Task"
-  description: "Refactoring, enabling or disabling functionality, other engineering tasks"
-  color: "98e6ae"
-- name: "X-Blocked"
-  description: "Cannot be merged due to external dependencies"
-  color: "ff7979"
-- name: "X-Cannot-Reproduce"
-  description: "Needs reproduction steps"
-  color: "ff7979"
-- name: "X-Needs-Design"
-  description: "May require input from the design team"
-  color: "ff7979"
-- name: "X-Needs-Info"
-  description: "This issue is blocked awaiting information from the reporter"
-  color: "ff7979"
-- name: "X-Needs-Investigation"
-  color: "ff7979"
-- name: "X-Needs-Product"
-  description: "More input needed from the Product team"
-  color: "ff7979"
-- name: "X-Regression"
-  color: "ff7979"
-- name: "X-Release-Blocker"
-  color: "ff7979"
-- name: "X-Spec-Changes"
-  description: "May require spec changes"
-  color: "ff7979"
-- name: "X-Won't-Fix"
-  description: "This will not be worked on"
-  color: "ff7979"
-- name: "Z-Community-Testing"
-  description: "Issues found during the community testing sessions"
-  color: "efefef"
-- name: "Z-Could"
-  color: "ededed"
-- name: "Z-Design"
-  color: "ededed"
-- name: "Z-Flaky-Test"
-  color: "aaaaaa"
-- name: "Z-Media-Failure"
-  description: "Someone's audio or video isn't coming through"
-  color: "ededed"
-- name: "Z-Must"
-  color: "ededed"
-- name: "Z-Platform-Specific"
-  color: "ededed"
-- name: "Z-Power-Users"
-  color: "ededed"
-- name: "Z-ProductPolish"
-  color: "aaaaaa"
-- name: "Z-Should"
-  color: "ededed"
-- name: "Z-Splitbrain"
-  description: "Someone who should be on the call isn't showing up"
-  color: "ededed"

.github/workflows/lint.yaml

@@ -2,7 +2,7 @@ name: Lint, format & type check
 on:
   pull_request: {}
 jobs:
-  lint:
+  prettier:
     name: Lint, format & type check
     runs-on: ubuntu-latest
     steps:
@@ -20,12 +20,12 @@ jobs:
       - name: Install dependencies
         # ignore-pnpmfile should never be commited. Make CI crash if it happened (`pnpmfileChecksum` is present)
         run: "pnpm install --frozen-lockfile --ignore-pnpmfile"
-      - name: Formatting
-        run: "pnpm run format:check"
+      - name: Prettier
+        run: "pnpm run prettier:check"
       - name: i18n
         run: "pnpm run i18n:check"
-      - name: Lint
-        run: "pnpm run lint:oxlint"
+      - name: ESLint
+        run: "pnpm run lint:eslint"
       - name: Type check
         run: "pnpm run lint:types"
       - name: Dead code analysis

.github/workflows/sync-labels.yml

@@ -1,23 +0,0 @@
-name: Sync labels
-on:
-  workflow_dispatch: {}
-
-  push:
-    branches:
-      - livekit
-    paths:
-      - .github/labels.yml
-      - .github/workflows/sync-labels.yml
-
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
-jobs:
-  sync-labels:
-    uses: element-hq/element-meta/.github/workflows/sync-labels.yml@7f2f93fb9b52ece7a0998f60e64862aa203c1746
-    with:
-      LABELS: |
-        .github/labels.yml
-      DELETE: true
-      WET: true
-    secrets:
-      ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/test.yaml

@@ -10,7 +10,7 @@ jobs:
     container:
       # Make sure to grab the latest version of the Playwright image
       # https://playwright.dev/docs/docker#pull-the-image
-      image: mcr.microsoft.com/playwright:v1.61.1-noble
+      image: mcr.microsoft.com/playwright:v1.60.0-noble
     steps:
       - name: Checkout code
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

.github/workflows/translations-download.yaml

@@ -40,8 +40,8 @@ jobs:
       - name: Fix the owner of the downloaded files
         run: "sudo chown runner:docker -R locales"
 
-      - name: Formatting
-        run: pnpm format
+      - name: Prettier
+        run: pnpm prettier:format
 
       - name: Create Pull Request
         id: cpr

.github/workflows/zizmor.yml

@@ -15,9 +15,9 @@ jobs:
       security-events: write # Required for upload-sarif (used by zizmor-action) to upload SARIF files.
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
       - name: Run zizmor 🌈
-        uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7
+        uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3

.oxfmtrc.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "./node_modules/oxfmt/configuration_schema.json",
-  "printWidth": 80,
-  "sortPackageJson": false,
-  "ignorePatterns": ["pnpm-lock.yaml", "node_modules", "dist"]
-}

.oxlintrc.json

@@ -1,154 +0,0 @@
-{
-  "$schema": "./node_modules/oxlint/configuration_schema.json",
-  "plugins": [
-    "eslint",
-    "import",
-    "jsdoc",
-    "jsx-a11y",
-    "promise",
-    "react",
-    "typescript",
-    "unicorn",
-    "vitest"
-  ],
-  "jsPlugins": [
-    "eslint-plugin-storybook",
-    "eslint-plugin-element-call"
-    // TODO: Re-enable once oxlint supports lint rules that rely on TypeScript type-awareness.
-    // "eslint-plugin-rxjs"
-  ],
-  "categories": {
-    "correctness": "error",
-    "perf": "error"
-  },
-  "options": {
-    "denyWarnings": true,
-    "typeAware": true
-  },
-  "env": {
-    "builtin": true
-  },
-  "rules": {
-    "element-call/copyright-header": [
-      "error",
-      "/*\nCopyright %%CURRENT_YEAR%% Element Creations Ltd.\n\nSPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial\nPlease see LICENSE in the repository root for full details.\n*/\n\n"
-    ],
-    "element-call/no-observablescope-leak": "error",
-    "element-call/no-top-level-logger-get-child": "error",
-    "jsdoc/empty-tags": "error",
-    "jsdoc/check-property-names": "error",
-    "jsdoc/require-param-description": "warn",
-    "react/display-name": "error",
-    // TODO: Re-enable once oxlint supports lint rules that rely on TypeScript type-awareness.
-    // "rxjs/no-exposed-subjects": "error",
-    // "rxjs/finnish": [
-    //   "error",
-    //   {
-    //     "names": {
-    //       "^this$": false
-    //     }
-    //   }
-    // ],
-    "no-restricted-imports": [
-      "error",
-      {
-        "patterns": [
-          {
-            "group": [
-              "matrix-widget-api/src",
-              "matrix-widget-api/src/",
-              "matrix-widget-api/src/**",
-              "matrix-widget-api/lib",
-              "matrix-widget-api/lib/",
-              "matrix-widget-api/lib/**"
-            ],
-            "message": "Please use matrix-widget-api instead"
-          },
-          {
-            "group": [
-              "matrix-js-sdk/src",
-              "matrix-js-sdk/src/",
-              "matrix-js-sdk/src/**",
-              "matrix-js-sdk/lib",
-              "matrix-js-sdk/lib/",
-              "matrix-js-sdk/lib/index"
-            ],
-            "message": "Please use matrix-js-sdk instead"
-          }
-        ]
-      }
-    ],
-    "typescript/no-floating-promises": "error",
-    "typescript/no-misused-promises": "error",
-    "typescript/promise-function-async": "error",
-    "typescript/require-await": "error",
-    "typescript/await-thenable": "error",
-    // To help ensure that we get proper vite/rollup lazy loading (e.g. for matrix-js-sdk).
-    "typescript/consistent-type-imports": [
-      "error",
-      {
-        "fixStyle": "inline-type-imports"
-      }
-    ],
-    // TODO: These had to be disabled in the eslint -> oxlint migration. Would be nice to
-    // enable them in future or at least document why we're disabling them.
-    "eslint/no-await-in-loop": "off",
-    "eslint/no-unused-vars": ["error", { "args": "none" }],
-    "import/default": "off",
-    "jsdoc/check-tag-names": "off",
-    "jsx-a11y/prefer-tag-over-role": "off",
-    "promise/no-callback-in-promise": "off",
-    "react/jsx-key": "off",
-    "react/jsx-no-constructed-context-values": "off",
-    "react/no-array-index-key": "off",
-    "react/no-children-prop": "off",
-    "react/no-object-type-as-default-prop": "off",
-    "typescript/no-misused-spread": "off",
-    "typescript/no-useless-default-assignment": "off",
-    "typescript/restrict-template-expressions": "off",
-    "typescript/unbound-method": "off",
-    "vitest/expect-expect": "off",
-    "vitest/no-conditional-expect": "off",
-    "vitest/no-disabled-tests": "off",
-    "vitest/require-mock-type-parameters": "off",
-    "vitest/require-to-throw-message": "off"
-  },
-  "overrides": [
-    {
-      "files": ["src/*/**"],
-      "rules": {
-        // In application code we should use the js-sdk logger, never console directly.
-        "no-console": "error"
-      }
-    },
-    {
-      "files": [
-        "**/*.test.ts",
-        "**/*.test.tsx",
-        "**/test.ts",
-        "**/test.tsx",
-        "**/test-**"
-      ],
-      "rules": {
-        // Tests often initialize an ObservableScope in an outer scope in
-        // beforeEach, which is not actually a problem
-        "element-call/no-observablescope-leak": "off",
-        "jsdoc/empty-tags": "off",
-        "jsdoc/check-property-names": "off",
-        "jsdoc/require-param-description": "off",
-        "jsx-a11y/media-has-caption": "off"
-        // TODO: Enable once oxlint supports them.
-        // "jsdoc/check-values": "off",
-        // "jsdoc/check-param-names": "off",
-        // "jsdoc/no-types": "off",
-      }
-    },
-    {
-      "files": ["playwright/**"],
-      "rules": {
-        // Playwright as a `use` function that has nothing to do with React hooks.
-        "react-hooks/rules-of-hooks": "off"
-      }
-    }
-  ]
-}

.prettierignore

@@ -0,0 +1,3 @@
+pnpm-lock.yaml
+node_modules
+dist

.prettierrc.json

@@ -0,0 +1 @@
+{}

README.md

@@ -359,16 +359,6 @@ Usage and other technical details about the project can be found here:
 
 [**Docs**](./docs/README.md)
 
-## GitHub Labels
-
-GitHub labels in this repository are maintained in the [`labels.yml`](.github/labels.yml) file and
-automatically synced to GitHub using the [`sync-labels` workflow](.github/workflows/sync-labels.yml).
-We do this so that we can reuse the labels between repositories.
-
-> [!WARNING]
-> Do not manually edit labels in the GitHub UI. Any manual changes will be overridden by the
-> workflow on its next invocation.
-
 ## 📝 Copyright & License
 
 Copyright 2021-2025 New Vector Ltd

babel.config.cjs

@@ -0,0 +1,20 @@
+module.exports = {
+  presets: [
+    [
+      "@babel/preset-env",
+      {
+        targets: {
+          node: "current",
+        },
+      },
+    ],
+    [
+      "@babel/preset-react",
+      {
+        runtime: "automatic",
+      },
+    ],
+    "@babel/preset-typescript",
+  ],
+  plugins: ["babel-plugin-transform-vite-meta-env"],
+};

config/config.sample.json

@@ -12,7 +12,7 @@
     "feature_use_device_session_member_events": true
   },
   "ssla": "https://static.element.io/legal/element-software-and-services-license-agreement-uk-1.pdf",
-  "matrix_rtc_mode": "compatibility",
+  "matrix_rtc_mode": "legacy",
   "matrix_rtc_session": {
     "wait_for_key_rotation_ms": 3000,
     "membership_event_expiry_ms": 180000000,

docs/url_params.md

@@ -67,10 +67,9 @@ These parameters are relevant to both [widget](./embedded_standalone.md) and [st
 | `showControls`                                 | `true` or `false`                                                                                                                                                  | No, defaults to `true`                                                                            | No, defaults to `true`       | Displays controls like mute, screen-share, invite, and hangup buttons during a call.                                                                                                                                                                                                                                                                                                                |
 | `skipLobby` (deprecated: use `intent` instead) | `true` or `false`                                                                                                                                                  | No. If `intent` is explicitly `start_call` then defaults to `true`. Otherwise defaults to `false` | No, defaults to `false`      | Skips the lobby to join a call directly, can be combined with preload in widget. When `true` the audio and video inputs will be muted by default. (This means there currently is no way to start without muted video if one wants to skip the lobby. Also not in widget mode.)                                                                                                                      |
 | `theme`                                        | One of: `light`, `dark`, `light-high-contrast`, `dark-high-contrast`                                                                                               | No, defaults to `dark`                                                                            | No, defaults to `dark`       | UI theme to use.                                                                                                                                                                                                                                                                                                                                                                                    |
-| `background`                                   | One of: `solid`, `gradient`                                                                                                                                        | No, defaults to `gradient`                                                                        | No, defaults to `gradient`   | Visual style of the page background.                                                                                                                                                                                                                                                                                                                                                                |
 | `viaServers`                                   | Comma separated list of [Matrix Server Names](https://spec.matrix.org/v1.12/appendices/#server-name)                                                               | Not applicable                                                                                    | No                           | Homeserver for joining a room, non-empty value required for rooms not on the user’s default homeserver.                                                                                                                                                                                                                                                                                             |
 | `sendNotificationType`                         | `ring` or `notification`                                                                                                                                           | No                                                                                                | No                           | Will send a "ring" or "notification" `m.rtc.notification` event if the user is the first one in the call.                                                                                                                                                                                                                                                                                           |
-| `autoLeave`                                    | `true` or `false`                                                                                                                                                  | No, defaults to `false`                                                                           | No, defaults to `false`      | Whether the app should automatically leave the call when there is no one left in the call.                                                                                                                                                                                                                                                                                                          |
+| `autoLeaveWhenOthersLeft`                      | `true` or `false`                                                                                                                                                  | No, defaults to `false`                                                                           | No, defaults to `false`      | Whether the app should automatically leave the call when there is no one left in the call.                                                                                                                                                                                                                                                                                                          |
 | `waitForCallPickup`                            | `true` or `false`                                                                                                                                                  | No, defaults to `false`                                                                           | No, defaults to `false`      | When sending a notification, show UI that the app is awaiting an answer, play a dial tone, and (in widget mode) auto-close the widget once the notification expires.                                                                                                                                                                                                                                |
 
 ### Widget-only parameters

embedded/android/gradle/libs.versions.toml

@@ -9,4 +9,4 @@ android_gradle_plugin = { module = "com.android.tools.build:gradle", version.ref
 
 [plugins]
 android_library = { id = "com.android.library", version.ref = "android_gradle_plugin" }
-maven_publish = { id = "com.vanniktech.maven.publish", version = "0.36.0" }
+maven_publish = { id = "com.vanniktech.maven.publish", version = "0.36.0" }

eslint/CopyrightHeader.js

@@ -1,66 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { ESLintUtils } from "@typescript-eslint/utils";
-
-const rule = ESLintUtils.RuleCreator(
-  () => "https://github.com/element-hq/element-call",
-)({
-  name: "copyright-header",
-  meta: {
-    type: "problem",
-    fixable: "code",
-    docs: {
-      description: "Require a copyright header in files.",
-    },
-    messages: {
-      noHeader: "Copyright header is required.",
-    },
-    schema: [{ type: "string" }],
-  },
-  create(context) {
-    const code = context.getSourceCode();
-
-    return {
-      Program(node) {
-        const firstToken = code.getFirstToken(node, { includeComments: false });
-
-        if (!firstToken) {
-          return;
-        }
-
-        const headComments = code.getCommentsBefore(firstToken);
-        const hasSomeCopyrightHeader = headComments?.some((comment) =>
-          comment?.value?.includes("Copyright"),
-        );
-        if (hasSomeCopyrightHeader) {
-          return;
-        }
-        const headerTemplate = context.options[0];
-        const fix = headerTemplate
-          ? function (fixer) {
-              return fixer.insertTextBefore(
-                firstToken,
-                headerTemplate.replace(
-                  /%%CURRENT_YEAR%%/g,
-                  new Date().getFullYear(),
-                ),
-              );
-            }
-          : undefined;
-
-        context.report({
-          messageId: "noHeader",
-          node,
-          fix,
-        });
-      },
-    };
-  },
-});
-
-export default rule;

eslint/NoObservableScopeLeak.js

@@ -1,78 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { ESLintUtils } from "@typescript-eslint/utils";
-
-// These ObservableScope methods will not generally cause resource leaks even if
-// called from a callback
-const safeScopeMethods = new Set(["bind", "end"]);
-
-/**
- * Determines whether the variable with the given name is local to
- * the enclosing function or class scope.
- */
-function isLocal(name, scope) {
-  // If it is nowhere to be found in the "through" scope, it is local.
-  if (!scope.through.some(({ identifier }) => identifier.name === name))
-    return true;
-  if (scope.type === "function" || scope.type === "class") return false;
-  // If this is something other than a function or class scope, check its outer
-  // scope.
-  return !scope.upper || isLocal(name, scope.upper);
-}
-
-const rule = ESLintUtils.RuleCreator(
-  () => "https://github.com/element-hq/element-call",
-)({
-  name: "no-observablescope-leak",
-  meta: {
-    type: "problem",
-    docs: {
-      description:
-        "Require referenced ObservableScopes to be defined in the very same scope to avoid resource leaks.",
-    },
-    messages: {
-      scopeLeak:
-        "Do not reference ObservableScopes defined in an outer scope; this may create resource leaks.",
-    },
-    schema: [],
-  },
-  create(context) {
-    return {
-      Identifier(node) {
-        const scope = context.sourceCode.getScope(node);
-        if (
-          // Is this a reference to a variable defined in an outer scope?
-          !isLocal(node.name, scope) &&
-          // Exclude calls to "safe" ObservableScope methods
-          node.parent?.type === "MemberExpression" &&
-          node.parent.object === node &&
-          node.parent.property.type === "Identifier" &&
-          !safeScopeMethods.has(node.parent.property.name) &&
-          /(^s|S)cope$/.test(node.name)
-        ) {
-          // TODO: Once oxlint supports lint rules that rely on TypeScript type-awareness,
-          // Verify that the variable is actually of type ObservableScope rather than just
-          // checking its name. This is expensive so we should do this last.
-          //
-          // const services = ESLintUtils.getParserServices(context);
-          // const type = services.getTypeAtLocation(node);
-          // if (type.symbol?.name === "ObservableScope") { ... }
-
-          // This ObservableScope method call may be causing resource leaks.
-          context.report({
-            messageId: "scopeLeak",
-            loc: node.loc,
-            node,
-          });
-        }
-      },
-    };
-  },
-});
-
-export default rule;

eslint/NoTopLevelLoggerGetChild.js

@@ -1,92 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { ESLintUtils } from "@typescript-eslint/utils";
-
-/**
- * Node types that introduce a new non-module scope. A getChild() call nested
- * inside any of these is considered "not at the top level".
- */
-const FUNCTION_OR_CLASS_TYPES = new Set([
-  "FunctionDeclaration",
-  "FunctionExpression",
-  "ArrowFunctionExpression",
-  "ClassBody",
-]);
-
-const rule = ESLintUtils.RuleCreator(
-  () => "https://github.com/element-hq/element-call",
-)({
-  name: "no-top-level-logger-get-child",
-  meta: {
-    type: "problem",
-    docs: {
-      description:
-        "Disallow calling logger.getChild() at the top level of a module." +
-        "`getChild` has to be called after the rageshake logger `init()`." +
-        "If it is called at the top level the child logger will never be setup for rageshakes.",
-    },
-    messages: {
-      noTopLevelGetChild:
-        "Do not call logger.getChild() at the top level of a module; move it inside a function or class instead that gets called after rageshake logger `init()` is called.",
-    },
-    schema: [],
-  },
-  create(context) {
-    // Tracks the local binding names that refer to the logger imported from
-    // 'matrix-js-sdk/lib/logger', e.g. both `logger` and `rootLogger` in:
-    //   import { logger } from "matrix-js-sdk/lib/logger";
-    //   import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
-    const loggerNames = new Set();
-
-    return {
-      ImportDeclaration(node) {
-        if (node.source.value !== "matrix-js-sdk/lib/logger") return;
-        for (const specifier of node.specifiers) {
-          if (
-            specifier.type === "ImportSpecifier" &&
-            specifier.imported.name === "logger"
-          ) {
-            loggerNames.add(specifier.local.name);
-          }
-        }
-      },
-
-      CallExpression(node) {
-        // Must be a non-computed member expression call: something.getChild(...)
-        if (
-          node.callee.type !== "MemberExpression" ||
-          node.callee.computed ||
-          node.callee.property.type !== "Identifier" ||
-          node.callee.property.name !== "getChild"
-        )
-          return;
-
-        // The receiver must be one of the tracked logger names.
-        const object = node.callee.object;
-        if (object.type !== "Identifier" || !loggerNames.has(object.name))
-          return;
-
-        // Flag the call only when it is at module top level — i.e. there is no
-        // enclosing function or class body anywhere in the ancestor chain.
-        const ancestors = context.sourceCode.getAncestors(node);
-        const isTopLevel = !ancestors.some((a) =>
-          FUNCTION_OR_CLASS_TYPES.has(a.type),
-        );
-
-        if (isTopLevel) {
-          context.report({
-            messageId: "noTopLevelGetChild",
-            node,
-          });
-        }
-      },
-    };
-  },
-});
-
-export default rule;

eslint/index.js

@@ -1,8 +0,0 @@
-module.exports = {
-  rules: {
-    "copyright-header": require("./CopyrightHeader").default,
-    "no-observablescope-leak": require("./NoObservableScopeLeak").default,
-    "no-top-level-logger-get-child": require("./NoTopLevelLoggerGetChild")
-      .default,
-  },
-};

eslint/package.json

@@ -1,4 +0,0 @@
-{
-  "name": "eslint-plugin-element-call",
-  "version": "0.0.0"
-}

knip.ts

@@ -11,14 +11,12 @@ export default {
   vite: {
     config: ["vite.config.ts", "vite-embedded.config.ts", "vite-sdk.config.ts"],
   },
-  entry: ["src/main.tsx", "eslint/index.js", "i18next.config.ts"],
+  entry: ["src/main.tsx", "i18next.config.ts"],
   ignoreBinaries: [
     // This is deprecated, so Knip doesn't actually recognize it as a globally
     // installed binary. TODO We should switch to Compose v2:
     // https://docs.docker.com/compose/migrate/
     "docker-compose",
-    // This is a shell built-in.
-    "printf",
   ],
   ignoreFiles: ["scripts/.pnpmfile.cjs"],
   ignoreDependencies: [
@@ -32,9 +30,6 @@ export default {
     // https://github.com/webpro-nl/knip/issues/766
     "@vector-im/compound-web",
     "matrix-widget-api",
-    // Used by oxlint
-    "eslint-plugin-element-call",
-    "eslint-plugin-storybook",
   ],
   ignoreExportsUsedInFile: true,
 } satisfies KnipConfig;

locales/en/app.json

@@ -205,7 +205,6 @@
     "blur_not_supported_by_browser": "(Background blur is not supported by this device.)",
     "developer_tab_title": "Developer",
     "devices": {
-      "activating": "Activating…",
       "camera": "Camera",
       "camera_numbered": "Camera {{n}}",
       "change_device_button": "Change audio device",

package.json

@@ -17,11 +17,11 @@
     "build:sdk": "pnpm build:full --config vite-sdk.config.js",
     "build:sdk:production": "pnpm build:sdk",
     "serve": "vite preview",
-    "format": "oxfmt",
-    "format:check": "oxfmt --check; rc=$?; [[ $rc -ne 0 ]] && printf '\\033[46;30m INFO \\033[0m To fix, run: pnpm format\\n' >&2; exit $rc",
-    "lint": "pnpm lint:types && pnpm lint:oxlint && pnpm lint:knip",
-    "lint:oxlint": "oxlint src playwright",
-    "lint:oxlint-fix": "oxlint --fix src playwright",
+    "prettier:check": "prettier -c .",
+    "prettier:format": "prettier -w .",
+    "lint": "pnpm lint:types && pnpm lint:eslint && pnpm lint:knip",
+    "lint:eslint": "eslint --max-warnings 0 src playwright",
+    "lint:eslint-fix": "eslint --max-warnings 0 src playwright --fix",
     "lint:knip": "knip",
     "lint:types": "tsc",
     "i18n": "npx i18next-cli extract",
@@ -40,6 +40,10 @@
     "build-storybook": "storybook build"
   },
   "devDependencies": {
+    "@babel/core": "^7.16.5",
+    "@babel/preset-env": "^7.29.5",
+    "@babel/preset-react": "^7.22.15",
+    "@babel/preset-typescript": "^7.23.0",
     "@codecov/vite-plugin": "^1.3.0",
     "@fontsource/inconsolata": "^5.1.0",
     "@fontsource/inter": "^5.1.0",
@@ -47,6 +51,7 @@
     "@formatjs/intl-segmenter": "^11.7.3",
     "@livekit/components-core": "^0.12.0",
     "@livekit/components-react": "^2.0.0",
+    "@livekit/protocol": "^1.42.2",
     "@livekit/track-processors": "^0.7.1",
     "@mediapipe/tasks-vision": "^0.10.18",
     "@playwright/test": "^1.60.0",
@@ -59,11 +64,11 @@
     "@storybook/addon-docs": "^10.3.6",
     "@storybook/addon-vitest": "^10.3.6",
     "@storybook/react-vite": "^10.3.6",
+    "@stylistic/eslint-plugin": "^3.0.0",
     "@testing-library/dom": "^10.1.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.5.1",
-    "@types/eslint": "^9.6.1",
     "@types/grecaptcha": "^3.0.9",
     "@types/jsdom": "^21.1.7",
     "@types/lodash-es": "^4.17.12",
@@ -73,19 +78,33 @@
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",
     "@types/sdp-transform": "^2.4.5",
-    "@typescript-eslint/utils": "^8.61.0",
+    "@typescript-eslint/eslint-plugin": "^8.31.0",
+    "@typescript-eslint/parser": "^8.31.0",
     "@use-gesture/react": "^10.2.11",
     "@vector-im/compound-design-tokens": "^10.0.0",
     "@vector-im/compound-web": "^9.3.0",
-    "@vitejs/plugin-react": "^6.0.2",
+    "@vitejs/plugin-react": "^4.0.1",
     "@vitest/browser-playwright": "^4.1.5",
     "@vitest/coverage-v8": "^4.0.18",
-    "@vitest/ui": "4.1.9",
+    "@vitest/ui": "4.1.7",
+    "babel-plugin-transform-vite-meta-env": "^1.0.3",
     "classnames": "^2.3.1",
     "copy-to-clipboard": "^3.3.3",
-    "eslint-plugin-element-call": "link:eslint",
+    "eslint": "^8.14.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-config-prettier": "^10.0.0",
+    "eslint-plugin-deprecate": "^0.9.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jsdoc": "^61.5.0",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
+    "eslint-plugin-matrix-org": "2.1.0",
+    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-storybook": "^10.3.6",
+    "eslint-plugin-unicorn": "^56.0.0",
     "fetch-mock": "11.1.5",
+    "global-jsdom": "^26.0.0",
     "i18next": "^25.0.0",
     "i18next-browser-languagedetector": "^8.0.0",
     "i18next-cli": "^1.61.0",
@@ -99,13 +118,11 @@
     "node-stdlib-browser": "^1.3.1",
     "normalize.css": "^8.0.1",
     "observable-hooks": "^4.2.3",
-    "oxfmt": "^0.56.0",
-    "oxlint": "^1.70.0",
-    "oxlint-tsgolint": "^0.23.0",
     "pako": "^2.0.4",
     "postcss": "^8.4.41",
     "postcss-preset-env": "^10.0.0",
     "posthog-js": "1.374.0",
+    "prettier": "^3.0.0",
     "qrcode": "^1.5.4",
     "react": "19",
     "react-dom": "19",
@@ -116,6 +133,7 @@
     "sass": "^1.42.1",
     "storybook": "^10.3.6",
     "typescript": "^5.8.3",
+    "typescript-eslint-language-service": "^5.0.5",
     "unique-names-generator": "^4.6.0",
     "uuid": "^14.0.0",
     "vaul": "^1.0.0",
@@ -129,5 +147,19 @@
     "vitest": "^4.1.5",
     "vitest-axe": "^1.0.0-pre.3"
   },
-  "packageManager": "pnpm@11.6.0+sha512.9a36518224080c6fe5165afdcfe79bfa118c29be703f3f462b1e32efe1e98e47e8750b148e08286250aad4113cc7993ca413c4e2cd447752708c2ee5751bc95f"
+  "pnpm": {
+    "overrides": {
+      "@livekit/components-core>rxjs": "^7.8.1",
+      "@livekit/track-processors>@mediapipe/tasks-vision": "^0.10.18",
+      "minimatch": "^10.2.3",
+      "tar": "^7.5.11",
+      "glob": "^10.5.0",
+      "qs": "^6.14.1",
+      "js-yaml": "^4.1.1",
+      "esbuild": "^0.28.0",
+      "flatted": "^3.4.2",
+      "undici": "^6.24.0"
+    }
+  },
+  "packageManager": "pnpm@10.33.0"
 }

playwright/fixtures/widget-user.ts

@@ -120,11 +120,6 @@ export const widgetTest = test.extend<MyFixtures>({
           .getByRole("heading", { name: "Welcome Room" }),
       ).toBeVisible();
     } else if (callType === "dm") {
-      await TestHelpers.closeReleaseAnnouncement(
-        ewPage1,
-        "Introducing Sections",
-      );
-
       await ewPage1
         .getByRole("navigation", { name: "Room list" })
         .getByRole("button", { name: "New conversation" })

playwright/sfu-reconnect-bug.spec.ts

@@ -88,18 +88,15 @@ test("When creator left, avoid reconnect to the same SFU", async ({
   await guestCPage.getByRole("radio", { name: "Spotlight" }).check();
 
   await guestCPage.waitForTimeout(1000);
-  if (wsConnectionCount === 2) {
-    console.warn("wsConnectionCount is 2, expecting 1 after join");
-  }
-  const wsConnectionCountBeforeLeave = wsConnectionCount;
+
   // ========
   // the creator leaves the call
   await creatorPage.getByTestId("incall_leave").click();
 
   // https://github.com/element-hq/element-call/issues/3344
   // The app used to request a new jwt token then to reconnect to the SFU
-  expect(wsConnectionCount).toBe(wsConnectionCountBeforeLeave);
+  expect(wsConnectionCount).toBe(1);
   // Wait a bit to be sure that if there was a reconnect, it would have happened by now
   await guestCPage.waitForTimeout(6000);
-  expect(wsConnectionCount).toBe(wsConnectionCountBeforeLeave);
+  expect(wsConnectionCount).toBe(1);
 });

playwright/spa-helpers.ts

@@ -125,10 +125,21 @@ async function expectVideoTilesCount(page: Page, count: number): Promise<void> {
   });
 
   // There should be `count` video elements, visible and autoplaying
-  await expect(page.locator("video").filter({ visible: true })).toHaveCount(
-    count,
-    { timeout: 10000 },
-  );
+  await expect(page.locator("video")).toHaveCount(count);
+
+  await expect(async () => {
+    const videoBlockCount = await page
+      .locator("video")
+      .evaluateAll(
+        (videos: Element[]) =>
+          videos.filter(
+            (v: Element) => window.getComputedStyle(v).display === "block",
+          ).length,
+      );
+    expect(videoBlockCount).toBe(count);
+  }).toPass({
+    timeout: 10000,
+  });
 }
 
 export const SpaHelpers = {

playwright/widget/test-helpers.ts

@@ -160,7 +160,6 @@ export class TestHelpers {
     const expectedToasts = [
       { title: "Failed to load service worker", button: "OK" },
       { title: "Back up your chats", button: "Dismiss" },
-      { title: "Turn on key storage", button: "Dismiss" },
       { title: "Element does not support this browser", button: "Dismiss" },
     ];
 
@@ -190,27 +189,11 @@ export class TestHelpers {
     }
   }
 
-  public static async closeReleaseAnnouncement(
-    page: Page,
-    name: string,
-  ): Promise<void> {
-    try {
-      await page
-        .getByRole("dialog", { name })
-        .getByRole("button", { name: "OK" })
-        .click({ timeout: 2000 });
-    } catch {
-      // Announcement not shown; nothing to do
-    }
-  }
-
   public static async createRoom(
     name: string,
     page: Page,
     andInvite: string[] = [],
   ): Promise<void> {
-    await TestHelpers.closeReleaseAnnouncement(page, "Introducing Sections");
-
     await page
       .getByRole("navigation", { name: "Room list" })
       .getByRole("button", { name: "New conversation" })
@@ -385,9 +368,25 @@ export class TestHelpers {
     frame: FrameLocator,
     count: number,
   ): Promise<void> {
-    await expect(frame.locator("video").filter({ visible: true })).toHaveCount(
-      count,
-      { timeout: 10000 },
-    );
+    // XXX we need to be better at our HTML markup and accessibility, it would make
+    // this kind of stuff way easier to test if we could look out for aria attributes.
+    await expect
+      .poll(
+        async () => {
+          return await frame
+            .locator("video")
+            .evaluateAll(
+              (videos: Element[]) =>
+                videos.filter(
+                  (v: Element) =>
+                    window.getComputedStyle(v).display === "block",
+                ).length,
+            );
+        },
+        {
+          timeout: 10000,
+        },
+      )
+      .toBe(count);
   }
 }

playwright/widget/voice-call-dm.spec.ts

@@ -31,10 +31,12 @@ widgetTest(
     const brooksFrame = brooks.page
       .locator('iframe[title="Element Call"]')
       .contentFrame();
+
     // We should show a ringing tile, let's check for that
     await expect(
       brooksFrame
         .getByTestId("videoTile")
+        .filter({ has: brooksFrame.getByText(whistler.displayName) })
         .filter({ has: brooksFrame.getByText("Calling…") }),
     ).toBeVisible();
 
@@ -81,22 +83,23 @@ widgetTest(
       }),
     ).toBeVisible();
 
-    // We confirm that we started in Pip mode (voice call) and check that we still see the composer.
+    // In order to confirm that the call is disconnected we will check that the message composer is shown again.
+    // So first we need to confirm that it is hidden when in the call.
     await expect(
       whistler.page.locator(".mx_BasicMessageComposer"),
-    ).toBeVisible();
-    await expect(brooks.page.locator(".mx_BasicMessageComposer")).toBeVisible();
+    ).not.toBeVisible();
+    await expect(
+      brooks.page.locator(".mx_BasicMessageComposer"),
+    ).not.toBeVisible();
 
     // ASSERT hanging up on one side ends the call for both
     await brooksFrame.getByRole("button", { name: "End call" }).click();
 
-    // The widget should be closed on both sides
+    // The widget should be closed on both sides and the timeline should be back on screen
     await expect(
-      whistler.page.locator('iframe[title="Element Call"]'),
-    ).not.toBeVisible();
-    await expect(
-      whistler.page.locator('iframe[title="Element Call"]'),
-    ).not.toBeVisible();
+      whistler.page.locator(".mx_BasicMessageComposer"),
+    ).toBeVisible();
+    await expect(brooks.page.locator(".mx_BasicMessageComposer")).toBeVisible();
   },
 );
 

pnpm-workspace.yaml

@@ -1,35 +1,3 @@
-allowBuilds:
-  "@parcel/watcher": true
-  "@sentry/cli": true
-  "@swc/core": true
-  "core-js": true
-  "esbuild": true
-  "matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/8c95727b6278fe7942c20d0b9485f984dd0694b7": true
-  "protobufjs": true
-overrides:
-  # We need compatible versions of RxJS in our dependencies and LiveKit's dependencies, but
-  # LiveKit has pinned it to a very specific version which is now holding us back from updating.
-  # See livekit/components-js#1101 for a request for a proper solution.
-  "@livekit/components-core>rxjs": "^7.8.1"
-  # Dedupe Mediapipe dependencies.
-  "@livekit/track-processors>@mediapipe/tasks-vision": "^0.10.18"
-  # Security fix: https://security-tracker.debian.org/tracker/CVE-2026-31802
-  "tar": "^7.5.11"
-  # Security fixes:
-  # - https://github.com/advisories/GHSA-7r86-cg39-jmmj
-  # - https://github.com/advisories/GHSA-23c5-xmqv-rm74
-  "minimatch": "^10.2.3"
-  # Security fix: https://github.com/element-hq/element-call/security/dependabot/109
-  "glob": "^10.5.0"
-  # Security fixes:
-  # - https://github.com/element-hq/element-call/security/dependabot/110
-  # - https://github.com/element-hq/element-call/security/dependabot/122
-  "qs": "^6.14.1"
-  # Security fix: https://github.com/element-hq/element-call/security/dependabot/106
-  "js-yaml": "^4.1.1"
-  # Storybook declares support for 0.27.0 only but empirically works fine with 0.28.0.
-  "esbuild": "^0.28.0"
-  # Multiple security fixes: https://github.com/nodejs/undici/releases/tag/v6.24.0
-  "undici": "^6.24.0"
-  # Security fix: https://github.com/advisories/GHSA-rf6f-7fwh-wjgh
-  "flatted": "^3.4.2"
+# dependencies where we use branches and hashes in the package.json. But that also use a pre/post install script.
+onlyBuiltDependencies:
+  - "matrix-js-sdk"

renovate.json

@@ -64,7 +64,7 @@
     }
   ],
   "semanticCommits": "disabled",
-  "ignoreDeps": [],
+  "ignoreDeps": ["eslint-plugin-matrix-org"],
   "vulnerabilityAlerts": {
     "schedule": ["at any time"],
     "prHourlyLimit": 0,

sdk/helper.ts

@@ -15,8 +15,9 @@ import { scan } from "rxjs";
 import { type WidgetHelpers } from "../src/widget";
 import { type LivekitRoomItem } from "../src/state/CallViewModel/CallViewModel";
 
+export const logger = rootLogger.getChild("[MatrixRTCSdk]");
+
 export const tryMakeSticky = (widget: WidgetHelpers): void => {
-  const logger = rootLogger.getChild("[MatrixRTCSdk]");
   logger.info("try making sticky MatrixRTCSdk");
   void widget.api
     .setAlwaysOnScreen(true)

sdk/main.ts

@@ -52,8 +52,7 @@ import { getUrlParams } from "../src/UrlParams";
 import { MuteStates } from "../src/state/MuteStates";
 import { MediaDevices } from "../src/state/MediaDevices";
 import { E2eeType } from "../src/e2ee/e2eeType";
-import { currentAndPrev, TEXT_LK_TOPIC, tryMakeSticky } from "./helper";
-import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
+import { currentAndPrev, logger, TEXT_LK_TOPIC, tryMakeSticky } from "./helper";
 import {
   ElementWidgetActions,
   widget as _widget,
@@ -77,9 +76,9 @@ interface MatrixRTCSdk {
   stop: () => void;
   data$: Observable<{ rtcBackendIdentity: string; data: string }>;
   /**
-   * flattened list of remote members
+   * flattened list of members
    */
-  remoteMembers$: Behavior<
+  members$: Behavior<
     {
       connection: Connection | null;
       membership: CallMembership;
@@ -87,7 +86,7 @@ interface MatrixRTCSdk {
     }[]
   >;
   /**
-   * flattened local member
+   * flattened local members
    */
   localMember$: Behavior<{
     connection: Connection | null;
@@ -105,7 +104,6 @@ export async function createMatrixRTCSdk(
   id: string = "",
   sticky: boolean = false,
 ): Promise<MatrixRTCSdk> {
-  const logger = rootLogger.getChild("[MatrixRTCSdk]");
   const scope = new ObservableScope();
 
   // widget client
@@ -340,8 +338,8 @@ export async function createMatrixRTCSdk(
       ),
     ),
     connected$: callViewModel.connected$,
-    remoteMembers$: scope.behavior(
-      callViewModel.remoteMatrixLivekitMembers$.pipe(
+    members$: scope.behavior(
+      callViewModel.matrixLivekitMembers$.pipe(
         switchMap((members) => {
           const listOfMemberObservables = members.map((member) =>
             combineLatest([

src/App.tsx

@@ -30,7 +30,7 @@ import { useTheme } from "./useTheme";
 import { ProcessorProvider } from "./livekit/TrackProcessorContext";
 import { type AppViewModel } from "./state/AppViewModel";
 import { MediaDevicesContext } from "./MediaDevicesContext";
-import { getUrlParams, HeaderStyle, useUrlParams } from "./UrlParams";
+import { getUrlParams, HeaderStyle } from "./UrlParams";
 import { AppBar } from "./AppBar";
 
 const SentryRoute = Sentry.withSentryReactRouterV7Routing(Route);
@@ -41,17 +41,19 @@ interface SimpleProviderProps {
 
 const BackgroundProvider: FC<SimpleProviderProps> = ({ children }) => {
   const { pathname } = useLocation();
-  const { background } = useUrlParams();
 
   useEffect(() => {
-    document
-      .getElementsByTagName("body")[0]
-      .setAttribute("data-background", background);
-  }, [pathname, background]);
+    let backgroundImage = "";
+    if (!["/login", "/register"].includes(pathname) && !widget) {
+      backgroundImage = "var(--background-gradient)";
+    }
 
-  return children;
+    document.getElementsByTagName("body")[0].style.backgroundImage =
+      backgroundImage;
+  }, [pathname]);
+
+  return <>{children}</>;
 };
-
 const ThemeProvider: FC<SimpleProviderProps> = ({ children }) => {
   useTheme();
   return children;

src/AppBar.module.css

@@ -1,12 +1,6 @@
 .bar {
   flex-shrink: 0;
   position: relative;
-  z-index: var(--call-view-header-footer-layer);
-  padding-left: var(--content-inset-left);
-  padding-right: var(--content-inset-right);
-  padding-top: env(safe-area-inset-top);
-  opacity: 1;
-  transition: opacity 0.15s;
 }
 
 /* Pseudo-element for the gradient background */
@@ -15,7 +9,8 @@
   position: absolute;
   inset-inline: 0;
   /* Extend the gradient beyond the bottom of the header for readability */
-  inset-block: 0 -16px;
+  inset-block: -24px;
+  z-index: var(--call-view-header-footer-layer);
   background: linear-gradient(
     0deg,
     rgba(0, 0, 0, 0) 0%,
@@ -23,157 +18,21 @@
   );
 }
 
-.bar.hidden {
-  opacity: 0;
-  pointer-events: none;
-  /* Switch to position: absolute so the bar takes up no space in the layout
-    when hidden. */
-  position: absolute;
-  inset-block-start: 0;
-  inset-inline: 0;
-}
-
-.bar:has(:focus-visible) {
-  opacity: 1;
-  pointer-events: initial;
-}
-
 .bar > header {
-  flex-shrink: 0;
   position: sticky;
   inset-inline: 0;
   inset-block-start: 0;
-  display: grid;
-  grid-template-columns: 1fr auto 1fr;
-  grid-template-rows:
-    var(--cpd-space-3x) minmax(var(--cpd-space-10x), auto)
-    var(--cpd-space-3x);
-  grid-template-areas:
-    ". . ."
-    "primaryButton title secondaryButton"
-    ". . .";
-  place-items: center;
-  column-gap: var(--cpd-space-2x);
+  block-size: 64px;
+  z-index: var(--call-view-header-footer-layer);
 }
 
-.bar:has(.subtitle) > header {
-  grid-template-rows:
-    var(--cpd-space-3x) minmax(var(--cpd-space-10x), auto) var(--cpd-space-5x)
-    minmax(var(--cpd-space-8x), auto);
-  grid-template-areas:
-    ". . ."
-    "primaryButton title secondaryButton"
-    ". . ."
-    "subtitle subtitle subtitle";
+.bar svg path {
+  fill: var(--cpd-color-icon-primary);
 }
 
-/* Hide everything but the subtitle in small windows */
-@media (max-height: 450px) {
-  .bar {
-    display: none;
-  }
-
-  .bar:has(.subtitle) {
-    display: initial;
-
-    .title,
-    .primaryButton,
-    .secondaryButton {
-      display: none;
-    }
-
-    > header {
-      grid-template-columns: 1fr;
-      grid-template-rows: var(--cpd-space-5x) minmax(var(--cpd-space-5x), auto);
-      grid-template-areas: "." "subtitle";
-    }
-  }
-}
-
-.primaryButton {
-  grid-area: primaryButton;
-  justify-self: start;
-}
-
-.title {
-  grid-area: title;
-}
-
-.subtitle {
-  grid-area: subtitle;
-
-  svg {
-    color: var(--cpd-color-icon-tertiary);
-    margin-inline-end: var(--cpd-space-2x);
-    block-size: 1.2em;
-    inline-size: 1.2em;
-    vertical-align: text-bottom;
-  }
-}
-
-.title,
-.subtitle {
+.bar > header > h1 {
   margin: 0;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-
-.secondaryButton {
-  grid-area: secondaryButton;
-  justify-self: end;
-}
-
-.primaryButton,
-.secondaryButton {
-  svg * {
-    color: var(--cpd-color-icon-primary);
-  }
-}
-
-body[data-platform="ios"] {
-  .bar > header {
-    grid-template-rows: minmax(var(--cpd-space-11x), auto) var(--cpd-space-4x);
-    grid-template-areas: "primaryButton title secondaryButton";
-  }
-
-  .bar:has(.subtitle) > header {
-    grid-template-rows:
-      minmax(var(--cpd-space-6x), auto) minmax(var(--cpd-space-5x), auto)
-      var(--cpd-space-4x);
-    grid-template-areas:
-      "primaryButton title secondaryButton"
-      "primaryButton subtitle secondaryButton";
-
-    .title {
-      align-self: end;
-      /* Nudge the title and subtitle even closer together to replicate native
-      iOS styles */
-      transform: translateY(2px);
-    }
-
-    .subtitle {
-      align-self: start;
-    }
-  }
-
-  .subtitle {
-    color: var(--cpd-color-text-secondary);
-
-    svg {
-      display: none;
-    }
-  }
-
-  /* Hide everything but the subtitle in small windows */
-  @media (max-height: 450px) {
-    .bar:has(.subtitle) > header {
-      grid-template-rows: var(--cpd-space-4x) minmax(var(--cpd-space-5x), auto);
-      grid-template-areas: "." "subtitle";
-    }
-
-    .subtitle {
-      color: var(--cpd-color-text-primary);
-    }
-  }
-}

src/AppBar.test.tsx

@@ -5,33 +5,21 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type FC, type ReactNode } from "react";
 import { render } from "@testing-library/react";
 import { describe, expect, it } from "vitest";
 import { TooltipProvider } from "@vector-im/compound-web";
 
-import { AppBar, useAppBarSubtitle, useAppBarTitle } from "./AppBar";
-
-const content = <p>This is the content.</p>;
-
-function snapshotAppBar(content: ReactNode): void {
-  const { container } = render(
-    <TooltipProvider>
-      <AppBar>{content}</AppBar>
-    </TooltipProvider>,
-  );
-  expect(container).toMatchSnapshot();
-}
+import { AppBar } from "./AppBar";
 
 describe("AppBar", () => {
-  it("renders", () => snapshotAppBar(content));
-
-  it("renders with title and subtitle", () => {
-    const TestComponent: FC = () => {
-      useAppBarTitle("Title");
-      useAppBarSubtitle("Subtitle");
-      return content;
-    };
-    snapshotAppBar(<TestComponent />);
+  it("renders", () => {
+    const { container } = render(
+      <TooltipProvider>
+        <AppBar>
+          <p>This is the content.</p>
+        </AppBar>
+      </TooltipProvider>,
+    );
+    expect(container).toMatchSnapshot();
   });
 });

src/AppBar.tsx

@@ -6,34 +6,28 @@ Please see LICENSE in the repository root for full details.
 */
 
 import {
+  createContext,
+  type FC,
+  type MouseEvent,
+  type ReactNode,
   use,
   useCallback,
   useEffect,
   useMemo,
   useState,
-  createContext,
-  type FC,
-  type MouseEvent,
-  type ReactNode,
 } from "react";
-import classNames from "classnames";
-import { Heading, IconButton, Text, Tooltip } from "@vector-im/compound-web";
-import {
-  ArrowLeftIcon,
-  ChevronLeftIcon,
-  CollapseIcon,
-} from "@vector-im/compound-design-tokens/assets/web/icons";
+import { Heading, IconButton, Tooltip } from "@vector-im/compound-web";
+import { CollapseIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
 import { useTranslation } from "react-i18next";
 import { logger } from "matrix-js-sdk/lib/logger";
 
+import { Header, LeftNav, RightNav } from "./Header";
 import { platform } from "./Platform";
 import styles from "./AppBar.module.css";
 
 interface AppBarContext {
   setTitle: (value: string) => void;
-  setSubtitle: (value: ReactNode) => void;
   setSecondaryButton: (value: ReactNode) => void;
-  setPrimaryButtonIconKind: (value: "back" | "minimise") => void;
   setHidden: (value: boolean) => void;
 }
 
@@ -55,76 +49,44 @@ export const AppBar: FC<Props> = ({ children }) => {
   }, []);
 
   const [title, setTitle] = useState<string>("");
-  const [subtitle, setSubtitle] = useState<ReactNode>(undefined);
   const [hidden, setHidden] = useState<boolean>(false);
   const [secondaryButton, setSecondaryButton] = useState<ReactNode | null>(
     null,
   );
-  const [primaryButtonIcon, setPrimaryButtonIconKind] = useState<
-    "back" | "minimise"
-  >("minimise");
-
   const context = useMemo(
-    () => ({
-      setTitle,
-      setSubtitle,
-      setSecondaryButton,
-      setHidden,
-      setPrimaryButtonIconKind,
-    }),
-    [
-      setTitle,
-      setSubtitle,
-      setHidden,
-      setSecondaryButton,
-      setPrimaryButtonIconKind,
-    ],
+    () => ({ setTitle, setSecondaryButton, setHidden }),
+    [setTitle, setHidden, setSecondaryButton],
   );
 
-  const BackIcon = platform === "android" ? ArrowLeftIcon : ChevronLeftIcon;
-
   return (
     <>
-      {/* Wrap the header in a div due to annoying z-index issues with the
-      gradient background */}
-      <div className={classNames(styles.bar, { [styles.hidden]: hidden })}>
-        <header>
-          <Tooltip label={t("common.back")}>
-            <IconButton
-              className={styles.primaryButton}
-              // We render the back button (PrimaryButtonIcon) the same size as the native os.
-              // We render the minimise icon (default) smaller as per designs.
-              size={primaryButtonIcon === "back" ? "32px" : "24px"}
-              onClick={onBackClick}
-            >
-              {primaryButtonIcon === "back" ? (
-                <BackIcon aria-hidden />
-              ) : (
+      <div
+        style={{ display: hidden ? "none" : "block" }}
+        className={styles.bar}
+      >
+        <Header
+          // App bar is mainly seen in the call view, which has its own
+          // 'reconnecting' toast
+          disconnectedBanner={false}
+        >
+          <LeftNav>
+            <Tooltip label={t("common.back")}>
+              <IconButton size="24px" onClick={onBackClick}>
                 <CollapseIcon aria-hidden />
-              )}
-            </IconButton>
-          </Tooltip>
+              </IconButton>
+            </Tooltip>
+          </LeftNav>
           {title && (
             <Heading
-              className={styles.title}
               type="body"
-              size={platform === "ios" ? "md" : "lg"}
-              weight={platform === "ios" ? "semibold" : "medium"}
+              size="lg"
+              weight={platform === "android" ? "medium" : "semibold"}
             >
               {title}
             </Heading>
           )}
-          {subtitle && (
-            <Text
-              className={styles.subtitle}
-              as="span"
-              size={platform === "ios" ? "sm" : "lg"}
-            >
-              {subtitle}
-            </Text>
-          )}
-          <div className={styles.secondaryButton}>{secondaryButton}</div>
-        </header>
+          <RightNav>{secondaryButton}</RightNav>
+        </Header>
       </div>
       <AppBarContext value={context}>{children}</AppBarContext>
     </>
@@ -145,36 +107,6 @@ export function useAppBarTitle(title: string): void {
   }, [title, setTitle]);
 }
 
-/**
- * React hook which sets the subtitle to be shown in the app bar, if present. It
- * is an error to call this hook from multiple sites in the same component tree.
- */
-export function useAppBarSubtitle(subtitle: ReactNode): void {
-  const setSubtitle = use(AppBarContext)?.setSubtitle;
-  useEffect(() => {
-    if (setSubtitle !== undefined) {
-      setSubtitle(subtitle);
-      return (): void => setSubtitle("");
-    }
-  }, [subtitle, setSubtitle]);
-}
-
-/**
- * React hook which sets the primary button icon kind. Can only be "minimise" or "back"
- * It is an error to call this hook from multiple sites in the same component tree.
- */
-export function useAppBarPrimaryButtonIconKind(
-  icon: "back" | "minimise",
-): void {
-  const setIconKind = use(AppBarContext)?.setPrimaryButtonIconKind;
-  useEffect(() => {
-    if (setIconKind !== undefined) {
-      setIconKind(icon);
-      return (): void => setIconKind("minimise");
-    }
-  }, [setIconKind, icon]);
-}
-
 /**
  * React hook which sets the title to be shown in the app bar, if present. It is
  * an error to call this hook from multiple sites in the same component tree.

src/FullScreenView.tsx

@@ -47,7 +47,7 @@ export const FullScreenView: FC<FullScreenViewProps> = ({
 };
 
 interface ErrorPageProps {
-  error: unknown;
+  error: Error | unknown;
   widget: WidgetHelpers | null;
 }
 

src/UrlParams.ts

@@ -45,11 +45,6 @@ export enum HeaderStyle {
   AppBar = "app_bar",
 }
 
-export enum BackgroundStyle {
-  Solid = "solid",
-  Gradient = "gradient",
-}
-
 /**
  * The UrlProperties are used to pass required data to the widget.
  * Those are different in different rooms, users, devices. They do not configure the behavior of the
@@ -150,10 +145,6 @@ export interface UrlProperties {
    * can be "light", "dark", "light-high-contrast" or "dark-high-contrast".
    */
   theme: string | null;
-  /**
-   * The visual style of the page background.
-   */
-  background: BackgroundStyle;
 }
 
 /**
@@ -461,9 +452,6 @@ export const computeUrlParams = (search = "", hash = ""): UrlParams => {
     fonts: parser.getAllParams("font"),
     fontScale: Number.isNaN(fontScale) ? null : fontScale,
     theme: parser.getParam("theme"),
-    background:
-      parser.getEnumParam("background", BackgroundStyle) ??
-      BackgroundStyle.Gradient,
     viaServers: !isWidget ? parser.getParam("viaServers") : null,
     homeserver: !isWidget ? parser.getParam("homeserver") : null,
     posthogApiHost: parser.getParam("posthogApiHost"),

src/__snapshots__/AppBar.test.tsx.snap

@@ -3,90 +3,44 @@
 exports[`AppBar > renders 1`] = `
 <div>
   <div
-    class="_bar_221541"
+    class="bar"
+    style="display: block;"
   >
-    <header>
-      <button
-        aria-labelledby="_r_0_"
-        class="_icon-button_1215g_8 _primaryButton_221541"
-        data-kind="primary"
-        role="button"
-        style="--cpd-icon-button-size: 24px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_147l5_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M12 11.034a1 1 0 0 0 .29.702l.005.005c.18.18.43.29.705.29h8a1 1 0 0 0 0-2h-5.586L22 3.445a1 1 0 0 0-1.414-1.414L14 8.617V3.031a1 1 0 1 0-2 0zm0 1.963a1 1 0 0 0-.29-.702l-.005-.004A1 1 0 0 0 11 12H3a1 1 0 1 0 0 2h5.586L2 20.586A1 1 0 1 0 3.414 22L10 15.414V21a1 1 0 0 0 2 0z"
-            />
-          </svg>
-        </div>
-      </button>
+    <header
+      class="header"
+    >
       <div
-        class="_secondaryButton_221541"
-      />
-    </header>
-  </div>
-  <p>
-    This is the content.
-  </p>
-</div>
-`;
-
-exports[`AppBar > renders with title and subtitle 1`] = `
-<div>
-  <div
-    class="_bar_221541"
-  >
-    <header>
-      <button
-        aria-labelledby="_r_6_"
-        class="_icon-button_1215g_8 _primaryButton_221541"
-        data-kind="primary"
-        role="button"
-        style="--cpd-icon-button-size: 24px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_147l5_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M12 11.034a1 1 0 0 0 .29.702l.005.005c.18.18.43.29.705.29h8a1 1 0 0 0 0-2h-5.586L22 3.445a1 1 0 0 0-1.414-1.414L14 8.617V3.031a1 1 0 1 0-2 0zm0 1.963a1 1 0 0 0-.29-.702l-.005-.004A1 1 0 0 0 11 12H3a1 1 0 1 0 0 2h5.586L2 20.586A1 1 0 1 0 3.414 22L10 15.414V21a1 1 0 0 0 2 0z"
-            />
-          </svg>
-        </div>
-      </button>
-      <h1
-        class="_typography_6v6n8_153 _font-body-lg-medium_6v6n8_79 _title_221541"
-      >
-        Title
-      </h1>
-      <span
-        class="_typography_6v6n8_153 _font-body-lg-regular_6v6n8_69 _subtitle_221541"
-      >
-        Subtitle
-      </span>
-      <div
-        class="_secondaryButton_221541"
+        class="nav leftNav"
+      >
+        <button
+          aria-labelledby="_r_0_"
+          class="_icon-button_1215g_8"
+          data-kind="primary"
+          role="button"
+          style="--cpd-icon-button-size: 24px;"
+          tabindex="0"
+        >
+          <div
+            class="_indicator-icon_147l5_17"
+            style="--cpd-icon-button-size: 100%;"
+          >
+            <svg
+              aria-hidden="true"
+              fill="currentColor"
+              height="1em"
+              viewBox="0 0 24 24"
+              width="1em"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M12 11.034a1 1 0 0 0 .29.702l.005.005c.18.18.43.29.705.29h8a1 1 0 0 0 0-2h-5.586L22 3.445a1 1 0 0 0-1.414-1.414L14 8.617V3.031a1 1 0 1 0-2 0zm0 1.963a1 1 0 0 0-.29-.702l-.005-.004A1 1 0 0 0 11 12H3a1 1 0 1 0 0 2h5.586L2 20.586A1 1 0 1 0 3.414 22L10 15.414V21a1 1 0 0 0 2 0z"
+              />
+            </svg>
+          </div>
+        </button>
+      </div>
+      <div
+        class="nav rightNav"
       />
     </header>
   </div>

src/__snapshots__/Modal.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`the content is rendered when the modal is open 1`] = `
 <div
   aria-labelledby="radix-_r_4_"
-  class="_overlay_2f5303 _animate_2f5303 _modal_dbeffe _dialog_dbeffe _glass_sepwu_8"
+  class="overlay animate modal dialog _glass_sepwu_8"
   data-state="open"
   id="radix-_r_3_"
   role="dialog"
@@ -11,10 +11,10 @@ exports[`the content is rendered when the modal is open 1`] = `
   tabindex="-1"
 >
   <div
-    class="_content_dbeffe"
+    class="content"
   >
     <div
-      class="_header_dbeffe"
+      class="header"
     >
       <h2
         class="_typography_6v6n8_153 _font-heading-md-semibold_6v6n8_112"
@@ -24,7 +24,7 @@ exports[`the content is rendered when the modal is open 1`] = `
       </h2>
     </div>
     <div
-      class="_body_dbeffe"
+      class="body"
     >
       <p>
         This is the content.
@@ -37,7 +37,7 @@ exports[`the content is rendered when the modal is open 1`] = `
 exports[`the modal renders as a drawer in mobile viewports 1`] = `
 <div
   aria-labelledby="radix-_r_a_"
-  class="_overlay_2f5303 _modal_dbeffe _drawer_dbeffe"
+  class="overlay modal drawer"
   data-state="open"
   data-vaul-animate="true"
   data-vaul-custom-container="false"
@@ -51,13 +51,13 @@ exports[`the modal renders as a drawer in mobile viewports 1`] = `
   tabindex="-1"
 >
   <div
-    class="_content_dbeffe"
+    class="content"
   >
     <div
-      class="_header_dbeffe"
+      class="header"
     >
       <div
-        class="_handle_dbeffe"
+        class="handle"
       />
       <h2
         id="radix-_r_a_"
@@ -67,7 +67,7 @@ exports[`the modal renders as a drawer in mobile viewports 1`] = `
       </h2>
     </div>
     <div
-      class="_body_dbeffe"
+      class="body"
     >
       <p>
         This is the content.

src/__snapshots__/QrCode.test.tsx.snap

@@ -2,7 +2,7 @@
 
 exports[`QrCode > renders 1`] = `
 <div
-  class="_qrCode_458264 bar"
+  class="qrCode bar"
 >
   <img
     alt="QR Code"

src/__snapshots__/Toast.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`Toast > renders 1`] = `
 <button
   aria-labelledby="radix-_r_4_"
-  class="_overlay_2f5303 _animate_2f5303 _toast_15a045"
+  class="overlay animate toast"
   data-state="open"
   id="radix-_r_3_"
   role="dialog"

src/button/Button.tsx

@@ -173,7 +173,7 @@ export const LoudspeakerButton: FC<LoudspeakerButtonProps> = ({
         iconOnly
         Icon={loudspeakerModeEnabled ? VolumeOnSolidIcon : VolumeOffSolidIcon}
         {...props}
-        kind={loudspeakerModeEnabled ? "secondary" : "primary"}
+        kind={loudspeakerModeEnabled ? "primary" : "secondary"}
         aria-checked={loudspeakerModeEnabled}
       />
     </Tooltip>

src/button/__snapshots__/ReactionToggleButton.test.tsx.snap

@@ -140,7 +140,7 @@ exports[`Can raise hand 1`] = `
     aria-expanded="false"
     aria-haspopup="true"
     aria-labelledby="_r_1j_"
-    class="_button_1nw83_8 _raisedButton_fb25ab _has-icon_1nw83_60 _icon-only_1nw83_53"
+    class="_button_1nw83_8 raisedButton _has-icon_1nw83_60 _icon-only_1nw83_53"
     data-kind="primary"
     data-size="lg"
     role="button"

src/components/CallFooter.module.css

@@ -19,6 +19,11 @@ Please see LICENSE in the repository root for full details.
   padding-right: calc(env(safe-area-inset-right) + var(--cpd-space-6x));
   padding-block: var(--cpd-space-10x)
     calc(env(safe-area-inset-bottom) + var(--cpd-space-10x));
+  background: linear-gradient(
+    180deg,
+    rgba(0, 0, 0, 0) 0%,
+    var(--cpd-color-bg-canvas-default) 100%
+  );
 }
 
 .footer.hidden {

src/components/CallFooter.tsx

@@ -112,17 +112,11 @@ export interface FooterState {
 }
 
 export interface FooterProps {
-  className?: string;
   ref?: Ref<HTMLDivElement>;
   children?: JSX.Element | JSX.Element[] | false;
   vm: ViewModel<FooterSnapshot>;
 }
-export const CallFooter: FC<FooterProps> = ({
-  className,
-  ref,
-  children,
-  vm,
-}) => {
+export const CallFooter: FC<FooterProps> = ({ ref, children, vm }) => {
   const asOverlay = useBehavior(vm.asOverlay$);
   const showFooter = useBehavior(vm.showFooter$);
   const hideControls = useBehavior(vm.hideControls$);
@@ -298,7 +292,7 @@ export const CallFooter: FC<FooterProps> = ({
     <div
       ref={ref}
       data-testid="footer-container"
-      className={classNames(className, styles.footer, {
+      className={classNames(styles.footer, {
         [styles.overlay]: asOverlay,
         [styles.hidden]: !showFooter,
       })}

src/components/CallFooterViewModel.tsx

@@ -173,7 +173,9 @@ export function createCallFooterViewModel(
         callModel.setSettingsOpen$,
       ]).pipe(
         map(([isPip, showHeader, setSettingsOpen]) =>
-          !isPip && headerStyle !== HeaderStyle.AppBar && showControls
+          !isPip &&
+          !(headerStyle === HeaderStyle.AppBar && showHeader) &&
+          showControls
             ? (): void => setSettingsOpen(true)
             : undefined,
         ),

src/components/MediaMuteAndSwitchButton.test.tsx

@@ -180,12 +180,12 @@ describe("MediaMuteAndSwitchButton", () => {
     );
 
     await user.click(screen.getByRole("button", { name: "Microphone" }));
-    screen.getByRole("menuitemradio", { name: "Microphone 1" });
-    screen.getByRole("menuitemradio", { name: "Microphone 2" });
+    screen.getByRole("menuitem", { name: "Microphone 1" });
+    screen.getByRole("menuitem", { name: "Microphone 2" });
     await user.keyboard("[Escape]");
     await user.click(screen.getByRole("button", { name: "Camera" }));
-    screen.getByRole("menuitemradio", { name: "Camera 1" });
-    screen.getByRole("menuitemradio", { name: "Camera 2" });
+    screen.getByRole("menuitem", { name: "Camera 1" });
+    screen.getByRole("menuitem", { name: "Camera 2" });
   });
 
   test("calls select callback on menu click", async () => {
@@ -206,9 +206,7 @@ describe("MediaMuteAndSwitchButton", () => {
     );
 
     await user.click(getByRole("button", { name: "Microphone" }));
-    await user.click(
-      screen.getByRole("menuitemradio", { name: "Microphone 2" }),
-    );
+    await user.click(screen.getByRole("menuitem", { name: "Microphone 2" }));
 
     expect(onSelect).toHaveBeenCalledWith("mic2");
   });
@@ -230,9 +228,7 @@ describe("MediaMuteAndSwitchButton", () => {
     );
 
     await user.click(getByRole("button", { name: "Microphone" }));
-    await user.click(
-      screen.getByRole("menuitemradio", { name: "Microphone 1" }),
-    );
+    await user.click(screen.getByRole("menuitem", { name: "Microphone 1" }));
 
     expect(onSelect).not.toHaveBeenCalled();
   });
@@ -268,24 +264,18 @@ describe("MediaMuteAndSwitchButton", () => {
     const { getByRole } = renderComponent(<Wrapper />);
 
     await user.click(getByRole("button", { name: "Microphone" }));
-    await user.click(
-      screen.getByRole("menuitemradio", { name: "Microphone 2" }),
-    );
+    await user.click(screen.getByRole("menuitem", { name: "Microphone 2" }));
 
     expect(onSelectPressed).toHaveBeenCalled();
     expect(onOptionUpdated).not.toHaveBeenCalled();
     // After clicking, plannedSelection="mic2" but selectedOption is still "mic1",
-    // so mic2 should be in an activating state
-    screen.getByRole("menuitemradio", {
-      name: "Microphone 2 Activating…",
-      checked: false,
-    });
+    // so a spinner should appear on the mic2 item
+    const mic2Item = screen.getByRole("menuitem", { name: "Microphone 2" });
+    expect(mic2Item.querySelector(".rotate")).toBeTruthy();
 
-    // The currently-selected mic1 item should not be activating
-    screen.getByRole("menuitemradio", {
-      name: "Microphone 1",
-      checked: true,
-    });
+    // The currently-selected mic1 item should not have a spinner
+    const mic1Item = screen.getByRole("menuitem", { name: "Microphone 1" });
+    expect(mic1Item.querySelector(".rotate")).toBeNull();
     await act(async () => {
       // resolve the promise that acutally updates the select option.
       resolve();
@@ -294,7 +284,7 @@ describe("MediaMuteAndSwitchButton", () => {
 
     expect(onOptionUpdated).toHaveBeenCalled();
     // Spinner should now be gone since the selection has caught up
-    const mic2ItemAfter = screen.getByRole("menuitemradio", {
+    const mic2ItemAfter = screen.getByRole("menuitem", {
       name: "Microphone 2",
     });
     expect(mic2ItemAfter.querySelector(".rotate")).toBeNull();
@@ -346,15 +336,11 @@ describe("MediaMuteAndSwitchButton", () => {
     await user.click(getByRole("button", { name: "Microphone" }));
 
     // The selected item (mic2) renders both an IconOptions SVG and a CheckIcon SVG
-    const mic1Item = screen.getByRole("menuitemradio", {
-      name: "Microphone 2",
-    });
+    const mic1Item = screen.getByRole("menuitem", { name: "Microphone 2" });
     expect(mic1Item.querySelectorAll("svg").length).toBe(2);
 
     // The unselected item (mic1) only renders its IconOptions SVG
-    const mic2Item = screen.getByRole("menuitemradio", {
-      name: "Microphone 1",
-    });
+    const mic2Item = screen.getByRole("menuitem", { name: "Microphone 1" });
     expect(mic2Item.querySelectorAll("svg").length).toBe(1);
   });
 });

src/components/MediaMuteAndSwitchButton.tsx

@@ -191,7 +191,6 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
                     width={24}
                     height={24}
                     className={styles.itemIcon}
-                    aria-hidden
                   />
                 )
               }
@@ -202,23 +201,10 @@ export const MediaMuteAndSwitchButton: FC<MediaMuteAndSwitchButtonProps> = ({
                 onSelect?.(id);
               }}
               key={id}
-              role="menuitemradio"
-              aria-checked={selectedOption === id}
             >
-              {selectedOption === id && (
-                <CheckIcon
-                  width={24}
-                  height={24}
-                  aria-hidden // A label would be redundant to aria-checked above
-                />
-              )}
+              {selectedOption === id && <CheckIcon width={24} height={24} />}
               {selectedOption !== id && plannedSelection === id && (
-                <SpinnerIcon
-                  width={24}
-                  height={24}
-                  className={styles.rotate}
-                  aria-label={t("settings.devices.activating")}
-                />
+                <SpinnerIcon width={24} height={24} className={styles.rotate} />
               )}
             </MenuItem>
           );

src/components/__snapshots__/MediaMuteAndSwitchButton.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`MediaMuteAndSwitchButton > renders 1`] = `
 <div>
   <div
-    class="_container_e649de"
+    class="container"
   >
     <button
       aria-busy="false"
@@ -35,7 +35,7 @@ exports[`MediaMuteAndSwitchButton > renders 1`] = `
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="Microphone"
-      class="_button_1nw83_8 _menuButton_e649de _has-icon_1nw83_60 _icon-only_1nw83_53"
+      class="_button_1nw83_8 menuButton _has-icon_1nw83_60 _icon-only_1nw83_53"
       data-kind="tertiary"
       data-size="lg"
       data-state="closed"

src/e2ee/matrixKeyProvider.ts

@@ -10,15 +10,15 @@ import {
   type MatrixRTCSession,
   MatrixRTCSessionEvent,
 } from "matrix-js-sdk/lib/matrixrtc";
-import { logger as rootLogger, type Logger } from "matrix-js-sdk/lib/logger";
+import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
 import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
+const logger = rootLogger.getChild("[MatrixKeyProvider]");
 
 export class MatrixKeyProvider extends BaseKeyProvider {
   private rtcSession?: MatrixRTCSession;
-  private logger: Logger;
+
   public constructor() {
     super({ ratchetWindowSize: 10, keyringSize: 256 });
-    this.logger = rootLogger.getChild("[MatrixKeyProvider]");
   }
 
   public setRTCSession(rtcSession: MatrixRTCSession): void {
@@ -60,12 +60,12 @@ export class MatrixKeyProvider extends BaseKeyProvider {
             encryptionKeyIndex,
           );
 
-          this.logger.debug(
+          logger.debug(
             `Sent new key to livekit room=${this.rtcSession?.room.roomId} participantId=${rtcBackendIdentity} (before hash: ${membershipParts.userId}:${membershipParts.deviceId}) encryptionKeyIndex=${encryptionKeyIndex}`,
           );
         },
         (e) => {
-          this.logger.error(
+          logger.error(
             `Failed to create key material from buffer for livekit room=${this.rtcSession?.room.roomId} participantId before hash=${membershipParts.userId}:${membershipParts.deviceId} encryptionKeyIndex=${encryptionKeyIndex}`,
             e,
           );

src/graphics/loggedOutGradient.svg

@@ -0,0 +1,48 @@
+<svg width="1440" height="500" viewBox="0 0 1440 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_f_4162_80135)">
+<circle cx="720" cy="1620" r="1500" fill="url(#paint0_linear_4162_80135)"/>
+<circle cx="720" cy="1620" r="1498.92" stroke="white" stroke-opacity="0.5" stroke-width="2.16028" style="mix-blend-mode:overlay"/>
+</g>
+<g filter="url(#filter1_f_4162_80135)">
+<circle cx="720" cy="1550.86" r="1272.86" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_f_4162_80135" x="-900" y="0" width="3240" height="3240" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="60" result="effect1_foregroundBlur_4162_80135"/>
+</filter>
+<filter id="filter1_f_4162_80135" x="-672.863" y="158" width="2785.73" height="2785.73" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="60" result="effect1_foregroundBlur_4162_80135"/>
+</filter>
+<linearGradient id="paint0_linear_4162_80135" x1="549.5" y1="120" x2="549.5" y2="505.5" gradientUnits="userSpaceOnUse">
+<stop stop-color="#062993"/>
+<stop offset="0.040404" stop-color="#02389D"/>
+<stop offset="0.0808081" stop-color="#0045A6"/>
+<stop offset="0.121212" stop-color="#0051AD"/>
+<stop offset="0.161616" stop-color="#005DB4"/>
+<stop offset="0.20202" stop-color="#0069BA"/>
+<stop offset="0.242424" stop-color="#0075BB"/>
+<stop offset="0.282828" stop-color="#0081BB"/>
+<stop offset="0.323232" stop-color="#008CB9"/>
+<stop offset="0.363636" stop-color="#0098B7"/>
+<stop offset="0.40404" stop-color="#00A3B3"/>
+<stop offset="0.444444" stop-color="#00AEAD"/>
+<stop offset="0.484848" stop-color="#00B8A4"/>
+<stop offset="0.525253" stop-color="#00C2A0"/>
+<stop offset="0.565657" stop-color="#00CC99"/>
+<stop offset="0.606061" stop-color="#3AD396"/>
+<stop offset="0.646465" stop-color="#5DD898"/>
+<stop offset="0.686869" stop-color="#79DD99"/>
+<stop offset="0.727273" stop-color="#92E29B"/>
+<stop offset="0.767677" stop-color="#A8E69F"/>
+<stop offset="0.808081" stop-color="#BBEAA5"/>
+<stop offset="0.848485" stop-color="#CDEEAE"/>
+<stop offset="0.888889" stop-color="#DCF2B9"/>
+<stop offset="0.929293" stop-color="#EAF6C7"/>
+<stop offset="0.969697" stop-color="#F5FBD5"/>
+</linearGradient>
+</defs>
+</svg>

src/graphics/mobile-gradient.svg

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="1200"
-   height="285"
-   viewBox="0 0 1200 285"
-   fill="none"
-   version="1.1"
-   id="svg5"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <g
-     filter="url(#filter0_f_3970_9366)"
-     id="g2"
-     transform="translate(422.00201)">
-    <path
-       d="m -164.342,495.134 c 188.2881,-188.288 494.684,-190 684.684,0"
-       stroke="url(#paint0_linear_3970_9366)"
-       stroke-width="235.517"
-       stroke-linecap="round"
-       id="path1"
-       style="stroke:url(#paint0_linear_3970_9366)" />
-    <path
-       d="m -164.342,495.134 c 188.2881,-188.288 494.684,-190 684.684,0"
-       stroke="url(#paint1_linear_3970_9366)"
-       style="mix-blend-mode:overlay;stroke:url(#paint1_linear_3970_9366)"
-       stroke-width="235.517"
-       stroke-linecap="round"
-       id="path2" />
-  </g>
-  <defs
-     id="defs5">
-    <filter
-       id="filter0_f_3970_9366"
-       x="-517.617"
-       y="-0.00012207"
-       width="1391.23"
-       height="848.409"
-       filterUnits="userSpaceOnUse"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         flood-opacity="0"
-         result="BackgroundImageFix"
-         id="feFlood2" />
-      <feBlend
-         mode="normal"
-         in="SourceGraphic"
-         in2="BackgroundImageFix"
-         result="shape"
-         id="feBlend2" />
-      <feGaussianBlur
-         stdDeviation="117.758"
-         result="effect1_foregroundBlur_3970_9366"
-         id="feGaussianBlur2" />
-    </filter>
-    <linearGradient
-       id="paint0_linear_3970_9366"
-       x1="349.17099"
-       y1="323.96301"
-       x2="6.82898"
-       y2="666.30499"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#0D5CBD"
-         id="stop2" />
-      <stop
-         offset="0.730863"
-         stop-color="#0DBDA8"
-         id="stop3" />
-    </linearGradient>
-    <linearGradient
-       id="paint1_linear_3970_9366"
-       x1="349.17099"
-       y1="323.96301"
-       x2="6.82898"
-       y2="666.30499"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#0D5CBD"
-         id="stop4" />
-      <stop
-         offset="0.730863"
-         stop-color="#0DBDA8"
-         id="stop5" />
-    </linearGradient>
-  </defs>
-</svg>

src/index.css

@@ -55,6 +55,7 @@ layer(compound);
   --small-drop-shadow: 0px 1.2px 2.4px 0px rgba(0, 0, 0, 0.15);
   --big-drop-shadow: 0px 0px 24px 0px #1b1d221a;
   --subtle-drop-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
+  --background-gradient: url("graphics/backgroundGradient.svg");
 
   --call-view-overlay-layer: 1;
   --call-view-header-footer-layer: 2;
@@ -73,6 +74,9 @@ layer(compound);
 
 body {
   background-color: var(--cpd-color-bg-canvas-default);
+  background-size: calc(max(1440px, 100vw)) calc(max(800px, 100vh));
+  background-repeat: no-repeat;
+  background-position: center;
   color: var(--cpd-color-text-primary);
   color-scheme: dark;
   margin: 0;
@@ -81,24 +85,6 @@ body {
   -webkit-tap-highlight-color: transparent;
 }
 
-@media (min-height: 330px) {
-  body[data-background="gradient"]::before {
-    content: "";
-    position: fixed;
-    inset: 0;
-    background-image: url("graphics/mobile-gradient.svg");
-    background-size: auto;
-    background-position: bottom;
-    background-repeat: no-repeat;
-  }
-
-  body[data-background="gradient"][data-platform="desktop"]::before {
-    background-image: url("graphics/desktop-gradient.svg");
-    background-size: calc(max(1440px, 100vw)) calc(max(800px, 100vh));
-    background-position: center;
-  }
-}
-
 /* This prohibits the view to scroll for pages smaller than 122px in width
 we use this for mobile pip webviews */
 .no-scroll-body {

src/livekit/MatrixAudioRenderer.tsx

@@ -14,7 +14,7 @@ import {
   AudioTrack,
   type AudioTrackProps,
 } from "@livekit/components-react";
-import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { useEarpieceAudioConfig } from "../MediaDevicesContext";
 import { useReactiveState } from "../useReactiveState";
@@ -40,6 +40,7 @@ export interface MatrixAudioRendererProps {
   muted?: boolean;
 }
 
+const prefixedLogger = logger.getChild("[MatrixAudioRenderer]");
 /**
  * Takes care of handling remote participants’ audio tracks and makes sure that microphones and screen share are audible.
  *
@@ -59,7 +60,6 @@ export function LivekitRoomAudioRenderer({
   validIdentities,
   muted,
 }: MatrixAudioRendererProps): ReactNode {
-  const logger = rootLogger.getChild("[MatrixAudioRenderer]");
   const tracks = useTracks(
     [
       Track.Source.Microphone,
@@ -80,7 +80,7 @@ export function LivekitRoomAudioRenderer({
       if (!isValid) {
         // TODO make sure to also skip the warn logging for the local identity
         // Log that there is an invalid identity, that means that someone is publishing audio that is not expected to be in the call.
-        logger.warn(
+        prefixedLogger.warn(
           `Audio track ${ref.participant.identity} from ${url} has no matching matrix call member`,
           `current members: ${validIdentities.join()}`,
           `track will not get rendered`,

src/livekit/TrackProcessorContext.tsx

@@ -7,7 +7,7 @@ Please see LICENSE in the repository root for full details.
 
 import {
   ProcessorWrapper,
-  supportsBackgroundProcessors as supportsBackgroundProcessorsLivekitSdk,
+  supportsBackgroundProcessors,
   type BackgroundOptions,
 } from "@livekit/track-processors";
 import {
@@ -29,7 +29,6 @@ import {
 import { BlurBackgroundTransformer } from "./BlurBackgroundTransformer";
 import { type Behavior } from "../state/Behavior";
 import { type ObservableScope } from "../state/ObservableScope";
-import { platform } from "../Platform";
 
 //TODO-MULTI-SFU: This is not yet fully there.
 // it is a combination of exposing observable and react hooks.
@@ -107,10 +106,6 @@ interface Props {
   children: JSX.Element;
 }
 
-function supportsBackgroundProcessors(): boolean {
-  return supportsBackgroundProcessorsLivekitSdk() && platform === "desktop";
-}
-
 export const ProcessorProvider: FC<Props> = ({ children }) => {
   // The setting the user wants to have
   const [blurActivated] = useSetting(backgroundBlurSettings);

src/reactions/__snapshots__/RaisedHandIndicator.test.tsx.snap

@@ -2,10 +2,10 @@
 
 exports[`RaisedHandIndicator > renders a smaller indicator when miniature is specified 1`] = `
 <div
-  class="_reactionIndicatorWidget_abd277"
+  class="reactionIndicatorWidget"
 >
   <div
-    class="_reaction_abd277"
+    class="reaction"
   >
     <span
       aria-label="Reaction"
@@ -22,10 +22,10 @@ exports[`RaisedHandIndicator > renders a smaller indicator when miniature is spe
 
 exports[`RaisedHandIndicator > renders an indicator when a hand has been raised 1`] = `
 <div
-  class="_reactionIndicatorWidget_abd277 _reactionIndicatorWidgetLarge_abd277"
+  class="reactionIndicatorWidget reactionIndicatorWidgetLarge"
 >
   <div
-    class="_reaction_abd277 _reactionLarge_abd277"
+    class="reaction reactionLarge"
   >
     <span
       aria-label="Reaction"
@@ -42,10 +42,10 @@ exports[`RaisedHandIndicator > renders an indicator when a hand has been raised
 
 exports[`RaisedHandIndicator > renders an indicator when a hand has been raised with the expected time 1`] = `
 <div
-  class="_reactionIndicatorWidget_abd277 _reactionIndicatorWidgetLarge_abd277"
+  class="reactionIndicatorWidget reactionIndicatorWidgetLarge"
 >
   <div
-    class="_reaction_abd277 _reactionLarge_abd277"
+    class="reaction reactionLarge"
   >
     <span
       aria-label="Reaction"

src/room/GroupCallView.test.tsx

@@ -272,7 +272,7 @@ test.skip("GroupCallView plays a leave sound synchronously in widget mode", asyn
   expect(leaveRTCSession).toHaveBeenCalledOnce();
 });
 
-test("Should close widget when all other left and play a sound", async () => {
+test("Should close widget when all other left and have time to play a sound", async () => {
   const user = userEvent.setup();
   let widgetClosedCalled = false;
   const { promise: widgetClosedPromise, resolve: widgetClosedResolver } =
@@ -310,6 +310,8 @@ test("Should close widget when all other left and play a sound", async () => {
   expect(widgetClosedCalled).toBeFalsy();
   resolvePlaySound.resolve();
 
+  // Expect the leave sound to be played but silent (volumeOverwrite = 0)
+  // The allOthersLeft effect should already play a leave sound for the last user in the call.
   expect(playSound).toHaveBeenCalledWith("left", 0);
   await widgetClosedPromise;
   await flushPromises();
@@ -317,6 +319,37 @@ test("Should close widget when all other left and play a sound", async () => {
   expect(widgetStopMock).toHaveBeenCalledOnce();
 }, 80000);
 
+test("Should close widget when all other left", async () => {
+  const user = userEvent.setup();
+  const widgetClosedCalled = Promise.withResolvers<void>();
+  const widgetSendMock = vi.fn().mockImplementation((action: string) => {
+    if (action === ElementWidgetActions.Close) {
+      widgetClosedCalled.resolve();
+    }
+  });
+  const widgetStopMock = vi.fn().mockResolvedValue(undefined);
+  const widget = {
+    api: {
+      setAlwaysOnScreen: vi.fn().mockResolvedValue(true),
+      transport: {
+        send: widgetSendMock,
+        reply: vi.fn().mockResolvedValue(undefined),
+        stop: widgetStopMock,
+      } as unknown as ITransport,
+    } as Partial<WidgetHelpers["api"]>,
+    lazyActions: new LazyEventEmitter(),
+  };
+
+  const { getByText } = createGroupCallView(widget as WidgetHelpers);
+  const leaveButton = getByText("SimulateOtherLeft");
+  await user.click(leaveButton);
+  await flushPromises();
+
+  await widgetClosedCalled.promise;
+  await flushPromises();
+  expect(widgetStopMock).toHaveBeenCalledOnce();
+});
+
 test("Should not close widget when auto leave due to error", async () => {
   const user = userEvent.setup();
 

src/room/GroupCallView.tsx

@@ -553,9 +553,11 @@ export const GroupCallView: FC<Props> = ({
           });
         }
       }}
-      onError={(_error) => {
-        if (rtcSession.isJoined()) onLeft("error");
-      }}
+      onError={
+        (/**error*/) => {
+          if (rtcSession.isJoined()) onLeft("error");
+        }
+      }
     >
       {body}
     </GroupCallErrorBoundary>

src/room/InCallView.module.css

@@ -14,23 +14,6 @@ Please see LICENSE in the repository root for full details.
   overflow-y: auto;
 }
 
-/* Normally the footer uses a transparent background to allow our expressive
-page gradients to shine through. However, we sometimes need to visually separate
-it from the content underneath. If the call layout is overflowing, or if the
-spotlight tile is maximised and displaying video, apply a gradient background. */
-.overflowing > .footer,
-.fixedGrid:has(
-    > .tile[data-maximised="true"]
-      .spotlightItem[data-background="transparent"][data-video-enabled="true"][aria-hidden="false"]
-  )
-  ~ .footer {
-  background: linear-gradient(
-    180deg,
-    rgba(0, 0, 0, 0) 0%,
-    var(--cpd-color-bg-canvas-default) 100%
-  );
-}
-
 .header {
   position: sticky;
   flex-shrink: 0;
@@ -99,18 +82,19 @@ spotlight tile is maximised and displaying video, apply a gradient background. *
   /* Disable pointer events so the overlay doesn't block interaction with
   elements behind it */
   pointer-events: none;
+}
 
-  > :not(:first-child) {
-    pointer-events: initial;
-  }
-
-  .tile {
-    position: absolute;
-    inset-block-start: 0;
-  }
+.fixedGrid > :not(:first-child),
+.scrollingGrid > :not(:first-child) {
+  pointer-events: initial;
 }
 
 .tile {
+  position: absolute;
+  inset-block-start: 0;
+}
+
+.tile.maximised {
   position: relative;
   flex-grow: 1;
 }

src/room/InCallView.test.tsx

@@ -7,6 +7,7 @@ Please see LICENSE in the repository root for full details.
 */
 
 import {
+  afterEach,
   beforeEach,
   describe,
   expect,
@@ -14,7 +15,12 @@ import {
   type MockedFunction,
   vi,
 } from "vitest";
-import { render, type RenderResult } from "@testing-library/react";
+import {
+  render,
+  type RenderResult,
+  getByRole,
+  screen,
+} from "@testing-library/react";
 import { type LocalParticipant } from "livekit-client";
 import { BehaviorSubject, of } from "rxjs";
 import { BrowserRouter } from "react-router-dom";
@@ -44,6 +50,7 @@ import { useRoomEncryptionSystem } from "../e2ee/sharedKeyManagement";
 import { LivekitRoomAudioRenderer } from "../livekit/MatrixAudioRenderer";
 import { MediaDevicesContext } from "../MediaDevicesContext";
 import { type MediaDevices as ECMediaDevices } from "../state/MediaDevices";
+import { constant } from "../state/Behavior";
 import { AppBar } from "../AppBar";
 import { initializeWidget } from "../widget";
 
@@ -188,6 +195,45 @@ describe("InCallView", () => {
     });
   });
 
+  describe("settings button with AppBar header", () => {
+    beforeEach(() => {
+      // getUrlParams() reads window.location directly rather than from the
+      // React Router context, so MemoryRouter alone is not enough to make
+      // it see "header=app_bar". Push the real URL so both paths agree.
+      window.history.pushState({}, "", "?header=app_bar");
+    });
+
+    afterEach(() => {
+      window.history.pushState({}, "", "/");
+    });
+
+    it("mobile portrait, is visible in the header", () => {
+      createInCallView({
+        withAppBar: true,
+        callViewModelOptions: {
+          // Narrow like a mobile phone in portrait orientation
+          windowSize$: constant({ width: 400, height: 700 }),
+        },
+      });
+
+      getByRole(screen.getByRole("banner"), "button", {
+        name: "Settings",
+      });
+    });
+
+    it("mobile landscape, is not visible anywhere", () => {
+      const { queryByRole } = createInCallView({
+        withAppBar: true,
+        callViewModelOptions: {
+          // Flat like a mobile phone in landscape orientation
+          windowSize$: constant({ width: 700, height: 400 }),
+        },
+      });
+
+      expect(queryByRole("button", { name: "Settings" })).not.toBeVisible();
+    });
+  });
+
   describe("audioOutputSwitcher", () => {
     it("is visible and can be clicked", async () => {
       const user = userEvent.setup();

src/room/InCallView.tsx

@@ -44,6 +44,7 @@ import {
   createCallViewModel$,
 } from "../state/CallViewModel/CallViewModel.ts";
 import { Grid, type TileProps } from "../grid/Grid";
+import { useInitial } from "../useInitial";
 import { SpotlightTile } from "../tile/SpotlightTile";
 import { type EncryptionSystem } from "../e2ee/sharedKeyManagement";
 import { E2eeType } from "../e2ee/e2eeType";
@@ -68,24 +69,22 @@ import { LivekitRoomAudioRenderer } from "../livekit/MatrixAudioRenderer.tsx";
 import { muteAllAudio$ } from "../state/MuteAllAudioModel.ts";
 import { useMediaDevices } from "../MediaDevicesContext.ts";
 import { EarpieceOverlay } from "./EarpieceOverlay.tsx";
-import {
-  useAppBarHidden,
-  useAppBarSecondaryButton,
-  useAppBarSubtitle,
-} from "../AppBar.tsx";
+import { useAppBarHidden, useAppBarSecondaryButton } from "../AppBar.tsx";
 import { useBehavior } from "../useBehavior.ts";
-import { constant } from "../state/Behavior.ts";
 import { Toast } from "../Toast.tsx";
 import overlayStyles from "../Overlay.module.css";
+import { prefetchSounds } from "../soundUtils";
+import { useAudioContext } from "../useAudioContext";
+import ringtoneMp3 from "../sound/ringtone.mp3?url";
+import ringtoneOgg from "../sound/ringtone.ogg?url";
 import { useTrackProcessorObservable$ } from "../livekit/TrackProcessorContext.tsx";
 import { type Layout } from "../state/layout-types.ts";
 import { ObservableScope } from "../state/ObservableScope.ts";
+import { useLatest } from "../useLatest.ts";
 import { CallFooter, type FooterSnapshot } from "../components/CallFooter.tsx";
 import { SettingsIconButton } from "../button/Button.tsx";
 import { createCallFooterViewModel } from "../components/CallFooterViewModel.tsx";
 import { type ViewModel } from "../state/ViewModel.ts";
-import { RingingStatus } from "../tile/RingingStatus.tsx";
-import { RingingAudioRenderer } from "./RingingAudioRenderer.tsx";
 
 declare module "react" {
   interface CSSProperties {
@@ -94,6 +93,8 @@ declare module "react" {
   }
 }
 
+const logger = rootLogger.getChild("[InCallView]");
+
 export interface ActiveCallProps extends Omit<
   InCallViewProps,
   "vm" | "livekitRoom" | "connState" | "footerVm"
@@ -114,7 +115,7 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {
   const mediaDevices = useMediaDevices();
   const trackProcessorState$ = useTrackProcessorObservable$();
   useEffect(() => {
-    rootLogger.info("START CALL VIEW SCOPE");
+    logger.info("START CALL VIEW SCOPE");
     const scope = new ObservableScope();
     const reactionsReader = new ReactionsReader(scope, props.rtcSession);
     const { autoLeaveWhenOthersLeft, waitForCallPickup, sendNotificationType } =
@@ -216,7 +217,6 @@ export const InCallView: FC<InCallViewProps> = ({
   muteStates,
   onShareClick,
 }) => {
-  const logger = rootLogger.getChild("[InCallView]");
   const { t } = useTranslation();
   const { sendReaction, toggleRaisedHand } = useReactionsSender();
 
@@ -240,6 +240,20 @@ export const InCallView: FC<InCallViewProps> = ({
   const { showControls, header: headerStyle } = useUrlParams();
 
   const muteAllAudio = useBehavior(muteAllAudio$);
+
+  // Preload a waiting and decline sounds
+  const pickupPhaseSoundCache = useInitial(async () => {
+    return prefetchSounds({
+      waiting: { mp3: ringtoneMp3, ogg: ringtoneOgg },
+    });
+  });
+
+  const pickupPhaseAudio = useAudioContext({
+    sounds: pickupPhaseSoundCache,
+    latencyHint: "interactive",
+    muted: muteAllAudio,
+  });
+  const latestPickupPhaseAudio = useLatest(pickupPhaseAudio);
   const toggleAudio = useBehavior(muteStates.audio.toggle$);
   const toggleVideo = useBehavior(muteStates.video.toggle$);
   const setAudioEnabled = useBehavior(muteStates.audio.setEnabled$);
@@ -252,13 +266,12 @@ export const InCallView: FC<InCallViewProps> = ({
     () => void toggleRaisedHand(),
   );
 
-  const ringingVm = useBehavior(vm.ringingVm$);
+  const ringing = useBehavior(vm.ringing$);
   const audioParticipants = useBehavior(vm.livekitRoomItems$);
   const participantCount = useBehavior(vm.participantCount$);
   const reconnecting = useBehavior(vm.reconnecting$);
   const layout = useBehavior(vm.layout$);
   const edgeToEdge = useBehavior(vm.edgeToEdge$);
-  const overflowing = useBehavior(vm.overflowing$);
   const showNameTags = useBehavior(vm.showNameTags$);
   const showHeader = useBehavior(vm.showHeader$);
   const settingsOpen = useBehavior(vm.settingsOpen$);
@@ -273,6 +286,22 @@ export const InCallView: FC<InCallViewProps> = ({
     throw fatalCallError;
   }
 
+  // While ringing, loop the ringtone
+  useEffect((): void | (() => void) => {
+    const audio = latestPickupPhaseAudio.current;
+    if (ringing && audio) {
+      const endSound = audio.playSoundLooping(
+        "waiting",
+        audio.soundDuration["waiting"] ?? 1,
+      );
+      return () => {
+        void endSound().catch((e) => {
+          logger.error("Failed to stop ringing sound", e);
+        });
+      };
+    }
+  }, [ringing, latestPickupPhaseAudio]);
+
   // iOS Safari doesn't reliably fire `click` on plain <div>s, so we listen
   // for `pointerup` instead. Scrolls end in `pointercancel`, not `pointerup`,
   // so this still only fires for taps.
@@ -334,11 +363,6 @@ export const InCallView: FC<InCallViewProps> = ({
   );
 
   useAppBarHidden(!showHeader);
-  useAppBarSubtitle(
-    ringingVm && vm.ringingStatusLocation === "app_bar" && (
-      <RingingStatus vm={ringingVm} />
-    ),
-  );
 
   let header: ReactNode = null;
   switch (headerStyle) {
@@ -433,12 +457,6 @@ export const InCallView: FC<InCallViewProps> = ({
         );
         const showSpeakingIndicators = useBehavior(vm.showSpeakingIndicators$);
         const showNameTags = useBehavior(vm.showNameTags$);
-        const showRingingStatus = vm.ringingStatusLocation === "tile";
-        const showOutline = useBehavior(
-          model instanceof GridTileViewModel
-            ? model.showOutline$
-            : constant(false),
-        );
 
         return model instanceof GridTileViewModel ? (
           <GridTile
@@ -451,8 +469,6 @@ export const InCallView: FC<InCallViewProps> = ({
             style={style}
             showSpeakingIndicators={showSpeakingIndicators}
             showNameTags={showNameTags}
-            showRingingStatus={showRingingStatus}
-            showOutline={showOutline}
             focusable={!contentObscured}
           />
         ) : (
@@ -465,10 +481,8 @@ export const InCallView: FC<InCallViewProps> = ({
             targetHeight={targetHeight}
             showIndicators={showSpotlightIndicators}
             showNameTags={showNameTags}
-            showRingingStatus={showRingingStatus}
             focusable={!contentObscured}
             className={classNames(className, styles.tile)}
-            itemClassName={styles.spotlightItem}
             style={style}
           />
         );
@@ -493,9 +507,7 @@ export const InCallView: FC<InCallViewProps> = ({
     if (layout.type === "pip") {
       return (
         <SpotlightTile
-          className={styles.tile}
-          itemClassName={styles.spotlightItem}
-          data-maximised
+          className={classNames(styles.tile, styles.maximised)}
           vm={layout.spotlight}
           expanded
           onToggleExpanded={null}
@@ -503,7 +515,6 @@ export const InCallView: FC<InCallViewProps> = ({
           targetHeight={gridBounds.height}
           showIndicators={false}
           showNameTags={showNameTags}
-          showRingingStatus={vm.ringingStatusLocation === "tile"}
           focusable={!contentObscured}
           aria-hidden={contentObscured}
         />
@@ -587,7 +598,7 @@ export const InCallView: FC<InCallViewProps> = ({
 
   // Only hide the settings button if we have an AppBar header and we are showing the header
   const footer = footerVm !== null && (
-    <CallFooter className={styles.footer} ref={footerRef} vm={footerVm} />
+    <CallFooter ref={footerRef} vm={footerVm} />
   );
   const allConnections = useBehavior(vm.allConnections$);
 
@@ -596,9 +607,7 @@ export const InCallView: FC<InCallViewProps> = ({
     // and the footer is also viewable by moving focus into it, so this is fine.
     // eslint-disable-next-line jsx-a11y/no-static-element-interactions
     <div
-      className={classNames(styles.inRoom, {
-        [styles.overflowing]: overflowing,
-      })}
+      className={styles.inRoom}
       ref={containerRef}
       onPointerUp={onViewPointerUp}
       onPointerMove={onPointerMove}
@@ -617,7 +626,6 @@ export const InCallView: FC<InCallViewProps> = ({
       {renderContent()}
       <CallEventAudioRenderer vm={vm} muted={muteAllAudio} />
       <ReactionsAudioRenderer vm={vm} muted={muteAllAudio} />
-      <RingingAudioRenderer vm={ringingVm} muted={muteAllAudio} />
       {reconnectingToast}
       {earpieceOverlay}
       <ReactionsOverlay vm={vm} />

src/room/LobbyView.test.tsx

@@ -11,10 +11,6 @@ import { BrowserRouter } from "react-router-dom";
 import { TooltipProvider } from "@vector-im/compound-web";
 import { type MatrixClient } from "matrix-js-sdk";
 import { axe } from "vitest-axe";
-import {
-  ArrowLeftIcon,
-  ChevronLeftIcon,
-} from "@vector-im/compound-design-tokens/assets/web/icons";
 
 import { LobbyView } from "./LobbyView";
 import { E2eeType } from "../e2ee/e2eeType";
@@ -24,7 +20,6 @@ import { type ProcessorState } from "../livekit/TrackProcessorContext";
 import { type EncryptionSystem } from "../e2ee/sharedKeyManagement";
 import lobbyStyles from "./LobbyView.module.css";
 import headerStyles from "../Header.module.css";
-import { AppBar } from "../AppBar";
 
 vi.mock("@livekit/components-react", () => ({
   usePreviewTracks: (): unknown[] => [],
@@ -52,13 +47,6 @@ const mockClient = {
   getDeviceId: () => "DEVICE",
 } as Partial<MatrixClient> as MatrixClient;
 
-const platformMock = vi.hoisted(() => vi.fn(() => "desktop"));
-vi.mock("../Platform", () => ({
-  get platform(): string {
-    return platformMock();
-  },
-}));
-
 const matrixInfo = {
   userId: "@user:example.org",
   displayName: "Test User",
@@ -72,32 +60,25 @@ const matrixInfo = {
 
 function renderLobbyView(
   props: Partial<Parameters<typeof LobbyView>[0]> = {},
-  withAppBar = false,
-  platform = "android",
 ): ReturnType<typeof render> {
-  platformMock.mockReturnValue(platform);
   const mediaDevices = mockMediaDevices({});
   const muteStates = mockMuteStates();
-  const hideHeader = withAppBar ? true : false;
-  const lobbyView = (
-    <LobbyView
-      client={mockClient}
-      matrixInfo={matrixInfo}
-      muteStates={muteStates}
-      onEnter={() => {}}
-      confineToRoom={false}
-      hideHeader={hideHeader}
-      participantCount={3}
-      onShareClick={null}
-      {...props}
-    />
-  );
+
   return render(
     <BrowserRouter>
       <MediaDevicesContext value={mediaDevices}>
         <TooltipProvider>
-          {withAppBar && <AppBar>{lobbyView}</AppBar>}
-          {!withAppBar && lobbyView}
+          <LobbyView
+            client={mockClient}
+            matrixInfo={matrixInfo}
+            muteStates={muteStates}
+            onEnter={() => {}}
+            confineToRoom={false}
+            hideHeader={false}
+            participantCount={3}
+            onShareClick={null}
+            {...props}
+          />
         </TooltipProvider>
       </MediaDevicesContext>
     </BrowserRouter>,
@@ -116,10 +97,9 @@ describe("LobbyView", () => {
 
   it("renders without header", () => {
     const { container } = renderLobbyView({ hideHeader: true });
-    const els = container.getElementsByClassName(headerStyles.header);
-    for (const el of els) {
-      expect(el).not.toBeVisible();
-    }
+    expect(
+      container.getElementsByClassName(headerStyles.header).length,
+    ).toBeFalsy();
   });
 
   it("renders with waiting for invite state", () => {
@@ -128,50 +108,4 @@ describe("LobbyView", () => {
     });
     expect(getByTestId("lobby_joinCall")).toHaveClass(lobbyStyles.wait);
   });
-
-  it("renders with AppBar android", async () => {
-    const { container, getByRole } = renderLobbyView(
-      {
-        waitingForInvite: true,
-      },
-      true,
-      "android",
-    );
-    getByRole("banner");
-    // Check that the primary button uses ArrowLeftIcon (the back/return icon),
-    // not the default CollapseIcon
-    const { container: iconContainer } = render(<ArrowLeftIcon />);
-    const expectedSvgPath = iconContainer
-      .querySelector("path")!
-      .getAttribute("d");
-    const primaryButtonSvgPath = container
-      .querySelector("path")
-      ?.getAttribute("d");
-    expect(primaryButtonSvgPath).toBe(expectedSvgPath);
-    expect(container).toMatchSnapshot();
-    expect(await axe(container)).toHaveNoViolations();
-  });
-
-  it("renders with AppBar ios", async () => {
-    const { container, getByRole } = renderLobbyView(
-      {
-        waitingForInvite: true,
-      },
-      true,
-      "ios",
-    );
-    getByRole("banner");
-    // Check that the primary button uses ArrowLeftIcon (the back/return icon),
-    // not the default CollapseIcon
-    const { container: iconContainer } = render(<ChevronLeftIcon />);
-    const expectedSvgPath = iconContainer
-      .querySelector("path")!
-      .getAttribute("d");
-    const primaryButtonSvgPath = container
-      .querySelector("path")
-      ?.getAttribute("d");
-    expect(primaryButtonSvgPath).toBe(expectedSvgPath);
-    expect(container).toMatchSnapshot();
-    expect(await axe(container)).toHaveNoViolations();
-  });
 });

src/room/LobbyView.tsx

@@ -51,7 +51,6 @@ import { CallFooter, type FooterSnapshot } from "../components/CallFooter";
 import { useCallViewKeyboardShortcuts } from "../useCallViewKeyboardShortcuts";
 import { createLobbyFooterViewModel } from "../components/CallFooterViewModel";
 import { type ViewModel } from "../state/ViewModel";
-import { useAppBarPrimaryButtonIconKind } from "../AppBar";
 
 interface Props {
   client: MatrixClient;
@@ -86,9 +85,8 @@ export const LobbyView: FC<Props> = ({
   }, []);
 
   const { t } = useTranslation();
-
   usePageTitle(matrixInfo.roomName);
-  useAppBarPrimaryButtonIconKind("back");
+
   const audioEnabled = useBehavior(muteStates.audio.enabled$);
   const videoEnabled = useBehavior(muteStates.video.enabled$);
   const toggleAudio = useBehavior(muteStates.audio.toggle$);

src/room/RingingAudioRenderer.test.tsx

@@ -1,59 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { expect, type MockedFunction, test, vi } from "vitest";
-import { act, render } from "@testing-library/react";
-import { BehaviorSubject } from "rxjs";
-
-import { useAudioContext } from "../useAudioContext";
-import { createRingingMedia } from "../state/media/RingingMediaViewModel";
-import { alice, aliceId } from "../utils/test-fixtures";
-import { constant } from "../state/Behavior";
-import { RingingAudioRenderer } from "./RingingAudioRenderer";
-import { prefetchSounds } from "../soundUtils";
-
-vi.mock("../useAudioContext");
-vi.mock("../soundUtils");
-
-test("ringtone plays on loop while ringing", () => {
-  (prefetchSounds as MockedFunction<typeof prefetchSounds>).mockResolvedValue({
-    sound: new ArrayBuffer(0),
-  });
-  const endSoundLooping = vi.fn().mockReturnValue(Promise.resolve());
-  const playSoundLooping = vi.fn().mockReturnValue(endSoundLooping);
-  (useAudioContext as MockedFunction<typeof useAudioContext>).mockReturnValue({
-    playSound: vi.fn(),
-    playSoundLooping,
-    soundDuration: {},
-  });
-
-  const pickupState$ = new BehaviorSubject<"ringing" | "timeout" | "decline">(
-    "ringing",
-  );
-  const vm = createRingingMedia({
-    id: aliceId,
-    userId: alice.userId,
-    displayName$: constant("Alice"),
-    mxcAvatarUrl$: constant(undefined),
-    intent: "audio",
-    pickupState$,
-  });
-
-  // Begin ringing
-  render(<RingingAudioRenderer vm={vm} muted={false} />);
-  expect(playSoundLooping).toHaveBeenCalledExactlyOnceWith(
-    "ringtone",
-    expect.any(Number),
-  );
-  expect(endSoundLooping).not.toHaveBeenCalled();
-  vi.clearAllMocks();
-
-  // End ringing
-  act(() => pickupState$.next("decline"));
-  expect(playSoundLooping).not.toHaveBeenCalled();
-  expect(endSoundLooping).toHaveBeenCalledExactlyOnceWith();
-});

src/room/RingingAudioRenderer.tsx

@@ -1,72 +0,0 @@
-/*
-Copyright 2026 Element Creations Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { useEffect, type FC } from "react";
-import { logger } from "matrix-js-sdk/lib/logger";
-
-import { type RingingMediaViewModel } from "../state/media/RingingMediaViewModel";
-import { useBehavior } from "../useBehavior";
-import { useInitial } from "../useInitial";
-import { prefetchSounds } from "../soundUtils";
-import ringtoneMp3 from "../sound/ringtone.mp3?url";
-import ringtoneOgg from "../sound/ringtone.ogg?url";
-import { type UseAudioContext, useAudioContext } from "../useAudioContext";
-import { useLatest } from "../useLatest";
-
-interface RingingAudioRendererProps {
-  vm: RingingMediaViewModel | null;
-  muted: boolean;
-}
-
-export const RingingAudioRenderer: FC<RingingAudioRendererProps> = ({
-  vm,
-  muted,
-}) => {
-  // Preload a waiting and decline sounds
-  const sounds = useInitial(async () => {
-    return prefetchSounds({
-      ringtone: { mp3: ringtoneMp3, ogg: ringtoneOgg },
-    });
-  });
-  const audio = useAudioContext({
-    sounds,
-    latencyHint: "interactive",
-    muted,
-  });
-
-  return vm && <ActiveRingingAudioRenderer vm={vm} audio={audio} />;
-};
-
-interface ActiveRingingAudioRendererProps {
-  vm: RingingMediaViewModel;
-  audio: UseAudioContext<"ringtone"> | null;
-}
-
-const ActiveRingingAudioRenderer: FC<ActiveRingingAudioRendererProps> = ({
-  vm,
-  audio,
-}) => {
-  const audio_ = useLatest(audio);
-  const pickupState = useBehavior(vm.pickupState$);
-
-  // While ringing, loop the ringtone
-  useEffect((): void | (() => void) => {
-    if (pickupState === "ringing" && audio_.current) {
-      const endSound = audio_.current.playSoundLooping(
-        "ringtone",
-        audio_.current.soundDuration["ringtone"] ?? 1,
-      );
-      return () => {
-        void endSound().catch((e) => {
-          logger.error("Failed to stop ringing sound", e);
-        });
-      };
-    }
-  }, [pickupState, audio_]);
-
-  return null;
-};

src/room/__snapshots__/GroupCallErrorBoundary.test.tsx.snap

@@ -3,17 +3,17 @@
 exports[`ConnectionLostError: Action handling should reset error state 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -95,20 +95,20 @@ exports[`ConnectionLostError: Action handling should reset error state 1`] = `
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -161,17 +161,17 @@ exports[`ConnectionLostError: Action handling should reset error state 1`] = `
 exports[`LiveKit ConnectionError variants > should display LiveKit 'internal' error correctly 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -253,20 +253,20 @@ exports[`LiveKit ConnectionError variants > should display LiveKit 'internal' er
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -318,17 +318,17 @@ exports[`LiveKit ConnectionError variants > should display LiveKit 'internal' er
 exports[`LiveKit ConnectionError variants > should display LiveKit 'notAllowed' error correctly 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -410,20 +410,20 @@ exports[`LiveKit ConnectionError variants > should display LiveKit 'notAllowed'
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -475,17 +475,17 @@ exports[`LiveKit ConnectionError variants > should display LiveKit 'notAllowed'
 exports[`LiveKit ConnectionError variants > should display LiveKit 'serverUnreachable' error correctly 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -567,20 +567,20 @@ exports[`LiveKit ConnectionError variants > should display LiveKit 'serverUnreac
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -632,17 +632,17 @@ exports[`LiveKit ConnectionError variants > should display LiveKit 'serverUnreac
 exports[`LiveKit ConnectionError variants > should display LiveKit 'serviceNotFound' error correctly 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -724,20 +724,20 @@ exports[`LiveKit ConnectionError variants > should display LiveKit 'serviceNotFo
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -789,17 +789,17 @@ exports[`LiveKit ConnectionError variants > should display LiveKit 'serviceNotFo
 exports[`LiveKit ConnectionError variants > should display LiveKit 'timeout' error correctly 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -881,20 +881,20 @@ exports[`LiveKit ConnectionError variants > should display LiveKit 'timeout' err
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -946,17 +946,17 @@ exports[`LiveKit ConnectionError variants > should display LiveKit 'timeout' err
 exports[`LiveKit ConnectionError variants > should link to troubleshoot guide when timeout error 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -1038,20 +1038,20 @@ exports[`LiveKit ConnectionError variants > should link to troubleshoot guide wh
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -1103,17 +1103,17 @@ exports[`LiveKit ConnectionError variants > should link to troubleshoot guide wh
 exports[`should have a close button in widget mode 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -1195,20 +1195,20 @@ exports[`should have a close button in widget mode 1`] = `
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -1257,17 +1257,17 @@ exports[`should have a close button in widget mode 1`] = `
 exports[`should render the error page with link back to home 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -1349,20 +1349,20 @@ exports[`should render the error page with link back to home 1`] = `
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -1411,17 +1411,17 @@ exports[`should render the error page with link back to home 1`] = `
 exports[`should report correct error for 'Call is not supported' 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -1503,20 +1503,20 @@ exports[`should report correct error for 'Call is not supported' 1`] = `
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -1565,17 +1565,17 @@ exports[`should report correct error for 'Call is not supported' 1`] = `
 exports[`should report correct error for 'Connection lost' 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -1657,20 +1657,20 @@ exports[`should report correct error for 'Connection lost' 1`] = `
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -1723,17 +1723,17 @@ exports[`should report correct error for 'Connection lost' 1`] = `
 exports[`should report correct error for 'Homeserver does not support Matrix 2.…' 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -1815,20 +1815,20 @@ exports[`should report correct error for 'Homeserver does not support Matrix 2.
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -1877,17 +1877,17 @@ exports[`should report correct error for 'Homeserver does not support Matrix 2.
 exports[`should report correct error for 'Incompatible browser' 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -1969,20 +1969,20 @@ exports[`should report correct error for 'Incompatible browser' 1`] = `
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >
@@ -2026,17 +2026,17 @@ exports[`should report correct error for 'Incompatible browser' 1`] = `
 exports[`should report correct error for 'Insufficient capacity' 1`] = `
 <DocumentFragment>
   <div
-    class="_page_4be5c0"
+    class="page"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <a
           aria-label="Element Call Home"
-          class="_headerLogo_e4b327"
+          class="headerLogo"
           data-discover="true"
           href="/"
         >
@@ -2118,20 +2118,20 @@ exports[`should report correct error for 'Insufficient capacity' 1`] = `
         </a>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_container_4be5c0"
+      class="container"
     >
       <div
-        class="_content_4be5c0"
+        class="content"
       >
         <div
-          class="_error_a69dc5"
+          class="error"
         >
           <div
-            class="_big-icon_1ssbv_8 _icon_a69dc5"
+            class="_big-icon_1ssbv_8 icon"
             data-kind="primary"
             data-size="lg"
           >

src/room/__snapshots__/InCallView.test.tsx.snap

@@ -3,28 +3,28 @@
 exports[`InCallView > rendering > renders 1`] = `
 <div>
   <div
-    class="_inRoom_4e7ff8"
+    class="inRoom"
   >
     <header
-      class="_header_e4b327 _header_4e7ff8"
+      class="header header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <div
-          class="_roomHeaderInfo_e4b327"
+          class="roomHeaderInfo"
           data-size="lg"
         >
           <span
             aria-label=""
-            class="_avatar_va14e_8 _roomAvatar_e4b327 _avatar-imageless_va14e_55"
+            class="_avatar_va14e_8 roomAvatar _avatar-imageless_va14e_55"
             data-color="1"
             data-type="round"
             role="img"
             style="--cpd-avatar-size: 56px;"
           />
           <div
-            class="_nameLine_e4b327"
+            class="nameLine"
           >
             <h1
               class="_typography_6v6n8_153 _font-heading-md-semibold_6v6n8_112"
@@ -35,7 +35,7 @@ exports[`InCallView > rendering > renders 1`] = `
             >
               <svg
                 aria-labelledby="_r_0_"
-                class="_lock_edc97d"
+                class="lock"
                 data-encrypted="false"
                 fill="currentColor"
                 height="16"
@@ -50,7 +50,7 @@ exports[`InCallView > rendering > renders 1`] = `
             </span>
           </div>
           <div
-            class="_participantsLine_e4b327"
+            class="participantsLine"
           >
             <svg
               aria-label="Participants"
@@ -80,21 +80,21 @@ exports[`InCallView > rendering > renders 1`] = `
         </div>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_scrollingGrid_4e7ff8 _grid_b0d1cd"
+      class="scrollingGrid grid"
     >
       <div
-        class="_layer_b00c5f"
+        class="layer"
       >
         <div
-          class="_container_b00c5f _slot_b0d1cd"
+          class="container slot"
           data-id="1"
         >
           <div
-            class="_slot_b00c5f _local_b00c5f _slot_b0d1cd"
+            class="slot local slot"
             data-block-alignment="start"
             data-id="0"
             data-inline-alignment="end"
@@ -103,22 +103,22 @@ exports[`InCallView > rendering > renders 1`] = `
       </div>
     </div>
     <div
-      class="_fixedGrid_4e7ff8 _grid_b0d1cd"
+      class="fixedGrid grid"
       style="inset-block-start: NaNpx;"
     >
       <div />
     </div>
     <div
-      class="_bg_2f5303 _animate_2f5303"
+      class="bg animate"
       data-state="closed"
     />
     <div
       aria-hidden="true"
-      class="_overlay_eb6724"
+      class="overlay"
       data-show="false"
     >
       <div
-        class="_big-icon_1ssbv_8 _icon_eb6724"
+        class="_big-icon_1ssbv_8 icon"
         data-kind="primary"
         data-size="lg"
       >
@@ -157,22 +157,22 @@ exports[`InCallView > rendering > renders 1`] = `
         Back to Speaker Mode
       </button>
       <div
-        class="_spacer_eb6724"
+        class="spacer"
       />
     </div>
     <div
-      class="_container_8084b5"
+      class="container"
     />
     <div
-      class="_footer_4e7ff8 _footer_20b7b4"
+      class="footer"
       data-testid="footer-container"
     >
       <div
-        class="_settingsLogoContainer_20b7b4"
+        class="settingsLogoContainer"
       >
         <button
           aria-labelledby="_r_8_"
-          class="_icon-button_1215g_8 _settingsOnlyShowWide_20b7b4"
+          class="_icon-button_1215g_8 settingsOnlyShowWide"
           data-kind="secondary"
           data-testid="settings-bottom-left"
           role="button"
@@ -198,7 +198,7 @@ exports[`InCallView > rendering > renders 1`] = `
           </div>
         </button>
         <div
-          class="_logo_20b7b4"
+          class="logo"
         >
           <svg
             aria-hidden="true"
@@ -303,11 +303,11 @@ exports[`InCallView > rendering > renders 1`] = `
         </div>
       </div>
       <div
-        class="_buttons_20b7b4"
+        class="buttons"
       >
         <button
           aria-labelledby="_r_d_"
-          class="_button_1nw83_8 _settingsOnlyShowNarrow_20b7b4 _has-icon_1nw83_60 _icon-only_1nw83_53"
+          class="_button_1nw83_8 settingsOnlyShowNarrow _has-icon_1nw83_60 _icon-only_1nw83_53"
           data-kind="secondary"
           data-size="lg"
           data-testid="settings-bottom-center"
@@ -382,7 +382,7 @@ exports[`InCallView > rendering > renders 1`] = `
           aria-expanded="false"
           aria-haspopup="true"
           aria-labelledby="_r_s_"
-          class="_button_1nw83_8 _raiseHand_20b7b4 _has-icon_1nw83_60 _icon-only_1nw83_53"
+          class="_button_1nw83_8 raiseHand _has-icon_1nw83_60 _icon-only_1nw83_53"
           data-kind="secondary"
           data-size="lg"
           role="button"
@@ -405,7 +405,7 @@ exports[`InCallView > rendering > renders 1`] = `
         </button>
         <button
           aria-labelledby="_r_14_"
-          class="_button_1nw83_8 _endCall_204dcb _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
+          class="_button_1nw83_8 endCall _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
           data-kind="primary"
           data-size="lg"
           data-testid="incall_leave"
@@ -428,7 +428,7 @@ exports[`InCallView > rendering > renders 1`] = `
       </div>
       <fieldset
         aria-label="Layout"
-        class="_toggle_13rnk_9 _layout_20b7b4"
+        class="_toggle_13rnk_9 layout"
         data-size="lg"
       >
         <input

src/room/__snapshots__/LobbyView.test.tsx.snap

@@ -1,485 +1,23 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`LobbyView > renders with AppBar android 1`] = `
-<div>
-  <div
-    class="_bar_221541"
-  >
-    <header>
-      <button
-        aria-labelledby="_r_36_"
-        class="_icon-button_1215g_8 _primaryButton_221541"
-        data-kind="primary"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_147l5_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M12.207 5.293a1 1 0 0 1 0 1.414L7.914 11H18.5a1 1 0 1 1 0 2H7.914l4.293 4.293a1 1 0 0 1-1.414 1.414l-6-6a1 1 0 0 1 0-1.414l6-6a1 1 0 0 1 1.414 0"
-            />
-          </svg>
-        </div>
-      </button>
-      <div
-        class="_secondaryButton_221541"
-      />
-    </header>
-  </div>
-  <div
-    class="_inRoom_4e7ff8"
-  >
-    <div
-      class="_content_f9ee84"
-    >
-      <div
-        class="_preview_dd2178"
-      >
-        <video
-          disablepictureinpicture=""
-          playsinline=""
-          tabindex="-1"
-        />
-        <div
-          class="_avatarContainer_dd2178"
-        >
-          <div>
-            <span
-              aria-label="@user:example.org"
-              class="_avatar_va14e_8 _avatar-imageless_va14e_55"
-              data-color="6"
-              data-type="round"
-              role="img"
-              style="--cpd-avatar-size: NaNpx;"
-            >
-              T
-            </span>
-          </div>
-        </div>
-        <div
-          class="_buttonBar_dd2178"
-        >
-          <button
-            aria-disabled="true"
-            class="_button_1nw83_8 _join_f9ee84 _wait_f9ee84"
-            data-kind="primary"
-            data-size="md"
-            data-testid="lobby_joinCall"
-            role="button"
-            tabindex="0"
-          >
-            Join call
-          </button>
-        </div>
-      </div>
-      <a
-        class="_link_k9ljz_8"
-        data-kind="primary"
-        data-size="md"
-        href="/"
-        rel="noreferrer noopener"
-      >
-        Back to recents
-      </a>
-    </div>
-    <div
-      class="_footer_20b7b4"
-      data-testid="footer-container"
-    >
-      <div
-        class="_settingsLogoContainer_20b7b4"
-      >
-        <button
-          aria-labelledby="_r_3c_"
-          class="_icon-button_1215g_8 _settingsOnlyShowWide_20b7b4"
-          data-kind="secondary"
-          data-testid="settings-bottom-left"
-          role="button"
-          style="--cpd-icon-button-size: 32px;"
-          tabindex="0"
-        >
-          <div
-            class="_indicator-icon_147l5_17"
-            style="--cpd-icon-button-size: 100%;"
-          >
-            <svg
-              aria-hidden="true"
-              fill="currentColor"
-              height="1em"
-              viewBox="0 0 24 24"
-              width="1em"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M12 20q-.825 0-1.412-.587A1.93 1.93 0 0 1 10 18q0-.824.588-1.413A1.93 1.93 0 0 1 12 16q.825 0 1.412.587Q14 17.176 14 18t-.588 1.413A1.93 1.93 0 0 1 12 20m0-6q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m0-6q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 6q0-.824.588-1.412A1.93 1.93 0 0 1 12 4q.825 0 1.412.588Q14 5.175 14 6q0 .824-.588 1.412A1.93 1.93 0 0 1 12 8"
-              />
-            </svg>
-          </div>
-        </button>
-      </div>
-      <div
-        class="_buttons_20b7b4"
-      >
-        <button
-          aria-labelledby="_r_3h_"
-          class="_button_1nw83_8 _settingsOnlyShowNarrow_20b7b4 _has-icon_1nw83_60 _icon-only_1nw83_53"
-          data-kind="secondary"
-          data-size="lg"
-          data-testid="settings-bottom-center"
-          role="button"
-          tabindex="0"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="24"
-            viewBox="0 0 24 24"
-            width="24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M12 20q-.825 0-1.412-.587A1.93 1.93 0 0 1 10 18q0-.824.588-1.413A1.93 1.93 0 0 1 12 16q.825 0 1.412.587Q14 17.176 14 18t-.588 1.413A1.93 1.93 0 0 1 12 20m0-6q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m0-6q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 6q0-.824.588-1.412A1.93 1.93 0 0 1 12 4q.825 0 1.412.588Q14 5.175 14 6q0 .824-.588 1.412A1.93 1.93 0 0 1 12 8"
-            />
-          </svg>
-        </button>
-        <button
-          aria-busy="false"
-          aria-checked="false"
-          aria-disabled="true"
-          aria-labelledby="_r_3m_"
-          class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53"
-          data-kind="primary"
-          data-size="lg"
-          data-testid="incall_mute"
-          role="switch"
-          tabindex="0"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="24"
-            viewBox="0 0 24 24"
-            width="24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M8 8v-.006l6.831 6.832-.002.002 1.414 1.415.003-.003 1.414 1.414-.003.003L20.5 20.5a1 1 0 0 1-1.414 1.414l-3.022-3.022A7.95 7.95 0 0 1 13 19.938V21a1 1 0 0 1-2 0v-1.062A8 8 0 0 1 4 12a1 1 0 1 1 2 0 6 6 0 0 0 8.587 5.415l-1.55-1.55A4.005 4.005 0 0 1 8 12v-1.172L2.086 4.914A1 1 0 0 1 3.5 3.5zm9.417 6.583 1.478 1.477A7.96 7.96 0 0 0 20 12a1 1 0 0 0-2 0c0 .925-.21 1.8-.583 2.583M8.073 5.238l7.793 7.793q.132-.495.134-1.031V6a4 4 0 0 0-7.927-.762"
-            />
-          </svg>
-        </button>
-        <button
-          aria-busy="false"
-          aria-checked="false"
-          aria-disabled="true"
-          aria-labelledby="_r_3r_"
-          class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53"
-          data-kind="primary"
-          data-size="lg"
-          data-testid="incall_videomute"
-          role="switch"
-          tabindex="0"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="24"
-            viewBox="0 0 24 24"
-            width="24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M2.747 2.753 4.35 4.355l.007-.003L18 17.994v.012l3.247 3.247a1 1 0 0 1-1.414 1.414l-2.898-2.898A2 2 0 0 1 16 20H6a4 4 0 0 1-4-4V8c0-.892.292-1.715.785-2.38L1.333 4.166a1 1 0 0 1 1.414-1.414M18 15.166 6.834 4H16a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-labelledby="_r_40_"
-          class="_button_1nw83_8 _endCall_204dcb _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
-          data-kind="primary"
-          data-size="lg"
-          data-testid="incall_leave"
-          role="button"
-          tabindex="0"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="24"
-            viewBox="0 0 24 24"
-            width="24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="m2.765 16.02-2.47-2.416A1.02 1.02 0 0 1 0 12.852q0-.456.295-.751a15.6 15.6 0 0 1 5.316-3.786A15.9 15.9 0 0 1 12 7q3.355 0 6.39 1.329a16 16 0 0 1 5.315 3.772q.295.294.295.751t-.295.752l-2.47 2.416a1.047 1.047 0 0 1-1.396.108l-3.114-2.363a1.1 1.1 0 0 1-.322-.376 1.1 1.1 0 0 1-.108-.483v-2.27a13.6 13.6 0 0 0-2.12-.524C13.459 9.996 12 9.937 12 9.937s-1.459.059-2.174.175q-1.074.174-2.121.523v2.271q0 .268-.108.483a1.1 1.1 0 0 1-.322.376l-3.114 2.363a1.047 1.047 0 0 1-1.396-.107"
-            />
-          </svg>
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`LobbyView > renders with AppBar ios 1`] = `
-<div>
-  <div
-    class="_bar_221541"
-  >
-    <header>
-      <button
-        aria-labelledby="_r_4a_"
-        class="_icon-button_1215g_8 _primaryButton_221541"
-        data-kind="primary"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
-      >
-        <div
-          class="_indicator-icon_147l5_17"
-          style="--cpd-icon-button-size: 100%;"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="m13.3 17.3-4.6-4.6a.9.9 0 0 1-.213-.325A1.1 1.1 0 0 1 8.425 12q0-.2.062-.375A.9.9 0 0 1 8.7 11.3l4.6-4.6a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7L10.8 12l3.9 3.9a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
-            />
-          </svg>
-        </div>
-      </button>
-      <div
-        class="_secondaryButton_221541"
-      />
-    </header>
-  </div>
-  <div
-    class="_inRoom_4e7ff8"
-  >
-    <div
-      class="_content_f9ee84"
-    >
-      <div
-        class="_preview_dd2178"
-      >
-        <video
-          disablepictureinpicture=""
-          playsinline=""
-          tabindex="-1"
-        />
-        <div
-          class="_avatarContainer_dd2178"
-        >
-          <div>
-            <span
-              aria-label="@user:example.org"
-              class="_avatar_va14e_8 _avatar-imageless_va14e_55"
-              data-color="6"
-              data-type="round"
-              role="img"
-              style="--cpd-avatar-size: NaNpx;"
-            >
-              T
-            </span>
-          </div>
-        </div>
-        <div
-          class="_buttonBar_dd2178"
-        >
-          <button
-            aria-disabled="true"
-            class="_button_1nw83_8 _join_f9ee84 _wait_f9ee84"
-            data-kind="primary"
-            data-size="md"
-            data-testid="lobby_joinCall"
-            role="button"
-            tabindex="0"
-          >
-            Join call
-          </button>
-        </div>
-      </div>
-      <a
-        class="_link_k9ljz_8"
-        data-kind="primary"
-        data-size="md"
-        href="/"
-        rel="noreferrer noopener"
-      >
-        Back to recents
-      </a>
-    </div>
-    <div
-      class="_footer_20b7b4"
-      data-testid="footer-container"
-    >
-      <div
-        class="_settingsLogoContainer_20b7b4"
-      >
-        <button
-          aria-labelledby="_r_4g_"
-          class="_icon-button_1215g_8 _settingsOnlyShowWide_20b7b4"
-          data-kind="secondary"
-          data-testid="settings-bottom-left"
-          role="button"
-          style="--cpd-icon-button-size: 32px;"
-          tabindex="0"
-        >
-          <div
-            class="_indicator-icon_147l5_17"
-            style="--cpd-icon-button-size: 100%;"
-          >
-            <svg
-              aria-hidden="true"
-              fill="currentColor"
-              height="1em"
-              viewBox="0 0 24 24"
-              width="1em"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
-              />
-            </svg>
-          </div>
-        </button>
-      </div>
-      <div
-        class="_buttons_20b7b4"
-      >
-        <button
-          aria-labelledby="_r_4l_"
-          class="_button_1nw83_8 _settingsOnlyShowNarrow_20b7b4 _has-icon_1nw83_60 _icon-only_1nw83_53"
-          data-kind="secondary"
-          data-size="lg"
-          data-testid="settings-bottom-center"
-          role="button"
-          tabindex="0"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="24"
-            viewBox="0 0 24 24"
-            width="24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
-            />
-          </svg>
-        </button>
-        <button
-          aria-busy="false"
-          aria-checked="false"
-          aria-disabled="true"
-          aria-labelledby="_r_4q_"
-          class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53"
-          data-kind="primary"
-          data-size="lg"
-          data-testid="incall_mute"
-          role="switch"
-          tabindex="0"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="24"
-            viewBox="0 0 24 24"
-            width="24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M8 8v-.006l6.831 6.832-.002.002 1.414 1.415.003-.003 1.414 1.414-.003.003L20.5 20.5a1 1 0 0 1-1.414 1.414l-3.022-3.022A7.95 7.95 0 0 1 13 19.938V21a1 1 0 0 1-2 0v-1.062A8 8 0 0 1 4 12a1 1 0 1 1 2 0 6 6 0 0 0 8.587 5.415l-1.55-1.55A4.005 4.005 0 0 1 8 12v-1.172L2.086 4.914A1 1 0 0 1 3.5 3.5zm9.417 6.583 1.478 1.477A7.96 7.96 0 0 0 20 12a1 1 0 0 0-2 0c0 .925-.21 1.8-.583 2.583M8.073 5.238l7.793 7.793q.132-.495.134-1.031V6a4 4 0 0 0-7.927-.762"
-            />
-          </svg>
-        </button>
-        <button
-          aria-busy="false"
-          aria-checked="false"
-          aria-disabled="true"
-          aria-labelledby="_r_4v_"
-          class="_button_1nw83_8 _has-icon_1nw83_60 _icon-only_1nw83_53"
-          data-kind="primary"
-          data-size="lg"
-          data-testid="incall_videomute"
-          role="switch"
-          tabindex="0"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="24"
-            viewBox="0 0 24 24"
-            width="24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M2.747 2.753 4.35 4.355l.007-.003L18 17.994v.012l3.247 3.247a1 1 0 0 1-1.414 1.414l-2.898-2.898A2 2 0 0 1 16 20H6a4 4 0 0 1-4-4V8c0-.892.292-1.715.785-2.38L1.333 4.166a1 1 0 0 1 1.414-1.414M18 15.166 6.834 4H16a2 2 0 0 1 2 2v4.286l3.35-2.871a1 1 0 0 1 1.65.76v7.65a1 1 0 0 1-1.65.76L18 13.715z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-labelledby="_r_54_"
-          class="_button_1nw83_8 _endCall_204dcb _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
-          data-kind="primary"
-          data-size="lg"
-          data-testid="incall_leave"
-          role="button"
-          tabindex="0"
-        >
-          <svg
-            aria-hidden="true"
-            fill="currentColor"
-            height="24"
-            viewBox="0 0 24 24"
-            width="24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="m2.765 16.02-2.47-2.416A1.02 1.02 0 0 1 0 12.852q0-.456.295-.751a15.6 15.6 0 0 1 5.316-3.786A15.9 15.9 0 0 1 12 7q3.355 0 6.39 1.329a16 16 0 0 1 5.315 3.772q.295.294.295.751t-.295.752l-2.47 2.416a1.047 1.047 0 0 1-1.396.108l-3.114-2.363a1.1 1.1 0 0 1-.322-.376 1.1 1.1 0 0 1-.108-.483v-2.27a13.6 13.6 0 0 0-2.12-.524C13.459 9.996 12 9.937 12 9.937s-1.459.059-2.174.175q-1.074.174-2.121.523v2.271q0 .268-.108.483a1.1 1.1 0 0 1-.322.376l-3.114 2.363a1.047 1.047 0 0 1-1.396-.107"
-            />
-          </svg>
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
 exports[`LobbyView > renders with header and participant count 1`] = `
 <div>
   <div
-    class="_inRoom_4e7ff8"
+    class="inRoom"
   >
     <header
-      class="_header_e4b327"
+      class="header"
     >
       <div
-        class="_nav_e4b327 _leftNav_e4b327"
+        class="nav leftNav"
       >
         <div
-          class="_roomHeaderInfo_e4b327"
+          class="roomHeaderInfo"
           data-size="lg"
         >
           <span
             aria-label="!room:example.org"
-            class="_avatar_va14e_8 _roomAvatar_e4b327 _avatar-imageless_va14e_55"
+            class="_avatar_va14e_8 roomAvatar _avatar-imageless_va14e_55"
             data-color="3"
             data-type="round"
             role="img"
@@ -488,7 +26,7 @@ exports[`LobbyView > renders with header and participant count 1`] = `
             T
           </span>
           <div
-            class="_nameLine_e4b327"
+            class="nameLine"
           >
             <h1
               class="_typography_6v6n8_153 _font-heading-md-semibold_6v6n8_112"
@@ -501,7 +39,7 @@ exports[`LobbyView > renders with header and participant count 1`] = `
             >
               <svg
                 aria-labelledby="_r_0_"
-                class="_lock_edc97d"
+                class="lock"
                 data-encrypted="false"
                 fill="currentColor"
                 height="16"
@@ -516,7 +54,7 @@ exports[`LobbyView > renders with header and participant count 1`] = `
             </span>
           </div>
           <div
-            class="_participantsLine_e4b327"
+            class="participantsLine"
           >
             <svg
               aria-label="Participants"
@@ -546,14 +84,14 @@ exports[`LobbyView > renders with header and participant count 1`] = `
         </div>
       </div>
       <div
-        class="_nav_e4b327 _rightNav_e4b327"
+        class="nav rightNav"
       />
     </header>
     <div
-      class="_content_f9ee84"
+      class="content"
     >
       <div
-        class="_preview_dd2178"
+        class="preview"
       >
         <video
           disablepictureinpicture=""
@@ -561,7 +99,7 @@ exports[`LobbyView > renders with header and participant count 1`] = `
           tabindex="-1"
         />
         <div
-          class="_avatarContainer_dd2178"
+          class="avatarContainer"
         >
           <div>
             <span
@@ -577,10 +115,10 @@ exports[`LobbyView > renders with header and participant count 1`] = `
           </div>
         </div>
         <div
-          class="_buttonBar_dd2178"
+          class="buttonBar"
         >
           <button
-            class="_button_1nw83_8 _join_f9ee84"
+            class="_button_1nw83_8 join"
             data-kind="primary"
             data-size="lg"
             data-testid="lobby_joinCall"
@@ -602,15 +140,15 @@ exports[`LobbyView > renders with header and participant count 1`] = `
       </a>
     </div>
     <div
-      class="_footer_20b7b4"
+      class="footer"
       data-testid="footer-container"
     >
       <div
-        class="_settingsLogoContainer_20b7b4"
+        class="settingsLogoContainer"
       >
         <button
           aria-labelledby="_r_6_"
-          class="_icon-button_1215g_8 _settingsOnlyShowWide_20b7b4"
+          class="_icon-button_1215g_8 settingsOnlyShowWide"
           data-kind="secondary"
           data-testid="settings-bottom-left"
           role="button"
@@ -630,13 +168,13 @@ exports[`LobbyView > renders with header and participant count 1`] = `
               xmlns="http://www.w3.org/2000/svg"
             >
               <path
-                d="M12 20q-.825 0-1.412-.587A1.93 1.93 0 0 1 10 18q0-.824.588-1.413A1.93 1.93 0 0 1 12 16q.825 0 1.412.587Q14 17.176 14 18t-.588 1.413A1.93 1.93 0 0 1 12 20m0-6q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m0-6q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 6q0-.824.588-1.412A1.93 1.93 0 0 1 12 4q.825 0 1.412.588Q14 5.175 14 6q0 .824-.588 1.412A1.93 1.93 0 0 1 12 8"
+                d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
               />
             </svg>
           </div>
         </button>
         <div
-          class="_logo_20b7b4"
+          class="logo"
         >
           <svg
             aria-hidden="true"
@@ -741,11 +279,11 @@ exports[`LobbyView > renders with header and participant count 1`] = `
         </div>
       </div>
       <div
-        class="_buttons_20b7b4"
+        class="buttons"
       >
         <button
           aria-labelledby="_r_b_"
-          class="_button_1nw83_8 _settingsOnlyShowNarrow_20b7b4 _has-icon_1nw83_60 _icon-only_1nw83_53"
+          class="_button_1nw83_8 settingsOnlyShowNarrow _has-icon_1nw83_60 _icon-only_1nw83_53"
           data-kind="secondary"
           data-size="lg"
           data-testid="settings-bottom-center"
@@ -761,7 +299,7 @@ exports[`LobbyView > renders with header and participant count 1`] = `
             xmlns="http://www.w3.org/2000/svg"
           >
             <path
-              d="M12 20q-.825 0-1.412-.587A1.93 1.93 0 0 1 10 18q0-.824.588-1.413A1.93 1.93 0 0 1 12 16q.825 0 1.412.587Q14 17.176 14 18t-.588 1.413A1.93 1.93 0 0 1 12 20m0-6q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m0-6q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 6q0-.824.588-1.412A1.93 1.93 0 0 1 12 4q.825 0 1.412.588Q14 5.175 14 6q0 .824-.588 1.412A1.93 1.93 0 0 1 12 8"
+              d="M6 14q-.824 0-1.412-.588A1.93 1.93 0 0 1 4 12q0-.825.588-1.412A1.93 1.93 0 0 1 6 10q.824 0 1.412.588Q8 11.175 8 12t-.588 1.412A1.93 1.93 0 0 1 6 14m6 0q-.825 0-1.412-.588A1.93 1.93 0 0 1 10 12q0-.825.588-1.412A1.93 1.93 0 0 1 12 10q.825 0 1.412.588Q14 11.175 14 12t-.588 1.412A1.93 1.93 0 0 1 12 14m6 0q-.824 0-1.413-.588A1.93 1.93 0 0 1 16 12q0-.825.587-1.412A1.93 1.93 0 0 1 18 10q.824 0 1.413.588Q20 11.175 20 12t-.587 1.412A1.93 1.93 0 0 1 18 14"
             />
           </svg>
         </button>
@@ -817,7 +355,7 @@ exports[`LobbyView > renders with header and participant count 1`] = `
         </button>
         <button
           aria-labelledby="_r_q_"
-          class="_button_1nw83_8 _endCall_204dcb _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
+          class="_button_1nw83_8 endCall _has-icon_1nw83_60 _icon-only_1nw83_53 _destructive_1nw83_110"
           data-kind="primary"
           data-size="lg"
           data-testid="incall_leave"

src/settings/__snapshots__/DeveloperSettingsTab.test.tsx.snap

@@ -18,10 +18,10 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
     Device ID: DEVICE123
   </p>
   <div
-    class="_fieldRow_1bd8c0"
+    class="fieldRow"
   >
     <div
-      class="_field_1bd8c0 _inputField_1bd8c0"
+      class="field inputField"
     >
       <input
         aria-describedby="_r_1_"
@@ -38,10 +38,10 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
     </div>
   </div>
   <div
-    class="_fieldRow_1bd8c0"
+    class="fieldRow"
   >
     <div
-      class="_field_1bd8c0 _checkboxField_1bd8c0"
+      class="field checkboxField"
     >
       <input
         aria-describedby="_r_2_"
@@ -52,7 +52,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
         for="debugTileLayout"
       >
         <div
-          class="_checkbox_1bd8c0"
+          class="checkbox"
         >
           <svg
             fill="none"
@@ -75,10 +75,10 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
     </div>
   </div>
   <div
-    class="_fieldRow_1bd8c0"
+    class="fieldRow"
   >
     <div
-      class="_field_1bd8c0 _checkboxField_1bd8c0"
+      class="field checkboxField"
     >
       <input
         aria-describedby="_r_3_"
@@ -89,7 +89,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
         for="showConnectionStats"
       >
         <div
-          class="_checkbox_1bd8c0"
+          class="checkbox"
         >
           <svg
             fill="none"
@@ -112,10 +112,10 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
     </div>
   </div>
   <div
-    class="_fieldRow_1bd8c0"
+    class="fieldRow"
   >
     <div
-      class="_field_1bd8c0 _checkboxField_1bd8c0"
+      class="field checkboxField"
     >
       <input
         aria-describedby="_r_4_"
@@ -126,7 +126,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
         for="muteAllAudio"
       >
         <div
-          class="_checkbox_1bd8c0"
+          class="checkbox"
         >
           <svg
             fill="none"
@@ -150,10 +150,10 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
   </div>
    
   <div
-    class="_fieldRow_1bd8c0"
+    class="fieldRow"
   >
     <div
-      class="_field_1bd8c0 _checkboxField_1bd8c0"
+      class="field checkboxField"
     >
       <input
         aria-describedby="_r_5_"
@@ -164,7 +164,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
         for="alwaysShowIphoneEarpiece"
       >
         <div
-          class="_checkbox_1bd8c0"
+          class="checkbox"
         >
           <svg
             fill="none"
@@ -187,10 +187,10 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
     </div>
   </div>
   <div
-    class="_fieldRow_1bd8c0"
+    class="fieldRow"
   >
     <div
-      class="_field_1bd8c0 _checkboxField_1bd8c0"
+      class="field checkboxField"
     >
       <input
         aria-describedby="_r_6_"
@@ -201,7 +201,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
         for="enableLivekitExtendedLogs"
       >
         <div
-          class="_checkbox_1bd8c0"
+          class="checkbox"
         >
           <svg
             fill="none"
@@ -274,6 +274,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
         >
           <input
             aria-describedby="radix-_r_a_ radix-_r_c_ radix-_r_e_"
+            checked=""
             class="_input_1ug7n_18"
             id="radix-_r_9_"
             name="_r_0_"
@@ -314,7 +315,6 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
         >
           <input
             aria-describedby="radix-_r_a_ radix-_r_c_ radix-_r_e_"
-            checked=""
             class="_input_1ug7n_18"
             id="radix-_r_b_"
             name="_r_0_"
@@ -386,7 +386,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
     </div>
   </form>
   <div
-    class="_livekit_room_box_2ddec4"
+    class="livekit_room_box"
   >
     <h4>
       LiveKit SFU: wss://local-sfu.example.org
@@ -427,7 +427,7 @@ exports[`DeveloperSettingsTab > renders and matches snapshot 1`] = `
     <ul />
   </div>
   <div
-    class="_livekit_room_box_2ddec4"
+    class="livekit_room_box"
   >
     <h4>
       LiveKit SFU: wss://remote-sfu.example.org

src/settings/rageshake.ts

@@ -467,7 +467,7 @@ declare global {
   // eslint-disable-next-line no-var, camelcase
   var mx_rage_initStoragePromise: Promise<void> | undefined;
 }
-export let rageshakeLogger: Logger;
+
 /**
  * Configure rage shaking support for sending bug reports.
  * Modifies globals.
@@ -477,8 +477,7 @@ export async function init(): Promise<void> {
   global.mx_rage_logger = new ConsoleLogger();
 
   // configure loglevel based loggers:
-  rageshakeLogger = logger;
-  setLogExtension(rageshakeLogger, global.mx_rage_logger.log);
+  setLogExtension(logger, global.mx_rage_logger.log);
 
   // intercept console logging so that we can get matrix_sdk logs:
   // this is nasty, but no logging hooks are provided

src/settings/settings.ts

@@ -137,7 +137,7 @@ export const enableExtendedLivekitLogs = new Setting<boolean>(
 
 export const matrixRTCMode = new Setting<MatrixRTCMode>(
   "matrix-rtc-mode",
-  MatrixRTCMode.Compatibility,
+  MatrixRTCMode.Legacy,
 );
 
 export const customLivekitUrl = new Setting<string | null>(

src/state/AndroidControlledAudioOutput.test.ts

@@ -253,7 +253,7 @@ describe("Test mappings", () => {
 });
 
 describe("Test select a device", () => {
-  it(`Switch to correct device`, () => {
+  it(`Switch to correct device `, () => {
     withTestScheduler(({ cold, schedule, expectObservable, flush }) => {
       const controlledAudioOutput = new AndroidControlledAudioOutput(
         cold("a", { a: FULL_DEVICE_LIST }),

src/state/CallViewModel/CallNotificationLifecycle.test.ts

@@ -5,19 +5,17 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { test } from "vitest";
+import { describe, it } from "vitest";
 import {
   EventType,
+  type IEvent,
   type IRoomTimelineData,
   MatrixEvent,
   type Room,
 } from "matrix-js-sdk";
-import { type RTCCallIntent } from "matrix-js-sdk/lib/matrixrtc";
-import { map, mergeMap, NEVER, type Observable, startWith } from "rxjs";
 
 import { withTestScheduler } from "../../utils/test";
 import {
-  alice,
   aliceRtcMember,
   local,
   localRtcMember,
@@ -25,10 +23,9 @@ import {
 import {
   type CallNotificationWrapper,
   createCallNotificationLifecycle$,
-  type RingAttempt,
+  type Props as CallNotificationLifecycleProps,
 } from "./CallNotificationLifecycle";
-import { Epoch, trackEpoch } from "../ObservableScope";
-import { constant } from "../Behavior";
+import { trackEpoch } from "../ObservableScope";
 
 function mockRingEvent(
   eventId: string,
@@ -43,272 +40,311 @@ function mockRingEvent(
   } as unknown as CallNotificationWrapper;
 }
 
-const defaultProps = {
-  memberships$: constant(new Epoch([])),
-  matrixRoomMembers$: constant(new Map([[alice.userId, alice]])),
-  receivedDecline$: NEVER,
-  options: {
-    waitForCallPickup: true,
-    autoLeaveWhenOthersLeft: false,
-  },
-  localUser: localRtcMember,
-};
-
-function summarizeRingAttempts$(
-  ringAttempts$: Observable<RingAttempt>,
-): Observable<
-  | { intent: RTCCallIntent; recipient: string }
-  | { outcome: "accept" | "decline" | "timeout" }
-> {
-  return ringAttempts$.pipe(
-    mergeMap(({ intent, recipient, outcome$ }) =>
-      outcome$.pipe(
-        map((outcome) => ({ outcome })),
-        startWith({ intent, recipient }),
-      ),
-    ),
-  );
-}
-
-test("no ring attempt when waitForCallPickup=false", () => {
-  withTestScheduler(({ scope, expectObservable, hot }) => {
-    const { ringAttempts$ } = createCallNotificationLifecycle$({
-      scope,
-      ...defaultProps,
-      sentCallNotification$: hot("-a", {
-        a: mockRingEvent("$notif1", 30),
-      }),
-      options: { ...defaultProps.options, waitForCallPickup: false },
-    });
-
-    expectObservable(ringAttempts$).toBe("");
-  });
-});
-
-test("no ring attempt when notification type is not ring", () => {
-  withTestScheduler(({ scope, expectObservable, hot }) => {
-    const { ringAttempts$ } = createCallNotificationLifecycle$({
-      scope,
-      ...defaultProps,
-      sentCallNotification$: hot("-a", {
-        a: {
-          ...mockRingEvent("$notif1", 30),
-          notification_type: "notification",
-        },
-      }),
-    });
-
-    expectObservable(ringAttempts$).toBe("");
-  });
-});
-
-test("no ring attempt if lifetime is missing", () => {
-  withTestScheduler(({ scope, expectObservable, hot }) => {
-    const { ringAttempts$ } = createCallNotificationLifecycle$({
-      scope,
-      ...defaultProps,
-      sentCallNotification$: hot("-a", {
-        a: mockRingEvent("$notif1", undefined),
-      }),
-    });
-
-    expectObservable(ringAttempts$).toBe("");
-  });
-});
-
-test("ring attempt times out after nobody joins", () => {
-  withTestScheduler(({ scope, expectObservable, hot }) => {
-    const { ringAttempts$ } = createCallNotificationLifecycle$({
-      scope,
-      ...defaultProps,
+describe("waitForCallPickup$", () => {
+  it("unknown -> ringing -> timeout when notified and nobody joins", () => {
+    withTestScheduler(({ scope, expectObservable, behavior, hot }) => {
       // No one ever joins (only local user)
-      memberships$: constant(new Epoch([])),
-      sentCallNotification$: hot("-a", {
-        a: mockRingEvent("$notif1", 30),
-      }),
-    });
+      const props: CallNotificationLifecycleProps = {
+        scope,
+        memberships$: scope.behavior(
+          behavior("a", { a: [] }).pipe(trackEpoch()),
+        ),
+        sentCallNotification$: hot("10ms a", {
+          a: mockRingEvent("$notif1", 30),
+        }),
+        receivedDecline$: hot(""),
+        options: {
+          waitForCallPickup: true,
+          autoLeaveWhenOthersLeft: false,
+        },
+        localUser: localRtcMember,
+      };
 
-    expectObservable(summarizeRingAttempts$(ringAttempts$)).toBe("-a 29ms A", {
-      a: { intent: "audio", recipient: alice.userId },
-      A: { outcome: "timeout" },
+      const lifecycle = createCallNotificationLifecycle$(props);
+
+      expectObservable(lifecycle.callPickupState$).toBe("a 9ms b 29ms c", {
+        a: "unknown",
+        b: "ringing",
+        c: "timeout",
+      });
     });
   });
-});
 
-test("ring attempt is accepted once recipient joins", () => {
-  withTestScheduler(({ scope, expectObservable, hot, behavior }) => {
-    const { ringAttempts$ } = createCallNotificationLifecycle$({
-      scope,
-      ...defaultProps,
-      memberships$: scope.behavior(
-        behavior("a-b", { a: [], b: [aliceRtcMember] }).pipe(trackEpoch()),
-      ),
-      sentCallNotification$: hot("-a", {
-        a: mockRingEvent("$notif1", 30),
-      }),
-    });
-
-    expectObservable(summarizeRingAttempts$(ringAttempts$)).toBe("-aA", {
-      a: { intent: "audio", recipient: alice.userId },
-      A: { outcome: "accept" },
+  it("ringing -> success if someone joins before timeout is reached", () => {
+    withTestScheduler(({ scope, hot, behavior, expectObservable }) => {
+      // Someone joins at 20ms (both LiveKit participant and MatrixRTC member)
+      const props: CallNotificationLifecycleProps = {
+        scope,
+        memberships$: scope.behavior(
+          behavior("a 19ms b", {
+            a: [localRtcMember],
+            b: [localRtcMember, aliceRtcMember],
+          }).pipe(trackEpoch()),
+        ),
+        sentCallNotification$: hot("5ms a", {
+          a: mockRingEvent("$notif2", 100),
+        }),
+        receivedDecline$: hot(""),
+        options: {
+          waitForCallPickup: true,
+          autoLeaveWhenOthersLeft: false,
+        },
+        localUser: localRtcMember,
+      };
+      const lifecycle = createCallNotificationLifecycle$(props);
+      expectObservable(lifecycle.callPickupState$).toBe("a 4ms b 14ms c", {
+        a: "unknown",
+        b: "ringing",
+        c: "success",
+      });
     });
   });
-});
-
-test("ring attempt is immediately accepted if recipient is already joined", () => {
-  withTestScheduler(({ scope, expectObservable, hot }) => {
-    const { ringAttempts$ } = createCallNotificationLifecycle$({
-      scope,
-      ...defaultProps,
-      memberships$: constant(new Epoch([aliceRtcMember])),
-      sentCallNotification$: hot("-a", {
-        a: mockRingEvent("$notif1", 30),
-      }),
-    });
-
-    expectObservable(summarizeRingAttempts$(ringAttempts$)).toBe("-(aA)", {
-      a: { intent: "audio", recipient: alice.userId },
-      A: { outcome: "accept" },
+  it("success when someone joins before we notify", () => {
+    withTestScheduler(({ scope, hot, behavior, expectObservable }) => {
+      // Someone joins at 20ms (both LiveKit participant and MatrixRTC member)
+      const props: CallNotificationLifecycleProps = {
+        scope,
+        memberships$: scope.behavior(
+          behavior("a 9ms b", {
+            a: [localRtcMember],
+            b: [localRtcMember, aliceRtcMember],
+          }).pipe(trackEpoch()),
+        ),
+        sentCallNotification$: hot("20ms a", {
+          a: mockRingEvent("$notif2", 50),
+        }),
+        receivedDecline$: hot(""),
+        options: {
+          waitForCallPickup: true,
+          autoLeaveWhenOthersLeft: false,
+        },
+        localUser: localRtcMember,
+      };
+      const lifecycle = createCallNotificationLifecycle$(props);
+      expectObservable(lifecycle.callPickupState$).toBe("a 9ms b", {
+        a: "unknown",
+        b: "success",
+      });
+    });
+  });
+  it("notify without lifetime -> immediate timeout", () => {
+    withTestScheduler(({ scope, hot, behavior, expectObservable }) => {
+      // Someone joins at 20ms (both LiveKit participant and MatrixRTC member)
+      const props: CallNotificationLifecycleProps = {
+        scope,
+        memberships$: scope.behavior(
+          behavior("a", {
+            a: [localRtcMember],
+          }).pipe(trackEpoch()),
+        ),
+        sentCallNotification$: hot("10ms a", {
+          a: mockRingEvent("$notif2", undefined),
+        }),
+        receivedDecline$: hot(""),
+        options: {
+          waitForCallPickup: true,
+          autoLeaveWhenOthersLeft: false,
+        },
+        localUser: localRtcMember,
+      };
+      const lifecycle = createCallNotificationLifecycle$(props);
+      expectObservable(lifecycle.callPickupState$).toBe("a 9ms b", {
+        a: "unknown",
+        b: "timeout",
+      });
     });
   });
-});
 
-test("ring attempt can be declined", () => {
-  withTestScheduler(({ scope, expectObservable, hot }) => {
-    const { ringAttempts$ } = createCallNotificationLifecycle$({
-      scope,
-      ...defaultProps,
-      sentCallNotification$: hot("-a", {
-        a: mockRingEvent("$notif1", 30),
-      }),
-      receivedDecline$: hot("--d", {
-        d: [
-          new MatrixEvent({
-            type: EventType.RTCDecline,
-            sender: alice.userId,
-            content: {
-              "m.relates_to": {
-                rel_type: "m.reference",
-                event_id: "$notif1",
+  it("stays null when waitForCallPickup=false", () => {
+    withTestScheduler(({ scope, hot, behavior, expectObservable }) => {
+      // Someone joins at 20ms (both LiveKit participant and MatrixRTC member)
+      const validProps: CallNotificationLifecycleProps = {
+        scope,
+        memberships$: scope.behavior(
+          behavior("a--b", {
+            a: [localRtcMember],
+            b: [localRtcMember, aliceRtcMember],
+          }).pipe(trackEpoch()),
+        ),
+        sentCallNotification$: hot("10ms a", {
+          a: mockRingEvent("$notif5", 30),
+        }),
+        receivedDecline$: hot(""),
+        options: {
+          waitForCallPickup: true,
+          autoLeaveWhenOthersLeft: false,
+        },
+        localUser: localRtcMember,
+      };
+      const propsDeactivated = {
+        ...validProps,
+        options: {
+          ...validProps.options,
+          waitForCallPickup: false,
+        },
+      };
+      const lifecycle = createCallNotificationLifecycle$(propsDeactivated);
+      expectObservable(lifecycle.callPickupState$).toBe("n", {
+        n: null,
+      });
+      const lifecycleReference = createCallNotificationLifecycle$(validProps);
+      expectObservable(lifecycleReference.callPickupState$).toBe("u--s", {
+        u: "unknown",
+        s: "success",
+      });
+    });
+  });
+
+  it("decline before timeout window ends -> decline", () => {
+    withTestScheduler(({ scope, hot, behavior, expectObservable }) => {
+      // Someone joins at 20ms (both LiveKit participant and MatrixRTC member)
+      const props: CallNotificationLifecycleProps = {
+        scope,
+        memberships$: scope.behavior(
+          behavior("a", {
+            a: [localRtcMember],
+          }).pipe(trackEpoch()),
+        ),
+        sentCallNotification$: hot("10ms a", {
+          a: mockRingEvent("$decl1", 50),
+        }),
+        receivedDecline$: hot("40ms d", {
+          d: [
+            new MatrixEvent({
+              type: EventType.RTCDecline,
+              content: {
+                "m.relates_to": {
+                  rel_type: "m.reference",
+                  event_id: "$decl1",
+                },
               },
-            },
-          }),
-          {} as Room,
-          undefined,
-          false,
-          {} as IRoomTimelineData,
-        ],
-      }),
-    });
-
-    expectObservable(summarizeRingAttempts$(ringAttempts$)).toBe("-aA", {
-      a: { intent: "audio", recipient: alice.userId },
-      A: { outcome: "decline" },
+            }),
+            {} as Room,
+            undefined,
+            false,
+            {} as IRoomTimelineData,
+          ],
+        }),
+        options: {
+          waitForCallPickup: true,
+          autoLeaveWhenOthersLeft: false,
+        },
+        localUser: localRtcMember,
+      };
+      const lifecycle = createCallNotificationLifecycle$(props);
+      expectObservable(lifecycle.callPickupState$).toBe("a 9ms b 29ms e", {
+        a: "unknown",
+        b: "ringing",
+        e: "decline",
+      });
     });
   });
-});
-
-test("ring attempt times out if recipient declines too late", () => {
-  withTestScheduler(({ scope, expectObservable, hot }) => {
-    const { ringAttempts$ } = createCallNotificationLifecycle$({
-      scope,
-      ...defaultProps,
-      sentCallNotification$: hot("-a", {
-        a: mockRingEvent("$notif1", 30),
-      }),
-      receivedDecline$: hot("100ms d", {
-        d: [
-          new MatrixEvent({
-            type: EventType.RTCDecline,
-            sender: alice.userId,
-            content: {
-              "m.relates_to": {
-                rel_type: "m.reference",
-                event_id: "$notif1",
+  it("decline after timeout window ends -> stays timeout", () => {
+    withTestScheduler(({ scope, hot, behavior, expectObservable }) => {
+      // Someone joins at 20ms (both LiveKit participant and MatrixRTC member)
+      const props: CallNotificationLifecycleProps = {
+        scope,
+        memberships$: scope.behavior(
+          behavior("a", {
+            a: [localRtcMember],
+          }).pipe(trackEpoch()),
+        ),
+        sentCallNotification$: hot("10ms a", {
+          a: mockRingEvent("$decl", 20),
+        }),
+        receivedDecline$: hot("40ms d", {
+          d: [
+            new MatrixEvent({
+              type: EventType.RTCDecline,
+              content: {
+                "m.relates_to": {
+                  rel_type: "m.reference",
+                  event_id: "$decl",
+                },
               },
-            },
-          }),
-          {} as Room,
-          undefined,
-          false,
-          {} as IRoomTimelineData,
-        ],
-      }),
-    });
-
-    expectObservable(summarizeRingAttempts$(ringAttempts$)).toBe("-a 29ms A", {
-      a: { intent: "audio", recipient: alice.userId },
-      A: { outcome: "timeout" },
+            }),
+            {} as Room,
+            undefined,
+            false,
+            {} as IRoomTimelineData,
+          ],
+        }),
+        options: {
+          waitForCallPickup: true,
+          autoLeaveWhenOthersLeft: false,
+        },
+        localUser: localRtcMember,
+      };
+      const lifecycle = createCallNotificationLifecycle$(props);
+      expectObservable(lifecycle.callPickupState$, "50ms !").toBe(
+        "a 9ms b 19ms e",
+        {
+          a: "unknown",
+          b: "ringing",
+          e: "timeout",
+        },
+      );
     });
   });
-});
-
-test("decline event relating to wrong event is ignored (times out)", () => {
-  withTestScheduler(({ scope, expectObservable, hot }) => {
-    const { ringAttempts$ } = createCallNotificationLifecycle$({
-      scope,
-      ...defaultProps,
-      sentCallNotification$: hot("-a", {
-        a: mockRingEvent("$notif1", 30),
-      }),
-      receivedDecline$: hot("--d", {
-        d: [
-          new MatrixEvent({
-            type: EventType.RTCDecline,
-            sender: alice.userId,
-            content: {
-              "m.relates_to": {
-                rel_type: "m.reference",
-                event_id: "$other", // <---- WRONG
-              },
-            },
-          }),
-          {} as Room,
-          undefined,
-          false,
-          {} as IRoomTimelineData,
-        ],
-      }),
-    });
-
-    expectObservable(summarizeRingAttempts$(ringAttempts$)).toBe("-a 29ms A", {
-      a: { intent: "audio", recipient: alice.userId },
-      A: { outcome: "timeout" },
-    });
-  });
-});
-
-test("decline event from wrong sender is ignored (times out)", () => {
-  withTestScheduler(({ scope, expectObservable, hot }) => {
-    const { ringAttempts$ } = createCallNotificationLifecycle$({
-      scope,
-      ...defaultProps,
-      sentCallNotification$: hot("-a", {
-        a: mockRingEvent("$notif1", 30),
-      }),
-      receivedDecline$: hot("--d", {
-        d: [
-          new MatrixEvent({
-            type: EventType.RTCDecline,
-            sender: local.userId, // <---- WRONG
-            content: {
-              "m.relates_to": {
-                rel_type: "m.reference",
-                event_id: "$notif1",
-              },
-            },
-          }),
-          {} as Room,
-          undefined,
-          false,
-          {} as IRoomTimelineData,
-        ],
-      }),
-    });
-
-    expectObservable(summarizeRingAttempts$(ringAttempts$)).toBe("-a 29ms A", {
-      a: { intent: "audio", recipient: alice.userId },
-      A: { outcome: "timeout" },
+  //
+  function testStaysRinging(
+    declineEvent: Partial<IEvent>,
+    expectDecline: boolean,
+  ): void {
+    withTestScheduler(({ scope, hot, behavior, expectObservable }) => {
+      // Someone joins at 20ms (both LiveKit participant and MatrixRTC member)
+      const props: CallNotificationLifecycleProps = {
+        scope,
+        memberships$: scope.behavior(
+          behavior("a", {
+            a: [localRtcMember],
+          }).pipe(trackEpoch()),
+        ),
+        sentCallNotification$: hot("10ms a", {
+          a: mockRingEvent("$right", 50),
+        }),
+        receivedDecline$: hot("20ms d", {
+          d: [
+            new MatrixEvent(declineEvent),
+            {} as Room,
+            undefined,
+            false,
+            {} as IRoomTimelineData,
+          ],
+        }),
+        options: {
+          waitForCallPickup: true,
+          autoLeaveWhenOthersLeft: false,
+        },
+        localUser: localRtcMember,
+      };
+      const lifecycle = createCallNotificationLifecycle$(props);
+      const marbles = expectDecline ? "a 9ms b 9ms d" : "a 9ms b";
+      expectObservable(lifecycle.callPickupState$, "21ms !").toBe(marbles, {
+        a: "unknown",
+        b: "ringing",
+        d: "decline",
+      });
     });
+  }
+  const reference = (refId?: string, sender?: string): Partial<IEvent> => ({
+    event_id: "$decline",
+    type: EventType.RTCDecline,
+    sender: sender ?? "@other:example.org",
+    content: {
+      "m.relates_to": {
+        rel_type: "m.reference",
+        event_id: refId ?? "$right",
+      },
+    },
+  });
+  it("decline reference works", () => {
+    testStaysRinging(reference(), true);
+  });
+  it("decline with wrong id is ignored (stays ringing)", () => {
+    testStaysRinging(reference("$wrong"), false);
+  });
+  it("decline with wrong id is ignored (stays ringing)", () => {
+    testStaysRinging(reference(undefined, local.userId), false);
   });
 });

src/state/CallViewModel/CallNotificationLifecycle.ts

@@ -10,22 +10,24 @@ import {
   type IRTCNotificationContent,
   type MatrixRTCSession,
   MatrixRTCSessionEvent,
-  type RTCCallIntent,
 } from "matrix-js-sdk/lib/matrixrtc";
 import {
+  combineLatest,
+  concat,
+  endWith,
   filter,
   fromEvent,
+  ignoreElements,
   map,
   merge,
   NEVER,
   type Observable,
   of,
   pairwise,
+  startWith,
   switchMap,
+  takeUntil,
   timer,
-  EMPTY,
-  race,
-  take,
 } from "rxjs";
 import {
   type EventTimelineSetHandlerMap,
@@ -33,26 +35,18 @@ import {
   type Room as MatrixRoom,
   RoomEvent,
 } from "matrix-js-sdk";
-import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
 
 import { type Behavior } from "../Behavior";
-import { type Epoch, type ObservableScope } from "../ObservableScope";
-import { type RoomMemberMap } from "./remoteMembers/MatrixMemberMetadata";
+import { type Epoch, mapEpoch, type ObservableScope } from "../ObservableScope";
 
 export type AutoLeaveReason = "allOthersLeft" | "timeout" | "decline";
-
-export interface RingAttempt {
-  intent: RTCCallIntent;
-  /**
-   * The user ID of the recipient being rung.
-   */
-  recipient: string;
-  /**
-   * The eventual outcome of the ringing attempt. (Emits a single value.)
-   */
-  // TODO: Include a callback for attempting ringing again in case of a timeout
-  outcome$: Observable<"accept" | "decline" | "timeout">;
-}
+export type CallPickupState =
+  | "unknown"
+  | "ringing"
+  | "timeout"
+  | "decline"
+  | "success"
+  | null;
 
 export type CallNotificationWrapper = {
   event_id: string;
@@ -82,7 +76,6 @@ export function createReceivedDecline$(
 export interface Props {
   scope: ObservableScope;
   memberships$: Behavior<Epoch<CallMembership[]>>;
-  matrixRoomMembers$: Behavior<RoomMemberMap>;
   sentCallNotification$: Observable<CallNotificationWrapper | null>;
   receivedDecline$: Observable<
     Parameters<EventTimelineSetHandlerMap[RoomEvent.Timeline]>
@@ -91,86 +84,34 @@ export interface Props {
   localUser: { deviceId: string; userId: string };
 }
 
+/**
+ * @returns two observables:
+ * `callPickupState$` The current call pickup state of the call.
+ *  - "unknown": The client has not yet sent the notification event. We don't know if it will because it first needs to send its own membership.
+ *     Then we can conclude if we were the first one to join or not.
+ *  - "ringing": The call is ringing on other devices in this room (This client should give audiovisual feedback that this is happening).
+ *  - "timeout": No-one picked up in the defined time this call should be ringing on others devices.
+ *     The call failed. If desired this can be used as a trigger to exit the call.
+ *  - "success": Someone else joined. The call is in a normal state. No audiovisual feedback.
+ *  - null: EC is configured to never show any waiting for answer state.
+ *
+ * `autoLeave$` An observable that emits (null) when the call should be automatically left.
+ *  - if options.autoLeaveWhenOthersLeft is set to true it emits when all others left.
+ *  - if options.waitForCallPickup is set to true it emits if noone picked up the ring or if the ring got declined.
+ *  - if options.autoLeaveWhenOthersLeft && options.waitForCallPickup is false it will never emit.
+ *
+ */
 export function createCallNotificationLifecycle$({
   scope,
   memberships$,
-  matrixRoomMembers$,
   sentCallNotification$,
   receivedDecline$,
   options,
   localUser,
 }: Props): {
-  /**
-   * An observable of attempts to ring the remote participant's devices.
-   */
-  ringAttempts$: Observable<RingAttempt>;
-  /**
-   * An observable that emits when the call should be automatically left.
-   *  - if options.autoLeaveWhenOthersLeft is set to true it emits when all others left.
-   *  - if options.waitForCallPickup is set to true it emits if noone picked up the ring or if the ring got declined.
-   *  - if options.autoLeaveWhenOthersLeft && options.waitForCallPickup is false it will never emit.
-   */
+  callPickupState$: Behavior<CallPickupState>;
   autoLeave$: Observable<AutoLeaveReason>;
 } {
-  const logger = rootLogger.getChild("[CallNotificationLifecycle]");
-  let ringAttempts$: Observable<RingAttempt> = NEVER;
-  if (options.waitForCallPickup)
-    ringAttempts$ = sentCallNotification$.pipe(
-      filter(
-        (
-          notificationEvent: CallNotificationWrapper | null,
-        ): notificationEvent is CallNotificationWrapper =>
-          // only care about new events (legacy do not have decline pattern)
-          notificationEvent?.notification_type === "ring" &&
-          notificationEvent.lifetime > 0,
-      ),
-      switchMap((notificationEvent) => {
-        // We assume that there is only one other user in the room when ringing
-        // TODO: Respect io.element.functional_members
-        const recipient = [...matrixRoomMembers$.value.keys()].find(
-          (userId) => userId !== localUser.userId,
-        );
-        if (recipient === undefined) {
-          logger.warn("No recipient for notification event; not ringing.");
-          return EMPTY;
-        }
-
-        // Ringing times out after lifetime ms have passed
-        const timeout$ = timer(notificationEvent.lifetime).pipe(
-          map(() => "timeout" as const),
-        );
-        // Call is accepted when the recipient joins
-        const accept$ = memberships$.pipe(
-          filter((ms) => ms.value.some((m) => m.userId === recipient)),
-          map(() => "accept" as const),
-        );
-        // Call is declined when we receive a decline event
-        const decline$ = receivedDecline$.pipe(
-          filter(
-            ([event]) =>
-              event.getRelation()?.rel_type === "m.reference" &&
-              event.getRelation()?.event_id === notificationEvent.event_id &&
-              event.getSender() === recipient,
-          ),
-          map(() => "decline" as const),
-        );
-
-        return of({
-          intent: notificationEvent["m.call.intent"] ?? "audio",
-          recipient,
-          outcome$: race(timeout$, accept$, decline$).pipe(
-            take(1),
-            // Make this observable 'hot' to avoid running multiple timers. This
-            // is not actually a resource leak since there will be at most one
-            // active ring attempt at any given time.
-            // eslint-disable-next-line element-call/no-observablescope-leak
-            scope.share,
-          ),
-        });
-      }),
-      scope.share,
-    );
-
   const allOthersLeft$ = memberships$.pipe(
     pairwise(),
     filter(
@@ -181,18 +122,87 @@ export function createCallNotificationLifecycle$({
     map(() => {}),
   );
 
+  /**
+   * Whether some Matrix user other than ourself is joined to the call.
+   */
+  const someoneElseJoined$ = memberships$.pipe(
+    mapEpoch((ms) => ms.some((m) => m.userId !== localUser.userId)),
+  ) as Behavior<Epoch<boolean>>;
+
+  /**
+   * The state of the current ringing attempt, if the RTC session is indeed
+   * ringing the remote participant's devices. Otherwise `null`.
+   */
+  const remoteRingState$: Behavior<"ringing" | "timeout" | "decline" | null> =
+    scope.behavior(
+      sentCallNotification$.pipe(
+        filter(
+          (notificationEventArgs: CallNotificationWrapper | null) =>
+            // only care about new events (legacy do not have decline pattern)
+            notificationEventArgs?.notification_type === "ring",
+        ),
+        map((e) => e as CallNotificationWrapper),
+        switchMap((notificationEvent) => {
+          const lifetimeMs = notificationEvent?.lifetime ?? 0;
+          return concat(
+            lifetimeMs === 0
+              ? // If no lifetime, skip the ring state
+                of(null)
+              : // Ring until lifetime ms have passed
+                timer(lifetimeMs).pipe(
+                  ignoreElements(),
+                  startWith("ringing" as const),
+                ),
+            // The notification lifetime has timed out, meaning ringing has likely
+            // stopped on all receiving clients.
+            of("timeout" as const),
+            // This makes sure we will not drop into the `endWith("decline" as const)` state
+            NEVER,
+          ).pipe(
+            takeUntil(
+              receivedDecline$.pipe(
+                filter(
+                  ([event]) =>
+                    event.getRelation()?.rel_type === "m.reference" &&
+                    event.getRelation()?.event_id ===
+                      notificationEvent.event_id &&
+                    event.getSender() !== localUser.userId &&
+                    callPickupState$.value !== "timeout",
+                ),
+              ),
+            ),
+            endWith("decline" as const),
+          );
+        }),
+      ),
+      null,
+    );
+
+  const callPickupState$ = scope.behavior(
+    options.waitForCallPickup === true
+      ? combineLatest(
+          [someoneElseJoined$, remoteRingState$],
+          (someoneElseJoined, ring) => {
+            if (someoneElseJoined.value === true) {
+              return "success" as const;
+            }
+            // Show the ringing state of the most recent ringing attempt.
+            // as long as we have not yet sent an RTC notification event or noone else joined,
+            // ring will be null -> callPickupState$ = unknown.
+            return ring ?? ("unknown" as const);
+          },
+        )
+      : NEVER,
+    null,
+  );
+
   const autoLeave$ = merge(
     options.autoLeaveWhenOthersLeft === true
       ? allOthersLeft$.pipe(map(() => "allOthersLeft" as const))
       : NEVER,
-    ringAttempts$.pipe(
-      switchMap(({ outcome$ }) =>
-        outcome$.pipe(
-          filter((outcome) => outcome === "timeout" || outcome === "decline"),
-        ),
-      ),
+    callPickupState$.pipe(
+      filter((state) => state === "timeout" || state === "decline"),
     ),
   );
-
-  return { ringAttempts$, autoLeave$ };
+  return { autoLeave$, callPickupState$ };
 }

src/state/CallViewModel/CallViewModel.test.ts

@@ -22,7 +22,6 @@ import { SyncState } from "matrix-js-sdk";
 import {
   ConnectionState,
   type LocalTrackPublication,
-  type Participant,
   type RemoteParticipant,
 } from "livekit-client";
 import * as ComponentsCore from "@livekit/components-core";
@@ -1032,10 +1031,6 @@ describe.each([
             a: [localRtcMember],
             b: [localRtcMember, aliceRtcMember],
           }),
-          videoEnabled: new Map<Participant, Behavior<boolean>>([
-            [localParticipant, constant(true)],
-            [aliceParticipant, constant(true)],
-          ]),
         },
         (vm) => {
           schedule(modeInputMarbles, {
@@ -1065,33 +1060,6 @@ describe.each([
     });
   });
 
-  test("expanded spotlight layout hides PiP tile in one-on-one voice call", () => {
-    withTestScheduler(({ behavior, schedule, expectObservable }) => {
-      withCallViewModel(
-        {
-          remoteParticipants$: constant([aliceParticipant]),
-          roomMembers: [local, alice],
-          rtcMembers$: constant([localRtcMember, aliceRtcMember]),
-          videoEnabled: new Map<Participant, Behavior<boolean>>([
-            [localParticipant, constant(false)],
-            [aliceParticipant, constant(false)],
-          ]),
-          windowSize$: constant({ width: 700, height: 380 }), // Mobile phone in landscape
-        },
-        (vm) => {
-          // Layout should show remote tile only
-          expectObservable(summarizeLayout$(vm.layout$)).toBe("a", {
-            a: {
-              type: "spotlight-expanded",
-              spotlight: [`${aliceId}:0`],
-              pip: undefined,
-            },
-          });
-        },
-      );
-    });
-  });
-
   test("spotlight remembers whether it's expanded", () => {
     withTestScheduler(({ schedule, expectObservable }) => {
       // Start in spotlight mode, then switch to grid and back to spotlight a
@@ -1128,7 +1096,7 @@ describe.each([
               b: {
                 type: "spotlight-expanded",
                 spotlight: [`${aliceId}:0`],
-                pip: undefined,
+                pip: `${localId}:0`,
               },
               c: {
                 type: "grid",
@@ -1452,14 +1420,8 @@ describe.each([
             },
           });
 
-          expectObservable(vm.ringingVm$).toBe("(ab)", {
-            a: null,
-            b: expect.objectContaining({
-              type: "ringing",
-              userId: alice.userId,
-              intent: "audio",
-            }),
-          });
+          // Should ring for 30ms and then time out
+          expectObservable(vm.ringing$).toBe("(ny) 26ms n", yesNo);
           // Layout should show placeholder media for the participant we're
           // ringing the entire time (even once timed out)
           expectObservable(summarizeLayout$(vm.layout$)).toBe("a", {
@@ -1498,14 +1460,7 @@ describe.each([
           });
 
           // Should ring until Alice joins
-          expectObservable(vm.ringingVm$).toBe("(ab) 17ms a", {
-            a: null,
-            b: expect.objectContaining({
-              type: "ringing",
-              userId: alice.userId,
-              intent: "audio",
-            }),
-          });
+          expectObservable(vm.ringing$).toBe("(ny) 17ms n", yesNo);
           // Layout should show placeholder media for the participant we're
           // ringing the entire time
           expectObservable(summarizeLayout$(vm.layout$)).toBe("a 20ms b", {

src/state/CallViewModel/CallViewModel.ts

@@ -29,6 +29,7 @@ import {
   pairwise,
   race,
   scan,
+  skipWhile,
   startWith,
   Subject,
   switchAll,
@@ -38,9 +39,8 @@ import {
   tap,
   throttleTime,
   timer,
-  takeUntil,
 } from "rxjs";
-import { type Logger, logger as rootLogger } from "matrix-js-sdk/lib/logger";
+import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
 import {
   MembershipManagerEvent,
   type LivekitTransportConfig,
@@ -125,9 +125,10 @@ import {
   createConnectionManager$,
 } from "./remoteMembers/ConnectionManager.ts";
 import {
-  createRemoteMatrixLivekitMembers$,
+  createMatrixLivekitMembers$,
   type LocalMatrixLivekitMember,
   type RemoteMatrixLivekitMember,
+  type MatrixLivekitMember,
 } from "./remoteMembers/MatrixLivekitMembers.ts";
 import {
   type AutoLeaveReason,
@@ -155,8 +156,8 @@ import {
   createRingingMedia,
   type RingingMediaViewModel,
 } from "../media/RingingMediaViewModel.ts";
-import { type GridTileViewModel } from "../TileViewModel.ts";
 
+const logger = rootLogger.getChild("[CallViewModel]");
 //TODO
 // Larger rename
 // member,membership -> rtcMember
@@ -207,7 +208,6 @@ export type WindowMode = "normal" | "narrow" | "flat" | "pip";
 
 interface LayoutScanState {
   layout: Layout | null;
-  overflowing: boolean;
   tiles: TileStore;
 }
 
@@ -230,13 +230,9 @@ export interface CallViewModel {
   // lifecycle
   autoLeave$: Observable<AutoLeaveReason>;
   /**
-   * View model for info relating to ringing, timing out, calling back, etc.
+   * Whether we are ringing a call recipient.
    */
-  ringingVm$: Behavior<RingingMediaViewModel | null>;
-  /**
-   * Which visual element the ringing status should be shown in.
-   */
-  ringingStatusLocation: "app_bar" | "tile";
+  ringing$: Behavior<boolean>;
   /** Observable that emits when the user should leave the call (hangup pressed, widget action, error).
    * THIS DOES NOT LEAVE THE CALL YET. The only way to leave the call (send the hangup event) is
    *  - by ending the scope
@@ -304,7 +300,7 @@ export interface CallViewModel {
   /** Participants sorted by livekit room so they can be used in the audio rendering */
   livekitRoomItems$: Behavior<LivekitRoomItem[]>;
   /** use the layout instead, this is just for the sdk export. */
-  remoteMatrixLivekitMembers$: Behavior<RemoteMatrixLivekitMember[]>;
+  matrixLivekitMembers$: Behavior<RemoteMatrixLivekitMember[]>;
   localMatrixLivekitMember$: Behavior<LocalMatrixLivekitMember | null>;
   /** List of participants raising their hand */
   handsRaised$: Behavior<Record<string, RaisedHandInfo>>;
@@ -360,10 +356,6 @@ export interface CallViewModel {
    * and header as overlays.
    */
   edgeToEdge$: Behavior<boolean>;
-  /**
-   * Whether the call layout is overflowing the interface (causing it to scroll).
-   */
-  overflowing$: Behavior<boolean>;
 
   settingsOpen$: Behavior<boolean>;
   setSettingsOpen$: Behavior<(open: boolean) => void>;
@@ -415,7 +407,6 @@ export function createCallViewModel$(
   reactionsSubject$: Observable<Record<string, ReactionInfo>>,
   trackProcessorState$: Behavior<ProcessorState>,
 ): CallViewModel {
-  const logger = rootLogger.getChild("[CallViewModel]");
   const client = matrixRoom.client;
   const userId = client.getUserId();
   const deviceId = client.getDeviceId();
@@ -425,7 +416,6 @@ export function createCallViewModel$(
   const livekitKeyProvider = getE2eeKeyProvider(
     options.encryptionSystem,
     matrixRTCSession,
-    logger,
   );
   // matrix_rtc_mode in config.json overrides the user's Developer Settings choice.
   // It is validated at config load (src/config/Config.ts) so the cast is safe.
@@ -537,15 +527,13 @@ export function createCallViewModel$(
     ownMembershipIdentity,
   });
 
-  const remoteMatrixLivekitMembers$: Behavior<
-    Epoch<RemoteMatrixLivekitMember[]>
-  > = createRemoteMatrixLivekitMembers$({
-    scope: scope,
-    membershipsWithTransport$:
-      membershipsAndTransports.membershipsWithTransport$,
-    connectionManager: connectionManager,
-    localUser: { userId, deviceId },
-  });
+  const matrixLivekitMembers$: Behavior<Epoch<RemoteMatrixLivekitMember[]>> =
+    createMatrixLivekitMembers$({
+      scope: scope,
+      membershipsWithTransport$:
+        membershipsAndTransports.membershipsWithTransport$,
+      connectionManager: connectionManager,
+    });
 
   const connectOptions$ = scope.behavior(
     matrixRTCMode$.pipe(
@@ -622,12 +610,19 @@ export function createCallViewModel$(
       ),
     );
 
-  const matrixLivekitMembers$ = scope.behavior(
-    combineLatest(
-      [localMatrixLivekitMember$, remoteMatrixLivekitMembers$],
-      (local, remote) => [...(local === null ? [] : [local]), ...remote.value],
-    ),
-  );
+  // ------------------------------------------------------------------------
+  // callLifecycle
+
+  // TODO if we are in "unknown" state we need a loading rendering (or empty screen)
+  // Otherwise it looks like we already connected and only than the ringing starts which is weird.
+  const { callPickupState$, autoLeave$ } = createCallNotificationLifecycle$({
+    scope: scope,
+    memberships$: memberships$,
+    sentCallNotification$: createSentCallNotification$(scope, matrixRTCSession),
+    receivedDecline$: createReceivedDecline$(matrixRoom),
+    options: options,
+    localUser: { userId: userId, deviceId: deviceId },
+  });
 
   // ------------------------------------------------------------------------
   // matrixMemberMetadataStore
@@ -639,26 +634,11 @@ export function createCallViewModel$(
     matrixRoomMembers$,
   );
 
-  // ------------------------------------------------------------------------
-  // callLifecycle
-
-  // TODO if we are in "unknown" state we need a loading rendering (or empty screen)
-  // Otherwise it looks like we already connected and only than the ringing starts which is weird.
-  const { ringAttempts$, autoLeave$ } = createCallNotificationLifecycle$({
-    scope,
-    memberships$,
-    matrixRoomMembers$,
-    sentCallNotification$: createSentCallNotification$(scope, matrixRTCSession),
-    receivedDecline$: createReceivedDecline$(matrixRoom),
-    options,
-    localUser: { userId, deviceId },
-  });
-
   const allConnections$ = scope.behavior(
     connectionManager.connectionManagerData$.pipe(map((d) => d.value)),
   );
   const livekitRoomItems$ = scope.behavior(
-    remoteMatrixLivekitMembers$.pipe(
+    matrixLivekitMembers$.pipe(
       switchMap((members) => {
         const a$ = combineLatest(
           members.value.map((member) =>
@@ -724,20 +704,43 @@ export function createCallViewModel$(
    * List of user media (camera feeds) that we want tiles for.
    */
   const userMedia$ = scope.behavior<WrappedUserMediaViewModel[]>(
-    combineLatest([matrixLivekitMembers$, duplicateTiles.value$]).pipe(
+    combineLatest([
+      localMatrixLivekitMember$,
+      matrixLivekitMembers$,
+      duplicateTiles.value$,
+    ]).pipe(
       // Generate a collection of user media from the list of expected (whether
       // present or missing) LiveKit participants.
       generateItems(
         "CallViewModel userMedia$",
-        function* ([members, duplicateTiles]) {
-          for (const {
-            userId,
-            participant,
-            connection$,
-            membership$,
-          } of members) {
-            const rtcId = membership$.value.rtcBackendIdentity;
-            const mediaId = `${userId}:${membership$.value.deviceId}`;
+        function* ([
+          localMatrixLivekitMember,
+          matrixLivekitMembers,
+          duplicateTiles,
+        ]) {
+          const computeMediaId = (m: MatrixLivekitMember): string =>
+            `${m.userId}:${m.membership$.value.deviceId}`;
+
+          const localUserMediaId = localMatrixLivekitMember
+            ? computeMediaId(localMatrixLivekitMember)
+            : undefined;
+
+          const localAsArray = localMatrixLivekitMember
+            ? [localMatrixLivekitMember]
+            : [];
+          const remoteWithoutLocal = matrixLivekitMembers.value.filter(
+            (m) => computeMediaId(m) !== localUserMediaId,
+          );
+          const allMatrixLivekitMembers = [
+            ...localAsArray,
+            ...remoteWithoutLocal,
+          ];
+
+          for (const matrixLivekitMember of allMatrixLivekitMembers) {
+            const { userId, participant, connection$, membership$ } =
+              matrixLivekitMember;
+            const rtcId = membership$.value.rtcBackendIdentity; // rtcBackendIdentity
+            const mediaId = computeMediaId(matrixLivekitMember);
             for (let dup = 0; dup < 1 + duplicateTiles; dup++) {
               yield {
                 keys: [dup, mediaId, userId, participant, connection$, rtcId],
@@ -781,42 +784,51 @@ export function createCallViewModel$(
     ),
   );
 
-  const ringingMedia$ = scope.behavior<RingingMediaViewModel | null>(
-    ringAttempts$.pipe(
-      switchMap(({ intent, recipient, outcome$ }) =>
-        outcome$.pipe(
-          startWith("ringing" as const),
-          generateItems(
-            "CallViewModel ringingMedia$",
-            function* (pickupState) {
-              if (pickupState !== "accept")
-                yield { keys: [intent, recipient], data: pickupState };
-            },
-            (scope, pickupState$, intent, userId) =>
-              createRingingMedia({
-                id: `ringing:${userId}`,
-                userId,
-                displayName$: scope.behavior(
-                  matrixRoomMembers$.pipe(
-                    map(
-                      (members) =>
-                        members.get(userId)?.rawDisplayName || userId,
-                    ),
-                  ),
-                ),
-                mxcAvatarUrl$:
-                  matrixMemberMetadataStore.createAvatarUrlBehavior$(
-                    scope,
-                    userId,
-                  ),
-                pickupState$,
-                intent,
-              }),
-          ),
-          map(([media]) => media ?? null),
-        ),
+  const ringingMedia$ = scope.behavior<RingingMediaViewModel[]>(
+    combineLatest([userMedia$, matrixRoomMembers$, callPickupState$]).pipe(
+      generateItems(
+        "CallViewModel ringingMedia$",
+        function* ([userMedia, roomMembers, callPickupState]) {
+          if (
+            callPickupState === "ringing" ||
+            callPickupState === "timeout" ||
+            callPickupState === "decline"
+          ) {
+            // TODO: Respect io.element.functional_members
+            for (const member of roomMembers.values()) {
+              if (!userMedia.some((vm) => vm.userId === member.userId))
+                yield {
+                  keys: [member.userId],
+                  data: callPickupState,
+                };
+            }
+          }
+        },
+        (scope, pickupState$, userId) =>
+          createRingingMedia({
+            id: `ringing:${userId}`,
+            userId,
+            displayName$: scope.behavior(
+              matrixRoomMembers$.pipe(
+                map((members) => members.get(userId)?.rawDisplayName || userId),
+              ),
+            ),
+            mxcAvatarUrl$: matrixMemberMetadataStore.createAvatarUrlBehavior$(
+              scope,
+              userId,
+            ),
+            pickupState$,
+            muteStates,
+          }),
       ),
-      startWith(null),
+      distinctUntilChanged(shallowEquals),
+      tap((ringingMedia) => {
+        if (ringingMedia.length > 1)
+          // Warn that UI may do something unexpected in this case
+          logger.warn(
+            `Ringing more than one participant is not supported (ringing ${ringingMedia.map((vm) => vm.userId).join(", ")})`,
+          );
+      }),
     ),
   );
 
@@ -855,10 +867,14 @@ export function createCallViewModel$(
    *    multiple devices.
    */
   const participantCount$ = scope.behavior(
-    matrixLivekitMembers$.pipe(map((ms) => ms.length)),
+    matrixLivekitMembers$.pipe(map((ms) => ms.value.length)),
   );
 
-  const leaveSoundEffect$ = userMedia$.pipe(
+  const leaveSoundEffect$ = combineLatest([callPickupState$, userMedia$]).pipe(
+    // Until the call is successful, do not play a leave sound.
+    // If callPickupState$ is null, then we always play the sound as it will not conflict with a decline sound.
+    skipWhile(([c]) => c !== null && c !== "success"),
+    map(([, userMedia]) => userMedia),
     pairwise(),
     filter(
       ([prev, current]) =>
@@ -867,9 +883,6 @@ export function createCallViewModel$(
     ),
     map(() => {}),
     throttleTime(THROTTLE_SOUND_EFFECT_MS),
-    // Avoid doubling up on any auto-leave sounds (e.g. the decline sound),
-    // which are handled elsewhere
-    takeUntil(autoLeave$),
   );
 
   const userHangup$ = new Subject<void>();
@@ -948,8 +961,8 @@ export function createCallViewModel$(
   );
 
   /**
-   * Local user media suitable for displaying in a PiP (undefined if not found,
-   * video is muted, or if user prefers to not see themselves).
+   * Local user media suitable for displaying in a PiP (undefined if not found
+   * or if user prefers to not see themselves).
    */
   const localUserMediaForPip$ = scope.behavior<
     LocalUserMediaViewModel | undefined
@@ -961,10 +974,8 @@ export function createCallViewModel$(
             m.type === "user" && m.local,
         );
         if (!localUserMedia) return of(undefined);
-        return combineLatest(
-          [localUserMedia.videoEnabled$, localUserMedia.alwaysShow$],
-          (videoEnabled, alwaysShow) =>
-            videoEnabled && alwaysShow ? localUserMedia : undefined,
+        return localUserMedia.alwaysShow$.pipe(
+          map((alwaysShow) => (alwaysShow ? localUserMedia : undefined)),
         );
       }),
     ),
@@ -976,8 +987,8 @@ export function createCallViewModel$(
   }>(
     ringingMedia$.pipe(
       switchMap((ringingMedia) => {
-        if (ringingMedia !== null)
-          return of({ spotlight: [ringingMedia], pip$: localUserMediaForPip$ });
+        if (ringingMedia.length > 0)
+          return of({ spotlight: ringingMedia, pip$: localUserMediaForPip$ });
 
         return screenShares$.pipe(
           switchMap((screenShares) => {
@@ -1133,10 +1144,14 @@ export function createCallViewModel$(
           // show ringing media instead
           if (userMedia.length === 1)
             return ringingMedia$.pipe(
-              map(
-                (ringingMedia) =>
-                  ringingMedia && { local, remote: ringingMedia },
-              ),
+              map((ringingMedia) => {
+                return ringingMedia.length === 1
+                  ? {
+                      local,
+                      remote: ringingMedia[0],
+                    }
+                  : null;
+              }),
             );
         }
       }
@@ -1433,7 +1448,7 @@ export function createCallViewModel$(
     windowMode$.pipe(
       switchMap((mode) => {
         // In small windows the header would be too obstructive
-        if (mode === "pip") return of(false);
+        if (mode === "pip" || mode === "flat") return of(false);
         // In edge-to-edge layouts, couple the visibility of the header
         // to that of the footer
         return edgeToEdge$.pipe(
@@ -1473,7 +1488,7 @@ export function createCallViewModel$(
 
   // There is a cyclical dependency here: the layout algorithms want to know
   // which tiles are on screen, but to know which tiles are on screen we have to
-  // first render a layout. To deal with this we assume initially that all tiles
+  // first render a layout. To deal with this we assume initially that no tiles
   // are visible, and loop the data back into the layouts with a Subject.
   const visibleTiles$ = new Subject<number>();
   const setVisibleTiles = (value: number): void => visibleTiles$.next(value);
@@ -1481,7 +1496,7 @@ export function createCallViewModel$(
   const layoutInternals$ = scope.behavior<LayoutScanState & { layout: Layout }>(
     combineLatest([
       layoutMedia$,
-      visibleTiles$.pipe(startWith(Infinity), distinctUntilChanged()),
+      visibleTiles$.pipe(startWith(0), distinctUntilChanged()),
     ]).pipe(
       scan<
         [LayoutMedia, number],
@@ -1491,8 +1506,6 @@ export function createCallViewModel$(
         ({ tiles: prevTiles }, [media, visibleTiles]) => {
           let layout: Layout;
           let newTiles: TileStore;
-          let pip: GridTileViewModel | undefined;
-          let overflowing = false;
           switch (media.type) {
             case "grid":
             case "spotlight-landscape":
@@ -1504,7 +1517,6 @@ export function createCallViewModel$(
                 setVisibleTiles,
                 prevTiles,
               );
-              overflowing = newTiles.gridTiles.length > visibleTiles;
               break;
             case "spotlight-expanded":
               [layout, newTiles] = spotlightExpandedLayout(
@@ -1519,7 +1531,6 @@ export function createCallViewModel$(
                 landscapePipAlignment$,
                 prevTiles,
               );
-              pip = layout.pip;
               break;
             case "one-on-one-portrait":
               [layout, newTiles] = oneOnOnePortraitLayout(
@@ -1528,20 +1539,15 @@ export function createCallViewModel$(
                 portraitPipAlignment$,
                 prevTiles,
               );
-              pip = layout.pip;
               break;
             case "pip":
               [layout, newTiles] = pipLayout(media, prevTiles);
               break;
           }
 
-          for (const tile of newTiles.gridTiles) {
-            tile.setShowOutline(tile === pip);
-          }
-
-          return { layout, overflowing, tiles: newTiles };
+          return { layout, tiles: newTiles };
         },
-        { layout: null, overflowing: false, tiles: TileStore.empty() },
+        { layout: null, tiles: TileStore.empty() },
       ),
     ),
   );
@@ -1553,10 +1559,6 @@ export function createCallViewModel$(
     layoutInternals$.pipe(map(({ layout }) => layout)),
   );
 
-  const overflowing$ = scope.behavior<boolean>(
-    layoutInternals$.pipe(map(({ overflowing }) => overflowing)),
-  );
-
   /**
    * The current generation of the tile store, exposed for debugging purposes.
    */
@@ -1726,9 +1728,9 @@ export function createCallViewModel$(
 
   return {
     autoLeave$: autoLeave$,
-    ringingVm$: ringingMedia$,
-    ringingStatusLocation:
-      urlParams.header === HeaderStyle.AppBar ? "app_bar" : "tile",
+    ringing$: scope.behavior(
+      callPickupState$.pipe(map((state) => state === "ringing")),
+    ),
     leave$: leave$,
     hangup: (): void => userHangup$.next(),
     join: localMembership.requestJoinAndPublish,
@@ -1773,8 +1775,8 @@ export function createCallViewModel$(
     setGridMode: setGridMode,
     layout$: layout$,
     localMatrixLivekitMember$,
-    remoteMatrixLivekitMembers$: scope.behavior(
-      remoteMatrixLivekitMembers$.pipe(
+    matrixLivekitMembers$: scope.behavior(
+      matrixLivekitMembers$.pipe(
         map((members) => members.value),
         tap((v) => {
           const listForLogs = v
@@ -1798,7 +1800,6 @@ export function createCallViewModel$(
     settingsOpen$: settingsOpen$,
     setSettingsOpen$: setSettingsOpen$,
     edgeToEdge$,
-    overflowing$,
     earpieceMode$: earpieceMode$,
     audioOutputSwitcher$: audioOutputSwitcher$,
     reconnecting$: localMembership.reconnecting$,
@@ -1810,7 +1811,6 @@ export function createCallViewModel$(
 function getE2eeKeyProvider(
   e2eeSystem: EncryptionSystem,
   rtcSession: MatrixRTCSession,
-  logger: Logger,
 ): BaseKeyProvider | undefined {
   if (e2eeSystem.kind === E2eeType.NONE) return undefined;
 

src/state/CallViewModel/localMember/HomeserverConnected.ts

@@ -31,6 +31,11 @@ import { type ObservableScope } from "../../ObservableScope";
 import { type Behavior } from "../../Behavior";
 import { type NodeStyleEventEmitter } from "../../../utils/test";
 
+/**
+ * Logger instance (scoped child) for homeserver connection updates.
+ */
+const logger = rootLogger.getChild("[HomeserverConnected]");
+
 export type HomeserverDisconnectReason = "sync" | "membership" | "probablyLeft";
 
 export interface HomeserverConnected {
@@ -65,7 +70,6 @@ export function createHomeserverConnected$(
     Pick<MatrixRTCSession, "membershipStatus" | "probablyLeft">,
   gracePeriodMs?: number,
 ): HomeserverConnected {
-  const logger = rootLogger.getChild("[HomeserverConnected]");
   // Get grace period from parameter or config (default 10000ms)
   const graceMs = gracePeriodMs ?? Config.get().sync_disconnect_grace_period_ms;
 

src/state/CallViewModel/localMember/LocalMember.ts

@@ -170,7 +170,7 @@ export const createLocalMembership$ = ({
   logger: parentLogger,
   muteStates,
   matrixRTCSession,
-  roomId,
+  roomId: roomId,
 }: Props): {
   /**
    * This request to start audio and video tracks.

src/state/CallViewModel/localMember/LocalTransport.ts

@@ -25,7 +25,7 @@ import {
   switchMap,
   tap,
 } from "rxjs";
-import { logger as rootLogger, type Logger } from "matrix-js-sdk/lib/logger";
+import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
 import { AutoDiscovery } from "matrix-js-sdk/lib/autodiscovery";
 import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
 
@@ -46,6 +46,8 @@ import { areLivekitTransportsEqual } from "../remoteMembers/MatrixLivekitMembers
 import { customLivekitUrl } from "../../../settings/settings.ts";
 import { RtcTransportAutoDiscovery } from "./RtcTransportAutoDiscovery.ts";
 
+const logger = rootLogger.getChild("[LocalTransport]");
+
 /*
  * It figures out “which LiveKit focus URL/alias the local user should use,”
  * optionally aligning with the oldest member, and ensures the SFU path is primed
@@ -138,14 +140,9 @@ export const createLocalTransport$ = ({
   forceJwtEndpoint,
   delayId$,
 }: Props): LocalTransport => {
-  const logger = rootLogger.getChild("[LocalTransport]");
   // The LiveKit transport in use by the oldest RTC membership. `null` when the
   // oldest member has no such transport.
-  const oldestMemberTransport$ = observerOldestMembership$(
-    scope,
-    memberships$,
-    logger,
-  );
+  const oldestMemberTransport$ = observerOldestMembership$(scope, memberships$);
 
   const transportDiscovery = new RtcTransportAutoDiscovery({
     client: client,
@@ -193,7 +190,6 @@ export const createLocalTransport$ = ({
           roomId,
           client,
           delayId ?? undefined,
-          logger,
         );
       } catch (e) {
         logger.error(
@@ -213,7 +209,6 @@ export const createLocalTransport$ = ({
       client,
       ownMembershipIdentity,
       roomId,
-      logger,
     );
   }
 
@@ -253,7 +248,6 @@ export const createLocalTransport$ = ({
 function observerOldestMembership$(
   scope: ObservableScope,
   memberships$: Behavior<Epoch<CallMembership[]>>,
-  logger: Logger,
 ): Behavior<LivekitTransportConfig | null> {
   return scope.behavior<LivekitTransportConfig | null>(
     memberships$.pipe(
@@ -313,7 +307,6 @@ async function doOpenIdAndJWTFromUrl(
   > &
     OpenIDClientParts,
   delayId?: string,
-  logger?: Logger,
 ): Promise<LocalTransportWithSFUConfig> {
   const sfuConfig = await getSFUConfigWithOpenID(
     client,
@@ -344,7 +337,6 @@ function observeLocalTransportForOldestMembership(
     OpenIDClientParts,
   ownMembershipIdentity: CallMembershipIdentityParts,
   roomId: string,
-  logger: Logger,
 ): LocalTransport {
   // Ensure we can authenticate with the SFU.
   const authenticatedOldestMemberTransport$ = oldestMemberTransport$.pipe(
@@ -363,7 +355,6 @@ function observeLocalTransportForOldestMembership(
           roomId,
           client,
           undefined,
-          logger,
         ),
       ).pipe(
         catchError((e: unknown) => {

src/state/CallViewModel/localMember/RtcTransportAutoDiscovery.ts

@@ -102,7 +102,7 @@ export class RtcTransportAutoDiscovery {
         const transportList = await doNetworkOperationWithRetry(async () =>
           client._unstable_getRTCTransports(),
         );
-        const first = transportList.find(isLivekitTransportConfig);
+        const first = transportList.filter(isLivekitTransportConfig)[0];
         if (first) {
           return first;
         } else {

src/state/CallViewModel/remoteMembers/MatrixLivekitMembers.test.ts

@@ -15,7 +15,7 @@ import { BehaviorSubject, combineLatest, map, type Observable } from "rxjs";
 import { type IConnectionManager } from "./ConnectionManager.ts";
 import {
   type RemoteMatrixLivekitMember,
-  createRemoteMatrixLivekitMembers$,
+  createMatrixLivekitMembers$,
 } from "./MatrixLivekitMembers.ts";
 import {
   Epoch,
@@ -31,7 +31,6 @@ import {
 } from "../../../utils/test.ts";
 import { type Connection } from "./Connection.ts";
 import { constant } from "../../Behavior.ts";
-import { localRtcMember } from "../../../utils/test-fixtures.ts";
 
 let testScope: ObservableScope;
 
@@ -89,17 +88,16 @@ test("should signal participant not yet connected to livekit", async () => {
     mockConnectionManagerData$,
   );
 
-  const remoteMatrixLivekitMembers$ = createRemoteMatrixLivekitMembers$({
+  const matrixLivekitMember$ = createMatrixLivekitMembers$({
     scope: testScope,
     membershipsWithTransport$: testScope.behavior(membershipsWithTransport$),
     connectionManager: {
       connectionManagerData$: connectionManagerData$,
     } as unknown as IConnectionManager,
-    localUser: localRtcMember,
   });
 
   await flushPromises();
-  expect(remoteMatrixLivekitMembers$.value.value).toSatisfy(
+  expect(matrixLivekitMember$.value.value).toSatisfy(
     (data: RemoteMatrixLivekitMember[]) => {
       expect(data.length).toEqual(1);
       expect(data[0].membership$.value).toBe(bobMembership);
@@ -159,17 +157,16 @@ test("should signal participant on a connection that is publishing", async () =>
     constant(dataWithPublisher),
   );
 
-  const remoteMatrixLivekitMembers$ = createRemoteMatrixLivekitMembers$({
+  const matrixLivekitMember$ = createMatrixLivekitMembers$({
     scope: testScope,
     membershipsWithTransport$: testScope.behavior(membershipsWithTransport$),
     connectionManager: {
       connectionManagerData$: connectionManagerData$,
     } as unknown as IConnectionManager,
-    localUser: localRtcMember,
   });
 
   await flushPromises();
-  expect(remoteMatrixLivekitMembers$.value.value).toSatisfy(
+  expect(matrixLivekitMember$.value.value).toSatisfy(
     (data: RemoteMatrixLivekitMember[]) => {
       expect(data.length).toEqual(1);
       expect(data[0].membership$.value).toBe(bobMembership);
@@ -200,16 +197,15 @@ test("should signal participant on a connection that is not publishing", async (
     constant(dataWithPublisher),
   );
 
-  const remoteMatrixLivekitMembers$ = createRemoteMatrixLivekitMembers$({
+  const matrixLivekitMember$ = createMatrixLivekitMembers$({
     scope: testScope,
     membershipsWithTransport$: testScope.behavior(membershipsWithTransport$),
     connectionManager: {
       connectionManagerData$: connectionManagerData$,
     } as unknown as IConnectionManager,
-    localUser: localRtcMember,
   });
   await flushPromises();
-  expect(remoteMatrixLivekitMembers$.value.value).toSatisfy(
+  expect(matrixLivekitMember$.value.value).toSatisfy(
     (data: RemoteMatrixLivekitMember[]) => {
       expect(data.length).toEqual(1);
       expect(data[0].membership$.value).toBe(bobMembership);
@@ -249,16 +245,15 @@ describe("Publication edge case", () => {
       constant(connectionWithPublisher),
     );
 
-    const remoteMatrixLivekitMembers$ = createRemoteMatrixLivekitMembers$({
+    const matrixLivekitMembers$ = createMatrixLivekitMembers$({
       scope: testScope,
       membershipsWithTransport$: testScope.behavior(membershipsWithTransport$),
       connectionManager: {
         connectionManagerData$: connectionManagerData$,
       } as unknown as IConnectionManager,
-      localUser: localRtcMember,
     });
     await flushPromises();
-    expect(remoteMatrixLivekitMembers$.value.value).toSatisfy(
+    expect(matrixLivekitMembers$.value.value).toSatisfy(
       (data: RemoteMatrixLivekitMember[]) => {
         expect(data.length).toEqual(2);
         expect(data[0].membership$.value).toBe(bobMembership);
@@ -308,17 +303,16 @@ test("bob is publishing in the wrong connection", async () => {
     connectionsWithPublisher$,
   );
 
-  const remoteMatrixLivekitMembers$ = createRemoteMatrixLivekitMembers$({
+  const matrixLivekitMember$ = createMatrixLivekitMembers$({
     scope: testScope,
     membershipsWithTransport$: testScope.behavior(membershipsWithTransport$),
     connectionManager: {
       connectionManagerData$: connectionManagerData$,
     } as unknown as IConnectionManager,
-    localUser: localRtcMember,
   });
 
   await flushPromises();
-  expect(remoteMatrixLivekitMembers$.value.value).toSatisfy(
+  expect(matrixLivekitMember$.value.value).toSatisfy(
     (data: RemoteMatrixLivekitMember[]) => {
       expect(data.length).toEqual(2);
       expect(data[0].membership$.value).toBe(bobMembership);

src/state/CallViewModel/remoteMembers/MatrixLivekitMembers.ts

@@ -62,9 +62,7 @@ interface Props {
     Epoch<{ membership: CallMembership; transport?: LivekitTransportConfig }[]>
   >;
   connectionManager: IConnectionManager;
-  localUser: { deviceId: string; userId: string };
 }
-
 /**
  * Combines MatrixRTC and Livekit worlds.
  *
@@ -75,14 +73,13 @@ interface Props {
  *  - out (via public Observable):
  *    - `remoteMatrixLivekitMember` an observable of MatrixLivekitMember[] to track the remote members and associated livekit data.
  */
-export function createRemoteMatrixLivekitMembers$({
+export function createMatrixLivekitMembers$({
   scope,
   membershipsWithTransport$,
   connectionManager,
-  localUser,
 }: Props): Behavior<Epoch<RemoteMatrixLivekitMember[]>> {
   /**
-   * Behavior of all the remote call members and their associated livekit data (if available).
+   * Stream of all the call members and their associated livekit data (if available).
    */
   return scope.behavior(
     combineLatest([
@@ -94,19 +91,12 @@ export function createRemoteMatrixLivekitMembers$({
       ),
       map(([ms, data]) => new Epoch([ms.value, data.value] as const, ms.epoch)),
       generateItemsWithEpoch(
-        "RemoteMatrixLivekitMembers",
+        "MatrixLivekitMembers",
         // Generator function.
         // creates an array of `{key, data}[]`
         // Each change in the keys (new key) will result in a call to the factory function.
         function* ([membershipsWithTransport, managerData]) {
           for (const { membership, transport } of membershipsWithTransport) {
-            // Exclude the local membership
-            if (
-              membership.userId === localUser.userId &&
-              membership.deviceId === localUser.deviceId
-            )
-              continue;
-
             const participants = transport
               ? managerData.getParticipantsForTransport(transport)
               : [];

src/state/CallViewModel/remoteMembers/MatrixMemberMetadata.ts

@@ -22,6 +22,8 @@ import {
 } from "../../../utils/displayname";
 import { type Behavior } from "../../Behavior";
 
+const logger = rootLogger.getChild("[MatrixMemberMetadata]");
+
 export type RoomMemberMap = Map<
   string,
   Pick<RoomMember, "userId" | "getMxcAvatarUrl" | "rawDisplayName">
@@ -65,7 +67,6 @@ export const memberDisplaynames$ = (
   memberships$: Behavior<Pick<CallMembership, "userId">[]>,
   roomMembers$: Behavior<RoomMemberMap>,
 ): Behavior<Map<string, string>> => {
-  const logger = rootLogger.getChild("[MatrixMemberMetadata]");
   // This map tracks userIds that at some point needed disambiguation.
   // This is a memory leak bound to the number of participants.
   // A call application will always increase the memory if there have been more members in a call.

src/state/CallViewModel/remoteMembers/integration.test.ts

@@ -29,13 +29,13 @@ import {
 import { type ProcessorState } from "../../../livekit/TrackProcessorContext.tsx";
 import {
   areLivekitTransportsEqual,
-  createRemoteMatrixLivekitMembers$,
+  createMatrixLivekitMembers$,
   type RemoteMatrixLivekitMember,
 } from "./MatrixLivekitMembers.ts";
 import { createConnectionManager$ } from "./ConnectionManager.ts";
 import { membershipsAndTransports$ } from "../../SessionBehaviors.ts";
 import { constant } from "../../Behavior.ts";
-import { localRtcMember, testJWTToken } from "../../../utils/test-fixtures.ts";
+import { testJWTToken } from "../../../utils/test-fixtures.ts";
 
 // Test the integration of ConnectionManager and MatrixLivekitMerger
 
@@ -130,15 +130,14 @@ test("bob, carl, then bob joining no tracks yet", () => {
       ownMembershipIdentity: ownMemberMock,
     });
 
-    const remoteMatrixLivekitMembers$ = createRemoteMatrixLivekitMembers$({
+    const matrixLivekitMembers$ = createMatrixLivekitMembers$({
       scope: testScope,
       membershipsWithTransport$:
         membershipsAndTransports.membershipsWithTransport$,
       connectionManager,
-      localUser: localRtcMember,
     });
 
-    expectObservable(remoteMatrixLivekitMembers$).toBe(vMarble, {
+    expectObservable(matrixLivekitMembers$).toBe(vMarble, {
       a: expect.toSatisfy((e: Epoch<RemoteMatrixLivekitMember[]>) => {
         const items = e.value;
         expect(items.length).toBe(1);

src/state/IOSControlledAudioOutput.test.ts

@@ -1,162 +0,0 @@
-/*
-Copyright 2026 Element Corp.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE in the repository root for full details.
-*/
-
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { type Observable, of } from "rxjs";
-
-import { ObservableScope } from "./ObservableScope";
-import { constant } from "./Behavior";
-import { type SelectedAudioOutputDevice } from "./MediaDevices";
-import {
-  availableOutputDevices$,
-  type Controls,
-  type OutputDevice,
-  outputDevice$,
-} from "../controls";
-import {
-  EARPIECE_CONFIG_ID,
-  IOSControlledAudioOutput,
-} from "./IOSControlledAudioOutput";
-
-// `vi.mock` calls are hoisted above all imports, so the static imports below
-// already see these mocks. Force the iOS platform so that the virtual earpiece
-// is available, and stub the livekit device observer (only subscribed for its
-// side effects).
-vi.mock("../Platform", () => ({ platform: "ios" }));
-vi.mock("@livekit/components-core", () => ({
-  createMediaDeviceObserver: (): Observable<MediaDeviceInfo[]> => of([]),
-}));
-
-// On iOS the host reports a single device for the current route. When output is
-// on the loudspeaker it is flagged `forEarpiece`, which makes the controller
-// expose a virtual earpiece device.
-const SPEAKER: OutputDevice = {
-  id: "speaker",
-  name: "Speaker",
-  isSpeaker: true,
-  forEarpiece: true,
-};
-
-// A connected headset (e.g. Bluetooth) is reported as a plain named device,
-// with neither the speaker nor earpiece flag set.
-const HEADSET: OutputDevice = {
-  id: "bt",
-  name: "AirPods",
-};
-
-let testScope: ObservableScope;
-
-beforeEach(() => {
-  testScope = new ObservableScope();
-  window.controls = {
-    onAudioDeviceSelect: vi.fn(),
-    onOutputDeviceSelect: vi.fn(),
-  } as unknown as Controls;
-});
-
-afterEach(() => {
-  testScope.end();
-});
-
-/**
- * Subscribe to the controller's `selected$` and return a getter for the latest
- * emitted value.
- */
-function latestSelection(
-  output: InstanceType<typeof IOSControlledAudioOutput>,
-): () => SelectedAudioOutputDevice | undefined {
-  let latest: SelectedAudioOutputDevice | undefined;
-  output.selected$.subscribe((s) => {
-    latest = s;
-  });
-  return () => latest;
-}
-
-describe("Default selection", () => {
-  it("defaults to the earpiece for voice (audio) calls", () => {
-    const output = new IOSControlledAudioOutput(
-      constant(false),
-      testScope,
-      "audio",
-    );
-    const selected = latestSelection(output);
-
-    availableOutputDevices$.next([SPEAKER]);
-
-    expect(selected()).toEqual({
-      id: EARPIECE_CONFIG_ID,
-      virtualEarpiece: true,
-    });
-    expect(window.controls.onAudioDeviceSelect).toHaveBeenLastCalledWith(
-      EARPIECE_CONFIG_ID,
-    );
-  });
-
-  it("defaults to the speaker for video calls", () => {
-    const output = new IOSControlledAudioOutput(
-      constant(false),
-      testScope,
-      "video",
-    );
-    const selected = latestSelection(output);
-
-    availableOutputDevices$.next([SPEAKER]);
-
-    expect(selected()).toEqual({ id: SPEAKER.id, virtualEarpiece: false });
-  });
-
-  it("keeps a headset for voice calls instead of forcing the earpiece", () => {
-    const output = new IOSControlledAudioOutput(
-      constant(false),
-      testScope,
-      "audio",
-    );
-    const selected = latestSelection(output);
-
-    // The host proposes the headset as the route (listed first), even though a
-    // forEarpiece device is also present so the virtual earpiece exists.
-    availableOutputDevices$.next([HEADSET, SPEAKER]);
-
-    expect(selected()).toEqual({ id: HEADSET.id, virtualEarpiece: false });
-  });
-});
-
-describe("Explicit selection", () => {
-  it("an explicit user selection overrides the earpiece default", () => {
-    const output = new IOSControlledAudioOutput(
-      constant(false),
-      testScope,
-      "audio",
-    );
-    const selected = latestSelection(output);
-
-    availableOutputDevices$.next([SPEAKER]);
-    // Earpiece by default for a voice call...
-    expect(selected()).toEqual({
-      id: EARPIECE_CONFIG_ID,
-      virtualEarpiece: true,
-    });
-
-    // ...until the user explicitly picks the speaker.
-    output.select(SPEAKER.id);
-    expect(selected()).toEqual({ id: SPEAKER.id, virtualEarpiece: false });
-  });
-
-  it("a host selection overrides the earpiece default", () => {
-    const output = new IOSControlledAudioOutput(
-      constant(false),
-      testScope,
-      "audio",
-    );
-    const selected = latestSelection(output);
-
-    availableOutputDevices$.next([SPEAKER]);
-    outputDevice$.next(SPEAKER.id);
-
-    expect(selected()).toEqual({ id: SPEAKER.id, virtualEarpiece: false });
-  });
-});

src/state/IOSControlledAudioOutput.ts

@@ -8,7 +8,6 @@ Please see LICENSE in the repository root for full details.
 import { logger as rootLogger } from "matrix-js-sdk/lib/logger";
 import { combineLatest, merge, startWith, Subject, tap } from "rxjs";
 
-import type { RTCCallIntent } from "matrix-js-sdk/lib/matrixrtc";
 import {
   availableOutputDevices$ as controlledAvailableOutputDevices$,
   outputDevice$ as controlledOutputSelection$,
@@ -25,7 +24,7 @@ import {
 
 // This hardcoded id is used in EX ios! It can only be changed in coordination with
 // the ios swift team.
-export const EARPIECE_CONFIG_ID = "earpiece-id";
+const EARPIECE_CONFIG_ID = "earpiece-id";
 
 /**
  * A special implementation of audio output that allows the hosting application
@@ -95,7 +94,7 @@ export class IOSControlledAudioOutput implements MediaDevice<
         ),
       ],
       (available, preferredId) => {
-        const id = preferredId ?? this.chooseDefaultId(available);
+        const id = preferredId ?? available.keys().next().value;
         return id === undefined
           ? undefined
           : { id, virtualEarpiece: id === EARPIECE_CONFIG_ID };
@@ -107,41 +106,9 @@ export class IOSControlledAudioOutput implements MediaDevice<
     ),
   );
 
-  /**
-   * Chooses the default output device when no explicit selection (from the user
-   * or the hosting application) has been made yet.
-   *
-   * For voice calls (`initialIntent === "audio"`) we want to start on the
-   * earpiece rather than the speaker, like a regular phone call. We only
-   * override when the device that would otherwise be the default is the
-   * speaker: if the host already routed to a headset (e.g. Bluetooth) — which
-   * is reported as a plain named device, not "speaker"/"earpiece" — we keep it.
-   * This mirrors the Android behaviour in {@link AndroidControlledAudioOutput}.
-   */
-  private chooseDefaultId(
-    available: Map<string, AudioOutputDeviceLabel>,
-  ): string | undefined {
-    const firstId = available.keys().next().value;
-    if (this.initialIntent === "audio") {
-      const firstLabel =
-        firstId !== undefined ? available.get(firstId) : undefined;
-      if (firstLabel?.type === "speaker") {
-        for (const [id, label] of available)
-          if (label.type === "earpiece") {
-            this.logger.info(
-              `IOS routing: default to earpiece ${id} instead of speaker for voice call`,
-            );
-            return id;
-          }
-      }
-    }
-    return firstId;
-  }
-
   public constructor(
     private readonly usingNames$: Behavior<boolean>,
     private readonly scope: ObservableScope,
-    private readonly initialIntent: RTCCallIntent | undefined = undefined,
   ) {
     this.selected$.subscribe((device) => {
       // Let the hosting application know which output device has been selected.

src/state/MediaDevices.ts

@@ -376,11 +376,7 @@ export class MediaDevices {
           getUrlParams().callIntent,
           window.controls,
         )
-      : new IOSControlledAudioOutput(
-          this.usingNames$,
-          this.scope,
-          getUrlParams().callIntent,
-        )
+      : new IOSControlledAudioOutput(this.usingNames$, this.scope)
     : new AudioOutput(this.usingNames$, this.scope);
 
   public readonly videoInput: MediaDevice<DeviceLabel, SelectedDevice> =

src/state/OneOnOnePortraitLayout.ts

@@ -26,7 +26,7 @@ export function oneOnOnePortraitLayout(
   prevTiles: TileStore,
 ): [OneOnOnePortraitLayout, TileStore] {
   const update = prevTiles.from(media.pip === undefined ? 0 : 1);
-  update.registerSpotlight([media.spotlight], true, "transparent");
+  update.registerSpotlight([media.spotlight], true);
   if (media.pip !== undefined) update.registerGridTile(media.pip);
   const tiles = update.build();
 

src/state/PipLayout.ts

@@ -21,7 +21,6 @@ export function pipLayout(
   update.registerSpotlight(
     media.spotlight,
     platform === "desktop" ? false : true,
-    "transparent",
   );
   const tiles = update.build();
   return [

src/state/SpotlightExpandedLayout.ts

@@ -23,7 +23,7 @@ export function spotlightExpandedLayout(
   prevTiles: TileStore,
 ): [SpotlightExpandedLayout, TileStore] {
   const update = prevTiles.from(1);
-  update.registerSpotlight(media.spotlight, true, "transparent");
+  update.registerSpotlight(media.spotlight, true);
   if (media.pip !== undefined) update.registerPipTile(media.pip);
   const tiles = update.build();
 

src/state/TileStore.ts

@@ -15,8 +15,6 @@ import { type MediaViewModel } from "./media/MediaViewModel";
 import { type UserMediaViewModel } from "./media/UserMediaViewModel";
 import { type RingingMediaViewModel } from "./media/RingingMediaViewModel";
 
-type SpotlightBackground = "solid" | "transparent";
-
 function debugEntries(entries: GridTileData[]): string[] {
   return entries.map((e) => e.media.displayName$.value);
 }
@@ -41,29 +39,12 @@ class SpotlightTileData {
     this.maximised$.next(value);
   }
 
-  private readonly background$: BehaviorSubject<SpotlightBackground>;
-  public get background(): SpotlightBackground {
-    return this.background$.value;
-  }
-  public set background(value: SpotlightBackground) {
-    this.background$.next(value);
-  }
-
   public readonly vm: SpotlightTileViewModel;
 
-  public constructor(
-    media: MediaViewModel[],
-    maximised: boolean,
-    background: SpotlightBackground,
-  ) {
+  public constructor(media: MediaViewModel[], maximised: boolean) {
     this.media$ = new BehaviorSubject(media);
     this.maximised$ = new BehaviorSubject(maximised);
-    this.background$ = new BehaviorSubject(background);
-    this.vm = new SpotlightTileViewModel(
-      this.media$,
-      this.maximised$,
-      this.background$,
-    );
+    this.vm = new SpotlightTileViewModel(this.media$, this.maximised$);
   }
 }
 
@@ -150,9 +131,9 @@ export class TileStoreBuilder {
   private numGridEntries = 0;
   // A sparse array of grid entries which should be kept in the same spots as
   // which they appeared in the previous grid
-  private readonly stationaryGridEntries: GridTileData[] = Array.from({
-    length: this.prevGrid.length,
-  });
+  private readonly stationaryGridEntries: GridTileData[] = new Array(
+    this.prevGrid.length,
+  );
   // Grid entries which should now enter the visible section of the grid
   private readonly visibleGridEntries: GridTileData[] = [];
   // Grid entries which should now enter the invisible section of the grid
@@ -176,11 +157,7 @@ export class TileStoreBuilder {
    * Sets the contents of the spotlight tile. If this is never called, there
    * will be no spotlight tile.
    */
-  public registerSpotlight(
-    media: MediaViewModel[],
-    maximised: boolean,
-    background: SpotlightBackground = "solid",
-  ): void {
+  public registerSpotlight(media: MediaViewModel[], maximised: boolean): void {
     if (DEBUG_ENABLED)
       logger.debug(
         `[TileStore, ${this.generation}] register spotlight: ${media.map((m) => m.displayName$.value)}`,
@@ -192,12 +169,11 @@ export class TileStoreBuilder {
 
     // Reuse the previous spotlight tile if it exists
     if (this.prevSpotlight === null) {
-      this.spotlight = new SpotlightTileData(media, maximised, background);
+      this.spotlight = new SpotlightTileData(media, maximised);
     } else {
       this.spotlight = this.prevSpotlight;
       this.spotlight.media = media;
       this.spotlight.maximised = maximised;
-      this.spotlight.background = background;
     }
   }
 

src/state/TileViewModel.ts

@@ -5,8 +5,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { BehaviorSubject } from "rxjs";
-
 import { type Behavior } from "./Behavior";
 import { type MediaViewModel } from "./media/MediaViewModel";
 import { type RingingMediaViewModel } from "./media/RingingMediaViewModel";
@@ -19,25 +17,18 @@ function createId(): string {
 
 export class GridTileViewModel {
   public readonly id = createId();
-  private readonly _showOutline$ = new BehaviorSubject(false);
-  public readonly showOutline$: Behavior<boolean> = this._showOutline$;
 
   public constructor(
     public readonly media$: Behavior<
       UserMediaViewModel | RingingMediaViewModel
     >,
   ) {}
-
-  public setShowOutline(value: boolean): void {
-    this._showOutline$.next(value);
-  }
 }
 
 export class SpotlightTileViewModel {
   public constructor(
     public readonly media$: Behavior<MediaViewModel[]>,
     public readonly maximised$: Behavior<boolean>,
-    public readonly background$: Behavior<"solid" | "transparent">,
   ) {}
 }
 

src/state/media/MemberMediaViewModel.ts

@@ -92,7 +92,6 @@ export function createMemberMedia(
   }: MemberMediaInputs,
 ): BaseMemberMediaViewModel {
   const trackBehavior$ = (
-    scope: ObservableScope,
     source: Track.Source,
   ): Behavior<TrackReference | undefined> =>
     scope.behavior(
@@ -103,8 +102,8 @@ export function createMemberMedia(
       ),
     );
 
-  const audio$ = trackBehavior$(scope, audioSource);
-  const video$ = trackBehavior$(scope, videoSource);
+  const audio$ = trackBehavior$(audioSource);
+  const video$ = trackBehavior$(videoSource);
 
   return {
     ...createBaseMedia(inputs),

src/state/media/RingingMediaViewModel.ts

@@ -5,9 +5,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE in the repository root for full details.
 */
 
-import { type RTCCallIntent } from "matrix-js-sdk/lib/matrixrtc";
-
 import { type Behavior } from "../Behavior";
+import { type MuteStates } from "../MuteStates";
 import {
   type BaseMediaInputs,
   type BaseMediaViewModel,
@@ -21,23 +20,32 @@ import {
 export interface RingingMediaViewModel extends BaseMediaViewModel {
   type: "ringing";
   pickupState$: Behavior<"ringing" | "timeout" | "decline">;
-  intent: RTCCallIntent;
+  /**
+   * Whether this media would be expected to have video, were it not simply a
+   * placeholder.
+   */
+  videoEnabled$: Behavior<boolean>;
 }
 
 export interface RingingMediaInputs extends BaseMediaInputs {
   pickupState$: Behavior<"ringing" | "timeout" | "decline">;
-  intent: RTCCallIntent;
+  /**
+   * The local user's own mute states.
+   */
+  muteStates: MuteStates;
 }
 
 export function createRingingMedia({
   pickupState$,
-  intent,
+  muteStates,
   ...inputs
 }: RingingMediaInputs): RingingMediaViewModel {
   return {
     ...createBaseMedia(inputs),
     type: "ringing",
     pickupState$,
-    intent,
+    // If our own video is enabled, then this is a video call and we would
+    // expect remote media to have video as well
+    videoEnabled$: muteStates.video.enabled$,
   };
 }

src/tile/GridTile.module.css

@@ -66,11 +66,6 @@ borders don't support gradients */
   opacity: 1;
 }
 
-.tile.outline {
-  outline: var(--cpd-border-width-1) solid
-    var(--cpd-color-border-interactive-secondary);
-}
-
 @media (hover: hover) {
   .tile:hover {
     outline: var(--cpd-border-width-2) solid

src/tile/GridTile.test.tsx

@@ -26,6 +26,7 @@ import {
   createRingingMedia,
   type RingingMediaViewModel,
 } from "../state/media/RingingMediaViewModel";
+import { type MuteStates } from "../state/MuteStates";
 
 global.IntersectionObserver = class MockIntersectionObserver {
   public observe(): void {}
@@ -77,8 +78,6 @@ test("GridTile is accessible", async () => {
         targetHeight={200}
         showSpeakingIndicators
         showNameTags
-        showRingingStatus
-        showOutline
         focusable
       />
     </ReactionsSenderProvider>,
@@ -94,8 +93,10 @@ test("GridTile displays ringing media", async () => {
   >("ringing");
   const vm = createRingingMedia({
     pickupState$,
+    muteStates: {
+      video: { enabled$: constant(false) },
+    } as unknown as MuteStates,
     id: "test",
-    intent: "audio",
     userId: "@alice:example.org",
     displayName$: constant("Alice"),
     mxcAvatarUrl$: constant(undefined),
@@ -110,8 +111,6 @@ test("GridTile displays ringing media", async () => {
         targetHeight={200}
         showSpeakingIndicators
         showNameTags
-        showRingingStatus
-        showOutline
         focusable
       />
     </ReactionsSenderProvider>,