Fix the settings label

We were displaying the raw translation key rather than the translated text.

.eslintrc.cjs

@@ -1,8 +1,17 @@
 const COPYRIGHT_HEADER = `/*
-Copyright %%CURRENT_YEAR%% New Vector Ltd.
+Copyright %%CURRENT_YEAR%% New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 `;
@@ -29,13 +38,6 @@ module.exports = {
     "jsx-a11y/media-has-caption": "off",
     // We should use the js-sdk logger, never console directly.
     "no-console": ["error"],
-    "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",
   },
   settings: {
     react: {

.github/CODEOWNERS

@@ -1 +1 @@
-* @element-hq/element-call-reviewers
+* @vector-im/element-call-reviewers

.github/workflows/build.yaml

@@ -1,25 +1,34 @@
 name: Build
 on:
-  pull_request:
-    types:
-      - synchronize
-      - opened
-      - labeled
-    paths-ignore:
-      - ".github/**"
-      - "docs/**"
+  pull_request: {}
   push:
     branches: [livekit, full-mesh]
-    paths-ignore:
-      - ".github/**"
-      - "docs/**"
 jobs:
-  build_element_call:
-    uses: ./.github/workflows/element-call.yaml
-    with:
-      vite_app_version: ${{ github.event.release.tag_name || github.sha }}
-    secrets:
-      SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-      SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-      SENTRY_URL: ${{ secrets.SENTRY_URL }}
-      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Yarn cache
+        uses: actions/setup-node@v4
+        with:
+          cache: "yarn"
+      - name: Install dependencies
+        run: "yarn install"
+      - name: Build
+        run: "yarn run build"
+        env:
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+          SENTRY_URL: ${{ secrets.SENTRY_URL }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          VITE_APP_VERSION: ${{ github.sha }}
+          NODE_OPTIONS: "--max-old-space-size=4096"
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: build
+          path: dist
+          # We'll only use this in a triggered job, then we're done with it
+          retention-days: 1

.github/workflows/docker.yaml

@@ -1,60 +0,0 @@
-name: Docker - Deploy
-on:
-  workflow_call:
-    inputs:
-      docker_tags:
-        required: true
-        type: string
-      artifact_run_id:
-        required: false
-        type: string
-        default: ${{ github.run_id }}
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build_and_deploy:
-    name: Build & publish docker
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write # required to upload release asset
-      packages: write
-    steps:
-      - name: Check it out
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
-
-      - name: 📥 Download artifact
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ inputs.artifact_run_id }}
-          name: build-output
-          path: dist
-
-      - name: Log in to container registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: ${{ inputs.docker_tags}}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/e2e.yml

@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out test private repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@v4
         with:
-          repository: element-hq/static-call-participant
+          repository: vector-im/static-call-participant
           ref: refs/heads/main
           path: static-call-participant
           token: ${{ secrets.GH_E2E_TEST_TOKEN }}

.github/workflows/element-call.yaml

@@ -1,47 +0,0 @@
-name: Element Call - Build
-on:
-  workflow_call:
-    inputs:
-      vite_app_version:
-        required: true
-        type: string
-    secrets:
-      SENTRY_ORG:
-        required: true
-      SENTRY_PROJECT:
-        required: true
-      SENTRY_URL:
-        required: true
-      SENTRY_AUTH_TOKEN:
-        required: true
-
-jobs:
-  build:
-    name: Build Element Call
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
-      - name: Yarn cache
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
-        with:
-          cache: "yarn"
-          node-version: "lts/*"
-      - name: Install dependencies
-        run: "yarn install"
-      - name: Build
-        run: "yarn run build"
-        env:
-          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-          SENTRY_URL: ${{ secrets.SENTRY_URL }}
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          VITE_APP_VERSION: ${{ inputs.vite_app_version }}
-          NODE_OPTIONS: "--max-old-space-size=4096"
-      - name: Upload Artifact
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
-        with:
-          name: build-output
-          path: dist
-          # We'll only use this in a triggered job, then we're done with it
-          retention-days: 1

.github/workflows/lint.yaml

@@ -7,12 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@v4
       - name: Yarn cache
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
+        uses: actions/setup-node@v4
         with:
           cache: "yarn"
-          node-version: "lts/*"
       - name: Install dependencies
         run: "yarn install"
       - name: Prettier
@@ -23,5 +22,3 @@ jobs:
         run: "yarn run lint:eslint"
       - name: Type check
         run: "yarn run lint:types"
-      - name: Dead code analysis
-        run: "yarn run lint:knip"

.github/workflows/netlify-pr.yaml

@@ -1,79 +1,73 @@
-name: Netlify - Deploy
+name: Netlify PR Preview
 on:
-  workflow_call:
-    inputs:
-      pr_number:
-        required: true
-        type: string
-      pr_head_full_name:
-        required: true
-        type: string
-      pr_head_ref:
-        required: true
-        type: string
-      deployment_ref:
-        required: true
-        type: string
-      artifact_run_id:
-        required: false
-        type: string
-        default: ${{ github.run_id }}
-    secrets:
-      ELEMENT_BOT_TOKEN:
-        required: true
-      NETLIFY_AUTH_TOKEN:
-        required: true
-      NETLIFY_SITE_ID:
-        required: true
-
+  workflow_run:
+    workflows: ["Build"]
+    types:
+      - completed
+    branches-ignore:
+      - "main"
+      - "livekit"
 jobs:
   deploy:
+    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
     runs-on: ubuntu-latest
     permissions:
       deployments: write
     environment: Netlify
     steps:
       - name: 📝 Create Deployment
-        uses: bobheadxi/deployments@648679e8e4915b27893bd7dbc35cb504dc915bc8 # v1
+        uses: bobheadxi/deployments@v1
         id: deployment
         with:
           step: start
           token: ${{ secrets.GITHUB_TOKEN }}
           env: Netlify
-          ref: ${{ inputs.deployment_ref }}
+          ref: ${{ github.event.workflow_run.head_sha }}
           desc: |
             Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
             Exercise caution. Use test accounts.
 
-      - name: 📥 Download artifact
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
+      - id: prdetails
+        uses: matrix-org/pr-details-action@v1.3
         with:
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-          run-id: ${{ inputs.artifact_run_id }}
-          name: build-output
+          owner: ${{ github.event.workflow_run.head_repository.owner.login }}
+          branch: ${{ github.event.workflow_run.head_branch }}
+
+      # There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
+      # (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
+      - name: 📥 Download artifact
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          run_id: ${{ github.event.workflow_run.id }}
+          name: build
           path: webapp
 
       - name: Add redirects file
         # We fetch from github directly as we don't bother checking out the repo
-        run: curl -s https://raw.githubusercontent.com/element-hq/element-call/main/config/netlify_redirects > webapp/_redirects
+        run: curl -s https://raw.githubusercontent.com/vector-im/element-call/main/config/netlify_redirects > webapp/_redirects
 
       - name: Add config file
-        run: curl -s "https://raw.githubusercontent.com/${{ inputs.pr_head_full_name }}/${{ inputs.pr_head_ref }}/config/config_netlify_preview.json" > webapp/config.json
+        env:
+          HEADBRACH: ${{ github.event.workflow_run.head_branch }}
+        run: curl -s "https://raw.githubusercontent.com/vector-im/element-call/${HEADBRACH}/config/element_io_preview.json" > webapp/config.json
 
       - name: ☁️ Deploy to Netlify
         id: netlify
-        uses: nwtgck/actions-netlify@4cbaf4c08f1a7bfa537d6113472ef4424e4eb654 # v3.0
+        uses: nwtgck/actions-netlify@v2.1
         with:
           publish-dir: webapp
           deploy-message: "Deploy from GitHub Actions"
-          alias: pr${{ inputs.pr_number }}
+          # These don't work because we're in workflow_run
+          enable-pull-request-comment: false
+          enable-commit-comment: false
+          alias: pr${{ steps.prdetails.outputs.pr_id }}
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
         timeout-minutes: 1
 
       - name: 🚦 Update deployment status
-        uses: bobheadxi/deployments@648679e8e4915b27893bd7dbc35cb504dc915bc8 # v1
+        uses: bobheadxi/deployments@v1
         if: always()
         with:
           step: finish

.github/workflows/pr-deploy.yaml

@@ -1,50 +0,0 @@
-name: PR Preview Deployments
-on:
-  workflow_run:
-    workflows: ["Build"]
-    types:
-      - completed
-
-jobs:
-  prdetails:
-    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request' }}
-    runs-on: ubuntu-latest
-    outputs:
-      pr_number: ${{ steps.prdetails.outputs.pr_id }}
-      pr_data_json: ${{ steps.prdetails.outputs.data }}
-    steps:
-      - id: prdetails
-        uses: matrix-org/pr-details-action@15bde5285d7850ba276cc3bd8a03733e3f24622a # v1.3
-        continue-on-error: true
-        with:
-          owner: ${{ github.event.workflow_run.head_repository.owner.login }}
-          branch: ${{ github.event.workflow_run.head_branch }}
-
-  netlify:
-    needs: prdetails
-    permissions:
-      deployments: write
-    uses: ./.github/workflows/netlify.yaml
-    with:
-      artifact_run_id: ${{ github.event.workflow_run.id || github.run_id }}
-      pr_number: ${{ needs.prdetails.outputs.pr_number }}
-      pr_head_full_name: ${{ github.event.workflow_run.head_repository.full_name }}
-      pr_head_ref: ${{ needs.prdetails.outputs.pr_data_json && fromJSON(needs.prdetails.outputs.pr_data_json).head.ref }}
-      deployment_ref: ${{ needs.prdetails.outputs.pr_data_json && fromJSON(needs.prdetails.outputs.pr_data_json).head.sha || github.ref || github.head_ref }}
-    secrets:
-      ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-      NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-      NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-
-  docker:
-    if: ${{ needs.prdetails.outputs.pr_data_json && contains(fromJSON(needs.prdetails.outputs.pr_data_json).labels.*.name, 'docker build') }}
-    needs: prdetails
-    permissions:
-      contents: write
-      packages: write
-    uses: ./.github/workflows/docker.yaml
-    with:
-      artifact_run_id: ${{ github.event.workflow_run.id || github.run_id }}
-      docker_tags: |
-        type=sha,format=short,event=branch
-        type=raw,value=pr_${{ needs.prdetails.outputs.pr_number }}

.github/workflows/publish.yaml

@@ -3,34 +3,17 @@ name: Build & publish images to the package registry for tags
 on:
   release:
     types: [published]
-  workflow_run:
-    workflows: ["Build"]
+  push:
     branches: [livekit]
-    types:
-      - completed
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build_element_call:
-    if: ${{ github.event_name == 'release' }}
-    uses: ./.github/workflows/element-call.yaml
-    with:
-      vite_app_version: ${{ github.event.release.tag_name || github.sha }}
-    secrets:
-      SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-      SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-      SENTRY_URL: ${{ secrets.SENTRY_URL }}
-      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-  publish_tarball:
-    needs: build_element_call
-    if: always()
-    name: Publish tarball
+  build:
+    name: Build & publish
     runs-on: ubuntu-latest
-    outputs:
-      unix_time: ${{steps.current-time.outputs.unix_time}}
     permissions:
       contents: write # required to upload release asset
       packages: write
@@ -38,35 +21,64 @@ jobs:
       - name: Get current time
         id: current-time
         run: echo "unix_time=$(date +'%s')" >> $GITHUB_OUTPUT
-      - name: 📥 Download artifact
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
+
+      - name: Check it out
+        uses: actions/checkout@v4
+
+      - name: Log in to container registry
+        uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          run-id: ${{ github.event.workflow_run.id || github.run_id }}
-          name: build-output
-          path: dist
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Yarn cache
+        uses: actions/setup-node@v4
+        with:
+          cache: "yarn"
+      - name: Install dependencies
+        run: "yarn install"
+      - name: Build
+        run: "yarn run build"
+        env:
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+          SENTRY_URL: ${{ secrets.SENTRY_URL }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          VITE_APP_VERSION: ${{ github.event.release.tag_name || github.sha }}
+
       - name: Create Tarball
         env:
           TARBALL_VERSION: ${{ github.event.release.tag_name || github.sha }}
         run: |
           tar --numeric-owner --transform "s/dist/element-call-${TARBALL_VERSION}/" -cvzf element-call-${TARBALL_VERSION}.tar.gz dist
+
       - name: Upload
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           path: "./element-call-*.tar.gz"
-  publish_docker:
-    needs: publish_tarball
-    if: always()
-    permissions:
-      contents: write
-      packages: write
-    uses: ./.github/workflows/docker.yaml
-    with:
-      artifact_run_id: ${{ github.event.workflow_run.id || github.run_id }}
-      docker_tags: |
-        type=sha,format=short,event=branch
-        type=semver,pattern=v{{version}}
-        type=raw,value=latest-ci,enable={{is_default_branch}}
-        type=raw,value=latest-ci_${{needs.publish_tarball.outputs.unix_time}},enable={{is_default_branch}}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@2a4836ac76fe8f5d0ee3a0d89aa12a80cc552ad3
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha,format=short,event=branch
+            type=semver,pattern=v{{version}}
+            type=raw,value=latest-ci,enable={{is_default_branch}}
+            type=raw,value=latest-ci_${{steps.current-time.outputs.unix_time}},enable={{is_default_branch}}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@6d5347c4025fdf2bb05167a2519cac535a14a408
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/test.yaml

@@ -1,28 +1,24 @@
-name: Run unit tests
+name: Run jest tests
 on:
   pull_request: {}
   push:
     branches: [livekit, full-mesh]
 jobs:
-  vitest:
-    name: Run vitest tests
+  jest:
+    name: Run jest tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@v4
       - name: Yarn cache
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
+        uses: actions/setup-node@v4
         with:
           cache: "yarn"
-          node-version: "lts/*"
       - name: Install dependencies
         run: "yarn install"
-      - name: Vitest
-        run: "yarn run test:coverage"
+      - name: Jest
+        run: "yarn run test"
       - name: Upload to codecov
-        uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        uses: codecov/codecov-action@v3
         with:
           flags: unittests
-          fail_ci_if_error: true

.github/workflows/translations-download.yaml

@@ -13,12 +13,11 @@ jobs:
 
     steps:
       - name: Checkout the code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@v4
 
-      - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
+      - uses: actions/setup-node@v3
         with:
           cache: "yarn"
-          node-version: "lts/*"
 
       - name: Install Deps
         run: "yarn install --frozen-lockfile"
@@ -27,7 +26,7 @@ jobs:
         run: "rm -R public/locales"
 
       - name: Download translation files
-        uses: localazy/download@0a79880fb66150601e3b43606fab69c88123c087 # v1.1.0
+        uses: localazy/download@v1.1.0
         with:
           groups: "-p includeSourceLang:true"
 
@@ -39,7 +38,7 @@ jobs:
 
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 # v7.0.2
+        uses: peter-evans/create-pull-request@v5.0.2
         with:
           token: ${{ secrets.ELEMENT_BOT_TOKEN }}
           branch: actions/localazy-download

.github/workflows/translations-upload.yaml

@@ -3,8 +3,6 @@ on:
   push:
     branches:
       - livekit
-    paths-ignore:
-      - ".github/**"
 
 jobs:
   upload:
@@ -14,9 +12,9 @@ jobs:
 
     steps:
       - name: Checkout the code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@v4
 
       - name: Upload
-        uses: localazy/upload@27e6b5c0fddf4551596b42226b1c24124335d24a # v1
+        uses: localazy/upload@v1
         with:
           write_key: ${{ secrets.LOCALAZY_WRITE_KEY }}

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "book"]
-	path = book
-	url = https://gitea.networkx.de/rzerres/element-call-book.git

.storybook/main.js

@@ -0,0 +1,25 @@
+const svgrPlugin = require("vite-plugin-svgr");
+const path = require("path");
+
+module.exports = {
+  stories: ["../src/**/*.stories.@(js|jsx|ts|tsx)"],
+  framework: "@storybook/react",
+  core: {
+    builder: "storybook-builder-vite",
+  },
+  async viteFinal(config) {
+    config.plugins = config.plugins.filter(
+      (item) =>
+        !(
+          Array.isArray(item) &&
+          item.length > 0 &&
+          item[0].name === "vite-plugin-mdx"
+        ),
+    );
+    config.plugins.push(svgrPlugin());
+    config.resolve = config.resolve || {};
+    config.resolve.dedupe = config.resolve.dedupe || [];
+    config.resolve.dedupe.push("react", "react-dom", "matrix-js-sdk");
+    return config;
+  },
+};

.storybook/preview.jsx

@@ -0,0 +1,24 @@
+import { addDecorator } from "@storybook/react";
+import { MemoryRouter } from "react-router-dom";
+import { usePageFocusStyle } from "../src/usePageFocusStyle";
+import { OverlayProvider } from "@react-aria/overlays";
+import "../src/index.css";
+
+export const parameters = {
+  actions: { argTypesRegex: "^on[A-Z].*" },
+  controls: {
+    matchers: {
+      color: /(background|color)$/i,
+      date: /Date$/,
+    },
+  },
+};
+
+addDecorator((story) => {
+  usePageFocusStyle();
+  return (
+    <MemoryRouter initialEntries={["/"]}>
+      <OverlayProvider>{story()}</OverlayProvider>
+    </MemoryRouter>
+  );
+});

LICENSE

@@ -1,661 +1,177 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

README.md

@@ -5,7 +5,7 @@
 
 Group calls with WebRTC that leverage [Matrix](https://matrix.org) and an open-source WebRTC toolkit from [LiveKit](https://livekit.io/).
 
-For prior version of the Element Call that relied solely on full-mesh logic, check [`full-mesh`](https://github.com/element-hq/element-call/tree/full-mesh) branch.
+For prior version of the Element Call that relied solely on full-mesh logic, check [`full-mesh`](https://github.com/vector-im/element-call/tree/full-mesh) branch.
 
 ![A demo of Element Call with six people](demo.jpg)
 
@@ -16,13 +16,13 @@ To try it out, visit our hosted version at [call.element.io](https://call.elemen
 Until prebuilt tarballs are available, you'll need to build Element Call from source. First, clone and install the package:
 
 ```
-git clone https://github.com/element-hq/element-call.git
+git clone https://github.com/vector-im/element-call.git
 cd element-call
 yarn
 yarn build
 ```
 
-If all went well, you can now find the build output under `dist` as a series of static files. These can be hosted using any web server that can be configured with custom routes (see below).
+If all went well, you can now find the build output under `dist` as a series of static files. These can be hosted using any web server of your choice.
 
 You may also wish to add a configuration file (Element Call uses the domain it's hosted on as a Homeserver URL by default,
 but you can change this in the config file). This goes in `public/config.json` - you can use the sample as a starting point:
@@ -54,38 +54,6 @@ Therefore, to use a self-hosted homeserver, this is recommended to be a new serv
 
 There are currently two different config files. `.env` holds variables that are used at build time, while `public/config.json` holds variables that are used at runtime. Documentation and default values for `public/config.json` can be found in [ConfigOptions.ts](src/config/ConfigOptions.ts).
 
-If you're using [Synapse](https://github.com/element-hq/synapse/), you'll need to additionally add the following to `homeserver.yaml` or Element Call won't work:
-
-```
-experimental_features:
-    msc3266_enabled: true
-```
-
-MSC3266 allows to request a room summary of rooms you are not joined.
-The summary contains the room join rules. We need that to decide if the user gets prompted with the option to knock ("ask to join"), a cannot join error or the join view.
-
-Element Call requires a Livekit SFU behind a Livekit jwt service to work. The url to the Livekit jwt service can either be configured in the config of Element Call (fallback/legacy configuration) or be configured by your homeserver via the `.well-known`.
-This is the recommended method.
-
-The configuration is a list of Foci configs:
-
-```json
-"org.matrix.msc4143.rtc_foci": [
-    {
-        "type": "livekit",
-        "livekit_service_url": "https://someurl.com"
-    },
-     {
-        "type": "livekit",
-        "livekit_service_url": "https://livekit2.com"
-    },
-    {
-        "type": "another_foci",
-        "props_for_another_foci": "val"
-    },
-]
-```
-
 ## Translation
 
 If you'd like to help translate Element Call, head over to [Localazy](https://localazy.com/p/element-call). You're also encouraged to join the [Element Translators](https://matrix.to/#/#translators:element.io) space to discuss and coordinate translation efforts.
@@ -106,7 +74,7 @@ yarn link
 Next, we can set up this project:
 
 ```
-git clone https://github.com/element-hq/element-call.git
+git clone https://github.com/vector-im/element-call.git
 cd element-call
 yarn
 yarn link matrix-js-sdk
@@ -125,14 +93,12 @@ service for development. These use a test 'secret' published in this
 repository, so this must be used only for local development and
 **_never be exposed to the public Internet._**
 
-To use it, add a SFU parameter in your local config `./public/config.json`:
-(Be aware, that this is only the fallback Livekit SFU. If the homeserver
-advertises one in the client well-known, this will not be used.)
+To use it, add SFU parameter in your local config `./public/config.yml`:
 
-```json
+```yaml
 "livekit": {
-  "livekit_service_url": "http://localhost:7881"
-},
+    "jwt_service_url": "http://localhost:8881"
+  },
 ```
 
 Run backend components:
@@ -141,32 +107,6 @@ Run backend components:
 yarn backend
 ```
 
-### Test Coverage
-
-<img src="https://codecov.io/github/element-hq/element-call/graphs/tree.svg?token=O6CFVKK6I1"></img>
-
-### Add a new translation key
-
-To add a new translation key you can do these steps:
-
-1. Add the new key entry to the code where the new key is used: `t("some_new_key")`
-1. Run `yarn i18n` to extract the new key and update the translation files. This will add a skeleton entry to the `public/locales/en-GB/app.json` file:
-   ```jsonc
-   {
-       ...
-       "some_new_key": "",
-       ...
-   }
-   ```
-1. Update the skeleton entry in the `public/locales/en-GB/app.json` file with the English translation:
-   ```jsonc
-   {
-       ...
-       "some_new_key": "Some new key",
-       ...
-   }
-   ```
-
 ## Documentation
 
 Usage and other technical details about the project can be found here:

backend-docker-compose.yml

@@ -5,7 +5,7 @@ networks:
 
 services:
   auth-service:
-    image: ghcr.io/element-hq/lk-jwt-service:latest-ci
+    image: ghcr.io/vector-im/lk-jwt-service:latest-ci
     hostname: auth-server
     ports:
       - 8881:8080

backend/livekit.yaml

@@ -1,4 +1,5 @@
 port: 7880
+environment: dev
 bind_addresses:
   - "0.0.0.0"
 rtc:
@@ -21,3 +22,5 @@ turn:
   external_tls: true
 keys:
   devkey: secret
+signal_relay:
+  enabled: true

codecov.yaml

@@ -1,15 +0,0 @@
-# Don't post comments on PRs; they're noisy and the same information can be
-# gotten through the checks section at the bottom of the PR anyways
-comment: false
-coverage:
-  status:
-    project:
-      default:
-        # Track the impact of changes on overall coverage without blocking PRs
-        informational: true
-    patch:
-      default:
-        # Encourage (but don't enforce) 80% coverage on all lines that a PR
-        # touches
-        target: 80%
-        informational: true

config/config.sample.json

@@ -5,11 +5,5 @@
       "server_name": "call.ems.host"
     }
   },
-  "livekit": {
-    "livekit_service_url": "http://localhost:7881"
-  },
-  "features": {
-    "feature_use_device_session_member_events": true
-  },
   "eula": "https://static.element.io/legal/online-EULA.pdf"
 }

config/element_io_develop.json

@@ -0,0 +1,19 @@
+{
+  "default_server_config": {
+    "m.homeserver": {
+      "base_url": "https://call.ems.host",
+      "server_name": "call.ems.host"
+    }
+  },
+  "posthog": {
+    "api_key": "phc_rXGHx9vDmyEvyRxPziYtdVIv0ahEv8A9uLWFcCi1WcU",
+    "api_host": "https://posthog-element-call.element.io"
+  },
+  "sentry": {
+    "environment": "main-branch-cd",
+    "DSN": "https://b1e328d49be3402ba96101338989fb35@sentry.matrix.org/41"
+  },
+  "rageshake": {
+    "submit_url": "https://element.io/bugreports/submit"
+  }
+}

config/element_io_preview.json

@@ -8,9 +8,6 @@
   "livekit": {
     "livekit_service_url": "https://livekit-jwt.call.element.dev"
   },
-  "features": {
-    "feature_use_device_session_member_events": true
-  },
   "posthog": {
     "api_key": "phc_rXGHx9vDmyEvyRxPziYtdVIv0ahEv8A9uLWFcCi1WcU",
     "api_host": "https://posthog-element-call.element.io"

config/httpd.conf

@@ -1,30 +0,0 @@
-<VirtualHost *:8080>
-    ServerName localhost
-
-    DocumentRoot "/app"
-
-    <Location "/">
-        # disable cache entriely by default (apart from Etag which is accurate enough)
-        Header add Cache-Control "private no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0"
-        CacheDisable on
-        ExpiresActive off
-
-        # also turn off last-modified since they are just the timestamps of the file in the docker image
-        # and may or may not bear any resemblance to when the resource changed
-        Header add Last-Modified ""
-
-        DirectoryIndex index.html
-    </Location>
-
-    # assets can be cached because they have hashed filenames
-    <Location "/assets">
-        ExpiresActive on
-        ExpiresDefault "access plus 1 week"
-        Header add Cache-Control "public, no-transform"
-    </Location>
-
-    <Location "/apple-app-site-association">
-        ForceType application/json
-    </Location>
-</VirtualHost>
-

docs/README.md

@@ -2,6 +2,5 @@
 
 This folder contains documentation for Element Call setup and usage.
 
-- [Embedded vs standalone mode](./embedded-standalone.md)
 - [Url format and parameters](./url-params.md)
-- [Global JS controls](./controls.md)
+- [Embedded vs standalone mode](./embedded-standalone.md)

docs/controls.md

@@ -1,7 +0,0 @@
-# Global JS controls
-
-A few aspects of Element Call's interface can be controlled through a global API on the `window`:
-
-- `controls.canEnterPip(): boolean` Determines whether it's possible to enter picture-in-picture mode.
-- `controls.enablePip(): void` Puts the call interface into picture-in-picture mode. Throws if not in a call.
-- `controls.disablePip(): void` Takes the call interface out of picture-in-picture mode, restoring it to its natural display mode. Throws if not in a call.

docs/url-params.md

@@ -1,76 +1,57 @@
-# Url Format and parameters
+## Url Format and parameters
 
 There are two formats for Element Call urls.
 
 - **Current Format**
-
-  ```text
+  ```
   https://element_call.domain/room/#
   /<room_name_alias>?roomId=!id:domain&password=1234&<other params see below>
   ```
-
-  The url is split into two sections. The `https://element_call.domain/room/#`
-  contains the app and the intend that the link brings you into a specific room
-  (`https://call.element.io/#` would be the homepage). The fragment is used for
-  query parameters to make sure they never get sent to the element_call.domain
-  server. Here we have the actual matrix roomId and the password which are used
-  to connect all participants with e2ee. This allows that `<room_name_alias>` does
-  not need to be unique. Multiple meetings with the label weekly-sync can be created
-  without collisions.
-
+  The url is split into two sections. The `https://element_call.domain/room/#` contains the app and the intend that the link brings you into a specific room (`https://call.element.io/#` would be the homepage). The fragment is used for query parameters to make sure they never get sent to the element_call.domain server. Here we have the actual matrix roomId and the password which are used to connect all participants with e2ee. This allows that `<room_name_alias>` does not need to be unique. Multiple meetings with the label weekly-sync can be created without collisions.
 - **deprecated**
-
-  ```text
+  ```
   https://element_call.domain/<room_name>
   ```
-
-  With this format the livekit alias that will be used is the `<room_name>`.
-  All ppl connecting to this url will end up in the same unencrypted room.
-  This does not scale, is super unsecure
-  (ppl could end up in the same room by accident) and it also is not really
-  possible to support encryption.
+  With this format the livekit alias that will be used is the `<room_name>`. All ppl connecting to this url will end up in the same unencrypted room. This does not scale, is super unsecure (ppl could end up in the same room by accident) and it also is not really possible to support encryption.
   The url parameters are spit into two categories: **general** and **widget related**.
 
-## Widget related params
+### Widget related params
 
 **widgetId**
-The id used by the widget. The presence of this parameter implies that element
-call will not connect to a homeserver directly and instead tries to establish
-postMessage communication via the `parentUrl`.
+The id used by the widget. The presence of this parameter inplis that elemetn call will not connect to a homeserver directly and instead tries to establish postMessage communication via the `parentUrl`
 
-```ts
+```
 widgetId: string | null;
 ```
 
 **parentUrl**
-The url used to send widget action postMessages. This should be the domain of
-the client or the webview the widget is hosted in. (in case the widget is not
-in an Iframe but in a dedicated webview we send the postMessages same webview
-the widget lives in. Filtering is done in the widget so it ignores the messages
-it receives from itself)
+The url used to send widget action postMessages. This should be the domain of the client
+or the webview the widget is hosted in. (in case the widget is not in an Iframe but in a
+dedicated webview we send the postMessages same webview the widget lives in. Filtering is
+done in the widget so it ignores the messages it receives from itself)
 
-```ts
+```
 parentUrl: string | null;
 ```
 
 **userId**
 The user's ID (only used in matryoshka mode).
 
-```ts
+```
 userId: string | null;
 ```
 
 **deviceId**
 The device's ID (only used in matryoshka mode).
 
-```ts
+```
 deviceId: string | null;
 ```
 
 **baseUrl**
 The base URL of the homeserver to use for media lookups in matryoshka mode.
 
-```ts
+```
 baseUrl: string | null;
 ```
 
@@ -83,14 +64,14 @@ roomId is an exception as we need the room ID in embedded (matroyska) mode, and
 the room alias (or even the via params because we are not trying to join it). This
 is also not validated, where it is in useRoomIdentifier().
 
-```ts
+```
 roomId: string | null;
 ```
 
 **confineToRoom**
 Whether the app should keep the user confined to the current call/room.
 
-```ts
+```
 confineToRoom: boolean; (default: false)
 ```
 
@@ -98,7 +79,7 @@ confineToRoom: boolean; (default: false)
 Whether upon entering a room, the user should be prompted to launch the
 native mobile app. (Affects only Android and iOS.)
 
-```ts
+```
 appPrompt: boolean; (default: true)
 ```
 
@@ -106,29 +87,28 @@ appPrompt: boolean; (default: true)
 Whether the app should pause before joining the call until it sees an
 io.element.join widget action, allowing it to be preloaded.
 
-```ts
+```
 preload: boolean; (default: false)
 ```
 
 **hideHeader**
 Whether to hide the room header when in a call.
 
-```ts
+```
 hideHeader: boolean; (default: false)
 ```
 
 **showControls**
-Whether to show the buttons to mute, screen-share, invite, hangup are shown
-when in a call.
+Whether to show the buttons to mute, screen-share, invite, hangup are shown when in a call.
 
-```ts
+```
 showControls: boolean; (default: true)
 ```
 
 **hideScreensharing**
 Whether to hide the screen-sharing button.
 
-```ts
+```
 hideScreensharing: boolean; (default: false)
 ```
 
@@ -136,7 +116,7 @@ hideScreensharing: boolean; (default: false)
 Whether to use end-to-end encryption. This is a legacy flag for the full mesh branch.
 It is not used on the livekit branch and has no impact there!
 
-```ts
+```
 enableE2EE: boolean; (default: true)
 ```
 
@@ -144,29 +124,28 @@ enableE2EE: boolean; (default: true)
 Whether to use per participant encryption.
 Keys will be exchanged over encrypted matrix room messages.
 
-```ts
+```
 perParticipantE2EE: boolean; (default: false)
 ```
 
 **password**
-E2EE password when using a shared secret.
-(For individual sender keys in embedded mode this is not required.)
+E2EE password when using a shared secret. (For individual sender keys in embedded mode this is not required.)
 
-```ts
+```
 password: string | null;
 ```
 
 **displayName**
 The display name to use for auto-registration.
 
-```ts
+```
 displayName: string | null;
 ```
 
 **lang**
 The BCP 47 code of the language the app should use.
 
-```ts
+```
 lang: string | null;
 ```
 
@@ -174,7 +153,7 @@ lang: string | null;
 The font/fonts which the interface should use.
 There can be multiple font url parameters: `?font=font-one&font=font-two...`
 
-```ts
+```
 font: string;
 font: string;
 ...
@@ -183,15 +162,14 @@ font: string;
 **fontScale**
 The factor by which to scale the interface's font size.
 
-```ts
+```
 fontScale: number | null;
 ```
 
 **analyticsID**
-The Posthog analytics ID. It is only available if the user has given consent for
-sharing telemetry in element web.
+The Posthog analytics ID. It is only available if the user has given consent for sharing telemetry in element web.
 
-```ts
+```
 analyticsID: string | null;
 ```
 
@@ -199,7 +177,7 @@ analyticsID: string | null;
 Whether the app is allowed to use fallback STUN servers for ICE in case the
 user's homeserver doesn't provide any.
 
-```ts
+```
 allowIceFallback: boolean; (default: false)
 ```
 
@@ -208,45 +186,6 @@ Setting this flag skips the lobby and brings you in the call directly.
 In the widget this can be combined with preload to pass the device settings
 with the join widget action.
 
-```ts
+```
 skipLobby: boolean; (default: false)
 ```
-
-**returnToLobby**
-Setting this flag makes element call show the lobby in widget mode after leaving
-a call.
-This is useful for video rooms.
-If set to false, the widget will show a blank page after leaving the call.
-
-```ts
-returnToLobby: boolean; (default: false)
-```
-
-**theme**
-The theme to use for element call.
-can be "light", "dark", "light-high-contrast" or "dark-high-contrast".
-If not set element call will use the dark theme.
-
-```ts
-theme: string | null;
-```
-
-**viaServers**
-This defines the homeserver that is going to be used when joining a room.
-It has to be set to a non default value for links to rooms
-that are not on the default homeserver,
-that is in use for the current user.
-
-```ts
-viaServers: string; (default: undefined)
-```
-
-**homeserver**
-This defines the homeserver that is going to be used when registering
-a new (guest) user.
-This can be user to configure a non default guest user server when
-creating a spa link.
-
-```ts
-homeserver: string; (default: undefined)
-```

knip.ts

@@ -1,30 +0,0 @@
-import { KnipConfig } from "knip";
-
-export default {
-  entry: ["src/main.tsx", "i18next-parser.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",
-  ],
-  ignoreDependencies: [
-    // Used in CSS
-    "normalize.css",
-    // Used for its global type declarations
-    "@types/grecaptcha",
-    // Because we use matrix-js-sdk as a Git dependency rather than consuming
-    // the proper release artifacts, and also import directly from src/, we're
-    // forced to re-install some of the types that it depends on even though
-    // these look unused to Knip
-    "@types/content-type",
-    "@types/sdp-transform",
-    "@types/uuid",
-    // We obviously use this, but if the package has been linked with yarn link,
-    // then Knip will flag it as a false positive
-    // https://github.com/webpro-nl/knip/issues/766
-    "@vector-im/compound-web",
-    "matrix-widget-api",
-  ],
-  ignoreExportsUsedInFile: true,
-} satisfies KnipConfig;

package.json

@@ -1,5 +1,4 @@
 {
-  "name": "element-call",
   "version": "0.0.0",
   "type": "module",
   "scripts": {
@@ -8,61 +7,100 @@
     "serve": "vite preview",
     "prettier:check": "prettier -c .",
     "prettier:format": "prettier -w .",
-    "lint": "yarn lint:types && yarn lint:eslint && yarn lint:knip",
+    "lint": "yarn lint:types && yarn lint:eslint",
     "lint:eslint": "eslint --max-warnings 0 src",
     "lint:eslint-fix": "eslint --max-warnings 0 src --fix",
-    "lint:knip": "knip",
     "lint:types": "tsc",
-    "i18n": "i18next",
-    "i18n:check": "i18next --fail-on-warnings --fail-on-update",
-    "test": "vitest",
-    "test:coverage": "vitest --coverage",
+    "i18n": "node_modules/i18next-parser/bin/cli.js",
+    "i18n:check": "node_modules/i18next-parser/bin/cli.js --fail-on-warnings --fail-on-update",
+    "test": "jest",
     "backend": "docker-compose -f backend-docker-compose.yml up"
   },
+  "dependencies": {
+    "@juggle/resize-observer": "^3.3.1",
+    "@livekit/components-react": "^1.1.0",
+    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz",
+    "@opentelemetry/api": "^1.4.0",
+    "@opentelemetry/context-zone": "^1.9.1",
+    "@opentelemetry/exporter-jaeger": "^1.9.1",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.45.0",
+    "@opentelemetry/instrumentation-document-load": "^0.33.0",
+    "@opentelemetry/instrumentation-user-interaction": "^0.33.0",
+    "@opentelemetry/sdk-trace-web": "^1.9.1",
+    "@radix-ui/react-dialog": "^1.0.4",
+    "@radix-ui/react-visually-hidden": "^1.0.3",
+    "@react-aria/button": "^3.3.4",
+    "@react-aria/focus": "^3.5.0",
+    "@react-aria/menu": "^3.3.0",
+    "@react-aria/overlays": "^3.7.3",
+    "@react-aria/select": "^3.6.0",
+    "@react-aria/tabs": "^3.1.0",
+    "@react-aria/tooltip": "^3.1.3",
+    "@react-aria/utils": "^3.10.0",
+    "@react-spring/web": "^9.4.4",
+    "@react-stately/collections": "^3.3.4",
+    "@react-stately/select": "^3.1.3",
+    "@react-stately/tooltip": "^3.0.5",
+    "@react-stately/tree": "^3.2.0",
+    "@sentry/react": "^7.0.0",
+    "@sentry/tracing": "^7.0.0",
+    "@types/lodash": "^4.14.199",
+    "@use-gesture/react": "^10.2.11",
+    "@vector-im/compound-design-tokens": "^0.1.0",
+    "@vector-im/compound-web": "^0.6.0",
+    "@vitejs/plugin-basic-ssl": "^1.0.1",
+    "@vitejs/plugin-react": "^4.0.1",
+    "buffer": "^6.0.3",
+    "classnames": "^2.3.1",
+    "events": "^3.3.0",
+    "i18next": "^23.0.0",
+    "i18next-browser-languagedetector": "^7.0.0",
+    "i18next-http-backend": "^2.0.0",
+    "livekit-client": "^1.12.3",
+    "lodash": "^4.17.21",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#eca651c0c2ff0600bdae0bb6aba43485e48b69d5",
+    "matrix-widget-api": "^1.3.1",
+    "normalize.css": "^8.0.1",
+    "pako": "^2.0.4",
+    "postcss-preset-env": "^9.0.0",
+    "posthog-js": "^1.29.0",
+    "react": "18",
+    "react-dom": "18",
+    "react-i18next": "^13.0.0",
+    "react-router-dom": "^5.2.0",
+    "react-use-clipboard": "^1.0.7",
+    "react-use-measure": "^2.1.1",
+    "sdp-transform": "^2.14.1",
+    "tinyqueue": "^2.0.3",
+    "unique-names-generator": "^4.6.0",
+    "uuid": "9",
+    "vaul": "^0.7.0"
+  },
   "devDependencies": {
     "@babel/core": "^7.16.5",
     "@babel/preset-env": "^7.22.20",
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.23.0",
-    "@livekit/components-core": "^0.11.0",
-    "@livekit/components-react": "^2.0.0",
-    "@opentelemetry/api": "^1.4.0",
-    "@opentelemetry/core": "^1.25.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.53.0",
-    "@opentelemetry/resources": "^1.25.1",
-    "@opentelemetry/sdk-trace-base": "^1.25.1",
-    "@opentelemetry/sdk-trace-web": "^1.9.1",
-    "@opentelemetry/semantic-conventions": "^1.25.1",
-    "@radix-ui/react-dialog": "^1.0.4",
-    "@radix-ui/react-slider": "^1.1.2",
-    "@radix-ui/react-visually-hidden": "^1.0.3",
-    "@react-spring/web": "^9.4.4",
-    "@sentry/react": "^8.0.0",
+    "@react-spring/rafz": "^9.7.3",
+    "@react-types/dialog": "^3.5.5",
     "@sentry/vite-plugin": "^2.0.0",
-    "@testing-library/dom": "^10.1.0",
-    "@testing-library/react": "^16.0.0",
-    "@testing-library/react-hooks": "^8.0.1",
+    "@testing-library/jest-dom": "^6.0.0",
+    "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.5.1",
     "@types/content-type": "^1.1.5",
-    "@types/grecaptcha": "^3.0.9",
-    "@types/jsdom": "^21.1.7",
-    "@types/lodash": "^4.14.199",
+    "@types/dom-screen-wake-lock": "^1.0.1",
+    "@types/dompurify": "^3.0.2",
+    "@types/grecaptcha": "^3.0.4",
+    "@types/jest": "^29.5.5",
     "@types/node": "^20.0.0",
-    "@types/qrcode": "^1.5.5",
-    "@types/react-dom": "^18.3.0",
     "@types/react-router-dom": "^5.3.3",
+    "@types/request": "^2.48.8",
     "@types/sdp-transform": "^2.4.5",
-    "@types/uuid": "10",
-    "@typescript-eslint/eslint-plugin": "^8.0.0",
-    "@typescript-eslint/parser": "^8.0.0",
-    "@use-gesture/react": "^10.2.11",
-    "@vector-im/compound-design-tokens": "^1.0.0",
-    "@vector-im/compound-web": "^6.0.0",
-    "@vitejs/plugin-basic-ssl": "^1.0.1",
-    "@vitejs/plugin-react": "^4.0.1",
-    "@vitest/coverage-v8": "^2.0.5",
+    "@types/uuid": "9",
+    "@typescript-eslint/eslint-plugin": "^6.1.0",
+    "@typescript-eslint/parser": "^6.1.0",
+    "babel-loader": "^9.0.0",
     "babel-plugin-transform-vite-meta-env": "^1.0.3",
-    "classnames": "^2.3.1",
     "eslint": "^8.14.0",
     "eslint-config-google": "^0.14.0",
     "eslint-config-prettier": "^9.0.0",
@@ -72,47 +110,39 @@
     "eslint-plugin-matrix-org": "^1.2.1",
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.5.0",
-    "eslint-plugin-unicorn": "^55.0.0",
-    "global-jsdom": "^24.0.0",
-    "history": "^4.0.0",
-    "i18next": "^23.0.0",
-    "i18next-browser-languagedetector": "^8.0.0",
-    "i18next-http-backend": "^2.0.0",
-    "i18next-parser": "^9.0.0",
-    "jsdom": "^25.0.0",
-    "knip": "^5.27.2",
-    "livekit-client": "^2.0.2",
-    "lodash": "^4.17.21",
-    "loglevel": "^1.9.1",
-    "matrix-js-sdk": "matrix-org/matrix-js-sdk#414ac9d8cc28330718236b90ad67a1507e146932",
-    "matrix-widget-api": "^1.8.2",
-    "normalize.css": "^8.0.1",
-    "observable-hooks": "^4.2.3",
-    "pako": "^2.0.4",
-    "postcss": "^8.4.41",
-    "postcss-preset-env": "^10.0.0",
-    "posthog-js": "^1.29.0",
+    "eslint-plugin-unicorn": "^49.0.0",
+    "i18next-parser": "^8.0.0",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^29.2.2",
+    "jest-environment-jsdom": "^29.3.1",
+    "jest-mock": "^29.5.0",
     "prettier": "^3.0.0",
-    "qrcode": "^1.5.4",
-    "react": "18",
-    "react-dom": "18",
-    "react-i18next": "^15.0.0",
-    "react-router-dom": "^5.2.0",
-    "react-use-clipboard": "^1.0.7",
-    "react-use-measure": "^2.1.1",
-    "rxjs": "^7.8.1",
     "sass": "^1.42.1",
     "typescript": "^5.1.6",
     "typescript-eslint-language-service": "^5.0.5",
-    "unique-names-generator": "^4.6.0",
-    "vaul": "^0.9.0",
-    "vite": "^5.0.0",
+    "vite": "^4.2.0",
     "vite-plugin-html-template": "^1.1.0",
-    "vite-plugin-svgr": "^4.0.0",
-    "vitest": "^2.0.0",
-    "vitest-axe": "^1.0.0-pre.3"
+    "vite-plugin-svgr": "^4.0.0"
   },
-  "resolutions": {
-    "strip-ansi": "6.0.1"
+  "jest": {
+    "testEnvironment": "./test/environment.ts",
+    "testMatch": [
+      "<rootDir>/test/**/*-test.[jt]s?(x)"
+    ],
+    "transformIgnorePatterns": [
+      "/node_modules/(?!d3)+$",
+      "/node_modules/(?!internmap)+$"
+    ],
+    "moduleNameMapper": {
+      "\\.css$": "identity-obj-proxy",
+      "\\.svg\\?react$": "<rootDir>/test/mocks/svgr.ts",
+      "^\\./IndexedDBWorker\\?worker$": "<rootDir>/test/mocks/workerMock.ts",
+      "^\\./olm$": "<rootDir>/test/mocks/olmMock.ts"
+    },
+    "collectCoverage": true,
+    "coverageReporters": [
+      "text",
+      "cobertura"
+    ]
   }
 }

public/index.html

@@ -13,8 +13,7 @@
     </script>
   </head>
 
-  <!-- The default class is: .no-theme {display: none}. It will be overwritten once the app is loaded. -->
-  <body class="no-theme">
+  <body class="cpd-theme-dark">
     <div id="root"></div>
   </body>
 </html>

public/locales/bg/app.json

@@ -31,6 +31,8 @@
     "username": "Потребителско име",
     "video": "Видео"
   },
+  "exit_fullscreen_button_label": "Излез от цял екран",
+  "fullscreen_button_label": "Цял екран",
   "join_existing_call_modal": {
     "join_button": "Да, присъедини се",
     "text": "Този разговор вече съществува, искате ли да се присъедините?",
@@ -40,6 +42,7 @@
   "lobby": {
     "join_button": "Влез в разговора"
   },
+  "local_volume_label": "Локална сила на звука",
   "logging_in": "Влизане…",
   "login_auth_links": "<0>Създайте акаунт</0> или <2>Влезте като гост</2>",
   "login_title": "Влез",

public/locales/cs/app.json

@@ -29,8 +29,10 @@
     "settings": "Nastavení",
     "username": "Uživatelské jméno"
   },
+  "exit_fullscreen_button_label": "Ukončit režim celé obrazovky",
   "full_screen_view_description": "<0>Odeslání ladících záznamů nám pomůže diagnostikovat problém.</0>",
   "full_screen_view_h1": "<0>Oops, něco se pokazilo.</0>",
+  "fullscreen_button_label": "Zvětšit na celou obrazovku",
   "header_label": "Domov Element Call",
   "join_existing_call_modal": {
     "join_button": "Ano, připojit se",
@@ -41,6 +43,7 @@
   "lobby": {
     "join_button": "Připojit se k hovoru"
   },
+  "local_volume_label": "Lokální hlasitost",
   "logging_in": "Přihlašování se…",
   "login_auth_links": "<0>Vytvořit účet</0> Or <2>Jako host</2>",
   "login_title": "Přihlášení",

public/locales/de/app.json

@@ -15,7 +15,7 @@
     "sign_out": "Abmelden",
     "submit": "Absenden"
   },
-  "analytics_notice": "Mit der Teilnahme an der Beta akzeptierst du die Sammlung von anonymen Daten, die wir zur Verbesserung des Produkts verwenden. Weitere Informationen zu den von uns erhobenen Daten findest du in unserer <2>Datenschutzerklärung</2> und unseren <6>Cookie-Richtlinien</6>.",
+  "analytics_notice": "Mit der Teilnahme an der Beta akzeptierst du die Sammlung von anonymen Daten, die wir zur Verbesserung des Produkts verwenden. Weitere Informationen zu den von uns erhobenen Daten findest du in unserer <2>Datenschutzerklärung</2> und unseren <5>Cookie-Richtlinien</5>.",
   "app_selection_modal": {
     "continue_in_browser": "Weiter im Browser",
     "open_in_app": "In der App öffnen",
@@ -56,8 +56,12 @@
     "video": "Video"
   },
   "disconnected_banner": "Die Verbindung zum Server wurde getrennt.",
+  "exit_fullscreen_button_label": "Vollbildmodus verlassen",
   "full_screen_view_description": "<0>Übermittelte Problemberichte helfen uns, Fehler zu beheben.</0>",
   "full_screen_view_h1": "<0>Hoppla, etwas ist schiefgelaufen.</0>",
+  "fullscreen_button_label": "Vollbild",
+  "group_call_loader_failed_heading": "Anruf nicht gefunden",
+  "group_call_loader_failed_text": "Anrufe sind nun Ende-zu-Ende-verschlüsselt und müssen auf der Startseite erstellt werden. Damit stellen wir sicher, dass alle denselben Schlüssel verwenden.",
   "hangup_button_label": "Anruf beenden",
   "header_label": "Element Call-Startseite",
   "header_participants_label": "Teilnehmende",
@@ -76,6 +80,7 @@
     "join_button": "Anruf beitreten",
     "leave_button": "Zurück zu kürzlichen Anrufen"
   },
+  "local_volume_label": "Lokale Lautstärke",
   "log_in": "Anmelden",
   "logging_in": "Anmelden …",
   "login_auth_links": "<0>Konto erstellen</0> Oder <2>Als Gast betreten</2>",
@@ -136,6 +141,7 @@
   "unmute_microphone_button_label": "Mikrofon aktivieren",
   "version": "Version: {{version}}",
   "video_tile": {
+    "presenter_label": "{{displayName}} präsentiert",
     "sfu_participant_local": "Du"
   },
   "waiting_for_participants": "Warte auf weitere Teilnehmer …"

public/locales/el/app.json

@@ -13,7 +13,7 @@
     "sign_out": "Αποσύνδεση",
     "submit": "Υποβολή"
   },
-  "analytics_notice": "Συμμετέχοντας σε αυτή τη δοκιμαστική έκδοση, συναινείτε στη συλλογή ανώνυμων δεδομένων, τα οποία χρησιμοποιούμε για τη βελτίωση του προϊόντος. Μπορείτε να βρείτε περισσότερες πληροφορίες σχετικά με το ποια δεδομένα καταγράφουμε στην <2>Πολιτική απορρήτου</2> και στην <6>Πολιτική cookies</6>.",
+  "analytics_notice": "Συμμετέχοντας σε αυτή τη δοκιμαστική έκδοση, συναινείτε στη συλλογή ανώνυμων δεδομένων, τα οποία χρησιμοποιούμε για τη βελτίωση του προϊόντος. Μπορείτε να βρείτε περισσότερες πληροφορίες σχετικά με το ποια δεδομένα καταγράφουμε στην <2>Πολιτική απορρήτου</2> και στην <5>Πολιτική cookies</5>.",
   "call_ended_view": {
     "create_account_button": "Δημιουργία λογαριασμού",
     "create_account_prompt": "<0>Γιατί να μην ολοκληρώσετε με τη δημιουργία ενός κωδικού πρόσβασης για τη διατήρηση του λογαριασμού σας;</0><1>Θα μπορείτε να διατηρήσετε το όνομά σας και να ορίσετε ένα avatar για χρήση σε μελλοντικές κλήσεις.</1>",
@@ -37,8 +37,10 @@
     "username": "Όνομα χρήστη",
     "video": "Βίντεο"
   },
+  "exit_fullscreen_button_label": "Έξοδος από πλήρη οθόνη",
   "full_screen_view_description": "<0>Η υποβολή αρχείων καταγραφής σφαλμάτων θα μας βοηθήσει να εντοπίσουμε το πρόβλημα.</0>",
   "full_screen_view_h1": "<0>Ωχ, κάτι πήγε στραβά.</0>",
+  "fullscreen_button_label": "Πλήρη οθόνη",
   "header_label": "Element Κεντρική Οθόνη Κλήσεων",
   "join_existing_call_modal": {
     "join_button": "Ναι, συμμετοχή στην κλήση",
@@ -48,6 +50,7 @@
   "lobby": {
     "join_button": "Συμμετοχή στην κλήση"
   },
+  "local_volume_label": "Τοπική ένταση",
   "logging_in": "Σύνδεση…",
   "login_auth_links": "<0>Δημιουργήστε λογαριασμό</0> Ή <2>Συμμετέχετε ως επισκέπτης</2>",
   "login_title": "Σύνδεση",
@@ -91,5 +94,8 @@
   "unauthenticated_view_body": "Δεν έχετε εγγραφεί ακόμα; <2>Δημιουργήστε λογαριασμό</2>",
   "unauthenticated_view_login_button": "Συνδεθείτε στον λογαριασμό σας",
   "version": "Έκδοση: {{version}}",
+  "video_tile": {
+    "presenter_label": "{{displayName}} παρουσιάζει"
+  },
   "waiting_for_participants": "Αναμονή για άλλους συμμετέχοντες…"
 }

public/locales/en-GB/app.json

@@ -4,8 +4,8 @@
   },
   "action": {
     "close": "Close",
+    "copy": "Copy",
     "copy_link": "Copy link",
-    "edit": "Edit",
     "go": "Go",
     "invite": "Invite",
     "no": "No",
@@ -13,10 +13,9 @@
     "remove": "Remove",
     "sign_in": "Sign in",
     "sign_out": "Sign out",
-    "submit": "Submit",
-    "upload_file": "Upload file"
+    "submit": "Submit"
   },
-  "analytics_notice": "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <6>Cookie Policy</6>.",
+  "analytics_notice": "By participating in this beta, you consent to the collection of anonymous data, which we use to improve the product. You can find more information about which data we track in our <2>Privacy Policy</2> and our <5>Cookie Policy</5>.",
   "app_selection_modal": {
     "continue_in_browser": "Continue in browser",
     "open_in_app": "Open in the app",
@@ -42,16 +41,14 @@
     "analytics": "Analytics",
     "audio": "Audio",
     "avatar": "Avatar",
-    "back": "Back",
     "camera": "Camera",
+    "copied": "Copied!",
     "display_name": "Display name",
     "encrypted": "Encrypted",
     "error": "Error",
     "home": "Home",
     "loading": "Loading…",
     "microphone": "Microphone",
-    "next": "Next",
-    "options": "Options",
     "password": "Password",
     "profile": "Profile",
     "settings": "Settings",
@@ -59,22 +56,13 @@
     "username": "Username",
     "video": "Video"
   },
-  "crypto_version": "Crypto version: {{version}}",
-  "device_id": "Device ID: {{id}}",
   "disconnected_banner": "Connectivity to the server has been lost.",
+  "exit_fullscreen_button_label": "Exit full screen",
   "full_screen_view_description": "<0>Submitting debug logs will help us track down the problem.</0>",
   "full_screen_view_h1": "<0>Oops, something's gone wrong.</0>",
-  "group_call_loader": {
-    "banned_body": "You have been banned from the room.",
-    "banned_heading": "Banned",
-    "call_ended_body": "You have been removed from the call.",
-    "call_ended_heading": "Call ended",
-    "failed_heading": "Failed to join",
-    "failed_text": "Call not found or is not accessible.",
-    "knock_reject_body": "The room members declined your request to join.",
-    "knock_reject_heading": "Not allowed to join",
-    "reason": "Reason"
-  },
+  "fullscreen_button_label": "Full screen",
+  "group_call_loader_failed_heading": "Call not found",
+  "group_call_loader_failed_text": "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.",
   "hangup_button_label": "End call",
   "header_label": "Element Call Home",
   "header_participants_label": "Participants",
@@ -90,24 +78,21 @@
   "layout_grid_label": "Grid",
   "layout_spotlight_label": "Spotlight",
   "lobby": {
-    "ask_to_join": "Ask to join call",
     "join_button": "Join call",
-    "leave_button": "Back to recents",
-    "waiting_for_invite": "Request sent"
+    "leave_button": "Back to recents"
   },
+  "local_volume_label": "Local volume",
   "log_in": "Log In",
   "logging_in": "Logging in…",
   "login_auth_links": "<0>Create an account</0> Or <2>Access as a guest</2>",
   "login_auth_links_prompt": "Not registered yet?",
   "login_subheading": "To continue to Element",
   "login_title": "Login",
-  "matrix_id": "Matrix ID: {{id}}",
   "microphone_off": "Microphone off",
   "microphone_on": "Microphone on",
   "mute_microphone_button_label": "Mute microphone",
   "participant_count_one": "{{count, number}}",
   "participant_count_other": "{{count, number}}",
-  "qr_code": "QR Code",
   "rageshake_button_error_caption": "Retry sending logs",
   "rageshake_request_modal": {
     "body": "Another user on this call is having an issue. In order to better diagnose these issues we'd like to collect a debug log.",
@@ -131,11 +116,11 @@
   "room_auth_view_eula_caption": "By clicking \"Join call now\", you agree to our <2>End User Licensing Agreement (EULA)</2>",
   "room_auth_view_join_button": "Join call now",
   "screenshare_button_label": "Share screen",
+  "select_input_unset_button": "Select an option",
   "settings": {
     "developer_settings_label": "Developer Settings",
     "developer_settings_label_description": "Expose developer settings in the settings window.",
     "developer_tab_title": "Developer",
-    "duplicate_tiles_label": "Number of additional tile copies per participant",
     "feedback_tab_body": "If you are experiencing issues or simply would like to provide some feedback, please send us a short description below.",
     "feedback_tab_description_label": "Your feedback",
     "feedback_tab_h4": "Submit feedback",
@@ -144,6 +129,7 @@
     "feedback_tab_title": "Feedback",
     "more_tab_title": "More",
     "opt_in_description": "<0></0><1></1>You may withdraw consent by unchecking this box. If you are currently in a call, this setting will take effect at the end of the call.",
+    "show_connection_stats_label": "Show connection stats",
     "speaker_device_selection_label": "Speaker"
   },
   "star_rating_input_label_one": "{{count}} stars",
@@ -157,13 +143,10 @@
   "unauthenticated_view_eula_caption": "By clicking \"Go\", you agree to our <2>End User Licensing Agreement (EULA)</2>",
   "unauthenticated_view_login_button": "Login to your account",
   "unmute_microphone_button_label": "Unmute microphone",
-  "version": "{{productName}} version: {{version}}",
+  "version": "Version: {{version}}",
   "video_tile": {
-    "always_show": "Always show",
-    "change_fit_contain": "Fit to frame",
-    "collapse": "Collapse",
-    "expand": "Expand",
-    "mute_for_me": "Mute for me",
-    "volume": "Volume"
-  }
+    "presenter_label": "{{displayName}} is presenting",
+    "sfu_participant_local": "You"
+  },
+  "waiting_for_participants": "Waiting for other participants…"
 }

public/locales/es/app.json

@@ -12,7 +12,7 @@
     "sign_out": "Cerrar sesión",
     "submit": "Enviar"
   },
-  "analytics_notice": "Al participar en esta beta, consientes a la recogida de datos anónimos, los cuales usaremos para mejorar el producto. Puedes encontrar más información sobre que datos recogemos en nuestra <2>Política de privacidad</2> y en nuestra <6>Política sobre Cookies</6>.",
+  "analytics_notice": "Al participar en esta beta, consientes a la recogida de datos anónimos, los cuales usaremos para mejorar el producto. Puedes encontrar más información sobre que datos recogemos en nuestra <2>Política de privacidad</2> y en nuestra <5>Política sobre Cookies</5>.",
   "call_ended_view": {
     "create_account_button": "Crear cuenta",
     "create_account_prompt": "<0>¿Por qué no mantienes tu cuenta estableciendo una contraseña?</0><1>Podrás mantener tu nombre y establecer un avatar para usarlo en futuras llamadas</1>",
@@ -34,8 +34,10 @@
     "settings": "Ajustes",
     "username": "Nombre de usuario"
   },
+  "exit_fullscreen_button_label": "Salir de pantalla completa",
   "full_screen_view_description": "<0>Subir los registros de depuración nos ayudará a encontrar el problema.</0>",
   "full_screen_view_h1": "<0>Ups, algo ha salido mal.</0>",
+  "fullscreen_button_label": "Pantalla completa",
   "header_label": "Inicio de Element Call",
   "join_existing_call_modal": {
     "join_button": "Si, unirse a la llamada",
@@ -46,6 +48,7 @@
   "lobby": {
     "join_button": "Unirse a la llamada"
   },
+  "local_volume_label": "Volumen local",
   "logging_in": "Iniciando sesión…",
   "login_auth_links": "<0>Crear una cuenta</0> o <2>Acceder como invitado</2>",
   "login_title": "Iniciar sesión",
@@ -92,5 +95,8 @@
   "unauthenticated_view_eula_caption": "Al hacer clic en \"Comenzar\", aceptas nuestro <2>Contrato de Licencia de Usuario Final (CLUF)</2>",
   "unauthenticated_view_login_button": "Iniciar sesión en tu cuenta",
   "version": "Versión: {{version}}",
+  "video_tile": {
+    "presenter_label": "{{displayName}} está presentando"
+  },
   "waiting_for_participants": "Esperando a los otros participantes…"
 }

public/locales/et/app.json

@@ -15,7 +15,7 @@
     "sign_out": "Logi välja",
     "submit": "Saada"
   },
-  "analytics_notice": "Nõustudes selle beetaversiooni kasutamisega sa nõustud ka toote arendamiseks kasutatavate anonüümsete andmete kogumisega. Täpsemat teavet kogutavate andmete kohta leiad meie <2>Privaatsuspoliitikast</2> ja meie <6>Küpsiste kasutamise reeglitest</6>.",
+  "analytics_notice": "Nõustudes selle beetaversiooni kasutamisega sa nõustud ka toote arendamiseks kasutatavate anonüümsete andmete kogumisega. Täpsemat teavet kogutavate andmete kohta leiad meie <2>Privaatsuspoliitikast</2> ja meie <5>Küpsiste kasutamise reeglitest</5>.",
   "app_selection_modal": {
     "continue_in_browser": "Jätka veebibrauseris",
     "open_in_app": "Ava rakenduses",
@@ -52,8 +52,12 @@
     "username": "Kasutajanimi"
   },
   "disconnected_banner": "Võrguühendus serveriga on katkenud.",
+  "exit_fullscreen_button_label": "Välju täisekraanivaatest",
   "full_screen_view_description": "<0>Kui saadad meile vealogid, siis on lihtsam vea põhjust otsida.</0>",
   "full_screen_view_h1": "<0>Ohoo, midagi on nüüd katki.</0>",
+  "fullscreen_button_label": "Täisekraan",
+  "group_call_loader_failed_heading": "Kõnet ei leidu",
+  "group_call_loader_failed_text": "Kõned on nüüd läbivalt krüptitud ning need pead looma kodulehelt. Sellega tagad, et kõik kasutavad samu krüptovõtmeid.",
   "hangup_button_label": "Lõpeta kõne",
   "header_participants_label": "Osalejad",
   "invite_modal": {
@@ -71,6 +75,7 @@
     "join_button": "Kõnega liitumine",
     "leave_button": "Tagasi hiljutiste kõnede juurde"
   },
+  "local_volume_label": "Kohalik helitugevus",
   "logging_in": "Sisselogimine …",
   "login_auth_links": "<0>Loo konto</0> Või <2>Sisene külalisena</2>",
   "login_title": "Sisselogimine",
@@ -128,6 +133,7 @@
   "unmute_microphone_button_label": "Lülita mikrofon sisse",
   "version": "Versioon: {{version}}",
   "video_tile": {
+    "presenter_label": "{{displayName}} on esitlemas",
     "sfu_participant_local": "Sina"
   },
   "waiting_for_participants": "Ootame teiste osalejate lisandumist…"

public/locales/fa/app.json

@@ -32,6 +32,8 @@
     "username": "نام کاربری",
     "video": "ویدیو"
   },
+  "exit_fullscreen_button_label": "خروج از حالت تمام صفحه",
+  "fullscreen_button_label": "تمام صحفه",
   "header_label": "خانهٔ تماس المنت",
   "join_existing_call_modal": {
     "join_button": "بله، به تماس بپیوندید",
@@ -42,6 +44,7 @@
   "lobby": {
     "join_button": "پیوستن به تماس"
   },
+  "local_volume_label": "حجم داخلی",
   "logging_in": "ورود…",
   "login_auth_links": "<0>ساخت حساب کاربری</0> Or <2>دسترسی به عنوان میهمان</2>",
   "login_title": "ورود",

public/locales/fr/app.json

@@ -15,7 +15,7 @@
     "sign_out": "Déconnexion",
     "submit": "Envoyer"
   },
-  "analytics_notice": "En participant à cette beta, vous consentez à la collecte de données anonymes, qui seront utilisées pour améliorer le produit. Vous trouverez plus d’informations sur les données collectées dans notre <2>Politique de vie privée</2> et notre <6>Politique de cookies</6>.",
+  "analytics_notice": "En participant à cette beta, vous consentez à la collecte de données anonymes, qui seront utilisées pour améliorer le produit. Vous trouverez plus d’informations sur les données collectées dans notre <2>Politique de vie privée</2> et notre <5>Politique de cookies</5>.",
   "app_selection_modal": {
     "continue_in_browser": "Continuer dans le navigateur",
     "open_in_app": "Ouvrir dans l’application",
@@ -50,8 +50,12 @@
     "video": "Vidéo"
   },
   "disconnected_banner": "La connexion avec le serveur a été perdue.",
+  "exit_fullscreen_button_label": "Quitter le plein écran",
   "full_screen_view_description": "<0>Soumettre les journaux de débogage nous aidera à déterminer le problème.</0>",
   "full_screen_view_h1": "<0>Oups, quelque chose s’est mal passé.</0>",
+  "fullscreen_button_label": "Plein écran",
+  "group_call_loader_failed_heading": "Appel non trouvé",
+  "group_call_loader_failed_text": "Les appels sont maintenant chiffrés de bout-en-bout et doivent être créés depuis la page d’accueil. Cela permet d’être sûr que tout le monde utilise la même clé de chiffrement.",
   "hangup_button_label": "Terminer l’appel",
   "header_label": "Accueil Element Call",
   "invite_modal": {
@@ -69,6 +73,7 @@
     "join_button": "Rejoindre l’appel",
     "leave_button": "Revenir à l’historique des appels"
   },
+  "local_volume_label": "Volume local",
   "logging_in": "Connexion…",
   "login_auth_links": "<0>Créer un compte</0> Or <2>Accès invité</2>",
   "login_title": "Connexion",
@@ -126,6 +131,7 @@
   "unmute_microphone_button_label": "Allumer le microphone",
   "version": "Version : {{version}}",
   "video_tile": {
+    "presenter_label": "{{displayName}} est à l’écran",
     "sfu_participant_local": "Vous"
   },
   "waiting_for_participants": "En attente d’autres participants…"

public/locales/id/app.json

@@ -15,7 +15,7 @@
     "sign_out": "Keluar",
     "submit": "Kirim"
   },
-  "analytics_notice": "Dengan bergabung dalam beta ini, Anda mengizinkan kami untuk mengumpulkan data anonim, yang kami gunakan untuk meningkatkan produk ini. Anda dapat mempelajari lebih lanjut tentang data apa yang kami lacak dalam <2>Kebijakan Privasi</2> dan <6>Kebijakan Kuki</6> kami.",
+  "analytics_notice": "Dengan bergabung dalam beta ini, Anda mengizinkan kami untuk mengumpulkan data anonim, yang kami gunakan untuk meningkatkan produk ini. Anda dapat mempelajari lebih lanjut tentang data apa yang kami lacak dalam <2>Kebijakan Privasi</2> dan <5>Kebijakan Kuki</5> kami.",
   "app_selection_modal": {
     "continue_in_browser": "Lanjutkan dalam peramban",
     "open_in_app": "Buka dalam aplikasi",
@@ -50,8 +50,12 @@
     "username": "Nama pengguna"
   },
   "disconnected_banner": "Koneksi ke server telah hilang.",
+  "exit_fullscreen_button_label": "Keluar dari layar penuh",
   "full_screen_view_description": "<0>Mengirim catatan pengawakutuan akan membantu kami melacak masalahnya.</0>",
   "full_screen_view_h1": "<0>Aduh, ada yang salah.</0>",
+  "fullscreen_button_label": "Layar penuh",
+  "group_call_loader_failed_heading": "Panggilan tidak ditemukan",
+  "group_call_loader_failed_text": "Panggilan sekarang terenkripsi secara ujung ke ujung dan harus dibuat dari laman beranda. Ini memastikan bahwa semuanya menggunakan kunci enkripsi yang sama.",
   "hangup_button_label": "Akhiri panggilan",
   "header_label": "Beranda Element Call",
   "header_participants_label": "Peserta",
@@ -70,6 +74,7 @@
     "join_button": "Bergabung ke panggilan",
     "leave_button": "Kembali ke terkini"
   },
+  "local_volume_label": "Volume lokal",
   "logging_in": "Memasuki…",
   "login_auth_links": "<0>Buat akun</0> Atau <2>Akses sebagai tamu</2>",
   "login_title": "Masuk",
@@ -127,6 +132,7 @@
   "unmute_microphone_button_label": "Nyalakan mikrofon",
   "version": "Versi: {{version}}",
   "video_tile": {
+    "presenter_label": "{{displayName}} sedang menampilkan",
     "sfu_participant_local": "Anda"
   },
   "waiting_for_participants": "Menunggu peserta lain…"

public/locales/it/app.json

@@ -14,7 +14,7 @@
     "sign_out": "Disconnetti",
     "submit": "Invia"
   },
-  "analytics_notice": "Partecipando a questa beta, acconsenti alla raccolta di dati anonimi che usiamo per migliorare il prodotto. Puoi trovare più informazioni su quali dati monitoriamo nella nostra <2>informativa sulla privacy</2> e nell'<6>informativa sui cookie</6>.",
+  "analytics_notice": "Partecipando a questa beta, acconsenti alla raccolta di dati anonimi che usiamo per migliorare il prodotto. Puoi trovare più informazioni su quali dati monitoriamo nella nostra <2>informativa sulla privacy</2> e nell'<5>informativa sui cookie</5>.",
   "app_selection_modal": {
     "continue_in_browser": "Continua nel browser",
     "open_in_app": "Apri nell'app",
@@ -48,8 +48,12 @@
     "username": "Nome utente"
   },
   "disconnected_banner": "La connessione al server è stata persa.",
+  "exit_fullscreen_button_label": "Esci da schermo intero",
   "full_screen_view_description": "<0>L'invio di registri di debug ci aiuterà ad individuare il problema.</0>",
   "full_screen_view_h1": "<0>Ops, qualcosa è andato storto.</0>",
+  "fullscreen_button_label": "Schermo intero",
+  "group_call_loader_failed_heading": "Chiamata non trovata",
+  "group_call_loader_failed_text": "Le chiamate ora sono cifrate end-to-end e devono essere create dalla pagina principale. Ciò assicura che chiunque usi la stessa chiave di crittografia.",
   "hangup_button_label": "Termina chiamata",
   "header_label": "Inizio di Element Call",
   "header_participants_label": "Partecipanti",
@@ -68,6 +72,7 @@
     "join_button": "Entra in chiamata",
     "leave_button": "Torna ai recenti"
   },
+  "local_volume_label": "Volume locale",
   "logging_in": "Accesso…",
   "login_auth_links": "<0>Crea un profilo</0> o <2>Accedi come ospite</2>",
   "login_title": "Accedi",
@@ -124,6 +129,7 @@
   "unmute_microphone_button_label": "Riaccendi il microfono",
   "version": "Versione: {{version}}",
   "video_tile": {
+    "presenter_label": "{{displayName}} sta presentando",
     "sfu_participant_local": "Tu"
   },
   "waiting_for_participants": "In attesa di altri partecipanti…"

public/locales/ja/app.json

@@ -30,7 +30,9 @@
     "username": "ユーザー名",
     "video": "ビデオ"
   },
+  "exit_fullscreen_button_label": "全画面表示を終了",
   "full_screen_view_h1": "<0>何かがうまく行きませんでした。</0>",
+  "fullscreen_button_label": "全画面表示",
   "header_label": "Element Call ホーム",
   "join_existing_call_modal": {
     "join_button": "はい、通話に参加",

public/locales/lv/app.json

@@ -13,7 +13,7 @@
     "sign_out": "Atteikties",
     "submit": "Iesniegt"
   },
-  "analytics_notice": "Piedalīšanās šajā beta apliecina piekrišanu anonīmu datu ievākšanai, ko mēs izmantojam, lai uzlabotu izstrādājumu. Vairāk informācijas par datiem, ko mēs ievācam, var atrast mūsu <2>privātuma nosacījumos</2> un <6>sīkdatņu nosacījumos</6>.",
+  "analytics_notice": "Piedalīšanās šajā beta apliecina piekrišanu anonīmu datu ievākšanai, ko mēs izmantojam, lai uzlabotu izstrādājumu. Vairāk informācijas par datiem, ko mēs ievācam, var atrast mūsu <2>privātuma nosacījumos</2> un <5>sīkdatņu nosacījumos</5>.",
   "call_ended_view": {
     "body": "Tu tiki atvienots no zvana",
     "create_account_button": "Izveidot kontu",
@@ -40,8 +40,10 @@
     "username": "Lietotājvārds"
   },
   "disconnected_banner": "Ir zaudēts savienojums ar serveri.",
+  "exit_fullscreen_button_label": "Iziet no pilnekrāna",
   "full_screen_view_description": "<0>Atkļūdošanas žurnāla ierakstu iesūtīšana palīdzēs mums atklāt nepilnību.</0>",
   "full_screen_view_h1": "<0>Ak vai, kaut kas nogāja greizi!</0>",
+  "fullscreen_button_label": "Pilnekrāns",
   "header_label": "Element Call sākums",
   "join_existing_call_modal": {
     "join_button": "Jā, pievienoties zvanam",
@@ -52,6 +54,7 @@
   "lobby": {
     "join_button": "Pievienoties zvanam"
   },
+  "local_volume_label": "Vietējais skaļums",
   "logging_in": "Piesakās…",
   "login_auth_links": "<0>Izveidot kontu</0> vai <2>Piekļūt kā viesim</2>",
   "login_title": "Pieteikties",
@@ -100,5 +103,8 @@
   "unauthenticated_view_eula_caption": "Klikšķināšana uz \"Aiziet\" apliecina piekrišanu mūsu <2>galalietotāja licencēšanas nolīgumam (GLLN)</2>",
   "unauthenticated_view_login_button": "Pieteikties kontā",
   "version": "Versija: {{version}}",
+  "video_tile": {
+    "presenter_label": "{{displayName}} uzstājas"
+  },
   "waiting_for_participants": "Gaida citus dalībniekus…"
 }

public/locales/pl/app.json

@@ -15,7 +15,7 @@
     "sign_out": "Wyloguj się",
     "submit": "Wyślij"
   },
-  "analytics_notice": "Uczestnicząc w tej becie, upoważniasz nas do zbierania anonimowych danych, które wykorzystamy do ulepszenia produktu. Dowiedz się więcej na temat danych, które zbieramy w naszej <2>Polityce prywatności</2> i <6>Polityce ciasteczek</6>.",
+  "analytics_notice": "Uczestnicząc w tej becie, upoważniasz nas do zbierania anonimowych danych, które wykorzystamy do ulepszenia produktu. Dowiedz się więcej na temat danych, które zbieramy w naszej <2>Polityce prywatności</2> i <5>Polityce ciasteczek</5>.",
   "app_selection_modal": {
     "continue_in_browser": "Kontynuuj w przeglądarce",
     "open_in_app": "Otwórz w aplikacji",
@@ -53,8 +53,12 @@
     "video": "Wideo"
   },
   "disconnected_banner": "Utracono połączenie z serwerem.",
+  "exit_fullscreen_button_label": "Opuść pełny ekran",
   "full_screen_view_description": "<0>Wysłanie dzienników debuggowania pomoże nam ustalić przyczynę problemu.</0>",
   "full_screen_view_h1": "<0>Ojej, coś poszło nie tak.</0>",
+  "fullscreen_button_label": "Pełny ekran",
+  "group_call_loader_failed_heading": "Nie znaleziono połączenia",
+  "group_call_loader_failed_text": "Połączenia są teraz szyfrowane end-to-end i muszą zostać utworzone ze strony głównej. Pomaga to upewnić się, że każdy korzysta z tego samego klucza szyfrującego.",
   "hangup_button_label": "Zakończ połączenie",
   "header_label": "Strona główna Element Call",
   "header_participants_label": "Uczestnicy",
@@ -73,6 +77,7 @@
     "join_button": "Dołącz do połączenia",
     "leave_button": "Wróć do ostatnie"
   },
+  "local_volume_label": "Głośność lokalna",
   "logging_in": "Logowanie…",
   "login_auth_links": "<0>Utwórz konto</0> lub <2>Dołącz jako gość</2>",
   "login_title": "Zaloguj się",
@@ -130,6 +135,7 @@
   "unmute_microphone_button_label": "Odcisz mikrofon",
   "version": "Wersja: {{version}}",
   "video_tile": {
+    "presenter_label": "{{displayName}} prezentuje",
     "sfu_participant_local": "Ty"
   },
   "waiting_for_participants": "Oczekiwanie na pozostałych uczestników…"

public/locales/ru/app.json

@@ -13,7 +13,7 @@
     "sign_out": "Выйти",
     "submit": "Отправить"
   },
-  "analytics_notice": "Участвуя в этой бета-версии, вы соглашаетесь на сбор анонимных данных, которые мы используем для улучшения продукта. Более подробную информацию о том, какие данные мы отслеживаем, вы можете найти в нашей <2> Политике конфиденциальности</2> и нашей <6> Политике использования файлов cookie</6>.",
+  "analytics_notice": "Участвуя в этой бета-версии, вы соглашаетесь на сбор анонимных данных, которые мы используем для улучшения продукта. Более подробную информацию о том, какие данные мы отслеживаем, вы можете найти в нашей <2> Политике конфиденциальности</2> и нашей <5> Политике использования файлов cookie</5>.",
   "call_ended_view": {
     "create_account_button": "Создать аккаунт",
     "create_account_prompt": "<0>Почему бы не задать пароль, тем самым сохранив аккаунт?</0><1>Так вы можете оставить своё имя и задать аватар для будущих звонков.</1>",
@@ -38,8 +38,10 @@
     "username": "Имя пользователя",
     "video": "Видео"
   },
+  "exit_fullscreen_button_label": "Выйти из полноэкранного режима",
   "full_screen_view_description": "<0>Отправка журналов поможет нам найти и устранить проблему.</0>",
   "full_screen_view_h1": "<0>Упс, что-то пошло не так.</0>",
+  "fullscreen_button_label": "Полноэкранный режим",
   "header_label": "Главная Element Call",
   "join_existing_call_modal": {
     "join_button": "Да, присоединиться",
@@ -50,6 +52,7 @@
   "lobby": {
     "join_button": "Присоединиться"
   },
+  "local_volume_label": "Местная громкость",
   "logging_in": "Вход…",
   "login_auth_links": "<0>Создать аккаунт</0> или <2>Зайти как гость</2>",
   "login_title": "Вход",
@@ -93,5 +96,8 @@
   "unauthenticated_view_body": "Ещё не зарегистрированы? <2>Создайте аккаунт</2>",
   "unauthenticated_view_login_button": "Войдите в свой аккаунт",
   "version": "Версия: {{version}}",
+  "video_tile": {
+    "presenter_label": "{{displayName}} представляет"
+  },
   "waiting_for_participants": "Ожидание других участников…"
 }

public/locales/sk/app.json

@@ -15,7 +15,7 @@
     "sign_out": "Odhlásiť sa",
     "submit": "Odoslať"
   },
-  "analytics_notice": "Účasťou v tejto beta verzii súhlasíte so zhromažďovaním anonymných údajov, ktoré použijeme na zlepšenie produktu. Viac informácií o tom, ktoré údaje sledujeme, nájdete v našich <2>Zásadách ochrany osobných údajov</2> a <6>Zásadách používania súborov cookie</6>.",
+  "analytics_notice": "Účasťou v tejto beta verzii súhlasíte so zhromažďovaním anonymných údajov, ktoré použijeme na zlepšenie produktu. Viac informácií o tom, ktoré údaje sledujeme, nájdete v našich <2>Zásadách ochrany osobných údajov</2> a <5>Zásadách používania súborov cookie</5>.",
   "app_selection_modal": {
     "continue_in_browser": "Pokračovať v prehliadači",
     "open_in_app": "Otvoriť v aplikácii",
@@ -51,8 +51,12 @@
     "username": "Meno používateľa"
   },
   "disconnected_banner": "Spojenie so serverom sa stratilo.",
+  "exit_fullscreen_button_label": "Ukončiť zobrazenie na celú obrazovku",
   "full_screen_view_description": "<0>Odoslanie záznamov ladenia nám pomôže nájsť problém.</0>",
   "full_screen_view_h1": "<0>Hups, niečo sa pokazilo.</0>",
+  "fullscreen_button_label": "Zobrazenie na celú obrazovku",
+  "group_call_loader_failed_heading": "Hovor nebol nájdený",
+  "group_call_loader_failed_text": "Hovory sú teraz end-to-end šifrované a je potrebné ich vytvoriť z domovskej stránky. To pomáha zabezpečiť, aby všetci používali rovnaký šifrovací kľúč.",
   "hangup_button_label": "Ukončiť hovor",
   "header_label": "Domov Element Call",
   "header_participants_label": "Účastníci",
@@ -71,6 +75,7 @@
     "join_button": "Pripojiť sa k hovoru",
     "leave_button": "Späť k nedávnym"
   },
+  "local_volume_label": "Lokálna hlasitosť",
   "logging_in": "Prihlasovanie…",
   "login_auth_links": "<0>Vytvoriť konto</0> Alebo <2>Prihlásiť sa ako hosť</2>",
   "login_title": "Prihlásiť sa",
@@ -128,6 +133,7 @@
   "unmute_microphone_button_label": "Zrušiť stlmenie mikrofónu",
   "version": "Verzia: {{version}}",
   "video_tile": {
+    "presenter_label": "{{displayName}} prezentuje",
     "sfu_participant_local": "Vy"
   },
   "waiting_for_participants": "Čaká sa na ďalších účastníkov…"

public/locales/sv/app.json

@@ -3,5 +3,8 @@
     "headline": "{{displayName}}, ditt samtal har avslutats."
   },
   "star_rating_input_label_one": "{{count}} stjärna",
-  "star_rating_input_label_other": "{{count}} stjärnor"
+  "star_rating_input_label_other": "{{count}} stjärnor",
+  "video_tile": {
+    "presenter_label": "{{displayName}} presenterar"
+  }
 }

public/locales/tr/app.json

@@ -24,6 +24,8 @@
     "password": "Parola",
     "settings": "Ayarlar"
   },
+  "exit_fullscreen_button_label": "Tam ekranı terk et",
+  "fullscreen_button_label": "Tam ekran",
   "join_existing_call_modal": {
     "text": "Bu arama zaten var, katılmak ister misiniz?",
     "title": "Mevcut aramaya katıl?"
@@ -31,6 +33,7 @@
   "lobby": {
     "join_button": "Aramaya katıl"
   },
+  "local_volume_label": "Yerel ses seviyesi",
   "logging_in": "Giriliyor…",
   "login_auth_links": "<0>Hesap oluştur</0> yahut <2>Konuk olarak gir</2>",
   "login_title": "Gir",

public/locales/uk/app.json

@@ -15,7 +15,7 @@
     "sign_out": "Вийти",
     "submit": "Надіслати"
   },
-  "analytics_notice": "Користуючись дочасним доступом, ви даєте згоду на збір анонімних даних, які ми використовуємо для вдосконалення продукту. Ви можете знайти більше інформації про те, які дані ми відстежуємо в нашій <2>Політиці Приватності</2> і нашій <6>Політиці про куки</6>.",
+  "analytics_notice": "Користуючись дочасним доступом, ви даєте згоду на збір анонімних даних, які ми використовуємо для вдосконалення продукту. Ви можете знайти більше інформації про те, які дані ми відстежуємо в нашій <2>Політиці Приватності</2> і нашій <5>Політиці про куки</5>.",
   "app_selection_modal": {
     "continue_in_browser": "Продовжити у браузері",
     "open_in_app": "Відкрити у застосунку",
@@ -53,8 +53,12 @@
     "video": "Відео"
   },
   "disconnected_banner": "Втрачено зв'язок з сервером.",
+  "exit_fullscreen_button_label": "Вийти з повноекранного режиму",
   "full_screen_view_description": "<0>Надсилання журналів налагодження допоможе нам виявити проблему.</0>",
   "full_screen_view_h1": "<0>Йой, щось пішло не за планом.</0>",
+  "fullscreen_button_label": "Повноекранний режим",
+  "group_call_loader_failed_heading": "Виклик не знайдено",
+  "group_call_loader_failed_text": "Відтепер виклики захищено наскрізним шифруванням, і їх потрібно створювати з домашньої сторінки. Це допомагає переконатися, що всі користувачі використовують один і той самий ключ шифрування.",
   "hangup_button_label": "Завершити виклик",
   "header_label": "Домівка Element Call",
   "header_participants_label": "Учасники",
@@ -73,6 +77,7 @@
     "join_button": "Приєднатися до виклику",
     "leave_button": "Повернутися до недавніх"
   },
+  "local_volume_label": "Локальна гучність",
   "logging_in": "Вхід…",
   "login_auth_links": "<0>Створити обліковий запис</0> або <2>Отримати доступ як гість</2>",
   "login_title": "Увійти",
@@ -130,6 +135,7 @@
   "unmute_microphone_button_label": "Увімкнути мікрофон",
   "version": "Версія: {{version}}",
   "video_tile": {
+    "presenter_label": "{{displayName}} представляє",
     "sfu_participant_local": "Ви"
   },
   "waiting_for_participants": "Очікування на інших учасників…"

public/locales/vi/app.json

@@ -29,8 +29,10 @@
     "username": "Tên người dùng",
     "video": "Truyền hình"
   },
+  "exit_fullscreen_button_label": "Rời chế độ toàn màn hình",
   "full_screen_view_description": "<0>Gửi nhật ký gỡ lỗi sẽ giúp chúng tôi theo dõi vấn đề.</0>",
   "full_screen_view_h1": "<0>Ối, có cái gì đó sai.</0>",
+  "fullscreen_button_label": "Toàn màn hình",
   "join_existing_call_modal": {
     "join_button": "Vâng, tham gia cuộc gọi",
     "text": "Cuộc gọi đã tồn tại, bạn có muốn tham gia không?",
@@ -71,5 +73,8 @@
   "unauthenticated_view_body": "Chưa đăng ký? <2>Tạo tài khoản</2>",
   "unauthenticated_view_login_button": "Đăng nhập vào tài khoản của bạn",
   "version": "Phiên bản: {{version}}",
+  "video_tile": {
+    "presenter_label": "{{displayName}} đang trình bày"
+  },
   "waiting_for_participants": "Đang đợi những người khác…"
 }

public/locales/zh-Hans/app.json

@@ -13,7 +13,7 @@
     "sign_out": "登出",
     "submit": "提交"
   },
-  "analytics_notice": "参与测试即表示您同意我们收集匿名数据，用于改进产品。您可以在我们的<2>隐私政策</2>和<6>Cookie政策</6>中找到有关我们跟踪哪些数据以及更多信息。",
+  "analytics_notice": "参与测试即表示您同意我们收集匿名数据，用于改进产品。您可以在我们的<2>隐私政策</2>和<5>Cookie政策</5>中找到有关我们跟踪哪些数据以及更多信息。",
   "app_selection_modal": {
     "continue_in_browser": "在浏览器中继续",
     "open_in_app": "在应用中打开",
@@ -51,8 +51,12 @@
     "video": "视频"
   },
   "disconnected_banner": "与服务器的连接中断。",
+  "exit_fullscreen_button_label": "退出全屏",
   "full_screen_view_description": "<0>提交日志以帮助我们修复问题。</0>",
   "full_screen_view_h1": "<0>哎哟，出问题了。</0>",
+  "fullscreen_button_label": "全屏",
+  "group_call_loader_failed_heading": "未找到通话",
+  "group_call_loader_failed_text": "现在，通话是端对端加密的，需要从主页创建。这有助于确保每个人都使用相同的加密密钥。",
   "hangup_button_label": "通话结束",
   "header_label": "Element Call主页",
   "join_existing_call_modal": {
@@ -66,6 +70,7 @@
     "join_button": "加入通话",
     "leave_button": "返回最近通话"
   },
+  "local_volume_label": "本地音量",
   "logging_in": "登录中……",
   "login_auth_links": "<0>创建账户</0> Or <2>以访客身份继续</2>",
   "login_title": "登录",
@@ -123,6 +128,7 @@
   "unmute_microphone_button_label": "取消麦克风静音",
   "version": "版本：{{version}}",
   "video_tile": {
+    "presenter_label": "{{displayName}}正在展示",
     "sfu_participant_local": "你"
   },
   "waiting_for_participants": "等待其他参与者……"

public/locales/zh-Hant/app.json

@@ -15,7 +15,7 @@
     "sign_out": "登出",
     "submit": "遞交"
   },
-  "analytics_notice": "參與此測試版即表示您同意蒐集匿名資料，我們使用這些資料來改進產品。您可以在我們的<2>隱私政策</2>與我們的 <6>Cookie 政策</6> 中找到關於我們追蹤哪些資料的更多資訊。",
+  "analytics_notice": "參與此測試版即表示您同意蒐集匿名資料，我們使用這些資料來改進產品。您可以在我們的<2>隱私政策</2>與我們的 <5>Cookie 政策</5> 中找到關於我們追蹤哪些資料的更多資訊。",
   "app_selection_modal": {
     "continue_in_browser": "在瀏覽器中繼續",
     "open_in_app": "在應用程式中開啟",
@@ -53,8 +53,12 @@
     "video": "視訊"
   },
   "disconnected_banner": "到伺服器的連線已遺失。",
+  "exit_fullscreen_button_label": "退出全螢幕",
   "full_screen_view_description": "<0>送出除錯紀錄，可幫助我們修正問題。</0>",
   "full_screen_view_h1": "<0>喔喔，有些地方怪怪的。</0>",
+  "fullscreen_button_label": "全螢幕",
+  "group_call_loader_failed_heading": "找不到通話",
+  "group_call_loader_failed_text": "通話現在是端對端加密的，必須從首頁建立。這有助於確保每個人都使用相同的加密金鑰。",
   "hangup_button_label": "結束通話",
   "header_label": "Element Call 首頁",
   "header_participants_label": "參與者",
@@ -73,6 +77,7 @@
     "join_button": "加入通話",
     "leave_button": "回到最近的通話"
   },
+  "local_volume_label": "您的音量",
   "logging_in": "登入中…",
   "login_auth_links": "<0>建立帳號</0> 或<2>以訪客身份登入</2>",
   "login_title": "登入",
@@ -130,6 +135,7 @@
   "unmute_microphone_button_label": "將麥克風取消靜音",
   "version": "版本： {{version}}",
   "video_tile": {
+    "presenter_label": "{{displayName}} 正在展示",
     "sfu_participant_local": "您"
   },
   "waiting_for_participants": "等待其他參加者…"

renovate.json

@@ -3,46 +3,9 @@
   "extends": ["config:base"],
   "packageRules": [
     {
-      "groupName": "all non-major dependencies",
-      "groupSlug": "all-minor-patch",
-      "matchUpdateTypes": ["minor", "patch"],
-      "extends": ["schedule:weekly"]
-    },
-    {
-      "groupName": "GitHub Actions",
-      "matchDepTypes": ["action"],
-      "pinDigests": true,
-      "extends": ["schedule:monthly"]
-    },
-    {
-      "description": "Disable Renovate for packages we want to monitor ourselves",
-      "groupName": "manually updated packages",
-      "matchDepNames": ["matrix-js-sdk"],
+      "description": "Disable renoavte for packages we want to monitor ourselves",
+      "matchPackagePatterns": ["matrix-js-sdk"],
       "enabled": false
-    },
-    {
-      "groupName": "matrix-widget-api",
-      "matchDepNames": ["matrix-widget-api"]
-    },
-    {
-      "groupName": "Compound",
-      "matchPackagePrefixes": ["@vector-im/compound-"],
-      "schedule": "before 5am on Tuesday and Friday"
-    },
-    {
-      "groupName": "LiveKit client",
-      "matchDepNames": ["livekit-client"]
-    },
-    {
-      "groupName": "LiveKit components",
-      "matchPackagePrefixes": ["@livekit/components-"]
-    },
-    {
-      "groupName": "Vaul",
-      "matchDepNames": ["vaul"],
-      "extends": ["schedule:monthly"],
-      "prHeader": "Please review modals on mobile for visual regressions."
     }
-  ],
-  "semanticCommits": "disabled"
+  ]
 }

src/@types/global.d.ts

@@ -1,12 +1,20 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import "matrix-js-sdk/src/@types/global";
-import { Controls } from "../controls";
 
 declare global {
   interface Document {
@@ -16,7 +24,14 @@ declare global {
   }
 
   interface Window {
-    controls: Controls;
+    // TODO: https://gitlab.matrix.org/matrix-org/olm/-/issues/10
+    OLM_OPTIONS: Record<string, string>;
+  }
+
+  // TypeScript doesn't know about the experimental setSinkId method, so we
+  // declare it ourselves
+  interface MediaElement extends HTMLVideoElement {
+    setSinkId: (id: string) => void;
   }
 
   interface HTMLElement {

src/@types/i18next.d.ts

@@ -1,8 +1,17 @@
 /*
-Copyright 2023, 2024 New Vector Ltd.
+Copyright 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import "i18next";

src/@types/modules.d.ts

@@ -1,8 +1,17 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 /// <reference types="vite/client" />

src/App.tsx

@@ -1,8 +1,17 @@
 /*
-Copyright 2021-2024 New Vector Ltd.
+Copyright 2021 - 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import { FC, Suspense, useEffect, useState } from "react";
@@ -13,9 +22,8 @@ import {
   useLocation,
 } from "react-router-dom";
 import * as Sentry from "@sentry/react";
+import { OverlayProvider } from "@react-aria/overlays";
 import { History } from "history";
-import { TooltipProvider } from "@vector-im/compound-web";
-import { logger } from "matrix-js-sdk/src/logger";
 
 import { HomePage } from "./home/HomePage";
 import { LoginPage } from "./auth/LoginPage";
@@ -26,21 +34,19 @@ import { CrashView, LoadingView } from "./FullScreenView";
 import { DisconnectedBanner } from "./DisconnectedBanner";
 import { Initializer } from "./initializer";
 import { MediaDevicesProvider } from "./livekit/MediaDevicesContext";
-import { widget } from "./widget";
-import { useTheme } from "./useTheme";
 
 const SentryRoute = Sentry.withSentryRouting(Route);
 
-interface SimpleProviderProps {
+interface BackgroundProviderProps {
   children: JSX.Element;
 }
 
-const BackgroundProvider: FC<SimpleProviderProps> = ({ children }) => {
+const BackgroundProvider: FC<BackgroundProviderProps> = ({ children }) => {
   const { pathname } = useLocation();
 
   useEffect(() => {
     let backgroundImage = "";
-    if (!["/login", "/register"].includes(pathname) && !widget) {
+    if (!["/login", "/register"].includes(pathname)) {
       backgroundImage = "var(--background-gradient)";
     }
 
@@ -50,10 +56,6 @@ const BackgroundProvider: FC<SimpleProviderProps> = ({ children }) => {
 
   return <>{children}</>;
 };
-const ThemeProvider: FC<SimpleProviderProps> = ({ children }) => {
-  useTheme();
-  return children;
-};
 
 interface AppProps {
   history: History;
@@ -61,14 +63,11 @@ interface AppProps {
 
 export const App: FC<AppProps> = ({ history }) => {
   const [loaded, setLoaded] = useState(false);
+
   useEffect(() => {
-    Initializer.init()
-      ?.then(async () => {
-        if (loaded) return;
-        setLoaded(true);
-        await widget?.api.sendContentLoaded();
-      })
-      .catch(logger.error);
+    Initializer.init()?.then(() => {
+      setLoaded(true);
+    });
   });
 
   const errorPage = <CrashView />;
@@ -78,37 +77,35 @@ export const App: FC<AppProps> = ({ history }) => {
     // @ts-ignore
     <Router history={history}>
       <BackgroundProvider>
-        <ThemeProvider>
-          <TooltipProvider>
-            {loaded ? (
-              <Suspense fallback={null}>
-                <ClientProvider>
-                  <MediaDevicesProvider>
-                    <Sentry.ErrorBoundary fallback={errorPage}>
-                      <DisconnectedBanner />
-                      <Switch>
-                        <SentryRoute exact path="/">
-                          <HomePage />
-                        </SentryRoute>
-                        <SentryRoute exact path="/login">
-                          <LoginPage />
-                        </SentryRoute>
-                        <SentryRoute exact path="/register">
-                          <RegisterPage />
-                        </SentryRoute>
-                        <SentryRoute path="*">
-                          <RoomPage />
-                        </SentryRoute>
-                      </Switch>
-                    </Sentry.ErrorBoundary>
-                  </MediaDevicesProvider>
-                </ClientProvider>
-              </Suspense>
-            ) : (
-              <LoadingView />
-            )}
-          </TooltipProvider>
-        </ThemeProvider>
+        {loaded ? (
+          <Suspense fallback={null}>
+            <ClientProvider>
+              <MediaDevicesProvider>
+                <Sentry.ErrorBoundary fallback={errorPage}>
+                  <OverlayProvider>
+                    <DisconnectedBanner />
+                    <Switch>
+                      <SentryRoute exact path="/">
+                        <HomePage />
+                      </SentryRoute>
+                      <SentryRoute exact path="/login">
+                        <LoginPage />
+                      </SentryRoute>
+                      <SentryRoute exact path="/register">
+                        <RegisterPage />
+                      </SentryRoute>
+                      <SentryRoute path="*">
+                        <RoomPage />
+                      </SentryRoute>
+                    </Switch>
+                  </OverlayProvider>
+                </Sentry.ErrorBoundary>
+              </MediaDevicesProvider>
+            </ClientProvider>
+          </Suspense>
+        ) : (
+          <LoadingView />
+        )}
       </BackgroundProvider>
     </Router>
   );

src/Avatar.tsx

@@ -1,14 +1,23 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import { useMemo, FC } from "react";
 import { Avatar as CompoundAvatar } from "@vector-im/compound-web";
 
-import { getAvatarUrl } from "./utils/matrix";
+import { getAvatarUrl } from "./matrix-utils";
 import { useClient } from "./ClientContext";
 
 export enum Size {

src/Banner.module.css

@@ -0,0 +1,22 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.banner {
+  flex: 1;
+  border-radius: 8px;
+  padding: 16px;
+  background-color: var(--cpd-color-bg-subtle-primary);
+}

src/Banner.tsx

@@ -0,0 +1,27 @@
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { FC, ReactNode } from "react";
+
+import styles from "./Banner.module.css";
+
+interface Props {
+  children: ReactNode;
+}
+
+export const Banner: FC<Props> = ({ children }) => {
+  return <div className={styles.banner}>{children}</div>;
+};

src/ClientContext.tsx

@@ -1,8 +1,17 @@
 /*
-Copyright 2021-2024 New Vector Ltd.
+Copyright 2021-2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import {
@@ -16,18 +25,17 @@ import {
   useMemo,
 } from "react";
 import { useHistory } from "react-router-dom";
-import {
-  ClientEvent,
-  ICreateClientOpts,
-  MatrixClient,
-} from "matrix-js-sdk/src/client";
+import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/client";
 import { logger } from "matrix-js-sdk/src/logger";
 import { useTranslation } from "react-i18next";
 import { ISyncStateData, SyncState } from "matrix-js-sdk/src/sync";
-import { MatrixError } from "matrix-js-sdk/src/matrix";
 
 import { ErrorView } from "./FullScreenView";
-import { fallbackICEServerAllowed, initClient } from "./utils/matrix";
+import {
+  CryptoStoreIntegrityError,
+  fallbackICEServerAllowed,
+  initClient,
+} from "./matrix-utils";
 import { widget } from "./widget";
 import {
   PosthogAnalytics,
@@ -309,7 +317,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
       initClientState.client.on(ClientEvent.Sync, onSync);
     }
 
-    return (): void => {
+    return () => {
       if (initClientState.client) {
         initClientState.client.removeListener(ClientEvent.Sync, onSync);
       }
@@ -352,13 +360,13 @@ async function loadClient(): Promise<InitResult | null> {
 
       /* eslint-disable camelcase */
       const { user_id, device_id, access_token, passwordlessUser } = session;
-      const initClientParams: ICreateClientOpts = {
+      const initClientParams = {
         baseUrl: Config.defaultHomeserverUrl()!,
         accessToken: access_token,
         userId: user_id,
         deviceId: device_id,
         fallbackICEServerAllowed: fallbackICEServerAllowed,
-        livekitServiceURL: Config.get().livekit?.livekit_service_url,
+        livekitServiceURL: Config.get().livekit!.livekit_service_url,
       };
 
       try {
@@ -368,17 +376,22 @@ async function loadClient(): Promise<InitResult | null> {
           passwordlessUser,
         };
       } catch (err) {
-        if (err instanceof MatrixError && err.errcode === "M_UNKNOWN_TOKEN") {
+        if (err instanceof CryptoStoreIntegrityError) {
           // We can't use this session anymore, so let's log it out
-          logger.log(
-            "The session from local store is invalid; continuing without a client",
-          );
-          clearSession();
-          // returning null = "no client` pls register" (undefined = "loading" which is the current value when reaching this line)
-          return null;
+          try {
+            const client = await initClient(initClientParams, false); // Don't need the crypto store just to log out)
+            await client.logout(true);
+          } catch (err) {
+            logger.warn(
+              "The previous session was lost, and we couldn't log it out, " +
+                err +
+                "either",
+            );
+          }
         }
         throw err;
       }
+      /* eslint-enable camelcase */
     } catch (err) {
       clearSession();
       throw err;

src/DisconnectedBanner.module.css

@@ -1,8 +1,17 @@
 /*
-Copyright 2023, 2024 New Vector Ltd.
+Copyright 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 .banner {

src/DisconnectedBanner.tsx

@@ -1,8 +1,17 @@
 /*
-Copyright 2023, 2024 New Vector Ltd.
+Copyright 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import classNames from "classnames";

src/FullScreenView.module.css

@@ -1,8 +1,17 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 .page {

src/FullScreenView.tsx

@@ -1,8 +1,17 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import { FC, ReactNode, useCallback, useEffect } from "react";
@@ -11,15 +20,13 @@ import classNames from "classnames";
 import { Trans, useTranslation } from "react-i18next";
 import * as Sentry from "@sentry/react";
 import { logger } from "matrix-js-sdk/src/logger";
-import { Button } from "@vector-im/compound-web";
 
 import { Header, HeaderLogo, LeftNav, RightNav } from "./Header";
-import { LinkButton } from "./button";
+import { LinkButton, Button } from "./button";
 import styles from "./FullScreenView.module.css";
 import { TranslatedError } from "./TranslatedError";
 import { Config } from "./config/Config";
 import { RageshakeButton } from "./settings/RageshakeButton";
-import { useUrlParams } from "./UrlParams";
 
 interface FullScreenViewProps {
   className?: string;
@@ -30,11 +37,12 @@ export const FullScreenView: FC<FullScreenViewProps> = ({
   className,
   children,
 }) => {
-  const { hideHeader } = useUrlParams();
   return (
     <div className={classNames(styles.page, className)}>
       <Header>
-        <LeftNav>{!hideHeader && <HeaderLogo />}</LeftNav>
+        <LeftNav>
+          <HeaderLogo />
+        </LeftNav>
         <RightNav />
       </Header>
       <div className={styles.container}>
@@ -50,7 +58,6 @@ interface ErrorViewProps {
 
 export const ErrorView: FC<ErrorViewProps> = ({ error }) => {
   const location = useLocation();
-  const { confineToRoom } = useUrlParams();
   const { t } = useTranslation();
 
   useEffect(() => {
@@ -71,16 +78,25 @@ export const ErrorView: FC<ErrorViewProps> = ({ error }) => {
           : error.message}
       </p>
       <RageshakeButton description={`***Error View***: ${error.message}`} />
-      {!confineToRoom &&
-        (location.pathname === "/" ? (
-          <Button className={styles.homeLink} onClick={onReload}>
-            {t("return_home_button")}
-          </Button>
-        ) : (
-          <LinkButton className={styles.homeLink} to="/">
-            {t("return_home_button")}
-          </LinkButton>
-        ))}
+      {location.pathname === "/" ? (
+        <Button
+          size="lg"
+          variant="default"
+          className={styles.homeLink}
+          onPress={onReload}
+        >
+          {t("return_home_button")}
+        </Button>
+      ) : (
+        <LinkButton
+          size="lg"
+          variant="default"
+          className={styles.homeLink}
+          to="/"
+        >
+          {t("return_home_button")}
+        </LinkButton>
+      )}
     </FullScreenView>
   );
 };
@@ -104,7 +120,12 @@ export const CrashView: FC = () => {
       )}
 
       <RageshakeButton description="***Soft Crash***" />
-      <Button className={styles.wideButton} onClick={onReload}>
+      <Button
+        size="lg"
+        variant="default"
+        className={styles.wideButton}
+        onPress={onReload}
+      >
         {t("return_home_button")}
       </Button>
     </FullScreenView>

src/Header.module.css

@@ -1,8 +1,17 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 .header {
@@ -24,7 +33,6 @@ Please see LICENSE in the repository root for full details.
 }
 
 .headerLogo {
-  color: var(--cpd-color-text-primary);
   display: none;
   align-items: center;
   text-decoration: none;
@@ -81,7 +89,6 @@ Please see LICENSE in the repository root for full details.
 .nameLine {
   grid-area: name;
   flex-grow: 1;
-  min-width: 0;
   display: flex;
   align-items: center;
   gap: var(--cpd-space-1x);
@@ -89,6 +96,8 @@ Please see LICENSE in the repository root for full details.
 
 .nameLine > h1 {
   margin: 0;
+  /* XXX I can't actually get this ellipsis overflow to trigger, because
+  constraint propagation in a nested flexbox layout is a massive pain */
   overflow: hidden;
   text-overflow: ellipsis;
 }
@@ -99,7 +108,6 @@ Please see LICENSE in the repository root for full details.
 
 .participantsLine {
   grid-area: participants;
-  color: var(--cpd-color-text-secondary);
   display: flex;
   align-items: center;
   gap: var(--cpd-space-1-5x);

src/Header.test.tsx

@@ -1,30 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
-*/
-
-import { expect, test } from "vitest";
-import { render, screen } from "@testing-library/react";
-import { axe } from "vitest-axe";
-import { TooltipProvider } from "@vector-im/compound-web";
-
-import { RoomHeaderInfo } from "./Header";
-
-test("RoomHeaderInfo is accessible", async () => {
-  const { container } = render(
-    <TooltipProvider>
-      <RoomHeaderInfo
-        id="!a:example.org"
-        name="Mission Control"
-        avatarUrl=""
-        encrypted
-        participantCount={11}
-      />
-    </TooltipProvider>,
-  );
-  expect(await axe(container)).toHaveNoViolations();
-  // Check that the room name acts as a heading
-  screen.getByRole("heading", { name: "Mission Control" });
-});

src/Header.tsx

@@ -1,16 +1,25 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import classNames from "classnames";
-import { FC, HTMLAttributes, ReactNode, forwardRef } from "react";
+import { FC, HTMLAttributes, ReactNode } from "react";
 import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { Heading, Text } from "@vector-im/compound-web";
-import { UserProfileIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+import UserProfileIcon from "@vector-im/compound-design-tokens/icons/user-profile.svg?react";
 
 import styles from "./Header.module.css";
 import Logo from "./icons/Logo.svg?react";
@@ -23,21 +32,13 @@ interface HeaderProps extends HTMLAttributes<HTMLElement> {
   className?: string;
 }
 
-export const Header = forwardRef<HTMLElement, HeaderProps>(
-  ({ children, className, ...rest }, ref) => {
-    return (
-      <header
-        ref={ref}
-        className={classNames(styles.header, className)}
-        {...rest}
-      >
-        {children}
-      </header>
-    );
-  },
-);
-
-Header.displayName = "Header";
+export const Header: FC<HeaderProps> = ({ children, className, ...rest }) => {
+  return (
+    <header className={classNames(styles.header, className)} {...rest}>
+      {children}
+    </header>
+  );
+};
 
 interface LeftNavProps extends HTMLAttributes<HTMLElement> {
   children: ReactNode;
@@ -116,7 +117,7 @@ interface RoomHeaderInfoProps {
   name: string;
   avatarUrl: string | null;
   encrypted: boolean;
-  participantCount: number | null;
+  participantCount: number;
 }
 
 export const RoomHeaderInfo: FC<RoomHeaderInfoProps> = ({
@@ -149,7 +150,7 @@ export const RoomHeaderInfo: FC<RoomHeaderInfoProps> = ({
         </Heading>
         <EncryptionLock encrypted={encrypted} />
       </div>
-      {(participantCount ?? 0) > 0 && (
+      {participantCount > 0 && (
         <div className={styles.participantsLine}>
           <UserProfileIcon
             width={20}
@@ -157,7 +158,7 @@ export const RoomHeaderInfo: FC<RoomHeaderInfoProps> = ({
             aria-label={t("header_participants_label")}
           />
           <Text as="span" size="sm" weight="medium">
-            {t("participant_count", { count: participantCount ?? 0 })}
+            {t("participant_count", { count: participantCount })}
           </Text>
         </div>
       )}

src/IndexedDBWorker.ts

@@ -1,8 +1,17 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import { IndexedDBStoreWorker } from "matrix-js-sdk/src/indexeddb-worker";

src/LazyEventEmitter.ts

@@ -1,8 +1,17 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import EventEmitter from "events";

src/ListBox.module.css

@@ -0,0 +1,49 @@
+/*
+Copyright 2022 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.listBox {
+  margin: 0;
+  padding: 0;
+  max-height: 150px;
+  overflow-y: auto;
+  list-style: none;
+  background-color: transparent;
+  border: 1px solid var(--cpd-color-border-interactive-secondary);
+  background-color: var(--cpd-color-bg-canvas-default);
+  border-radius: 8px;
+}
+
+.option {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background-color: transparent;
+  color: var(--cpd-color-text-primary);
+  padding: 8px 16px;
+  outline: none;
+  cursor: pointer;
+  font-size: var(--font-size-body);
+  min-height: 32px;
+}
+
+.option.focused {
+  background-color: rgba(111, 120, 130, 0.2);
+}
+
+.option.disabled {
+  color: var(--cpd-color-text-disabled);
+  background-color: var(--stopgap-bgColor3);
+}

src/ListBox.tsx

@@ -0,0 +1,116 @@
+/*
+Copyright 2022 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+  MutableRefObject,
+  PointerEvent,
+  ReactNode,
+  useCallback,
+  useRef,
+} from "react";
+import { useListBox, useOption, AriaListBoxOptions } from "@react-aria/listbox";
+import { ListState } from "@react-stately/list";
+import { Node } from "@react-types/shared";
+import classNames from "classnames";
+
+import styles from "./ListBox.module.css";
+
+interface ListBoxProps<T> extends AriaListBoxOptions<T> {
+  optionClassName: string;
+  state: ListState<T>;
+  className?: string;
+  listBoxRef?: MutableRefObject<HTMLUListElement>;
+}
+
+export function ListBox<T>({
+  state,
+  optionClassName,
+  className,
+  listBoxRef,
+  ...rest
+}: ListBoxProps<T>): ReactNode {
+  const ref = useRef<HTMLUListElement>(null);
+
+  const listRef = listBoxRef ?? ref;
+
+  const { listBoxProps } = useListBox(rest, state, listRef);
+
+  return (
+    <ul
+      {...listBoxProps}
+      ref={listRef}
+      className={classNames(styles.listBox, className)}
+    >
+      {[...state.collection].map((item) => (
+        <Option
+          key={item.key}
+          item={item}
+          state={state}
+          className={optionClassName}
+        />
+      ))}
+    </ul>
+  );
+}
+
+interface OptionProps<T> {
+  className: string;
+  state: ListState<T>;
+  item: Node<T>;
+}
+
+function Option<T>({ item, state, className }: OptionProps<T>): ReactNode {
+  const ref = useRef(null);
+  const { optionProps, isSelected, isFocused, isDisabled } = useOption(
+    { key: item.key },
+    state,
+    ref,
+  );
+
+  // Hack: remove the onPointerUp event handler and re-wire it to
+  // onClick. Chrome Android triggers a click event after the onpointerup
+  // event which leaks through to elements underneath the z-indexed select
+  // popover. preventDefault / stopPropagation don't have any effect, even
+  // adding just a dummy onClick handler still doesn't work, but it's fine
+  // if we handle just onClick.
+  // https://github.com/vector-im/element-call/issues/762
+  const origPointerUp = optionProps.onPointerUp;
+  delete optionProps.onPointerUp;
+  optionProps.onClick = useCallback(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    (e) => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      origPointerUp(e as unknown as PointerEvent<HTMLElement>);
+    },
+    [origPointerUp],
+  );
+
+  return (
+    <li
+      {...optionProps}
+      ref={ref}
+      className={classNames(styles.option, className, {
+        [styles.selected]: isSelected,
+        [styles.focused]: isFocused,
+        [styles.disables]: isDisabled,
+      })}
+    >
+      {item.rendered}
+    </li>
+  );
+}

src/Menu.module.css

@@ -0,0 +1,73 @@
+/*
+Copyright 2022 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.menu {
+  width: 100%;
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+
+.menuItem {
+  cursor: pointer;
+  height: 48px;
+  display: flex;
+  align-items: center;
+  padding: 0 12px;
+  color: var(--cpd-color-text-primary);
+  font-size: var(--font-size-body);
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.menuItem > * {
+  margin: 0 10px 0 0;
+}
+
+.menuItem > :last-child {
+  margin-right: 0;
+}
+
+.menuItem.focused,
+.menuItem:hover {
+  background-color: var(--cpd-color-bg-action-secondary-hovered);
+}
+
+.menuItem:active {
+  background-color: var(--cpd-color-bg-action-secondary-pressed);
+}
+
+.menuItem.focused:first-child,
+.menuItem:hover:first-child {
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
+.menuItem.focused:last-child,
+.menuItem:hover:last-child {
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
+}
+
+.checkIcon {
+  position: absolute;
+  right: 16px;
+}
+
+.checkIcon * {
+  stroke: var(--cpd-color-text-primary);
+}

src/Menu.tsx

@@ -0,0 +1,102 @@
+/*
+Copyright 2022 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { Key, ReactNode, useRef, useState } from "react";
+import { AriaMenuOptions, useMenu, useMenuItem } from "@react-aria/menu";
+import { TreeState, useTreeState } from "@react-stately/tree";
+import { mergeProps } from "@react-aria/utils";
+import { useFocus } from "@react-aria/interactions";
+import classNames from "classnames";
+import { Node } from "@react-types/shared";
+
+import styles from "./Menu.module.css";
+
+interface MenuProps<T> extends AriaMenuOptions<T> {
+  className?: string;
+  onClose: () => void;
+  onAction: (value: Key) => void;
+  label?: string;
+}
+
+export function Menu<T extends object>({
+  className,
+  onAction,
+  onClose,
+  label,
+  ...rest
+}: MenuProps<T>): ReactNode {
+  const state = useTreeState<T>({ ...rest, selectionMode: "none" });
+  const menuRef = useRef(null);
+  const { menuProps } = useMenu<T>(rest, state, menuRef);
+
+  return (
+    <ul
+      {...mergeProps(menuProps, rest)}
+      ref={menuRef}
+      className={classNames(styles.menu, className)}
+    >
+      {[...state.collection].map((item) => (
+        <MenuItem
+          key={item.key}
+          item={item}
+          state={state}
+          onAction={onAction}
+          onClose={onClose}
+        />
+      ))}
+    </ul>
+  );
+}
+
+interface MenuItemProps<T> {
+  item: Node<T>;
+  state: TreeState<T>;
+  onAction: (value: Key) => void;
+  onClose: () => void;
+}
+
+function MenuItem<T>({
+  item,
+  state,
+  onAction,
+  onClose,
+}: MenuItemProps<T>): ReactNode {
+  const ref = useRef(null);
+  const { menuItemProps } = useMenuItem(
+    {
+      key: item.key,
+      onAction,
+      onClose,
+    },
+    state,
+    ref,
+  );
+
+  const [isFocused, setFocused] = useState(false);
+  const { focusProps } = useFocus({ onFocusChange: setFocused });
+
+  return (
+    <li
+      {...mergeProps(menuItemProps, focusProps)}
+      ref={ref}
+      className={classNames(styles.menuItem, {
+        [styles.focused]: isFocused,
+      })}
+    >
+      {item.rendered}
+    </li>
+  );
+}

src/Modal.module.css

@@ -1,8 +1,17 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 - 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 .modal {
@@ -125,10 +134,6 @@ body[data-platform="ios"] .drawer {
   padding-block: var(--cpd-space-9x) var(--cpd-space-10x);
 }
 
-.modal.tabbed .body {
-  padding-block-start: 0;
-}
-
 .handle {
   content: "";
   position: absolute;

src/Modal.tsx

@@ -1,11 +1,21 @@
 /*
-Copyright 2023, 2024 New Vector Ltd.
+Copyright 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import { FC, ReactNode, useCallback } from "react";
+import { AriaDialogProps } from "@react-types/dialog";
 import { useTranslation } from "react-i18next";
 import {
   Root as DialogRoot,
@@ -17,7 +27,7 @@ import {
 } from "@radix-ui/react-dialog";
 import { Drawer } from "vaul";
 import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
-import { CloseIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+import CloseIcon from "@vector-im/compound-design-tokens/icons/close.svg?react";
 import classNames from "classnames";
 import { Heading, Glass } from "@vector-im/compound-web";
 
@@ -25,7 +35,8 @@ import styles from "./Modal.module.css";
 import overlayStyles from "./Overlay.module.css";
 import { useMediaQuery } from "./useMediaQuery";
 
-export interface Props {
+// TODO: Support tabs
+export interface Props extends AriaDialogProps {
   title: string;
   children: ReactNode;
   className?: string;
@@ -41,11 +52,6 @@ export interface Props {
    * will be non-dismissable.
    */
   onDismiss?: () => void;
-  /**
-   * Whether the modal content has tabs.
-   */
-  // TODO: Better tabs support
-  tabbed?: boolean;
 }
 
 /**
@@ -58,7 +64,6 @@ export const Modal: FC<Props> = ({
   className,
   open,
   onDismiss,
-  tabbed,
   ...rest
 }) => {
   const { t } = useTranslation();
@@ -87,11 +92,7 @@ export const Modal: FC<Props> = ({
               overlayStyles.overlay,
               styles.modal,
               styles.drawer,
-              { [styles.tabbed]: tabbed },
             )}
-            // Suppress the warning about there being no description; the modal
-            // has an accessible title
-            aria-describedby={undefined}
             {...rest}
           >
             <div className={styles.content}>
@@ -114,9 +115,7 @@ export const Modal: FC<Props> = ({
           <DialogOverlay
             className={classNames(overlayStyles.bg, overlayStyles.animate)}
           />
-          {/* Suppress the warning about there being no description; the modal
-          has an accessible title */}
-          <DialogContent asChild aria-describedby={undefined} {...rest}>
+          <DialogContent asChild {...rest}>
             <Glass
               className={classNames(
                 className,
@@ -124,7 +123,6 @@ export const Modal: FC<Props> = ({
                 overlayStyles.animate,
                 styles.modal,
                 styles.dialog,
-                { [styles.tabbed]: tabbed },
               )}
             >
               <div className={styles.content}>

src/Overlay.module.css

@@ -1,12 +1,22 @@
 /*
-Copyright 2023, 2024 New Vector Ltd.
+Copyright 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 .bg {
   position: fixed;
+  z-index: 100;
   inset: 0;
   background: rgba(3, 12, 27, 0.528);
 }
@@ -39,6 +49,7 @@ Please see LICENSE in the repository root for full details.
 
 .overlay {
   position: fixed;
+  z-index: 101;
 }
 
 .overlay.animate {

src/Platform.ts

@@ -1,8 +1,17 @@
 /*
-Copyright 2023, 2024 New Vector Ltd.
+Copyright 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 /**
@@ -27,8 +36,3 @@ if (/android/i.test(navigator.userAgent)) {
 } else {
   platform = "desktop";
 }
-
-export const isFirefox = (): boolean => {
-  const { userAgent } = navigator;
-  return userAgent.includes("Firefox");
-};

src/QrCode.module.css

@@ -1,12 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
-*/
-
-.qrCode img {
-  max-width: 100%;
-  image-rendering: pixelated;
-  border-radius: var(--cpd-space-4x);
-}

src/QrCode.test.tsx

@@ -1,25 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
-*/
-
-import { describe, expect, test } from "vitest";
-import { render, configure } from "@testing-library/react";
-
-import { QrCode } from "./QrCode";
-
-configure({
-  defaultHidden: true,
-});
-
-describe("QrCode", () => {
-  test("renders", async () => {
-    const { container, findByRole } = render(
-      <QrCode data="foo" className="bar" />,
-    );
-    (await findByRole("img")) as HTMLImageElement;
-    expect(container.firstChild).toMatchSnapshot();
-  });
-});

src/QrCode.tsx

@@ -1,48 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
-*/
-
-import { FC, useEffect, useState } from "react";
-import { toDataURL } from "qrcode";
-import classNames from "classnames";
-import { t } from "i18next";
-
-import styles from "./QrCode.module.css";
-
-interface Props {
-  data: string;
-  className?: string;
-}
-
-export const QrCode: FC<Props> = ({ data, className }) => {
-  const [url, setUrl] = useState<string | null>(null);
-
-  useEffect(() => {
-    let isCancelled = false;
-
-    toDataURL(data, { errorCorrectionLevel: "L" })
-      .then((url) => {
-        if (!isCancelled) {
-          setUrl(url);
-        }
-      })
-      .catch((reason) => {
-        if (!isCancelled) {
-          setUrl(null);
-        }
-      });
-
-    return (): void => {
-      isCancelled = true;
-    };
-  }, [data]);
-
-  return (
-    <div className={classNames(styles.qrCode, className)}>
-      {url && <img src={url} alt={t("qr_code")} />}
-    </div>
-  );
-};

src/Slider.module.css

@@ -1,57 +0,0 @@
-/*
-Copyright 2023, 2024 New Vector Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
-*/
-
-.slider {
-  display: flex;
-  align-items: center;
-  position: relative;
-}
-
-.track {
-  flex-grow: 1;
-  border-radius: var(--cpd-radius-pill-effect);
-  background: var(--cpd-color-bg-subtle-primary);
-  height: var(--cpd-space-2x);
-  outline: var(--cpd-border-width-1) solid
-    var(--cpd-color-border-interactive-primary);
-  outline-offset: calc(-1 * var(--cpd-border-width-1));
-  cursor: pointer;
-  transition: outline-color ease 0.15s;
-}
-
-.track[data-disabled] {
-  cursor: initial;
-  outline-color: var(--cpd-color-border-disabled);
-}
-
-.highlight {
-  background: var(--cpd-color-bg-action-primary-rest);
-  position: absolute;
-  block-size: 100%;
-  border-radius: var(--cpd-radius-pill-effect);
-  transition: background-color ease 0.15s;
-}
-
-.highlight[data-disabled] {
-  background: var(--cpd-color-bg-action-primary-disabled);
-}
-
-.handle {
-  display: block;
-  block-size: var(--cpd-space-4x);
-  inline-size: var(--cpd-space-4x);
-  border-radius: var(--cpd-radius-pill-effect);
-  background: var(--cpd-color-bg-action-primary-rest);
-  box-shadow: 0 0 0 2px var(--cpd-color-bg-canvas-default);
-  cursor: pointer;
-  transition: background-color ease 0.15s;
-}
-
-.handle[data-disabled] {
-  cursor: initial;
-  background: var(--cpd-color-bg-action-primary-disabled);
-}

src/Slider.tsx

@@ -1,59 +0,0 @@
-/*
-Copyright 2023, 2024 New Vector Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
-*/
-
-import { FC, useCallback } from "react";
-import { Root, Track, Range, Thumb } from "@radix-ui/react-slider";
-import classNames from "classnames";
-
-import styles from "./Slider.module.css";
-
-interface Props {
-  className?: string;
-  label: string;
-  value: number;
-  onValueChange: (value: number) => void;
-  min: number;
-  max: number;
-  step: number;
-  disabled?: boolean;
-}
-
-/**
- * A slider control allowing a value to be selected from a range.
- */
-export const Slider: FC<Props> = ({
-  className,
-  label,
-  value,
-  onValueChange: onValueChangeProp,
-  min,
-  max,
-  step,
-  disabled,
-}) => {
-  const onValueChange = useCallback(
-    ([v]: number[]) => onValueChangeProp(v),
-    [onValueChangeProp],
-  );
-
-  return (
-    <Root
-      className={classNames(className, styles.slider)}
-      value={[value]}
-      onValueChange={onValueChange}
-      min={min}
-      max={max}
-      step={step}
-      disabled={disabled}
-    >
-      <Track className={styles.track}>
-        <Range className={styles.highlight} />
-      </Track>
-      <Thumb className={styles.handle} aria-label={label} />
-    </Root>
-  );
-};

src/Toast.module.css

@@ -1,8 +1,17 @@
 /*
-Copyright 2023, 2024 New Vector Ltd.
+Copyright 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 .toast {

src/Toast.test.tsx

@@ -1,68 +0,0 @@
-/*
-Copyright 2023, 2024 New Vector Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
-*/
-
-import { describe, expect, test, vi } from "vitest";
-import { render } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-
-import { Toast } from "../src/Toast";
-import { withFakeTimers } from "./utils/test";
-
-describe("Toast", () => {
-  test("renders", () => {
-    const { queryByRole } = render(
-      <Toast open={false} onDismiss={() => {}}>
-        Hello world!
-      </Toast>,
-    );
-    expect(queryByRole("dialog")).toBe(null);
-    const { getByRole } = render(
-      <Toast open={true} onDismiss={() => {}}>
-        Hello world!
-      </Toast>,
-    );
-    expect(getByRole("dialog")).toMatchSnapshot();
-  });
-
-  test("dismisses when Esc is pressed", async () => {
-    const user = userEvent.setup();
-    const onDismiss = vi.fn();
-    render(
-      <Toast open={true} onDismiss={onDismiss}>
-        Hello world!
-      </Toast>,
-    );
-    await user.keyboard("[Escape]");
-    expect(onDismiss).toHaveBeenCalled();
-  });
-
-  test("dismisses when background is clicked", async () => {
-    const user = userEvent.setup();
-    const onDismiss = vi.fn();
-    const { getByRole } = render(
-      <Toast open={true} onDismiss={onDismiss}>
-        Hello world!
-      </Toast>,
-    );
-    const background = getByRole("dialog").previousSibling! as Element;
-    await user.click(background);
-    expect(onDismiss).toHaveBeenCalled();
-  });
-
-  test("dismisses itself after the specified timeout", () => {
-    withFakeTimers(() => {
-      const onDismiss = vi.fn();
-      render(
-        <Toast open={true} onDismiss={onDismiss} autoDismiss={2000}>
-          Hello world!
-        </Toast>,
-      );
-      vi.advanceTimersByTime(2000);
-      expect(onDismiss).toHaveBeenCalled();
-    });
-  });
-});

src/Toast.tsx

@@ -1,8 +1,17 @@
 /*
-Copyright 2023, 2024 New Vector Ltd.
+Copyright 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import {
@@ -67,7 +76,7 @@ export const Toast: FC<Props> = ({
   useEffect(() => {
     if (open && autoDismiss !== undefined) {
       const timeout = setTimeout(onDismiss, autoDismiss);
-      return (): void => clearTimeout(timeout);
+      return () => clearTimeout(timeout);
     }
   }, [open, autoDismiss, onDismiss]);
 
@@ -77,7 +86,7 @@ export const Toast: FC<Props> = ({
         <DialogOverlay
           className={classNames(overlayStyles.bg, overlayStyles.animate)}
         />
-        <DialogContent aria-describedby={undefined} asChild>
+        <DialogContent asChild>
           <DialogClose
             className={classNames(
               overlayStyles.overlay,

src/Tooltip.module.css

@@ -0,0 +1,30 @@
+/*
+Copyright 2022 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.tooltip {
+  background-color: var(--cpd-color-bg-subtle-secondary);
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  padding: 10px;
+  color: var(--cpd-color-text-primary);
+  border-radius: 8px;
+  max-width: 135px;
+  width: max-content;
+  font-size: var(--font-size-caption);
+  font-weight: 500;
+  text-align: center;
+}

src/Tooltip.tsx

@@ -0,0 +1,114 @@
+/*
+Copyright 2022 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import {
+  ForwardedRef,
+  forwardRef,
+  ReactElement,
+  ReactNode,
+  useRef,
+} from "react";
+import {
+  TooltipTriggerState,
+  useTooltipTriggerState,
+} from "@react-stately/tooltip";
+import { FocusableProvider } from "@react-aria/focus";
+import { useTooltipTrigger, useTooltip } from "@react-aria/tooltip";
+import { mergeProps, useObjectRef } from "@react-aria/utils";
+import classNames from "classnames";
+import { OverlayContainer, useOverlayPosition } from "@react-aria/overlays";
+import { Placement } from "@react-types/overlays";
+
+import styles from "./Tooltip.module.css";
+
+interface TooltipProps {
+  className?: string;
+  state: TooltipTriggerState;
+  children: ReactNode;
+}
+
+const Tooltip = forwardRef<HTMLDivElement, TooltipProps>(
+  (
+    { state, className, children, ...rest }: TooltipProps,
+    ref: ForwardedRef<HTMLDivElement>,
+  ) => {
+    const { tooltipProps } = useTooltip(rest, state);
+
+    return (
+      <div
+        className={classNames(styles.tooltip, className)}
+        {...mergeProps(rest, tooltipProps)}
+        ref={ref}
+      >
+        {children}
+      </div>
+    );
+  },
+);
+
+interface TooltipTriggerProps {
+  children: ReactElement;
+  placement?: Placement;
+  delay?: number;
+  tooltip: () => string;
+}
+
+export const TooltipTrigger = forwardRef<HTMLElement, TooltipTriggerProps>(
+  (
+    { children, placement, tooltip, ...rest }: TooltipTriggerProps,
+    ref: ForwardedRef<HTMLElement>,
+  ) => {
+    const tooltipTriggerProps = { delay: 250, ...rest };
+    const tooltipState = useTooltipTriggerState(tooltipTriggerProps);
+    const triggerRef = useObjectRef<HTMLElement>(ref);
+    const overlayRef = useRef<HTMLDivElement>(null);
+    const { triggerProps, tooltipProps } = useTooltipTrigger(
+      tooltipTriggerProps,
+      tooltipState,
+      triggerRef,
+    );
+
+    const { overlayProps } = useOverlayPosition({
+      placement: placement || "top",
+      targetRef: triggerRef,
+      overlayRef,
+      isOpen: tooltipState.isOpen,
+      offset: 12,
+    });
+
+    return (
+      <FocusableProvider ref={triggerRef} {...triggerProps}>
+        <children.type
+          {...mergeProps<typeof children.props | typeof rest>(
+            children.props,
+            rest,
+          )}
+        />
+        {tooltipState.isOpen && (
+          <OverlayContainer>
+            <Tooltip
+              state={tooltipState}
+              ref={overlayRef}
+              {...mergeProps(tooltipProps, overlayProps)}
+            >
+              {tooltip()}
+            </Tooltip>
+          </OverlayContainer>
+        )}
+      </FocusableProvider>
+    );
+  },
+);

src/TranslatedError.ts

@@ -1,11 +1,23 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
-import type { DefaultNamespace, ParseKeys, TFunction, TOptions } from "i18next";
+import i18n from "i18next";
+
+import type { ParseKeys, TFunction } from "i18next/typescript/t";
+import type { DefaultNamespace, TOptions } from "i18next/typescript/options";
 
 /**
  * An error with messages in both English and the user's preferred language.
@@ -33,5 +45,5 @@ class TranslatedErrorImpl extends TranslatedError {}
 // function instead
 export const translatedError = (
   messageKey: ParseKeys<DefaultNamespace, TOptions>,
-  t: TFunction<"app", undefined>,
+  t: typeof i18n.t,
 ): TranslatedError => new TranslatedErrorImpl(messageKey, t);

src/UrlParams.ts

@@ -1,17 +1,25 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 - 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
-*/
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ */
 
 import { useMemo } from "react";
 import { useLocation } from "react-router-dom";
-import { logger } from "matrix-js-sdk/src/logger";
 
 import { Config } from "./config/Config";
-import { EncryptionSystem } from "./e2ee/sharedKeyManagement";
-import { E2eeType } from "./e2ee/e2eeType";
+
+export const PASSWORD_STRING = "password=";
 
 interface RoomIdentifier {
   roomAlias: string | null;
@@ -117,29 +125,6 @@ export interface UrlParams {
    * with the join widget action.
    */
   skipLobby: boolean;
-  /**
-   * Setting this flag makes element call show the lobby after leaving a call.
-   * This is useful for video rooms.
-   */
-  returnToLobby: boolean;
-  /**
-   * The theme to use for element call.
-   * can be "light", "dark", "light-high-contrast" or "dark-high-contrast".
-   */
-  theme: string | null;
-  /** This defines the homeserver that is going to be used when joining a room.
-   * It has to be set to a non default value for links to rooms
-   * that are not on the default homeserver,
-   * that is in use for the current user.
-   */
-  viaServers: string | null;
-  /**
-   * This defines the homeserver that is going to be used when registering
-   * a new (guest) user.
-   * This can be user to configure a non default guest user server when
-   * creating a spa link.
-   */
-  homeserver: string | null;
 }
 
 // This is here as a stopgap, but what would be far nicer is a function that
@@ -238,10 +223,6 @@ export const getUrlParams = (
     allowIceFallback: parser.getFlagParam("allowIceFallback"),
     perParticipantE2EE: parser.getFlagParam("perParticipantE2EE"),
     skipLobby: parser.getFlagParam("skipLobby"),
-    returnToLobby: parser.getFlagParam("returnToLobby"),
-    theme: parser.getParam("theme"),
-    viaServers: parser.getParam("viaServers"),
-    homeserver: parser.getParam("homeserver"),
   };
 };
 
@@ -320,32 +301,3 @@ export const useRoomIdentifier = (): RoomIdentifier => {
     [pathname, search, hash],
   );
 };
-
-export function generateUrlSearchParams(
-  roomId: string,
-  encryptionSystem: EncryptionSystem,
-  viaServers?: string[],
-): URLSearchParams {
-  const params = new URLSearchParams();
-  // The password shouldn't need URL encoding here (we generate URL-safe ones) but encode
-  // it in case it came from another client that generated a non url-safe one
-  switch (encryptionSystem?.kind) {
-    case E2eeType.SHARED_KEY: {
-      const encodedPassword = encodeURIComponent(encryptionSystem.secret);
-      if (encodedPassword !== encryptionSystem.secret) {
-        logger.info(
-          "Encoded call password used non URL-safe chars: buggy client?",
-        );
-      }
-      params.set("password", encodedPassword);
-      break;
-    }
-    case E2eeType.PER_PARTICIPANT:
-      params.set("perParticipantE2EE", "true");
-      break;
-  }
-  params.set("roomId", roomId);
-  viaServers?.forEach((s) => params.set("viaServers", s));
-
-  return params;
-}

src/UserMenu.module.css

@@ -1,8 +1,17 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 .menuIcon {
@@ -12,14 +21,6 @@ Please see LICENSE in the repository root for full details.
   flex-shrink: 0;
 }
 
-.userButton {
-  appearance: none;
-  background: none;
-  border: none;
-  margin: 0;
-  cursor: pointer;
-}
-
 .userButton svg * {
   fill: var(--cpd-color-icon-primary);
 }

src/UserMenu.tsx

@@ -1,21 +1,34 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 - 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
-import { FC, useMemo, useState } from "react";
+import { FC, ReactNode, useCallback, useMemo } from "react";
+import { Item } from "@react-stately/collections";
 import { useLocation } from "react-router-dom";
 import { useTranslation } from "react-i18next";
-import { Menu, MenuItem } from "@vector-im/compound-web";
 
-import { LinkButton } from "./button";
+import { Button, LinkButton } from "./button";
+import { PopoverMenuTrigger } from "./popover/PopoverMenu";
+import { Menu } from "./Menu";
+import { TooltipTrigger } from "./Tooltip";
 import { Avatar, Size } from "./Avatar";
 import UserIcon from "./icons/User.svg?react";
 import SettingsIcon from "./icons/Settings.svg?react";
 import LoginIcon from "./icons/Login.svg?react";
 import LogoutIcon from "./icons/Logout.svg?react";
+import { Body } from "./typography/Typography";
 import styles from "./UserMenu.module.css";
 
 interface Props {
@@ -78,7 +91,7 @@ export const UserMenu: FC<Props> = ({
     return arr;
   }, [isAuthenticated, isPasswordlessUser, displayName, preventNavigation, t]);
 
-  const [open, setOpen] = useState(false);
+  const tooltip = useCallback(() => t("common.profile"), [t]);
 
   if (!isAuthenticated) {
     return (
@@ -89,15 +102,10 @@ export const UserMenu: FC<Props> = ({
   }
 
   return (
-    <Menu
-      title={t("a11y.user_menu")}
-      showTitle={false}
-      align="end"
-      open={open}
-      onOpenChange={setOpen}
-      trigger={
-        <button
-          aria-label={t("common.profile")}
+    <PopoverMenuTrigger placement="bottom right">
+      <TooltipTrigger tooltip={tooltip} placement="bottom left">
+        <Button
+          variant="icon"
           className={styles.userButton}
           data-testid="usermenu_open"
         >
@@ -111,18 +119,26 @@ export const UserMenu: FC<Props> = ({
           ) : (
             <UserIcon />
           )}
-        </button>
+        </Button>
+      </TooltipTrigger>
+      {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (props: any): ReactNode => (
+          <Menu {...props} label={t("a11y.user_menu")} onAction={onAction}>
+            {items.map(({ key, icon: Icon, label, dataTestid }) => (
+              <Item key={key} textValue={label}>
+                <Icon
+                  width={24}
+                  height={24}
+                  className={styles.menuIcon}
+                  data-testid={dataTestid}
+                />
+                <Body overflowEllipsis>{label}</Body>
+              </Item>
+            ))}
+          </Menu>
+        )
       }
-    >
-      {items.map(({ key, icon: Icon, label, dataTestid }) => (
-        <MenuItem
-          key={key}
-          Icon={Icon}
-          label={label}
-          data-test-id={dataTestid}
-          onSelect={() => onAction(key)}
-        />
-      ))}
-    </Menu>
+    </PopoverMenuTrigger>
   );
 };

src/UserMenuContainer.tsx

@@ -1,8 +1,17 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 - 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import { FC, useCallback, useState } from "react";
@@ -10,7 +19,7 @@ import { useHistory, useLocation } from "react-router-dom";
 
 import { useClientLegacy } from "./ClientContext";
 import { useProfile } from "./profile/useProfile";
-import { defaultSettingsTab, SettingsModal } from "./settings/SettingsModal";
+import { SettingsModal } from "./settings/SettingsModal";
 import { UserMenu } from "./UserMenu";
 
 interface Props {
@@ -28,17 +37,17 @@ export const UserMenuContainer: FC<Props> = ({ preventNavigation = false }) => {
     [setSettingsModalOpen],
   );
 
-  const [settingsTab, setSettingsTab] = useState(defaultSettingsTab);
+  const [defaultSettingsTab, setDefaultSettingsTab] = useState<string>();
 
   const onAction = useCallback(
-    (value: string) => {
+    async (value: string) => {
       switch (value) {
         case "user":
-          setSettingsTab("profile");
+          setDefaultSettingsTab("profile");
           setSettingsModalOpen(true);
           break;
         case "settings":
-          setSettingsTab("audio");
+          setDefaultSettingsTab("audio");
           setSettingsModalOpen(true);
           break;
         case "logout":
@@ -67,10 +76,9 @@ export const UserMenuContainer: FC<Props> = ({ preventNavigation = false }) => {
       {client && (
         <SettingsModal
           client={client}
+          defaultTab={defaultSettingsTab}
           open={settingsModalOpen}
           onDismiss={onDismissSettingsModal}
-          tab={settingsTab}
-          onTabChange={setSettingsTab}
         />
       )}
     </>

src/__snapshots__/QrCode.test.tsx.snap

@@ -1,12 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`QrCode > renders 1`] = `
-<div
-  class="qrCode bar"
->
-  <img
-    alt="qr_code"
-    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHQAAAB0CAYAAABUmhYnAAAAAklEQVR4AewaftIAAALBSURBVO3BQW7kQAwEwSxC//9yro88NSBI4/UQjIg/WGMUa5RijVKsUYo1SrFGKdYoxRqlWKMUa5RijVKsUYo1SrFGKdYoxRrl4qEk/CaVkyR0Kl0STlS6JPwmlSeKNUqxRinWKBcvU3lTEk6S8ITKHSpvSsKbijVKsUYp1igXH5aEO1Q+SaVLQqdyRxLuUPmkYo1SrFGKNcrFl1PpknCShE5lkmKNUqxRijXKxZdLQqdyotIloVP5ZsUapVijFGuUiw9T+UuS8CaVv6RYoxRrlGKNcvGyJPwlSehUuiTckYS/rFijFGuUYo0Sf/DFkvAmlW9WrFGKNUqxRrl4KAknKl0SOpWTJJyodEk4UbkjCXeodEk4UXlTsUYp1ijFGuXiIZUuCXck4USlS0KXhE7lk1TelIRO5YlijVKsUYo1ysXLVLok3KHSJaFT6ZLQJaFTOUnCicodSehUTpLwpmKNUqxRijXKxUNJ6FSeSEKn0iXhROUkCZ3Kb0pCp/KmYo1SrFGKNcrFh6mcJKFT6ZJwotIloVPpVLokdCpdEjqVLgmdyh1J6FSeKNYoxRqlWKPEH3yxJHQqJ0noVO5IwolKl4ROpUtCp/JEsUYp1ijFGuXioST8JpU7ktCpnCShUzlROVHpktCpvKlYoxRrlGKNcvEylTcl4USlS8JJEt6UhBOVTqVLQqfyRLFGKdYoxRrl4sOScIfKEyonSehUTpJwh0qXhN9UrFGKNUqxRrn4ckn4JJU7kvA/FWuUYo1SrFEuvpxKl4QTlS4JncodSehU7kjCm4o1SrFGKdYoFx+m8klJOFE5UemScKJyRxI6lU7lTcUapVijFGuUi5cl4X9SOUnCicoTSThJQqfypmKNUqxRijVK/MEao1ijFGuUYo1SrFGKNUqxRinWKMUapVijFGuUYo1SrFGKNUqxRinWKP8AKoQP/lIBoMIAAAAASUVORK5CYII="
-  />
-</div>
-`;

src/__snapshots__/Toast.test.tsx.snap

@@ -1,21 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`Toast > renders 1`] = `
-<button
-  aria-labelledby="radix-:r4:"
-  class="overlay animate toast"
-  data-state="open"
-  id="radix-:r3:"
-  role="dialog"
-  style="pointer-events: auto;"
-  tabindex="-1"
-  type="button"
->
-  <h3
-    class="_typography_yh5dq_162 _font-body-sm-semibold_yh5dq_45"
-    id="radix-:r4:"
-  >
-    Hello world!
-  </h3>
-</button>
-`;

src/analytics/AnalyticsNotice.tsx

@@ -1,27 +1,30 @@
 /*
-Copyright 2023, 2024 New Vector Ltd.
+Copyright 2023 New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import { FC } from "react";
 import { Trans } from "react-i18next";
 
-import { ExternalLink } from "../button/Link";
+import { Link } from "../typography/Typography";
 
 export const AnalyticsNotice: FC = () => (
   <Trans i18nKey="analytics_notice">
     By participating in this beta, you consent to the collection of anonymous
     data, which we use to improve the product. You can find more information
     about which data we track in our{" "}
-    <ExternalLink href="https://element.io/privacy">
-      Privacy Policy
-    </ExternalLink>{" "}
-    and our{" "}
-    <ExternalLink href="https://element.io/cookie-policy">
-      Cookie Policy
-    </ExternalLink>
-    .
+    <Link href="https://element.io/privacy">Privacy Policy</Link> and our{" "}
+    <Link href="https://element.io/cookie-policy">Cookie Policy</Link>.
   </Trans>
 );

src/analytics/PosthogAnalytics.ts

@@ -1,16 +1,26 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 The New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import posthog, { CaptureOptions, PostHog, Properties } from "posthog-js";
 import { logger } from "matrix-js-sdk/src/logger";
-import { MatrixClient } from "matrix-js-sdk/src/matrix";
+import { MatrixClient } from "matrix-js-sdk";
 import { Buffer } from "buffer";
 
 import { widget } from "../widget";
+import { getSetting, setSetting, getSettingKey } from "../settings/useSetting";
 import {
   CallEndedTracker,
   CallStartedTracker,
@@ -21,11 +31,10 @@ import {
   UndecryptableToDeviceEventTracker,
   QualitySurveyEventTracker,
   CallDisconnectedEventTracker,
-  CallConnectDurationTracker,
 } from "./PosthogEvents";
 import { Config } from "../config/Config";
 import { getUrlParams } from "../UrlParams";
-import { optInAnalytics } from "../settings/settings";
+import { localStorageBus } from "../useLocalStorage";
 
 /* Posthog analytics tracking.
  *
@@ -64,7 +73,6 @@ interface PlatformProperties {
   appVersion: string;
   matrixBackend: "embedded" | "jssdk";
   callBackend: "livekit" | "full-mesh";
-  cryptoVersion?: string;
 }
 
 interface PosthogSettings {
@@ -122,7 +130,7 @@ export class PosthogAnalytics {
         const { analyticsID } = getUrlParams();
         // if the embedding platform (element web) already got approval to communicating with posthog
         // element call can also send events to posthog
-        optInAnalytics.setValue(Boolean(analyticsID));
+        setSetting("opt-in-analytics", Boolean(analyticsID));
       }
 
       this.posthog.init(posthogConfig.project_api_key, {
@@ -136,13 +144,15 @@ export class PosthogAnalytics {
         advanced_disable_decide: true,
       });
       this.enabled = true;
-    } else if (import.meta.env.MODE !== "test") {
+    } else {
       logger.info(
         "Posthog is not enabled because there is no api key or no host given in the config",
       );
       this.enabled = false;
     }
-    this.startListeningToSettingsChanges(); // Triggers maybeIdentifyUser
+    this.startListeningToSettingsChanges();
+    const optInAnalytics = getSetting("opt-in-analytics", false);
+    this.updateAnonymityAndIdentifyUser(optInAnalytics);
   }
 
   private sanitizeProperties = (
@@ -185,9 +195,6 @@ export class PosthogAnalytics {
       appVersion,
       matrixBackend: widget ? "embedded" : "jssdk",
       callBackend: "livekit",
-      cryptoVersion: widget
-        ? undefined
-        : window.matrixclient?.getCrypto()?.getVersion(),
     };
   }
 
@@ -260,7 +267,7 @@ export class PosthogAnalytics {
         this.posthog.identify(analyticsID);
       } else {
         logger.info(
-          "No analyticsID is available. Should not try to setup posthog",
+          "No analyticsID is availble. Should not try to setup posthog",
         );
       }
     }
@@ -328,9 +335,8 @@ export class PosthogAnalytics {
   }
 
   public onLoginStatusChanged(): void {
-    this.maybeIdentifyUser().catch(() =>
-      logger.log("Could not identify user on login status change"),
-    );
+    const optInAnalytics = getSetting("opt-in-analytics", false);
+    this.updateAnonymityAndIdentifyUser(optInAnalytics);
   }
 
   private updateSuperProperties(): void {
@@ -353,12 +359,20 @@ export class PosthogAnalytics {
     return this.eventSignup.getSignupEndTime() > new Date(0);
   }
 
-  private async maybeIdentifyUser(): Promise<void> {
+  private async updateAnonymityAndIdentifyUser(
+    pseudonymousOptIn: boolean,
+  ): Promise<void> {
+    // Update this.anonymity based on the user's analytics opt-in settings
+    const anonymity = pseudonymousOptIn
+      ? Anonymity.Pseudonymous
+      : Anonymity.Disabled;
+    this.setAnonymity(anonymity);
+
     // We may not yet have a Matrix client at this point, if not, bail. This should get
     // triggered again by onLoginStatusChanged once we do have a client.
     if (!window.matrixclient) return;
 
-    if (this.anonymity === Anonymity.Pseudonymous) {
+    if (anonymity === Anonymity.Pseudonymous) {
       this.setRegistrationType(
         window.matrixclient.isGuest() || window.passwordlessUser
           ? RegistrationType.Guest
@@ -374,32 +388,25 @@ export class PosthogAnalytics {
       }
     }
 
-    if (this.anonymity !== Anonymity.Disabled) {
+    if (anonymity !== Anonymity.Disabled) {
       this.updateSuperProperties();
     }
   }
 
-  public trackEvent<E extends IPosthogEvent>(
+  public async trackEvent<E extends IPosthogEvent>(
     { eventName, ...properties }: E,
     options?: CaptureOptions,
-  ): void {
-    const doCapture = (): void => {
-      if (
-        this.anonymity == Anonymity.Disabled ||
-        this.anonymity == Anonymity.Anonymous
-      )
-        return;
-      this.capture(eventName, properties, options);
-    };
-
+  ): Promise<void> {
     if (this.identificationPromise) {
-      // only make calls to posthog after the identification is done
-      this.identificationPromise.then(doCapture, (e) => {
-        logger.error("Failed to identify user for tracking", e);
-      });
-    } else {
-      doCapture();
+      // only make calls to posthog after the identificaion is done
+      await this.identificationPromise;
     }
+    if (
+      this.anonymity == Anonymity.Disabled ||
+      this.anonymity == Anonymity.Anonymous
+    )
+      return;
+    this.capture(eventName, properties, options);
   }
 
   private startListeningToSettingsChanges(): void {
@@ -411,11 +418,8 @@ export class PosthogAnalytics {
     //  * When the user changes their preferences on this device
     // Note that for new accounts, pseudonymousAnalyticsOptIn won't be set, so updateAnonymityFromSettings
     // won't be called (i.e. this.anonymity will be left as the default, until the setting changes)
-    optInAnalytics.value.subscribe((optIn) => {
-      this.setAnonymity(optIn ? Anonymity.Pseudonymous : Anonymity.Disabled);
-      this.maybeIdentifyUser().catch(() =>
-        logger.log("Could not identify user"),
-      );
+    localStorageBus.on(getSettingKey("opt-in-analytics"), (optInAnalytics) => {
+      this.updateAnonymityAndIdentifyUser(optInAnalytics);
     });
   }
 
@@ -440,5 +444,4 @@ export class PosthogAnalytics {
   public eventUndecryptableToDevice = new UndecryptableToDeviceEventTracker();
   public eventQualitySurvey = new QualitySurveyEventTracker();
   public eventCallDisconnected = new CallDisconnectedEventTracker();
-  public eventCallConnectDuration = new CallConnectDurationTracker();
 }

src/analytics/PosthogEvents.ts

@@ -1,13 +1,20 @@
 /*
-Copyright 2022-2024 New Vector Ltd.
+Copyright 2022 The New Vector Ltd
 
-SPDX-License-Identifier: AGPL-3.0-only
-Please see LICENSE in the repository root for full details.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 import { DisconnectReason } from "livekit-client";
-import { logger } from "matrix-js-sdk/src/logger";
-import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc";
 
 import {
   IPosthogEvent,
@@ -21,9 +28,6 @@ interface CallEnded extends IPosthogEvent {
   callParticipantsOnLeave: number;
   callParticipantsMax: number;
   callDuration: number;
-  roomEventEncryptionKeysSent: number;
-  roomEventEncryptionKeysReceived: number;
-  roomEventEncryptionKeysReceivedAverageAge: number;
 }
 
 export class CallEndedTracker {
@@ -47,7 +51,6 @@ export class CallEndedTracker {
     callId: string,
     callParticipantsNow: number,
     sendInstantly: boolean,
-    rtcSession: MatrixRTCSession,
   ): void {
     PosthogAnalytics.instance.trackEvent<CallEnded>(
       {
@@ -56,16 +59,6 @@ export class CallEndedTracker {
         callParticipantsMax: this.cache.maxParticipantsCount,
         callParticipantsOnLeave: callParticipantsNow,
         callDuration: (Date.now() - this.cache.startTime.getTime()) / 1000,
-        roomEventEncryptionKeysSent:
-          rtcSession.statistics.counters.roomEventEncryptionKeysSent,
-        roomEventEncryptionKeysReceived:
-          rtcSession.statistics.counters.roomEventEncryptionKeysReceived,
-        roomEventEncryptionKeysReceivedAverageAge:
-          rtcSession.statistics.counters.roomEventEncryptionKeysReceived > 0
-            ? rtcSession.statistics.totals
-                .roomEventEncryptionKeysReceivedTotalAge /
-              rtcSession.statistics.counters.roomEventEncryptionKeysReceived
-            : 0,
       },
       { send_instantly: sendInstantly },
     );
@@ -208,38 +201,3 @@ export class CallDisconnectedEventTracker {
     });
   }
 }
-
-interface CallConnectDuration extends IPosthogEvent {
-  eventName: "CallConnectDuration";
-  totalDuration: number;
-  websocketDuration: number;
-  peerConnectionDuration: number;
-}
-
-export class CallConnectDurationTracker {
-  private connectStart = 0;
-  private websocketConnected = 0;
-  public cacheConnectStart(): void {
-    this.connectStart = Date.now();
-  }
-  public cacheWsConnect(): void {
-    this.websocketConnected = Date.now();
-  }
-
-  public track(options = { log: false }): void {
-    const now = Date.now();
-    const totalDuration = now - this.connectStart;
-    const websocketDuration = this.websocketConnected - this.connectStart;
-    const peerConnectionDuration = now - this.websocketConnected;
-    PosthogAnalytics.instance.trackEvent<CallConnectDuration>({
-      eventName: "CallConnectDuration",
-      totalDuration,
-      websocketDuration,
-      peerConnectionDuration,
-    });
-    if (options.log)
-      logger.log(
-        `Time to connect:\ntotal: ${totalDuration}ms\npeerConnection: ${websocketDuration}ms\nwebsocket: ${peerConnectionDuration}ms`,
-      );
-  }
-}