upgrade to postcss-loader 4

These have been around forever (c1d4a0dd28) and don't seem to do much nowadays
except make modern versions of the loader unhappy.

.eslintrc.js

@@ -88,7 +88,6 @@ module.exports = {
                 "@typescript-eslint/explicit-function-return-type": "off",
                 "@typescript-eslint/explicit-member-accessibility": "off",
                 "@typescript-eslint/ban-ts-comment": "off",
-                "@typescript-eslint/no-floating-promises": "off",
             },
         },
     ],

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,17 @@
 
 ## Checklist
 
--   [ ] Tests written for new code (and old code if feasible).
--   [ ] New or updated `public`/`exported` symbols have accurate [TSDoc](https://tsdoc.org/) documentation.
--   [ ] Linter and other CI checks pass.
--   [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/element-hq/element-web/blob/develop/CONTRIBUTING.md)).
+-   [ ] Tests written for new code (and old code if feasible)
+-   [ ] Linter and other CI checks pass
+-   [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/element-hq/element-web/blob/develop/CONTRIBUTING.md))
+
+<!--
+If you would like to specify text for the changelog entry other than your PR title, add the following:
+
+Notes: Add super cool feature
+
+For PRs which *only* affect the desktop version, please use:
+
+Notes: none
+element-desktop notes: Add super cool feature
+-->

.github/cfp_headers

@@ -11,6 +11,3 @@
 
 /apple-app-site-association
   Content-Type: application/json
-
-/.well-known/assetlinks.json
-  Content-Type: application/json

.github/labels.yml

@@ -226,9 +226,6 @@
 - name: "Z-Fixed by Element Call"
   description: "Issues which can be closed when we move to Element Call"
   color: "ededed"
-- name: "Z-Fixed-By-OIDC"
-  description: "Issues which can be closed when we move to OIDC"
-  color: "ededed"
 - name: "Z-Flaky-Test"
   description: "A test is raising false alarms"
   color: "ededed"
@@ -261,6 +258,3 @@
   color: "ededed"
 - name: "Z-t3chguy"
   color: "ededed"
-- name: "Z-Flaky-Test-Disabled"
-  description: "The flaking test has been disabled"
-  color: "ededed"

.github/workflows/build.yml

@@ -3,8 +3,6 @@ on:
     pull_request: {}
     push:
         branches: [develop, master]
-    merge_group:
-        types: [checks_requested]
 # develop pushes and repository_dispatch handled in build_develop.yaml
 env:
     # These must be set for fetchdep.sh to get the right branch
@@ -37,7 +35,6 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             # Workaround for yarn install timeouts, especially on Windows
             - run: yarn config set network-timeout 300000

.github/workflows/build_debian.yaml

@@ -61,7 +61,7 @@ jobs:
                   dpkg-gencontrol -v"$VERSION" -ldebian/tmp/DEBIAN/changelog
                   dpkg-deb -Zxz --root-owner-group --build debian/tmp element-web.deb
 
-            - uses: actions/upload-artifact@v4
+            - uses: actions/upload-artifact@v3
               with:
                   name: element-web.deb
                   path: element-web.deb

.github/workflows/build_develop.yml

@@ -26,7 +26,6 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             - name: Install Dependencies
               run: "./scripts/layered.sh"
@@ -48,7 +47,7 @@ jobs:
 
             - run: mv dist/element-*.tar.gz dist/develop.tar.gz
 
-            - uses: actions/upload-artifact@v4
+            - uses: actions/upload-artifact@v3
               with:
                   name: webapp
                   path: dist/develop.tar.gz
@@ -85,21 +84,14 @@ jobs:
                   AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
                   AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
 
-            # We may be trying to deploy the same webapp bundles again, we need to ensure that the live bundles
-            # are not present in the _redirects file and instead accessed directly from Cloudflare Pages.
-            - name: Trim _redirects
-              working-directory: _deploy
-              run: |
-                  find bundles -type d -mindepth 1 -maxdepth 1 -exec sed -i "\:{}:d" _redirects \;
-
             - name: Wait for other steps to succeed
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
+              uses: t3chguy/wait-on-check-action@05861d3a448898eb33dfce34153bd1ecb9422fb9 # fork
               with:
                   ref: ${{ github.sha }}
                   running-workflow-name: "Build & Deploy develop.element.io"
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
                   wait-interval: 10
-                  check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label|Release|prepare|GitHub Pages).)*$
+                  check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label|Release).)*$
 
             # We keep the latest develop.tar.gz on R2 instead of relying on the github artifact uploaded earlier
             # as the expires after 24h and requires auth to download.

.github/workflows/dockerhub.yaml

@@ -7,9 +7,6 @@ on:
         # This job can take a while, and we have usage limits, so just publish develop only twice a day
         - cron: "0 7/12 * * *"
 concurrency: ${{ github.workflow }}-${{ github.ref_name }}
-
-permissions:
-    id-token: write # needed for signing the images with GitHub OIDC Token
 jobs:
     buildx:
         name: Docker Buildx
@@ -29,30 +26,27 @@ jobs:
               with:
                   fetch-depth: 0 # needed for docker-package to be able to calculate the version
 
-            - name: Install Cosign
-              uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3
-
             - name: Prepare
               if: matrix.prepare
               run: ${{ matrix.prepare }}
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
+              uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3
+              uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
               with:
                   install: true
 
             - name: Login to Docker Hub
-              uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
+              uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             - name: Docker meta
               id: meta
-              uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5
+              uses: docker/metadata-action@31cebacef4805868f9ce9a0cb03ee36c32df2ac4 # v5
               with:
                   images: |
                       vectorim/element-web
@@ -64,8 +58,7 @@ jobs:
                       ${{ matrix.flavor }}
 
             - name: Build and push
-              id: build-and-push
-              uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # v6
+              uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
               with:
                   context: .
                   push: true
@@ -73,20 +66,9 @@ jobs:
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
 
-            - name: Sign the images with GitHub OIDC Token
-              env:
-                  DIGEST: ${{ steps.build-and-push.outputs.digest }}
-                  TAGS: ${{ steps.meta.outputs.tags }}
-              run: |
-                  images=""
-                  for tag in ${TAGS}; do
-                      images+="${tag}@${DIGEST} "
-                  done
-                  cosign sign --yes ${images}
-
             - name: Update repo description
               if: matrix.variant == 'vanilla'
-              uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4
+              uses: peter-evans/dockerhub-description@dc67fad7001ef9e8e3c124cb7a64e16d0a63d864 # v3
               continue-on-error: true
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}

.github/workflows/docs.yml

@@ -46,7 +46,6 @@ jobs:
               with:
                   cache: "yarn"
                   cache-dependency-path: element-web/yarn.lock
-                  node-version: "lts/*"
 
             - name: Generate automations docs
               working-directory: element-web
@@ -56,7 +55,7 @@ jobs:
                   echo "-   [Automations](automations.md)" >> docs/SUMMARY.md
 
             - name: Setup mdBook
-              uses: peaceiris/actions-mdbook@v2
+              uses: peaceiris/actions-mdbook@v1
               with:
                   mdbook-version: "0.4.10"
 
@@ -100,7 +99,7 @@ jobs:
               run: mdbook build
 
             - name: Upload artifact
-              uses: actions/upload-pages-artifact@v3
+              uses: actions/upload-pages-artifact@v2
               with:
                   path: ./book
 
@@ -113,4 +112,4 @@ jobs:
         steps:
             - name: Deploy to GitHub Pages
               id: deployment
-              uses: actions/deploy-pages@v4
+              uses: actions/deploy-pages@v3

.github/workflows/end-to-end-tests.yaml

@@ -1,29 +0,0 @@
-# Triggers after the "Downstream artifacts" build has finished, to run the
-# matrix-react-sdk playwright tests (with access to repo secrets)
-
-name: matrix-react-sdk End to End Tests
-on:
-    merge_group:
-        types: [checks_requested]
-    pull_request: {}
-    push:
-        branches: [develop, master]
-
-concurrency:
-    group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch || github.run_id }}
-    cancel-in-progress: ${{ github.event.workflow_run.event == 'pull_request' }}
-
-jobs:
-    playwright:
-        name: Playwright
-        uses: matrix-org/matrix-react-sdk/.github/workflows/end-to-end-tests.yaml@develop
-        permissions:
-            actions: read
-            issues: read
-            pull-requests: read
-        with:
-            element-web-sha: ${{ github.sha }}
-            react-sdk-repository: matrix-org/matrix-react-sdk
-            # We only want to run the playwright tests on merge queue to prevent regressions
-            # from creeping in. They take a long time to run and consume multiple concurrent runners.
-            skip: ${{ github.event_name != 'merge_group' }}

.github/workflows/pull_request.yaml

@@ -2,8 +2,6 @@ name: Pull Request
 on:
     pull_request_target:
         types: [opened, edited, labeled, unlabeled, synchronize]
-    merge_group:
-        types: [checks_requested]
 jobs:
     action:
         uses: matrix-org/matrix-js-sdk/.github/workflows/pull_request.yaml@develop

.github/workflows/release-drafter.yml

@@ -2,10 +2,20 @@ name: Release Drafter
 on:
     push:
         branches: [staging]
-    workflow_dispatch: {}
+    workflow_dispatch:
+        inputs:
+            previous-version:
+                description: What release to use as a base for release note purposes
+                required: false
+                type: string
 concurrency: ${{ github.workflow }}
 jobs:
     draft:
-        uses: matrix-org/matrix-js-sdk/.github/workflows/release-drafter-workflow.yml@develop
-        with:
-            include-changes: matrix-react-sdk
+        runs-on: ubuntu-latest
+        steps:
+            - uses: release-drafter/release-drafter@e64b19c4c46173209ed9f2e5a2f4ca7de89a0e86 # v5
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  disable-autolabeler: true
+                  previous-version: ${{ inputs.previous-version }}

.github/workflows/release.yml

@@ -10,6 +10,16 @@ on:
                 options:
                     - rc
                     - final
+            matrix-react-sdk:
+                description: React SDK version to use (current|X.Y.Z)
+                required: false
+                default: current
+                type: string
+            matrix-js-sdk:
+                description: JS SDK version to use (current|X.Y.Z)
+                required: false
+                default: current
+                type: string
 concurrency: ${{ github.workflow }}
 jobs:
     release:
@@ -20,43 +30,10 @@ jobs:
             GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         with:
             final: ${{ inputs.mode == 'final' }}
+            include-changes: matrix-react-sdk
             gpg-fingerprint: ${{ vars.GPG_FINGERPRINT }}
             asset-path: dist/*.tar.gz
             expected-asset-count: 3
-
-    notify-downstream:
-        name: Trigger release drafter downstream
-        needs: release
-        runs-on: ubuntu-latest
-        steps:
-            - name: Notify element-desktop repo that element-web release has completed to re-trigger release-drafter
-              uses: benc-uk/workflow-dispatch@25b02cc069be46d637e8fe2f1e8484008e9e9609 # v1
-              with:
-                  workflow: release-drafter.yml
-                  repo: element-hq/element-desktop
-                  ref: staging
-                  # Required when using the `repo` option. Either a PAT or a token generated from the GitHub app or CLI
-                  token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-
-    check:
-        name: Post release checks
-        needs: release
-        runs-on: ubuntu-latest
-        steps:
-            - name: Wait for dockerhub
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: master
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  wait-interval: 10
-                  check-name: "Docker Buildx (vanilla)"
-                  allowed-conclusions: success
-
-            - name: Wait for debian package
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: master
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  wait-interval: 10
-                  check-name: Build package
-                  allowed-conclusions: success
+            dependencies: |
+                matrix-react-sdk=${{ inputs.matrix-react-sdk }}
+                matrix-js-sdk=${{ inputs.matrix-js-sdk }}

.github/workflows/release_prepare.yml

@@ -25,9 +25,6 @@ on:
 jobs:
     prepare:
         runs-on: ubuntu-latest
-        env:
-            # The order is specified bottom-up to avoid any races for allchange
-            REPOS: matrix-js-sdk matrix-react-sdk element-web element-desktop
         steps:
             - name: Checkout Element Desktop
               uses: actions/checkout@v4
@@ -70,55 +67,15 @@ jobs:
                   fetch-tags: true
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
+            - name: Resolve repos
+              run: |
+                  echo "REPOS=$(ls . | tr '\n' ' ')" >> $GITHUB_ENV
+
             - name: Merge develop
               run: |
                   git config --global user.email "releases@riot.im"
                   git config --global user.name "RiotRobot"
-                  for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" merge origin/develop; done
+                  for REPO in $REPOS; do git -C "$REPO" merge origin/develop; done
 
             - name: Push staging
-              run: for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" push origin staging; done
-
-            - name: Wait for matrix-js-sdk draft
-              if: inputs.matrix-js-sdk
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: staging
-                  repo: matrix-org/matrix-js-sdk
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  wait-interval: 10
-                  check-name: draft
-                  allowed-conclusions: success
-
-            - name: Wait for matrix-react-sdk draft
-              if: inputs.matrix-react-sdk
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: staging
-                  repo: matrix-org/matrix-react-sdk
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  wait-interval: 10
-                  check-name: draft
-                  allowed-conclusions: success
-
-            - name: Wait for element-web draft
-              if: inputs.element-web
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: staging
-                  repo: element-hq/element-web
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  wait-interval: 10
-                  check-name: draft
-                  allowed-conclusions: success
-
-            - name: Wait for element-desktop draft
-              if: inputs.element-desktop
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              with:
-                  ref: staging
-                  repo: element-hq/element-desktop
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  wait-interval: 10
-                  check-name: draft
-                  allowed-conclusions: success
+              run: for REPO in $REPOS; do git -C "$REPO" push origin staging; done

.github/workflows/sonarqube.yml

@@ -13,4 +13,3 @@ jobs:
         uses: matrix-org/matrix-js-sdk/.github/workflows/sonarcloud.yml@develop
         secrets:
             SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/static_analysis.yaml

@@ -3,8 +3,6 @@ on:
     pull_request: {}
     push:
         branches: [develop, master]
-    merge_group:
-        types: [checks_requested]
     repository_dispatch:
         types: [element-web-notify]
 env:
@@ -21,7 +19,6 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             - name: Install Dependencies
               run: "./scripts/layered.sh"
@@ -32,8 +29,6 @@ jobs:
     i18n_lint:
         name: "i18n Check"
         uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
-        with:
-            hardcoded-words: "Element"
 
     js_lint:
         name: "ESLint"
@@ -44,7 +39,6 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             # Does not need branch matching as only analyses this layer
             - name: Install Deps
@@ -62,7 +56,6 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             # Needs branch matching as it inherits .stylelintrc.js from matrix-react-sdk
             - name: Install Dependencies
@@ -80,7 +73,6 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             # Does not need branch matching as only analyses this layer
             - name: Install Deps
@@ -98,7 +90,6 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             - name: Install Deps
               run: "scripts/layered.sh"

.github/workflows/tests.yaml

@@ -3,8 +3,6 @@ on:
     pull_request: {}
     push:
         branches: [develop, master]
-    merge_group:
-        types: [checks_requested]
     repository_dispatch:
         types: [element-web-notify]
 env:
@@ -23,7 +21,6 @@ jobs:
               uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             - name: Install Dependencies
               run: "./scripts/layered.sh"
@@ -36,25 +33,9 @@ jobs:
               run: "yarn coverage --ci --max-workers ${{ steps.cpu-cores.outputs.count }}"
 
             - name: Upload Artifact
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@v3
               with:
                   name: coverage
                   path: |
                       coverage
                       !coverage/lcov-report
-
-    skip_sonar:
-        name: Skip SonarCloud in merge queue
-        if: github.event_name == 'merge_group'
-        runs-on: ubuntu-latest
-        needs: jest
-        steps:
-            - name: Skip SonarCloud
-              uses: Sibz/github-status-action@faaa4d96fecf273bd762985e0e7f9f933c774918 # v1
-              with:
-                  authToken: ${{ secrets.GITHUB_TOKEN }}
-                  state: success
-                  description: SonarCloud skipped
-                  context: SonarCloud Code Analysis
-                  sha: ${{ github.sha }}
-                  target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/triage-incoming.yml

@@ -8,7 +8,8 @@ jobs:
     automate-project-columns:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/add-to-project@main
+            - uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43
               with:
-                  project-url: https://github.com/orgs/element-hq/projects/120
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  project: Issue triage
+                  column: Incoming
+                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-labelled.yml

@@ -24,7 +24,8 @@ jobs:
             contains(github.event.issue.labels.*.name, 'A-Video-Rooms') ||
             contains(github.event.issue.labels.*.name, 'A-Message-Starring') ||
             contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor') ||
-            contains(github.event.issue.labels.*.name, 'A-Element-Call')
+            contains(github.event.issue.labels.*.name, 'A-Element-Call') ||
+            contains(github.event.issue.labels.*.name, 'A-Element-R')
         steps:
             - uses: actions/github-script@v7
               with:
@@ -56,48 +57,13 @@ jobs:
     move_needs_info_issues:
         name: X-Needs-Info issues to Need info column on triage board
         runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'X-Needs-Info')
         steps:
-            - id: add_to_project
-              uses: actions/add-to-project@v1.0.2
+            - uses: konradpabjan/move-labeled-or-milestoned-issue@190352295fe309fcb113b49193bc81d9aaa9cb01
               with:
-                  project-url: ${{ env.PROJECT_URL }}
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-            - id: set_fields
-              uses: titoportas/update-project-fields@421a54430b3cdc9eefd8f14f9ce0142ab7678751 # v0.1.0
-              with:
-                  project-url: ${{ env.PROJECT_URL }}
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  item-id: ${{ steps.add_to_project.outputs.itemId }} # Use the item-id output of the previous step
-                  field-keys: Status
-                  field-values: "Needs info"
-        env:
-            PROJECT_URL: https://github.com/orgs/element-hq/projects/120
-
-    move_flakey_test_issues:
-        name: Z-Flaky-Test issues to Sized for maintainer column on triage board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'Z-Flaky-Test')
-        steps:
-            - id: add_to_project
-              uses: actions/add-to-project@v1.0.2
-              with:
-                  project-url: ${{ env.PROJECT_URL }}
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-            - id: set_fields
-              uses: titoportas/update-project-fields@421a54430b3cdc9eefd8f14f9ce0142ab7678751 # v0.1.0
-              with:
-                  project-url: ${{ env.PROJECT_URL }}
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  item-id: ${{ steps.add_to_project.outputs.itemId }} # Use the item-id output of the previous step
-                  field-keys: Status
-                  field-values: "Sized for maintainer"
-        env:
-            PROJECT_URL: https://github.com/orgs/element-hq/projects/120
+                  action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
+                  project-url: "https://github.com/element-hq/element-web/projects/27"
+                  column-name: "Need info"
+                  label-name: "X-Needs-Info"
 
     add_priority_design_issues_to_project:
         name: P1 X-Needs-Design to Design project board
@@ -183,7 +149,7 @@ jobs:
             contains(github.event.issue.labels.*.name, 'A-Element-R')
         steps:
             - id: add_to_project
-              uses: actions/add-to-project@v1.0.2
+              uses: actions/add-to-project@v0.5.0
               with:
                   project-url: ${{ env.PROJECT_URL }}
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-stale-flaky-tests.yml

@@ -1,17 +0,0 @@
-name: Close stale flaky issues
-on:
-    schedule:
-        - cron: "30 1 * * *"
-jobs:
-    close:
-        runs-on: ubuntu-latest
-        permissions:
-            issues: write
-        steps:
-            - uses: actions/stale@v9
-              with:
-                  only-labels: "Z-Flaky-Test"
-                  days-before-stale: 14
-                  days-before-close: 0
-                  close-issue-message: "This flaky test issue has not been updated in 14 days. It is being closed as presumed resolved."
-                  exempt-issue-labels: "Z-Flaky-Test-Disabled"

.github/workflows/triage-unlabelled.yml

@@ -35,7 +35,7 @@ jobs:
                     fi
                   fi
             - name: Move issue
-              uses: alex-page/github-project-automation-plus@303f24a24c67ce7adf565a07e96720faf126fe36
+              uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43
               if: ${{ env.ALREADY_IN_BOARD == 'true' && env.SKIP_ACTION != 'true' }}
               with:
                   project: Issue triage

.github/workflows/update-jitsi.yml

@@ -13,7 +13,6 @@ jobs:
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-                  node-version: "lts/*"
 
             - name: Install Deps
               run: "yarn install --frozen-lockfile"
@@ -22,7 +21,7 @@ jobs:
               run: "yarn update:jitsi"
 
             - name: Create Pull Request
-              uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6
+              uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   branch: actions/jitsi-update

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx lint-staged --concurrent false

.lintstagedrc

@@ -1,7 +0,0 @@
-{
-    "*": "prettier --write",
-    "src/**/*.(ts|tsx)": ["eslint --fix"],
-    "scripts/**/*.(ts|tsx)": ["eslint --fix"],
-    "module_system/**/*.(ts|tsx)": ["eslint --fix --config .eslintrc-module_system.js module_system"],
-    "*.pcss": ["stylelint --fix"]
-}

.modernizr.json

@@ -1,5 +1,5 @@
 {
-    "minify": false,
+    "minify": true,
     "enableClasses": false,
     "feature-detects": [
         "test/css/animations",
@@ -31,7 +31,6 @@
         "test/json",
         "test/network/fetch",
         "test/storage/localstorage",
-        "test/window/resizeobserver",
-        "test/audio/webaudio"
+        "test/window/resizeobserver"
     ]
 }

.prettierignore

@@ -28,7 +28,6 @@ src/vector/modernizr.js
 
 # This file is owned, parsed, and generated by allchange, which doesn't comply with prettier
 /CHANGELOG.md
-/docs/changelogs
 
 # Downloaded and already minified
 res/jitsi_external_api.min.js

CONTRIBUTING.md

@@ -124,7 +124,7 @@ must include:
 
 1. Comprehensive unit tests written in Jest. These are located in `/test`.
 2. "happy path" end-to-end tests.
-   These are located in `/playwright/e2e` in `matrix-react-sdk`, and
+   These are located in `/cypress/e2e` in `matrix-react-sdk`, and
    are run using `element-web`. Ideally, you would also include tests for edge
    and error cases.
 

README.md

@@ -17,30 +17,20 @@ React SDK](https://github.com/matrix-org/matrix-react-sdk).
 Element has several tiers of support for different environments:
 
 -   Supported
-    -   Definition:
-        -   Issues **actively triaged**, regressions **block** the release
+    -   Definition: Issues **actively triaged**, regressions **block** the release
     -   Last 2 major versions of Chrome, Firefox, and Edge on desktop OSes
     -   Last 2 versions of Safari
     -   Latest release of official Element Desktop app on desktop OSes
     -   Desktop OSes means macOS, Windows, and Linux versions for desktop devices
         that are actively supported by the OS vendor and receive security updates
--   Best effort
-    -   Definition:
-        -   Issues **accepted**, regressions **do not block** the release
-        -   The wider Element Products(including Element Call and the Enterprise Server Suite) do still not officially support these browsers.
-        -   The element web project and its contributors should keep the client functioning and gracefully degrade where other sibling features (E.g. Element Call) may not function.
-    -   Last major release of Firefox ESR and Chrome/Edge Extended Stable
--   Community Supported
-    -   Definition:
-        -   Issues **accepted**, regressions **do not block** the release
-        -   Community contributions are welcome to support these issues
+-   Experimental
+    -   Definition: Issues **accepted**, regressions **do not block** the release
+    -   Element as an installed PWA via current stable version of Chrome
     -   Mobile web for current stable version of Chrome, Firefox, and Safari on Android, iOS, and iPadOS
 -   Not supported
     -   Definition: Issues only affecting unsupported environments are **closed**
     -   Everything else
 
-The period of support for these tiers should last until the releases specified above, plus 1 app release cycle(2 weeks). In the case of Firefox ESR this is extended further to allow it land in Debian Stable.
-
 For accessing Element on an Android or iOS device, we currently recommend the
 native apps [element-android](https://github.com/element-hq/element-android)
 and [element-ios](https://github.com/element-hq/element-ios).

babel.config.js

@@ -10,24 +10,24 @@ module.exports = {
                     "last 2 Safari versions",
                     "last 2 Edge versions",
                 ],
-                include: ["@babel/plugin-transform-class-properties"],
             },
         ],
-        ["@babel/preset-typescript", { allowDeclareFields: true }],
+        "@babel/preset-typescript",
         "@babel/preset-react",
     ],
     plugins: [
         "@babel/plugin-proposal-export-default-from",
-        "@babel/plugin-transform-numeric-separator",
-        "@babel/plugin-transform-object-rest-spread",
-        "@babel/plugin-transform-optional-chaining",
-        "@babel/plugin-transform-nullish-coalescing-operator",
+        "@babel/plugin-proposal-numeric-separator",
+        "@babel/plugin-proposal-class-properties",
+        "@babel/plugin-proposal-object-rest-spread",
+        "@babel/plugin-proposal-optional-chaining",
+        "@babel/plugin-proposal-nullish-coalescing-operator",
 
         // transform logical assignment (??=, ||=, &&=). preset-env doesn't
         // normally bother with these (presumably because all the target
         // browsers support it natively), but they make our webpack version (or
         // something downstream of babel, at least) fall over.
-        "@babel/plugin-transform-logical-assignment-operators",
+        "@babel/plugin-proposal-logical-assignment-operators",
 
         "@babel/plugin-syntax-dynamic-import",
         "@babel/plugin-transform-runtime",

code_style.md

@@ -225,12 +225,6 @@ Unless otherwise specified, the following applies to all code:
     }
     ```
 
-37. Avoid functions whose fundamental behaviour varies with different parameter types.
-    Multiple return types are fine, but if the function's behaviour is going to change significantly,
-    have two separate functions. For example, `SDKConfig.get()` with a string param which returns the
-    type according to the param given is ok, but `SDKConfig.get()` with no args returning the whole
-    config object would not be: this should just be a separate function.
-
 ## React
 
 Inheriting all the rules of TypeScript, the following additionally apply:

docs/config.md

@@ -137,7 +137,7 @@ complete re-branding/private labeling, a more personalised experience can be ach
    This setting is ignored if your homeserver provides `/.well-known/matrix/client` in its well-known location, and the JSON file
    at that location has a key `m.tile_server` (or the unstable version `org.matrix.msc3488.tile_server`). In this case, the
    configuration found in the well-known location is used instead.
-10. `welcome_user_id`: **DEPRECATED** An optional user ID to start a DM with after creating an account. Defaults to nothing (no DM created).
+10. `welcome_user_id`: An optional user ID to start a DM with after creating an account. Defaults to nothing (no DM created).
 11. `custom_translations_url`: An optional URL to allow overriding of translatable strings. The JSON file must be in a format of
     `{"affected|translation|key": {"languageCode": "new string"}}`. See https://github.com/matrix-org/matrix-react-sdk/pull/7886 for details.
 12. `branding`: Options for configuring various assets used within the app. Described in more detail down below.
@@ -167,10 +167,6 @@ Starting with `desktop_builds`, the following subproperties are available:
 1. `available`: Required. When `true`, the desktop app can be downloaded from somewhere.
 2. `logo`: Required. A URL to a logo (SVG), intended to be shown at 24x24 pixels.
 3. `url`: Required. The download URL for the app. This is used as a hyperlink.
-4. `url_macos`: Optional. Direct link to download macOS desktop app.
-5. `url_win32`: Optional. Direct link to download Windows 32-bit desktop app.
-6. `url_win64`: Optional. Direct link to download Windows 64-bit desktop app.
-7. `url_linux`: Optional. Direct link to download Linux desktop app.
 
 When `desktop_builds` is not specified at all, the app will assume desktop downloads are available from https://element.io
 
@@ -254,60 +250,17 @@ When Element is deployed alongside a homeserver with SSO-only login, some option
    user can be sent to in order to log them out of that system too, making logout symmetric between Element and the SSO system.
 2. `sso_redirect_options`: Options to define how to handle unauthenticated users. If the object contains `"immediate": true`, then
    all unauthenticated users will be automatically redirected to the SSO system to start their login. If instead you'd only like to
-   have users which land on the welcome page to be redirected, use `"on_welcome_page": true`. Additionally, there is an option to
-   redirect anyone landing on the login page, by using `"on_login_page": true`. As an example:
+   have users which land on the welcome page to be redirected, use `"on_welcome_page": true`. As an example:
     ```json
     {
         "sso_redirect_options": {
             "immediate": false,
-            "on_welcome_page": true,
-            "on_login_page": true
+            "on_welcome_page": true
         }
     }
     ```
     It is most common to use the `immediate` flag instead of `on_welcome_page`.
 
-## Native OIDC
-
-Native OIDC support is currently in labs and is subject to change.
-
-Static OIDC Client IDs are preferred and can be specified under `oidc_static_clients` as a mapping from `issuer` to configuration object containing `client_id`.
-Issuer must have a trailing forward slash. As an example:
-
-```json
-{
-    "oidc_static_clients": {
-        "https://auth.example.com/": {
-            "client_id": "example-client-id"
-        }
-    }
-}
-```
-
-If a matching static client is not found, the app will attempt to dynamically register a client using metadata specified under `oidc_metadata`.
-The app has sane defaults for the metadata properties below but on stricter policy identity providers they may not pass muster, e.g. `contacts` may be required.
-The following subproperties are available:
-
-1. `client_uri`: This is the base URI for the OIDC client registration, typically `logo_uri`, `tos_uri`, and `policy_uri` must be either on the same domain or a subdomain of this URI.
-2. `logo_uri`: Optional URI for the client logo.
-3. `tos_uri`: Optional URI for the client's terms of service.
-4. `policy_uri`: Optional URI for the client's privacy policy.
-5. `contacts`: Optional list of contact emails for the client.
-
-As an example:
-
-```json
-{
-    "oidc_metadata": {
-        "client_uri": "https://example.com",
-        "logo_uri": "https://example.com/logo.png",
-        "tos_uri": "https://example.com/tos",
-        "policy_uri": "https://example.com/policy",
-        "contacts": ["support@example.com"]
-    }
-}
-```
-
 ## VoIP / Jitsi calls
 
 Currently, Element uses Jitsi to offer conference calls in rooms, with an experimental Element Call implementation in the works.
@@ -378,8 +331,8 @@ The VoIP and Jitsi options are:
     }
     ```
     The `widget` is the `content` of a normal widget state event. The `layout` is the layout specifier for the widget being created,
-    as defined by the `io.element.widgets.layout` state event. By default this applies to all rooms, but the behaviour can be skipped for
-    2-person rooms, causing Element to fall back to 1:1 VoIP, by setting the option `widget_build_url_ignore_dm` to `true`.
+    as defined by the `io.element.widgets.layout` state event. By default this applies to all rooms, but the behaviour can be skipped for DMs
+    by setting the option `widget_build_url_ignore_dm` to `true`.
 5. `audio_stream_url`: Optional URL to pass to Jitsi to enable live streaming. This option is considered experimental and may be removed
    at any time without notice.
 6. `element_call`: Optional configuration for native group calls using Element Call, with the following subkeys:
@@ -391,12 +344,6 @@ The VoIP and Jitsi options are:
       this number is exceeded, the user will not be able to join a given call.
     - `brand`: Optional name for the app. Defaults to `Element Call`. This is
       used throughout the application in various strings/locations.
-    - `guest_spa_url`: Optional URL for an Element Call single-page app (SPA),
-      for guest links. If this is set, Element Web will expose a "join" link
-      for public video rooms, which can then be shared to non-matrix users.
-      The target Element Call SPA is typically set up to use a homeserver that
-      allows users to register without email ("passwordless guest users") and to
-      federate.
 
 ## Bug reporting
 

docs/labs.md

@@ -110,6 +110,12 @@ This is useful while we experiment with encryption and to make calling compatibl
 
 Enables rendering of MD / HTML in room topics.
 
+## Use the Rust cryptography implementation (`feature_rust_crypto`) [In Development]
+
+Configures Element to use a new cryptography implementation based on the [matrix-rust-sdk](https://github.com/matrix-org/matrix-rust-sdk).
+
+This setting is (currently) _sticky_ to a user's session: it only takes effect when the user logs in to a new session. Likewise, even after disabling the setting in `config.json`, the Rust implementation will remain in use until users log out.
+
 ## New room header & details (`feature_new_room_decoration_ui`) [In Development]
 
 Refactors visually the room header and room sidebar

docs/release.md

@@ -186,35 +186,33 @@ this means that any commit which goes to `staging` will eventually make its way
 Shortly after concluding the preparation stage (or pushing any changes to `staging` in general);
 a draft release will be automatically made on the 4 project repositories with suggested changelogs and version numbers.
 
-_Note: we should add a step here to write summaries atop the changelogs manually, or via AI_
+Review the draft releases created, check the version number makes sense and that the changelog contains everything you'd expect to.
 
-Publishing the SDKs to npm also commits a dependency upgrade to the relevant downstream projects,
-if you skip a layer of this release (e.g. for a hotfix) then the dependency will remain on `#develop` which will be
-switched back to the version of the dependency from the master branch to not leak develop code into a release.
+_Note: we should add a step here to write summaries atop the changelogs manually, or via AI_
 
 ### Matrix JS SDK
 
--   [ ] Check the draft release which has been generated by [the automation](https://github.com/matrix-org/matrix-js-sdk/actions/workflows/release-drafter.yml)
--   [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft**
--   [ ] Kick off a release using [the automation](https://github.com/matrix-org/matrix-js-sdk/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
+The first stop is the matrix-js-sdk; kick off a release using [the automation](https://github.com/matrix-org/matrix-js-sdk/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
+
+-   [ ] matrix-js-sdk has been released & published to npm
 
 ### Matrix React SDK
 
--   [ ] Check the draft release which has been generated by [the automation](https://github.com/matrix-org/matrix-react-sdk/actions/workflows/release-drafter.yml)
--   [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft**
--   [ ] Kick off a release using [the automation](https://github.com/matrix-org/matrix-react-sdk/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
+The next stop is matrix-react-sdk; kick off a release using [the automation](https://github.com/matrix-org/matrix-react-sdk/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. In the JS SDK version field enter the version of the JS SDK you wish to use, for typical releases including all the layers this would be the version released in the stage above.
+
+-   [ ] matrix-react-sdk has been released & published to npm
 
 ### Element Web
 
--   [ ] Check the draft release which has been generated by [the automation](https://github.com/element-hq/element-web/actions/workflows/release-drafter.yml)
--   [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft**
--   [ ] Kick off a release using [the automation](https://github.com/element-hq/element-web/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
+The next stop is element-web; kick off a release using [the automation](https://github.com/element-hq/element-web/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. In the SDK version fields enter the versions you wish to use, for typical releases including all the layers this would be the versions released in the stages above.
+
+-   [ ] Element Web has been released
 
 ### Element Desktop
 
--   [ ] Check the draft release which has been generated by [the automation](https://github.com/element-hq/element-desktop/actions/workflows/release-drafter.yml)
--   [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft**
--   [ ] Kick off a release using [the automation](https://github.com/element-hq/element-desktop/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
+The next stop is element-desktop; kick off a release using [the automation](https://github.com/element-hq/element-desktop/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. In the JS SDK version field enter the version of the JS SDK you wish to use, for typical releases including all the layers this would be the version released in the stage above.
+
+-   [ ] Element Desktop has been released
 
 # Deploying
 

docs/theming.md

@@ -31,7 +31,7 @@ To avoid name collisions, the internal name of a theme is
 `custom-${theme.name}`. So if you want to set the custom theme below as the
 default theme, you would use `default_theme: "custom-Electric Blue"`.
 
-e.g. in config.json:
+eg. in config.json:
 
 ```
 "setting_defaults": {
@@ -63,10 +63,8 @@ e.g. in config.json:
                     "timeline-text-color": "#2e2f32",
                     "timeline-text-secondary-color": "#61708b",
                     "timeline-highlights-color": "#f3f8fd",
-                },
-                "compound": {
-                    "--cpd-color-icon-accent-tertiary": "var(--cpd-color-blue-800)",
-                    "--cpd-color-text-action-accent": "var(--cpd-color-blue-900)"
+                    "username-colors": ["#ff0000", ...]
+                    "avatar-background-colors": ["#cc0000", ...]
                 }
             }, {
                 "name": "Deep Purple",
@@ -91,6 +89,8 @@ e.g. in config.json:
     }
 ```
 
-`compound` may contain overrides for any [semantic design token](https://compound.element.io/?path=/docs/tokens-semantic-colors--docs) belonging to our design system. The above example shows how you might change the accent color to blue by setting the relevant semantic tokens to refer to blue [base tokens](https://compound.element.io/?path=/docs/tokens-color-palettes--docs).
+`username-colors` is expected to contain 8 colors. `avatar-background-colors` is expected to contain 3 colors. Both values are optional and have fallbacks from the built-in theme.
+
+These are exposed as `--username-colors_0`, ... and `--avatar-background-colors_0`, ... respectively in CSS.
 
 All properties in `fonts` are optional, and will default to the standard Riot fonts.

docs/translating.md

@@ -14,9 +14,10 @@
 
 ## How to check if your language already is being translated
 
-Go to https://localazy.com/p/element-web. If your language is listed then you can get started. Have a read
-of https://localazy.com/docs/general/translating-strings if you need help getting started. If your language is not yet
-listed please express your wishes to start translating it in the general discussion room linked above.
+Go to https://localazy.com/p/element-web
+If your language is listed then you can get started, have a read of https://localazy.com/docs/general/translating-strings
+if you need help getting started. If your language is not yet listed please express your wishes to start translating it in
+the general discussion room linked above.
 
 ### What are `%(something)s`?
 

element.io/app/config.json

@@ -22,7 +22,7 @@
     "uisi_autorageshake_app": "element-auto-uisi",
     "show_labs_settings": false,
     "room_directory": {
-        "servers": ["matrix.org", "gitter.im"]
+        "servers": ["matrix.org", "gitter.im", "libera.chat"]
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
@@ -43,8 +43,5 @@
         "api_host": "https://posthog.element.io"
     },
     "privacy_policy_url": "https://element.io/cookie-policy",
-    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx",
-    "setting_defaults": {
-        "RustCrypto.staged_rollout_percent": 60
-    }
+    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

element.io/develop/config.json

@@ -22,7 +22,7 @@
     "uisi_autorageshake_app": "element-auto-uisi",
     "show_labs_settings": true,
     "room_directory": {
-        "servers": ["matrix.org", "gitter.im"]
+        "servers": ["matrix.org", "gitter.im", "libera.chat"]
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
@@ -48,13 +48,9 @@
     },
     "privacy_policy_url": "https://element.io/cookie-policy",
     "features": {
-        "threadsActivityCentre": true,
         "feature_video_rooms": true,
-        "feature_new_room_decoration_ui": true,
-        "feature_element_call_video_rooms": true
-    },
-    "setting_defaults": {
-        "RustCrypto.staged_rollout_percent": 100
+        "feature_rust_crypto": true,
+        "feature_new_room_decoration_ui": true
     },
     "element_call": {
         "url": "https://call.element.dev"

package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.69",
+    "version": "1.11.53",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -67,19 +67,14 @@
         "update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js"
     },
     "resolutions": {
-        "@types/react-dom": "17.0.25",
-        "@types/react": "17.0.80",
-        "@vector-im/compound-design-tokens": "1.7.0",
-        "@vector-im/compound-web": "5.5.0",
-        "@floating-ui/react": "0.26.11",
-        "@radix-ui/react-id": "1.1.0"
+        "@types/react-dom": "17.0.21",
+        "@types/react": "17.0.68"
     },
     "dependencies": {
-        "@formatjs/intl-segmenter": "^11.5.7",
-        "@matrix-org/react-sdk-module-api": "^2.3.0",
-        "@vector-im/compound-design-tokens": "^1.6.1",
-        "@vector-im/compound-web": "^5.5.0",
-        "jsrsasign": "^11.0.0",
+        "@matrix-org/olm": "3.2.15",
+        "@matrix-org/react-sdk-module-api": "^2.2.1",
+        "gfm.css": "^1.1.2",
+        "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "lodash": "^4.17.21",
         "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
@@ -90,29 +85,29 @@
         "ua-parser-js": "^1.0.0"
     },
     "devDependencies": {
-        "@action-validator/cli": "^0.6.0",
-        "@action-validator/core": "^0.6.0",
+        "@action-validator/cli": "^0.5.3",
+        "@action-validator/core": "^0.5.3",
         "@babel/core": "^7.12.10",
         "@babel/eslint-parser": "^7.12.10",
         "@babel/eslint-plugin": "^7.12.10",
+        "@babel/plugin-proposal-class-properties": "^7.12.1",
         "@babel/plugin-proposal-export-default-from": "^7.12.1",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+        "@babel/plugin-proposal-numeric-separator": "^7.12.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-transform-class-properties": "^7.12.1",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.20.7",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.12.1",
-        "@babel/plugin-transform-numeric-separator": "^7.12.7",
-        "@babel/plugin-transform-object-rest-spread": "^7.12.1",
-        "@babel/plugin-transform-optional-chaining": "^7.12.7",
         "@babel/plugin-transform-runtime": "^7.12.10",
         "@babel/preset-env": "^7.12.11",
         "@babel/preset-react": "^7.12.10",
         "@babel/preset-typescript": "^7.12.7",
         "@babel/register": "^7.12.10",
         "@babel/runtime": "^7.12.5",
-        "@casualbot/jest-sonar-reporter": "2.3.1",
+        "@casualbot/jest-sonar-reporter": "2.2.7",
         "@principalstudio/html-webpack-inject-preload": "^1.2.7",
         "@sentry/webpack-plugin": "^2.7.1",
-        "@svgr/webpack": "^8.0.0",
+        "@svgr/webpack": "^5.5.0",
         "@testing-library/react": "^12.1.5",
         "@types/commonmark": "^0.27.9",
         "@types/content-type": "^1.1.8",
@@ -132,94 +127,90 @@
         "@types/node-fetch": "^2.6.4",
         "@types/pako": "^2.0.3",
         "@types/qrcode": "^1.5.5",
-        "@types/react": "17.0.80",
+        "@types/react": "17.0.68",
         "@types/react-beautiful-dnd": "^13.1.7",
-        "@types/react-dom": "17.0.25",
+        "@types/react-dom": "17.0.21",
         "@types/react-transition-group": "^4.4.9",
         "@types/sanitize-html": "^2.9.5",
         "@types/sdp-transform": "^2.4.9",
-        "@types/semver": "^7.5.8",
         "@types/tar-js": "^0.3.5",
         "@types/ua-parser-js": "^0.7.36",
-        "@types/uuid": "^10.0.0",
-        "@typescript-eslint/eslint-plugin": "^7.0.0",
-        "@typescript-eslint/parser": "^7.0.0",
+        "@types/uuid": "^9.0.7",
+        "@typescript-eslint/eslint-plugin": "^6.0.0",
+        "@typescript-eslint/parser": "^6.0.0",
+        "allchange": "^1.0.6",
         "babel-jest": "^29.0.0",
         "babel-loader": "^9.0.0",
-        "babel-plugin-jsx-remove-data-test-id": "^3.0.0",
         "buffer": "^6.0.3",
         "chokidar": "^3.5.1",
         "concurrently": "^8.0.0",
-        "copy-webpack-plugin": "^12.0.0",
+        "copy-webpack-plugin": "^11.0.0",
         "cronstrue": "^2.41.0",
-        "css-loader": "^7.0.0",
-        "css-minimizer-webpack-plugin": "^7.0.0",
+        "css-loader": "^5.2.7",
+        "css-minimizer-webpack-plugin": "^5.0.1",
         "dotenv": "^16.0.2",
-        "eslint": "8.57.0",
+        "eslint": "8.55.0",
         "eslint-config-google": "^0.14.0",
         "eslint-config-prettier": "^9.0.0",
-        "eslint-plugin-deprecate": "0.8.5",
+        "eslint-plugin-deprecate": "0.8.4",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-matrix-org": "^1.0.0",
         "eslint-plugin-react": "^7.28.0",
         "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-unicorn": "^54.0.0",
-        "fake-indexeddb": "^6.0.0",
+        "eslint-plugin-unicorn": "^49.0.0",
+        "fake-indexeddb": "^5.0.0",
         "fetch-mock": "9.11.0",
         "fetch-mock-jest": "^1.5.1",
         "file-loader": "^6.0.0",
         "html-webpack-plugin": "^5.5.3",
-        "husky": "^8.0.3",
         "jest": "^29.0.0",
         "jest-canvas-mock": "2.5.2",
         "jest-environment-jsdom": "^29.0.0",
         "jest-mock": "^29.0.0",
         "jest-raw-loader": "^1.0.1",
-        "lint-staged": "^15.1.0",
         "matrix-mock-request": "^2.5.0",
-        "matrix-web-i18n": "^3.2.1",
-        "mini-css-extract-plugin": "2.9.0",
+        "matrix-web-i18n": "^3.1.3",
+        "mini-css-extract-plugin": "^2.7.6",
         "minimist": "^1.2.6",
         "mkdirp": "^3.0.0",
         "modernizr": "^3.12.0",
         "node-fetch": "^2.6.7",
-        "postcss": "8.4.38",
-        "postcss-easings": "^4.0.0",
-        "postcss-hexrgba": "2.1.0",
-        "postcss-import": "16.1.0",
-        "postcss-loader": "8.1.1",
-        "postcss-mixins": "^10.0.0",
-        "postcss-nested": "^6.0.0",
-        "postcss-preset-env": "^9.5.14",
+        "postcss": "^8.4.31",
+        "postcss-easings": "^2.0.0",
+        "postcss-hexrgba": "2.0.1",
+        "postcss-import": "^12.0.1",
+        "postcss-loader": "^4.0.0",
+        "postcss-mixins": "^6.2.3",
+        "postcss-nested": "^4.2.3",
+        "postcss-preset-env": "^6.7.0",
         "postcss-scss": "^4.0.4",
-        "postcss-simple-vars": "^7.0.1",
-        "prettier": "3.3.3",
+        "postcss-simple-vars": "^5.0.2",
+        "prettier": "3.1.1",
         "process": "^0.11.10",
+        "proxy-agent": "^6.3.0",
         "raw-loader": "^4.0.2",
-        "rimraf": "^6.0.0",
+        "rimraf": "^5.0.0",
         "semver": "^7.5.2",
+        "setimmediate": "^1.0.5",
         "string-replace-loader": "3",
-        "style-loader": "4",
-        "stylelint": "^16.1.0",
-        "stylelint-config-standard": "^36.0.0",
+        "style-loader": "3",
+        "stylelint": "^16.0.0",
+        "stylelint-config-standard": "^35.0.0",
         "stylelint-scss": "^6.0.0",
         "terser-webpack-plugin": "^5.3.9",
         "ts-node": "^10.9.1",
         "ts-prune": "^0.10.3",
-        "typescript": "5.5.4",
+        "typescript": "5.3.3",
         "util": "^0.12.5",
         "webpack": "^5.89.0",
         "webpack-bundle-analyzer": "^4.8.0",
         "webpack-cli": "^5.0.0",
-        "webpack-dev-server": "^5.0.0",
+        "webpack-dev-server": "^4.15.1",
         "yaml": "^2.3.3"
     },
     "@casualbot/jest-sonar-reporter": {
         "outputDirectory": "coverage",
         "outputName": "jest-sonar-report.xml",
         "relativePaths": true
-    },
-    "engines": {
-        "node": ">=20.0.0"
     }
 }

recorder-worklet-loader.js

@@ -38,7 +38,7 @@ module.exports.pitch = function pitch(request) {
             return cb(err);
         }
         if (entries[0]) {
-            return cb(null, `module.exports = __webpack_public_path__ + ${JSON.stringify([...entries[0].files][0])};`);
+            return cb(null, `module.exports = __webpack_public_path__ + ${JSON.stringify(entries[0].files[0])};`);
         }
         return cb(null, null);
     });

release.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+#
+# Script to perform a release of element-web.
+
+set -e
+
+cd "$(dirname "$0")"
+
+./node_modules/matrix-js-sdk/release.sh "$@"

res/.well-known/assetlinks.json

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

res/css/structures/ErrorView.pcss

@@ -14,61 +14,94 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_ErrorView {
-    --width: 520px;
-    --cpd-separator-inset: calc(50% - (var(--width) / 2));
-    --cpd-separator-spacing: var(--cpd-space-8x);
+/* import font-size variables manually,
+   ideally this file would get loaded by the theme which has all variables in context */
+@import "../../../node_modules/matrix-react-sdk/res/css/_font-sizes.pcss";
 
+.mx_ErrorView {
+    background: #c5e0f7;
+    background: -moz-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
+    background: -webkit-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
+    background: linear-gradient(to bottom, #c5e0f7 0%, #ffffff 100%);
+    /* stylelint-disable-next-line function-no-unknown */
+    filter: progid:dximagetransform.microsoft.gradient(startColorstr='#c5e0f7', endColorstr='#ffffff', GradientType=0);
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif,
         "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-    text-align: center;
-    color: var(--cpd-color-text-primary);
+    color: #000;
     width: 100%;
     height: 100%;
-    box-sizing: border-box;
     overflow: auto;
-    padding: var(--cpd-space-20x);
-
-    background-color: var(--cpd-color-theme-bg);
-    background-image: url("../../themes/element/img/compound/fade-arc-light.png");
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-
-    .mx_ErrorView_logo {
-        display: block;
-        margin: 0 auto;
-    }
+    padding: 0 20px;
+    box-sizing: border-box;
 
     .mx_ErrorView_container {
-        max-width: var(--width);
-        margin: 0 auto var(--cpd-space-8x);
+        max-width: 680px;
+        margin: auto;
+    }
+
+    .mx_Button {
+        border: 0;
+        border-radius: 4px;
+        font-size: $font-18px;
+        margin-left: 4px;
+        margin-right: 4px;
+        min-width: 80px;
+        background-color: #03b381;
+        color: #fff;
+        cursor: pointer;
+        padding: 12px 22px;
+        word-break: break-word;
+        text-decoration: none;
+    }
+
+    .mx_Center {
+        justify-content: center;
+    }
+
+    .mx_HomePage_header {
+        color: #2e2f32;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+
+    font-size: $font-16px;
+    h1 {
+        font-size: $font-32px;
+    }
+    h2 {
+        font-size: $font-24px;
+        color: #000;
+    }
+
+    .mx_HomePage_col {
+        display: flex;
+        flex-direction: row;
+    }
+
+    .mx_HomePage_row {
+        flex: 1 1 0;
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+    }
+
+    .mx_HomePage_logo {
+        margin: auto 20px auto 0;
     }
 
     h1,
     h2 {
-        color: var(--cpd-color-text-primary);
+        font-weight: 600;
+        margin-bottom: 32px;
     }
 
-    h2 {
-        margin: var(--cpd-space-8x) 0;
-        /* Workaround for heading sm being broken in Compound design tokens */
-        font-size: var(--cpd-font-size-heading-sm);
-        line-height: var(--cpd-font-line-height-tight);
-        font-weight: var(--cpd-font-weight-semibold);
+    .mx_Spacer {
+        margin-top: 24px;
     }
 
-    p {
-        color: var(--cpd-color-text-secondary);
-    }
-
-    .mx_Flex {
-        margin: 0 auto;
-        max-width: max-content;
-        flex-wrap: wrap;
-        justify-content: space-evenly;
-    }
-
-    .mx_ErrorView_buttons {
-        margin-top: var(--cpd-space-6x);
+    .mx_FooterLink {
+        color: #368bd6;
+        text-decoration: none;
     }
 }

res/sw.js

@@ -0,0 +1 @@
+self.addEventListener("fetch", () => {});

res/themes/element/img/compound/apple.svg

@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4157 2C13.4922 2.92763 13.1763 3.84642 12.535 4.56125C11.9129 5.27979 10.9701 5.69366 9.97726 5.68417C9.91411 4.78324 10.2392 3.89596 10.881 3.21774C11.531 2.53034 12.436 2.09555 13.4157 2ZM16.5554 7.45058C15.4132 8.10257 14.7104 9.25238 14.6932 10.4972C14.6948 11.9055 15.6031 13.1765 17 13.7251C16.7313 14.5354 16.3264 15.3013 15.8001 15.9942C15.0934 16.9759 14.3523 17.935 13.1762 17.9527C12.6168 17.9647 12.2392 17.8153 11.8458 17.6597C11.4354 17.4974 11.0077 17.3282 10.3385 17.3282C9.62875 17.3282 9.18194 17.5028 8.75102 17.6712C8.37862 17.8167 8.01808 17.9576 7.50997 17.9772C6.38987 18.0157 5.53384 16.9294 4.80138 15.9569C3.33741 13.971 2.19745 10.3601 3.72573 7.90322C4.44339 6.70576 5.78524 5.94589 7.26033 5.90164C7.89561 5.8895 8.5052 6.11686 9.03964 6.31619C9.44837 6.46863 9.81314 6.60468 10.1118 6.60468C10.3744 6.60468 10.729 6.474 11.1423 6.32171C11.7932 6.08181 12.5898 5.78827 13.4015 5.86738C14.6627 5.90402 15.8316 6.49076 16.5554 7.45058Z" fill="#1B1D22"/>
-</svg>

res/themes/element/img/compound/linux.svg

@@ -1,15 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_4244_203)">
-<path d="M11.0054 17.2033C10.7192 17.3348 10.4074 17.405 10.0911 17.4096C9.62287 17.4048 9.1673 17.2609 8.78524 16.9971C8.65787 17.3144 8.45841 17.5995 8.20182 17.831C7.94524 18.0626 7.63819 18.2344 7.30371 18.3337C7.34816 18.3337 7.39049 18.3337 7.43494 18.3337H12.4213C12.1196 18.2476 11.8387 18.103 11.5954 17.9088C11.3522 17.7147 11.1515 17.4747 11.0054 17.2033Z" fill="black"/>
-<path d="M5.59233 13.8942C5.61193 13.8889 5.63053 13.8805 5.64735 13.8694C5.6791 13.5971 5.71508 13.3352 5.7553 13.0856C5.74691 12.9449 5.77002 12.8041 5.82302 12.6731C6.11298 11.0868 6.51722 9.97294 7.07596 9.29637C7.09365 9.27503 7.1193 9.26142 7.14728 9.25851C7.17526 9.25561 7.20328 9.26367 7.22518 9.2809C7.24707 9.29813 7.26104 9.32313 7.26401 9.35041C7.26699 9.37768 7.25873 9.40498 7.24105 9.42631C7.18391 9.49645 7.12676 9.57277 7.07173 9.65322C6.64844 10.272 6.31404 11.2126 6.07277 12.477H6.09816C6.14375 12.4702 6.19014 12.4702 6.23573 12.477C6.40082 12.5121 6.65902 12.6462 7.05692 13.036C7.10771 10.7691 8.44108 8.94158 10.0919 8.94158C11.548 8.94158 12.765 10.371 13.0549 12.2729C13.1926 12.0053 13.4153 11.7882 13.6899 11.654C13.7577 11.6293 13.8293 11.6161 13.9016 11.6149C13.7518 10.9261 13.485 10.2666 13.1121 9.66353C13.0571 9.58308 13.002 9.50676 12.9449 9.43663C12.9357 9.42642 12.9287 9.41445 12.9244 9.40149C12.9201 9.38852 12.9186 9.37484 12.92 9.36128C12.9214 9.34774 12.9256 9.33461 12.9325 9.32273C12.9393 9.31085 12.9486 9.30047 12.9597 9.29224C12.9703 9.28351 12.9826 9.27695 12.9959 9.27294C13.0091 9.26893 13.0232 9.26756 13.0369 9.26891C13.0507 9.27025 13.0641 9.2743 13.0763 9.28078C13.0885 9.28727 13.0992 9.29608 13.1079 9.30668C13.5312 9.82648 13.8825 10.6041 14.145 11.6582C14.7101 11.8644 14.7248 12.7927 14.7375 13.5476C14.7375 13.9065 14.7375 14.2779 14.8243 14.3727C14.9111 14.4676 15.0952 14.447 15.3535 14.3397C15.3831 14.0118 15.3978 13.7209 15.4063 13.4755C15.4063 13.0856 15.4063 12.836 15.4063 12.836V12.574C15.4063 10.5113 12.6846 6.94487 12.6846 6.94487L12.3692 4.26334C12.3692 1.80251 10.0919 1.8252 10.0919 1.8252C10.0919 1.8252 7.80615 1.80251 7.80615 4.25302L7.50138 6.94487C7.50138 6.94487 4.77961 10.5092 4.77961 12.574V12.8319C4.77961 12.8319 4.76902 13.0814 4.77961 13.4713C4.77961 13.5311 4.77961 13.5951 4.77961 13.6611C5.1246 13.7889 5.47804 13.923 5.59233 13.8942ZM10.0813 5.21837C10.7163 5.27613 11.7279 5.42465 11.7745 5.72993C11.8084 5.96507 11.4168 6.41475 11.3385 6.50138C11.1755 6.68084 10.6083 7.26872 10.0962 7.26872C9.58397 7.26872 9.01676 6.68084 8.85591 6.50138C8.7776 6.41475 8.38606 5.96507 8.4178 5.72993C8.4559 5.41846 9.47815 5.27613 10.0813 5.21837Z" fill="black"/>
-<path d="M10.0925 7.0621C10.3698 7.0621 10.7952 6.78776 11.174 6.3649C11.464 6.04518 11.5698 5.81003 11.5613 5.7564C11.5084 5.6512 10.8164 5.49237 10.0798 5.42224C9.36657 5.49237 8.67449 5.6512 8.62158 5.76052C8.69778 5.98983 8.83166 6.19689 9.01101 6.36284C9.39197 6.78776 9.81526 7.0621 10.0925 7.0621Z" fill="black"/>
-<path d="M10.6623 15.9489C10.4189 13.7769 10.6432 13.3273 10.8337 13.1788C10.8804 13.1432 10.9358 13.1201 10.9945 13.1117C11.0531 13.1035 11.113 13.1102 11.1681 13.1313C11.3598 13.2237 11.5271 13.3577 11.657 13.5232C11.8962 13.7769 12.0634 13.9358 12.2179 13.8491C12.328 13.7852 12.4846 13.4366 12.6412 13.1169C12.7216 12.9456 12.8042 12.7621 12.8952 12.5868C12.6835 10.6457 11.5195 9.14819 10.0993 9.14819C8.53949 9.14819 7.27173 10.9531 7.27173 13.1705C7.27173 13.1973 7.27173 13.2241 7.27173 13.2509C7.52995 13.5149 7.83895 13.8698 8.21567 14.3338C8.36367 14.5155 8.4994 14.7064 8.62204 14.9052C8.79699 15.1841 8.909 15.4961 8.9506 15.8205C8.9922 16.1449 8.96245 16.4741 8.86331 16.7864C9.21862 17.0463 9.64882 17.1907 10.093 17.199C10.3777 17.1979 10.659 17.1382 10.9184 17.0236C10.862 16.9 10.8173 16.7716 10.7851 16.64C10.7302 16.4122 10.6892 16.1815 10.6623 15.9489Z" fill="black"/>
-<path d="M8.04303 14.459C7.74673 14.0918 7.49487 13.8009 7.279 13.5658L7.17105 13.4503L7.061 13.3348C6.5721 12.8397 6.31389 12.7037 6.17843 12.681C6.15951 12.678 6.14023 12.678 6.12129 12.681C6.10076 12.6833 6.08122 12.6909 6.06454 12.7028C6.04786 12.7147 6.03461 12.7307 6.02605 12.7489C6.02565 12.7538 6.02565 12.7586 6.02605 12.7634C5.98416 12.8712 5.96753 12.9869 5.97738 13.1017C5.97738 13.1595 5.97738 13.2173 5.97738 13.2749C5.97738 13.3327 5.97738 13.341 5.97738 13.374C6.00594 13.5827 5.96198 13.7947 5.8525 13.9763C5.83155 13.9994 5.80732 14.0196 5.78055 14.0362L5.7361 14.0629C5.70773 14.0774 5.67795 14.0892 5.6472 14.098H5.62393C5.44826 14.1289 5.16254 14.0279 4.80063 13.8917L4.6948 13.8505C4.24188 13.6752 3.71276 13.473 3.32545 13.473C3.23797 13.4644 3.14967 13.4777 3.06893 13.5116C2.98819 13.5455 2.91767 13.599 2.86406 13.6669C2.58046 14.0794 3.2154 14.7271 3.72758 15.2511C4.04294 15.5749 4.29056 15.8286 4.31808 16.0184C4.36675 16.3691 3.99002 16.5031 3.65774 16.6228C3.48628 16.6669 3.32623 16.7457 3.18788 16.8538C3.13709 16.9116 3.1392 16.9508 3.14979 16.9797C3.19635 17.1384 3.57308 17.4871 5.56466 18.0502C5.78512 18.1124 6.00914 18.1621 6.23558 18.1987C6.64453 18.2591 7.06268 18.2065 7.44245 18.0468C7.82223 17.8871 8.14838 17.6267 8.38379 17.2952C8.47591 17.159 8.55187 17.0129 8.61025 16.86L8.65257 16.7589C8.65257 16.7239 8.67163 16.6847 8.68221 16.6496C8.75827 16.3728 8.77591 16.0838 8.73407 15.8002C8.69223 15.5165 8.59179 15.2441 8.43881 14.9994C8.31764 14.812 8.18549 14.6316 8.04303 14.459Z" fill="black"/>
-<path d="M16.0589 14.3171C15.8816 14.3336 15.71 14.3863 15.5552 14.4717L15.3245 14.5687C15.0704 14.6635 14.8164 14.7089 14.6513 14.4903C14.6122 14.4329 14.5856 14.3683 14.573 14.3006C14.5437 14.1377 14.5282 13.9728 14.5265 13.8075C14.5265 13.723 14.5265 13.6342 14.5265 13.5393C14.5265 12.9391 14.5054 12.2171 14.2154 11.9346C14.1785 11.8974 14.1346 11.8673 14.0863 11.8459C14.0596 11.8345 14.0321 11.8255 14.0037 11.8191H13.972C13.9001 11.8109 13.8272 11.8208 13.7603 11.8479C13.5106 11.947 13.2926 12.2605 13.1022 12.6277L13.0112 12.8071C12.9772 12.8772 12.9455 12.9453 12.9138 13.0133C12.882 13.0814 12.8545 13.1392 12.827 13.2011C12.6408 13.6136 12.4947 13.9292 12.3254 14.0262C12.0122 14.2056 11.7391 13.9168 11.5 13.6611C11.3921 13.5236 11.2558 13.4098 11.1 13.3269C11.0796 13.3194 11.0582 13.3152 11.0365 13.3145C11.0108 13.3139 10.9859 13.3228 10.9666 13.3393C10.8354 13.4424 10.647 13.9148 10.8735 15.926C10.8978 16.148 10.936 16.3684 10.9878 16.586C11.0166 16.7008 11.0548 16.8133 11.1021 16.9222C11.1169 16.9532 11.1317 16.9841 11.1486 17.015C11.1656 17.0459 11.1762 17.0769 11.1931 17.1079C11.3664 17.4217 11.6184 17.6878 11.9256 17.8813C12.2328 18.0746 12.5853 18.1891 12.9501 18.214C13.3149 18.239 13.6804 18.1735 14.0122 18.0237C14.3441 17.8739 14.6317 17.6448 14.8482 17.3574C14.9843 17.1771 15.1093 16.989 15.2228 16.7943C16.2387 15.0307 16.2578 14.5254 16.1795 14.3809C16.1676 14.3603 16.15 14.3434 16.1286 14.332C16.1073 14.3208 16.0831 14.3155 16.0589 14.3171Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_4244_203">
-<rect width="14.4446" height="16.5081" fill="white" transform="translate(2.63892 1.8252)"/>
-</clipPath>
-</defs>
-</svg>

res/themes/element/img/compound/microsoft.svg

@@ -1,6 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="10.4908" y="2" width="7.50926" height="7.50926" fill="#1B1D22"/>
-<rect x="2" y="10.4904" width="7.50926" height="7.50926" fill="#1B1D22"/>
-<rect x="2" y="2" width="7.50926" height="7.50926" fill="#1B1D22"/>
-<rect x="10.4908" y="10.4904" width="7.50926" height="7.50926" fill="#1B1D22"/>
-</svg>

sonar-project.properties

@@ -1,5 +1,5 @@
 sonar.projectKey=element-web
-sonar.organization=element-hq
+sonar.organization=new_vector_ltd_organization
 
 # Encoding of the source code. Default is default system encoding
 #sonar.sourceEncoding=UTF-8
@@ -10,5 +10,5 @@ sonar.exclusions=__mocks__,docs,element.io,nginx
 
 sonar.typescript.tsconfigPath=./tsconfig.json
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
-sonar.coverage.exclusions=test/**/*,res/**/*,src/vector/modernizr.js
+sonar.coverage.exclusions=test/**/*,res/**/*
 sonar.testExecutionReportPaths=coverage/jest-sonar-report.xml

src/@types/global.d.ts

@@ -33,9 +33,7 @@ type ElectronChannel =
     | "update-downloaded"
     | "userDownloadCompleted"
     | "userDownloadAction"
-    | "openDesktopCapturerSourcePicker"
-    | "userAccessToken"
-    | "serverSupportedVersions";
+    | "openDesktopCapturerSourcePicker";
 
 declare global {
     interface Window {

src/async-components/structures/CompatibilityView.tsx

@@ -0,0 +1,149 @@
+/*
+Copyright 2020 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React, { ReactNode } from "react";
+import SdkConfig from "matrix-react-sdk/src/SdkConfig";
+
+import { _t } from "../../languageHandler";
+
+// directly import the style here as this layer does not support rethemedex at this time so no matrix-react-sdk
+// PostCSS variables will be accessible.
+import "../../../res/css/structures/ErrorView.pcss";
+
+interface IProps {
+    onAccept(): void;
+}
+
+const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
+    const brand = SdkConfig.get("brand");
+    const mobileBuilds = SdkConfig.get("mobile_builds");
+
+    let ios: JSX.Element | undefined;
+    const iosCustomUrl = mobileBuilds?.ios;
+    if (iosCustomUrl !== null) {
+        // could be undefined or a string
+        ios = (
+            <>
+                <p>
+                    <strong>iOS</strong> (iPhone or iPad)
+                </p>
+                <a href={iosCustomUrl} target="_blank" rel="noreferrer noopener" className="mx_ClearDecoration">
+                    <img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
+                </a>
+            </>
+        );
+    }
+
+    let android = [
+        <p className="mx_Spacer" key="header">
+            <strong>Android</strong>
+        </p>,
+    ];
+    const andCustomUrl = mobileBuilds?.android;
+    const fdroidCustomUrl = mobileBuilds?.fdroid;
+    if (andCustomUrl !== null) {
+        // undefined or string
+        android.push(
+            <a
+                href={andCustomUrl}
+                target="_blank"
+                rel="noreferrer noopener"
+                className="mx_ClearDecoration"
+                key="android"
+            >
+                <img height="48" src="themes/element/img/download/google.svg" alt="Google Play Store" />
+            </a>,
+        );
+    }
+    if (fdroidCustomUrl !== null) {
+        // undefined or string
+        android.push(
+            <a
+                href={fdroidCustomUrl}
+                target="_blank"
+                rel="noreferrer noopener"
+                className="mx_ClearDecoration"
+                key="fdroid"
+            >
+                <img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid" />
+            </a>,
+        );
+    }
+    if (android.length === 1) {
+        // just a header, meaning no links
+        android = [];
+    }
+
+    let mobileHeader: ReactNode = <h2 id="step2_heading">{_t("use_brand_on_mobile", { brand })}</h2>;
+    if (!android.length && !ios) {
+        mobileHeader = null;
+    }
+
+    return (
+        <div className="mx_ErrorView">
+            <div className="mx_ErrorView_container">
+                <div className="mx_HomePage_header">
+                    <span className="mx_HomePage_logo">
+                        <img height="42" src="themes/element/img/logos/element-logo.svg" alt="Element" />
+                    </span>
+                    <h1>{_t("incompatible_browser|title")}</h1>
+                </div>
+
+                <div className="mx_HomePage_col">
+                    <div className="mx_HomePage_row">
+                        <div>
+                            <h2 id="step1_heading">{_t("incompatible_browser|summary", { brand })}</h2>
+                            <p>{_t("incompatible_browser|features", { brand })}</p>
+                            <p>
+                                {_t(
+                                    "incompatible_browser|browser_links",
+                                    {},
+                                    {
+                                        chromeLink: (sub) => <a href="https://www.google.com/chrome">{sub}</a>,
+                                        firefoxLink: (sub) => <a href="https://firefox.com">{sub}</a>,
+                                        safariLink: (sub) => <a href="https://apple.com/safari">{sub}</a>,
+                                    },
+                                )}
+                            </p>
+                            <p>{_t("incompatible_browser|feature_warning")}</p>
+                            <button onClick={onAccept}>{_t("incompatible_browser|continue_warning")}</button>
+                        </div>
+                    </div>
+                </div>
+
+                <div className="mx_HomePage_col">
+                    <div className="mx_HomePage_row">
+                        <div>
+                            {mobileHeader}
+                            {ios}
+                            {android}
+                        </div>
+                    </div>
+                </div>
+
+                <div className="mx_HomePage_row mx_Center mx_Spacer">
+                    <p className="mx_Spacer">
+                        <a href="https://element.io" target="_blank" className="mx_FooterLink">
+                            {_t("go_to_element_io")}
+                        </a>
+                    </p>
+                </div>
+            </div>
+        </div>
+    );
+};
+
+export default CompatibilityView;

src/async-components/structures/ErrorView.tsx

@@ -14,16 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ReactNode } from "react";
-import { Text, Heading, Button, Separator } from "@vector-im/compound-web";
-import SdkConfig from "matrix-react-sdk/src/SdkConfig";
-import { Flex } from "matrix-react-sdk/src/components/utils/Flex";
-import PopOutIcon from "@vector-im/compound-design-tokens/assets/web/icons/pop-out";
+import * as React from "react";
 
 import { _t } from "../../languageHandler";
-import { Icon as AppleIcon } from "../../../res/themes/element/img/compound/apple.svg";
-import { Icon as MicrosoftIcon } from "../../../res/themes/element/img/compound/microsoft.svg";
-import { Icon as LinuxIcon } from "../../../res/themes/element/img/compound/linux.svg";
 
 // directly import the style here as this layer does not support rethemedex at this time so no matrix-react-sdk
 // PostCSS variables will be accessible.
@@ -33,184 +26,36 @@ interface IProps {
     // both of these should already be internationalised
     title: string;
     messages?: string[];
-    footer?: ReactNode;
 }
 
-export const ErrorView: React.FC<IProps> = ({ title, messages, footer, children }) => {
+const ErrorView: React.FC<IProps> = ({ title, messages }) => {
     return (
-        <div className="mx_ErrorView cpd-theme-light">
-            <img
-                className="mx_ErrorView_logo"
-                height="160"
-                src="themes/element/img/logos/element-app-logo.png"
-                alt="Element"
-            />
+        <div className="mx_ErrorView">
             <div className="mx_ErrorView_container">
-                <Heading size="md" weight="semibold">
-                    {title}
-                </Heading>
-                {messages?.map((message) => (
-                    <Text key={message} size="lg">
-                        {message}
-                    </Text>
-                ))}
-                {children}
+                <div className="mx_HomePage_header">
+                    <span className="mx_HomePage_logo">
+                        <img height="42" src="themes/element/img/logos/element-logo.svg" alt="Element" />
+                    </span>
+                    <h1>{_t("failed_to_start")}</h1>
+                </div>
+                <div className="mx_HomePage_col">
+                    <div className="mx_HomePage_row">
+                        <div>
+                            <h2 id="step1_heading">{title}</h2>
+                            {messages && messages.map((msg) => <p key={msg}>{msg}</p>)}
+                        </div>
+                    </div>
+                </div>
+                <div className="mx_HomePage_row mx_Center mx_Spacer">
+                    <p className="mx_Spacer">
+                        <a href="https://element.io" target="_blank" className="mx_FooterLink">
+                            {_t("go_to_element_io")}
+                        </a>
+                    </p>
+                </div>
             </div>
-            {footer}
         </div>
     );
 };
 
-const MobileAppLinks: React.FC<{
-    appleAppStoreUrl?: string;
-    googlePlayUrl?: string;
-    fdroidUrl?: string;
-}> = ({ appleAppStoreUrl, googlePlayUrl, fdroidUrl }) => (
-    <Flex gap="var(--cpd-space-6x)">
-        {appleAppStoreUrl && (
-            <a href={appleAppStoreUrl} target="_blank" rel="noreferrer noopener">
-                <img height="64" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
-            </a>
-        )}
-        {googlePlayUrl && (
-            <a href={googlePlayUrl} target="_blank" rel="noreferrer noopener" key="android">
-                <img height="64" src="themes/element/img/download/google.svg" alt="Google Play Store" />
-            </a>
-        )}
-        {fdroidUrl && (
-            <a href={fdroidUrl} target="_blank" rel="noreferrer noopener" key="fdroid">
-                <img height="64" src="themes/element/img/download/fdroid.svg" alt="F-Droid" />
-            </a>
-        )}
-    </Flex>
-);
-
-const DesktopAppLinks: React.FC<{
-    macOsUrl?: string;
-    win64Url?: string;
-    win32Url?: string;
-    linuxUrl?: string;
-}> = ({ macOsUrl, win64Url, win32Url, linuxUrl }) => {
-    return (
-        <Flex gap="var(--cpd-space-4x)">
-            {macOsUrl && (
-                <Button as="a" href={macOsUrl} kind="secondary" Icon={AppleIcon}>
-                    {_t("incompatible_browser|macos")}
-                </Button>
-            )}
-            {win64Url && (
-                <Button as="a" href={win64Url} kind="secondary" Icon={MicrosoftIcon}>
-                    {_t("incompatible_browser|windows", { bits: "64" })}
-                </Button>
-            )}
-            {win32Url && (
-                <Button as="a" href={win32Url} kind="secondary" Icon={MicrosoftIcon}>
-                    {_t("incompatible_browser|windows", { bits: "32" })}
-                </Button>
-            )}
-            {linuxUrl && (
-                <Button as="a" href={linuxUrl} kind="secondary" Icon={LinuxIcon}>
-                    {_t("incompatible_browser|linux")}
-                </Button>
-            )}
-        </Flex>
-    );
-};
-
-const linkFactory =
-    (link: string) =>
-    (text: string): JSX.Element => (
-        <a href={link} target="_blank" rel="noreferrer noopener">
-            {text}
-        </a>
-    );
-
-export const UnsupportedBrowserView: React.FC<{
-    onAccept?(): void;
-}> = ({ onAccept }) => {
-    const config = SdkConfig.get();
-    const brand = config.brand ?? "Element";
-
-    const hasDesktopBuilds =
-        config.desktop_builds?.available &&
-        (config.desktop_builds?.url_macos ||
-            config.desktop_builds?.url_win64 ||
-            config.desktop_builds?.url_win32 ||
-            config.desktop_builds?.url_linux);
-    const hasMobileBuilds = Boolean(
-        config.mobile_builds?.ios || config.mobile_builds?.android || config.mobile_builds?.fdroid,
-    );
-
-    return (
-        <ErrorView
-            title={_t("incompatible_browser|title", { brand })}
-            messages={[
-                _t("incompatible_browser|description", {
-                    brand,
-                    detail: onAccept
-                        ? _t("incompatible_browser|detail_can_continue")
-                        : _t("incompatible_browser|detail_no_continue"),
-                }),
-            ]}
-            footer={
-                <>
-                    {/* We render the apps in the footer as they are wider than the 520px container */}
-                    {(hasDesktopBuilds || hasMobileBuilds) && <Separator />}
-
-                    {hasDesktopBuilds && (
-                        <>
-                            <Heading as="h2" size="sm" weight="semibold">
-                                {_t("incompatible_browser|use_desktop_heading", { brand })}
-                            </Heading>
-                            <DesktopAppLinks
-                                macOsUrl={config.desktop_builds?.url_macos}
-                                win64Url={config.desktop_builds?.url_win64}
-                                win32Url={config.desktop_builds?.url_win32}
-                                linuxUrl={config.desktop_builds?.url_linux}
-                            />
-                        </>
-                    )}
-
-                    {hasMobileBuilds && (
-                        <>
-                            <Heading as="h2" size="sm" weight="semibold">
-                                {hasDesktopBuilds
-                                    ? _t("incompatible_browser|use_mobile_heading_after_desktop")
-                                    : _t("incompatible_browser|use_mobile_heading", { brand })}
-                            </Heading>
-                            <MobileAppLinks
-                                appleAppStoreUrl={config.mobile_builds?.ios ?? undefined}
-                                googlePlayUrl={config.mobile_builds?.android ?? undefined}
-                                fdroidUrl={config.mobile_builds?.fdroid ?? undefined}
-                            />
-                        </>
-                    )}
-                </>
-            }
-        >
-            <Text size="lg">
-                {_t(
-                    "incompatible_browser|supported_browsers",
-                    {},
-                    {
-                        Chrome: linkFactory("https://google.com/chrome"),
-                        Firefox: linkFactory("https://firefox.com"),
-                        Edge: linkFactory("https://microsoft.com/edge"),
-                        Safari: linkFactory("https://apple.com/safari"),
-                    },
-                )}
-            </Text>
-
-            <Flex gap="var(--cpd-space-4x)" className="mx_ErrorView_buttons">
-                <Button Icon={PopOutIcon} kind="secondary" size="sm">
-                    {_t("incompatible_browser|learn_more")}
-                </Button>
-                {onAccept && (
-                    <Button kind="primary" size="sm" onClick={onAccept}>
-                        {_t("incompatible_browser|continue")}
-                    </Button>
-                )}
-            </Flex>
-        </ErrorView>
-    );
-};
+export default ErrorView;

src/favicon.ts

@@ -101,7 +101,7 @@ export default class Favicon {
         h: number;
     } {
         const opt = {
-            n: typeof n === "number" ? Math.abs(n | 0) : n,
+            n: typeof n === "number" ? Math.abs(n as number | 0) : n,
             len: ("" + n).length,
             // badge positioning constants as percentages
             x: 0.4,
@@ -178,7 +178,7 @@ export default class Favicon {
         this.context.fillStyle = params.textColor;
 
         if (typeof opt.n === "number" && opt.n > 999) {
-            const count = (opt.n > 9999 ? 9 : Math.floor(opt.n / 1000)) + "k+";
+            const count = (opt.n > 9999 ? 9 : Math.floor((opt.n as number) / 1000)) + "k+";
             this.context.fillText(count, Math.floor(opt.x + opt.w / 2), Math.floor(opt.y + opt.h - opt.h * 0.2));
         } else {
             this.context.fillText("" + opt.n, Math.floor(opt.x + opt.w / 2), Math.floor(opt.y + opt.h - opt.h * 0.15));
@@ -194,9 +194,9 @@ export default class Favicon {
     }
 
     private setIcon(canvas: HTMLCanvasElement): void {
-        setTimeout(() => {
+        setImmediate(() => {
             this.setIconSrc(canvas.toDataURL("image/png"));
-        }, 0);
+        });
     }
 
     private setIconSrc(url: string): void {

src/i18n/strings/cs.json

@@ -21,12 +21,20 @@
         "invalid_json_generic": "Neplatný JSON",
         "misconfigured": "Váš Element je nesprávně nastaven"
     },
+    "failed_to_start": "Nepovedlo se nastartovat",
+    "go_to_element_io": "Přejít na element.io",
     "incompatible_browser": {
+        "browser_links": "Pro nejlepší zážitek si prosím nainstalujte prohlížeč <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, nebo <safariLink>Safari</safariLink>.",
+        "continue_warning": "Rozumím a přesto chci pokračovat",
+        "feature_warning": "Můžete pokračovat v užívání vašeho současného prohlížeče, ale některé (nebo dokonce všechny) funkce nemusí fungovat a vzhled a chování aplikace nemusí být správné.",
+        "features": "%(brand)s využívá pokročilých funkcí prohlížeče, které ten váš nepodporuje.",
+        "summary": "Váš prohlížeč nedokáže spustit %(brand)s",
         "title": "Nepodporovaný prohlížeč"
     },
     "powered_by_matrix": "Běží na Matrixu",
     "powered_by_matrix_with_logo": "Decentralizovaný, šifrovaný chat a spolupráce na platformě $matrixLogo",
     "unknown_device": "Neznámé zařízení",
+    "use_brand_on_mobile": "Používání %(brand)s v mobilních zařízeních",
     "web_default_device_name": "%(appName)s: %(browserName)s na %(osName)s",
     "welcome_to_element": "Vítá vás Element"
 }

src/i18n/strings/de_DE.json

@@ -21,12 +21,20 @@
         "invalid_json_generic": "Ungültiges JSON",
         "misconfigured": "Dein Element ist falsch konfiguriert"
     },
+    "failed_to_start": "Start fehlgeschlagen",
+    "go_to_element_io": "Gehe zu element.io",
     "incompatible_browser": {
+        "browser_links": "Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> oder <safariLink>Safari</safariLink> für das beste Erlebnis.",
+        "continue_warning": "Ich verstehe die Risiken und möchte fortfahren",
+        "feature_warning": "Du kannst deinen aktuellen Browser weiterhin verwenden. Es ist aber möglich, dass nicht alles richtig funktioniert oder das Aussehen der App inkorrekt ist.",
+        "features": "%(brand)s verwendet erweiterte Browserfunktionen, die von deinem Browser nicht unterstützt werden.",
+        "summary": "Dein Browser kann %(brand)s nicht ausführen",
         "title": "Nicht unterstützter Browser"
     },
     "powered_by_matrix": "Betrieben mit Matrix",
     "powered_by_matrix_with_logo": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von $matrixLogo",
     "unknown_device": "Unbekanntes Gerät",
+    "use_brand_on_mobile": "Verwende %(brand)s am Handy",
     "web_default_device_name": "%(appName)s: %(browserName)s auf %(osName)s",
     "welcome_to_element": "Willkommen bei Element"
 }

src/i18n/strings/el.json

@@ -19,11 +19,19 @@
         "invalid_json_generic": "Μη έγκυρο JSON",
         "misconfigured": "Το Element σας δεν εχει ρυθμιστεί σωστά"
     },
+    "failed_to_start": "Αποτυχία έναρξης",
+    "go_to_element_io": "Πήγαινε στο element.io",
     "incompatible_browser": {
+        "browser_links": "Παρακαλούμε εγκαταστήστε <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ή <safariLink>Safari</safariLink> για καλύτερη εμπειρία χρήσης.",
+        "continue_warning": "Κατανοώ τους κινδύνους και επιθυμώ να συνεχίσω",
+        "feature_warning": "Μπορείτε να συνεχίσετε να χρησιμοποιείτε το τρέχον πρόγραμμα περιήγησής σας, αλλά ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν και η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι λανθασμένη.",
+        "features": "%(brand)s χρησιμοποιεί προηγμένες δυνατότητες προγράμματος περιήγησης που δεν υποστηρίζονται από το τρέχον πρόγραμμα περιήγησής σας.",
+        "summary": "Το πρόγραμμα περιήγησής σας δεν μπορεί να εκτελέσει %(brand)s",
         "title": "Μη υποστηριζόμενο πρόγραμμα περιήγησης"
     },
     "powered_by_matrix": "Με την υποστήριξη του Matrix",
     "powered_by_matrix_with_logo": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία και συνεργασία χρησιμοποιώντας το $matrixLogo",
     "unknown_device": "Άγνωστη συσκευή",
+    "use_brand_on_mobile": "Χρήση %(brand)s σε κινητό",
     "welcome_to_element": "Καλώς ήλθατε στο Element"
 }

src/i18n/strings/en_EN.json

@@ -21,24 +21,20 @@
         "invalid_json_generic": "Invalid JSON",
         "misconfigured": "Your Element is misconfigured"
     },
+    "failed_to_start": "Failed to start",
+    "go_to_element_io": "Go to element.io",
     "incompatible_browser": {
-        "continue": "Continue anyway",
-        "description": "%(brand)s uses some browser features which are not available in your current browser. %(detail)s",
-        "detail_can_continue": "If you continue, some features may stop working and there is a risk that you may lose data in the future.",
-        "detail_no_continue": "Try updating this browser if you're not using the latest version and try again.",
-        "learn_more": "Learn more",
-        "linux": "Linux",
-        "macos": "Mac",
-        "supported_browsers": "For the best experience, use <Chrome>Chrome</Chrome>, <Firefox>Firefox</Firefox>, <Edge>Edge</Edge>, or <Safari>Safari</Safari>.",
-        "title": "%(brand)s does not support this browser",
-        "use_desktop_heading": "Use %(brand)s Desktop instead",
-        "use_mobile_heading": "Use %(brand)s on mobile instead",
-        "use_mobile_heading_after_desktop": "Or use our mobile app",
-        "windows": "Windows (%(bits)s-bit)"
+        "browser_links": "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
+        "continue_warning": "I understand the risks and wish to continue",
+        "feature_warning": "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.",
+        "features": "%(brand)s uses advanced browser features which aren't supported by your current browser.",
+        "summary": "Your browser can't run %(brand)s",
+        "title": "Unsupported browser"
     },
     "powered_by_matrix": "Powered by Matrix",
     "powered_by_matrix_with_logo": "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo",
     "unknown_device": "Unknown device",
+    "use_brand_on_mobile": "Use %(brand)s on mobile",
     "web_default_device_name": "%(appName)s: %(browserName)s on %(osName)s",
     "welcome_to_element": "Welcome to Element"
 }

src/i18n/strings/eo.json

@@ -20,12 +20,20 @@
         "invalid_json_generic": "Nevalida JSON",
         "misconfigured": "Via Elemento estas misagordita"
     },
+    "failed_to_start": "Malsukcesis starti",
+    "go_to_element_io": "Iri al element.io",
     "incompatible_browser": {
+        "browser_links": "Bonvolu instali retumilon <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, aŭ <safariLink>Safari</safariLink>, por la plej bona sperto.",
+        "continue_warning": "Mi komprenas la riskon kaj volas pluiĝi",
+        "feature_warning": "Vi povas daŭre uzi vian nunan foliumilon, sed iuj (eĉ ĉiuj) funkcioj eble ne funkciu, kaj la aspekto de la aplikaĵo eble ne estu ĝusta.",
+        "features": "%(brand)s uzas specialajn funkciojn de retumilo, kiujn via nuna retumilo ne subtenas.",
+        "summary": "Via retumilo ne povas ruli %(brand)s",
         "title": "Nesubtenata retumilo"
     },
     "powered_by_matrix": "Povigata de Matrix",
     "powered_by_matrix_with_logo": "Malcentralizita kaj ĉifrita babilejo; kunlaboro danke al $matrixLogo",
     "unknown_device": "Nekonata aparato",
+    "use_brand_on_mobile": "Uzi %(brand)s poŝtelefone",
     "web_default_device_name": "%(appName)s: %(browserName)s sur %(osName)s",
     "welcome_to_element": "Bonvenon al Element"
 }

src/i18n/strings/es.json

@@ -20,12 +20,20 @@
         "invalid_json_generic": "JSON inválido",
         "misconfigured": "Tu aplicación Element está mal configurada"
     },
+    "failed_to_start": "Fallo al iniciar",
+    "go_to_element_io": "Ir a element.io",
     "incompatible_browser": {
+        "browser_links": "Por favor, instale <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> para la mejor experiencia.",
+        "continue_warning": "Entiendo los riesgos y quiero continuar",
+        "feature_warning": "Puedes seguir utilizando tu navegador actual, pero puede que algunas funcionalidades no estén disponibles o que algunas partes de la aplicación se muestren de forma incorrecta.",
+        "features": "%(brand)s usa funciones avanzadas que su navegador actual no soporta.",
+        "summary": "Tu navegador no es compatible con %(brand)s",
         "title": "Navegador no compatible"
     },
     "powered_by_matrix": "Funciona con Matrix",
     "powered_by_matrix_with_logo": "Conversaciones y colaboración descentralizadas y cifradas gracias a $matrixLogo",
     "unknown_device": "Dispositivo desconocido",
+    "use_brand_on_mobile": "Usar %(brand)s en modo móvil",
     "web_default_device_name": "%(appName)s: %(browserName)s en %(osName)s",
     "welcome_to_element": "Te damos la bienvenida a Element"
 }

src/i18n/strings/et.json

@@ -21,12 +21,20 @@
         "invalid_json_generic": "Vigane JSON",
         "misconfigured": "Sinu Element on valesti seadistatud"
     },
+    "failed_to_start": "Käivitamine ei õnnestunud",
+    "go_to_element_io": "Mine element.io lehele",
     "incompatible_browser": {
+        "browser_links": "Parima kasutuskogemuse jaoks palun paigalda <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> või <safariLink>Safari</safariLink>.",
+        "continue_warning": "Ma mõistan riske ja soovin jätkata",
+        "feature_warning": "Sa võid jätkata praeguse brauseri kasutamist, kuid mõned või kõik funktsionaalsused ei pruugi toimida ning rakenduse välimus võib vigane olla.",
+        "features": "%(brand)s kasutab mitmeid uusi brauseri-põhiseid tehnoloogiaid, mis ei ole veel sinu veebibrauseris toetatud.",
+        "summary": "%(brand)s ei toimi sinu brauseris",
         "title": "Sellele brauserile puudub tugi"
     },
     "powered_by_matrix": "Põhineb Matrix'il",
     "powered_by_matrix_with_logo": "Hajutatud ja krüpteeritud suhtlus- ning ühistöörakendus, mille aluseks on $matrixLogo",
     "unknown_device": "Tundmatu seade",
+    "use_brand_on_mobile": "Kasuta rakendust %(brand)s nutiseadmes",
     "web_default_device_name": "%(appName)s: %(browserName)s operatsioonisüsteemis %(osName)s",
     "welcome_to_element": "Tere tulemast kasutama suhtlusrakendust Element"
 }

src/i18n/strings/fa.json

@@ -20,12 +20,20 @@
         "invalid_json_generic": "JSON اشتباه",
         "misconfigured": "Element شما پیکربندی نشده است"
     },
+    "failed_to_start": "خطا در شروع",
+    "go_to_element_io": "برو به element.io",
     "incompatible_browser": {
+        "browser_links": "لطفا برای تجربه بهتر <chromeLink>کروم</chromeLink>، <firefoxLink>فایرفاکس</firefoxLink>، یا <safariLink>سافاری</safariLink> را نصب کنید.",
+        "continue_warning": "از خطرات این کار آگاهم و مایلم که ادامه بدهم",
+        "feature_warning": "شما می توانید با مرورگر فعلی خود ادامه دهید، اما ممکن است عملکرد تمامی یا برخی از قابلیت ها با اشکال روبرو شود و نمایش برنامه صحیح نباشد.",
+        "features": "%(brand)s از ویژگی های پیشرفته مرورگر استفاده می کند که در مرورگر فعلی شما پشتیبانی نمی شوند.",
+        "summary": "مرورگر شما نمی تواند %(brand)s را اجرا کند",
         "title": "مرورگر پش‬تبانی نمی شود"
     },
     "powered_by_matrix": "راه اندازی شده با استفاده از ماتریکس",
     "powered_by_matrix_with_logo": "همکاری چت غیرمتمرکز و رمزگذاری شده &amp; توسعه یافته با استفاده از $matrixLogo",
     "unknown_device": "دستگاه ناشناخته",
+    "use_brand_on_mobile": "از %(brand)s گوشی استفاده کنید",
     "web_default_device_name": "%(appName)s: %(browserName)s: روی %(osName)s",
     "welcome_to_element": "به Element خوش‌آمدید"
 }

src/i18n/strings/fi.json

@@ -20,12 +20,20 @@
         "invalid_json_generic": "Virheellinen JSON",
         "misconfigured": "Elementisi asetukset ovat pielessä"
     },
+    "failed_to_start": "Käynnistys ei onnistunut",
+    "go_to_element_io": "Mene osoitteeseen riot.im",
     "incompatible_browser": {
+        "browser_links": "Asenna <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> tai <safariLink>Safari</safariLink>, jotta kaikki toimii parhaiten.",
+        "continue_warning": "Ymmärrän riskit ja haluan jatkaa",
+        "feature_warning": "Voit käyttää edelleen nykyistä selaintasi, mutta jotkut tai kaikki ominaisuudet eivät ehkä toimi ja sovelluksen ulkoasu voi olla virheellinen.",
+        "features": "%(brand)s käyttää edistyneitä selaimen ominaisuuksia, joita nykyinen selaimesi ei tue.",
+        "summary": "%(brand)s ei toimi selaimessasi",
         "title": "Selainta ei tueta"
     },
     "powered_by_matrix": "Moottorina Matrix",
     "powered_by_matrix_with_logo": "Hajautettu, salattu keskustelu &amp; yhteistyö, taustavoimana $matrixLogo",
     "unknown_device": "Tuntematon laite",
+    "use_brand_on_mobile": "Käytä %(brand)sia mobiilisti",
     "web_default_device_name": "%(appName)s: %(browserName)s käyttöjärjestelmällä %(osName)s",
     "welcome_to_element": "Tervetuloa Element-sovellukseen"
 }

src/i18n/strings/fr.json

@@ -21,12 +21,20 @@
         "invalid_json_generic": "JSON non valide",
         "misconfigured": "Votre Element est mal configuré"
     },
+    "failed_to_start": "Échec au démarrage",
+    "go_to_element_io": "Aller vers element.io",
     "incompatible_browser": {
+        "browser_links": "Veuillez installer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ou <safariLink>Safari</safariLink> pour une expérience optimale.",
+        "continue_warning": "Je comprends les risques et souhaite continuer",
+        "feature_warning": "Vous pouvez continuer à utiliser votre navigateur actuel, mais vous risquez de trouver que certaines fonctionnalités et/ou l’apparence de l’application sont incorrectes.",
+        "features": "%(brand)s nécessite des fonctionnalités avancées que votre navigateur actuel ne prend pas en charge.",
+        "summary": "Votre navigateur ne peut pas exécuter %(brand)s",
         "title": "Navigateur non pris en charge"
     },
     "powered_by_matrix": "Propulsé par Matrix",
     "powered_by_matrix_with_logo": "Messagerie décentralisée, chiffrée &amp; une collaboration alimentée par $matrixLogo",
     "unknown_device": "Appareil inconnu",
+    "use_brand_on_mobile": "Utiliser %(brand)s sur téléphone",
     "web_default_device_name": "%(appName)s : %(browserName)s pour %(osName)s",
     "welcome_to_element": "Bienvenue sur Element"
 }

src/i18n/strings/gl.json

@@ -20,12 +20,20 @@
         "invalid_json_generic": "JSON non válido",
         "misconfigured": "Element non está ben configurado"
     },
+    "failed_to_start": "Fallou o inicio",
+    "go_to_element_io": "Ir a element.io",
     "incompatible_browser": {
+        "browser_links": "Instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para ter unha mellor experiencia.",
+        "continue_warning": "Entendo os riscos e desexo continuar",
+        "feature_warning": "Podes continuar co teu navegador, pero algunhas características poderían non funcionar e o aspecto da aplicación podería non ser o correcto.",
+        "features": "%(brand)s utiliza características avanzadas do navegador que non están dispoñibles no teu navegador.",
+        "summary": "O teu navegador non pode executar %(brand)s",
         "title": "Navegador non soportado"
     },
     "powered_by_matrix": "Funciona grazas a Matrix",
     "powered_by_matrix_with_logo": "Conversas &amp; colaboración descentralizadas e cifradas grazas a $matrixLogo",
     "unknown_device": "Dispositivo descoñecido",
+    "use_brand_on_mobile": "Utiliza %(brand)s no móbil",
     "web_default_device_name": "%(appName)s: %(browserName)s en %(osName)s",
     "welcome_to_element": "Benvida/o a Element"
 }

src/i18n/strings/he.json

@@ -14,19 +14,26 @@
     "error": {
         "app_launch_unexpected_error": "שגיאה לא צפויה במהלך טעינת האפליקציה. ראו קונסול לפרטים נוספים.",
         "cannot_load_config": "לא ניתן לטעון את קובץ ההגדרות: יש לרענן את הדף כדי לנסות שנית.",
-        "invalid_configuration_mixed_server": "Invalid configuration: a default_hs_url can't be specified along with default_server_name or default_server_config",
         "invalid_configuration_no_server": "תצורה שגויה: לא צוין שרת ברירת מחדל.",
         "invalid_json": "האלמנט מכיל הגדרת JSON שגויה, אנא תקנו את הבעיה ואתחלו את הדף.",
         "invalid_json_detail": "ההודעה מהמנתח היא: %(message)s",
         "invalid_json_generic": "JSON לא חוקי",
         "misconfigured": "Element אינו מוגדר תקין"
     },
+    "failed_to_start": "כשל בהעלאת התוכנה",
+    "go_to_element_io": "חזור לאתר הראשי: element.io",
     "incompatible_browser": {
+        "browser_links": "נא התקן את דפדפן <chromeLink>כרום</chromeLink>, <firefoxLink>פיירפוקס</firefoxLink> או <safariLink>סאפרי</safariLink> בשביל החוויה הטובה ביותר.",
+        "continue_warning": "הסיכונים מובנים לי ואני מעוניינ/ת להמשיך",
+        "feature_warning": "ניתן להמשיך ולהשתמש בדפדפן זה, אך ייתכן שחלק מן התכונות והמאפיינים לא יעבדו כשורה או ייראו כשגויים.",
+        "features": "%(brand)s משתמש בתכונות דפדפן מתקדמות שאינן נתמכות בדפדפן הנוכחי שלך.",
+        "summary": "הדפדפן שלך לא יכול להריץ %(brand)s",
         "title": "דפדפן לא נתמך"
     },
     "powered_by_matrix": "מופעל על ידי מטריקס",
     "powered_by_matrix_with_logo": "צ'אט מבוזר ומוצפן &amp; מופעל בשיתוף פעולה ע\"י $matrixLogo",
     "unknown_device": "מכשיר לא ידוע",
+    "use_brand_on_mobile": "השתמש ב-%(brand)s במכשיר הנייד",
     "web_default_device_name": "%(appName)s: %(browserName)s עַל %(osName)s",
     "welcome_to_element": "ברוכים הבאים ל Element"
 }

src/i18n/strings/hu.json

@@ -21,12 +21,20 @@
         "invalid_json_generic": "Érvénytelen JSON",
         "misconfigured": "Az Element hibásan van beállítva"
     },
+    "failed_to_start": "Az indítás sikertelen",
+    "go_to_element_io": "Irány az element.io",
     "incompatible_browser": {
+        "browser_links": "A legjobb élmény érdékében telepítsen <chromeLink>Chrome-ot</chromeLink>, <firefoxLink>Firefoxot</firefoxLink> vagy <safariLink>Safarit</safariLink>.",
+        "continue_warning": "Megértettem a kockázatot és folytatom",
+        "feature_warning": "Folytathatja a jelenlegi böngészőjével, de néhány vagy az összes funkció használhatatlan lehet, vagy hibák lehetnek az alkalmazás kinézetében és viselkedésében.",
+        "features": "A(z) %(brand)s speciális böngészőfunkciókat használ, amelyeket a jelenlegi böngészője nem támogat.",
+        "summary": "A böngészője nem tudja futtatni ezt: %(brand)s",
         "title": "Nem támogatott böngésző"
     },
     "powered_by_matrix": "A gépházban: Matrix",
     "powered_by_matrix_with_logo": "Elosztott, titkosított csevegés és együttműködés ezzel: $matrixLogo",
     "unknown_device": "Ismeretlen eszköz",
+    "use_brand_on_mobile": "Mobilon használja ezt: %(brand)s",
     "web_default_device_name": "%(appName)s: (%(browserName)s itt: %(osName)s)",
     "welcome_to_element": "Üdvözli az Element"
 }

src/i18n/strings/id.json

@@ -21,12 +21,20 @@
         "invalid_json_generic": "JSON tidak absah",
         "misconfigured": "Anda salah mengatur Element"
     },
+    "failed_to_start": "Gagal untuk memulai",
+    "go_to_element_io": "Buka element.io",
     "incompatible_browser": {
+        "browser_links": "Silakan instal <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, atau <safariLink>Safari</safariLink> untuk pengalaman yang terbaik.",
+        "continue_warning": "Saya memahami risikonya dan ingin melanjutkan",
+        "feature_warning": "Anda dapat melanjutkan menggunakan peramban Anda saat ini, tetapi beberapa atau semua fitur mungkin tidak berfungsi dan tampilan serta nuansa aplikasi mungkin tidak benar.",
+        "features": "%(brand)s menggunakan fitur peramban tingkat lanjut yang tidak didukung oleh peramban Anda saat ini.",
+        "summary": "Peramban Anda tidak dapat menjalankan %(brand)s",
         "title": "Peramban tidak didukung"
     },
     "powered_by_matrix": "Diberdayakan oleh Matrix",
     "powered_by_matrix_with_logo": "Obrolan &amp; kolaborasi terdesentralisasi dan terenkripsi diberdayakan oleh $matrixLogo",
     "unknown_device": "Perangkat tidak diketahui",
+    "use_brand_on_mobile": "Gunakan %(brand)s di ponsel",
     "web_default_device_name": "%(appName)s: %(browserName)s di %(osName)s",
     "welcome_to_element": "Selamat datang di Element"
 }

src/i18n/strings/is.json

@@ -20,12 +20,20 @@
         "invalid_json_generic": "Ógilt JSON",
         "misconfigured": "Element-tilvikið þitt er rangt stillt"
     },
+    "failed_to_start": "Mistókst að ræsa",
+    "go_to_element_io": "Fara á element.io",
     "incompatible_browser": {
+        "browser_links": "Þú ættir að setja upp <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eða <safariLink>Safari</safariLink> til að fá sem besta útkomu.",
+        "continue_warning": "Ég skil áhættuna og óska að halda áfram",
+        "feature_warning": "Þú getur haldið áfram að nota núverandi vafra, en sumir eða allir eiginleikar virka mögulega ekki rétt, auk þess sem útlit og hegðun forritsins geta verið röng.",
+        "features": "%(brand)s notar háþróaða vafraeiginleika sem eru ekki studdir af vafranum þínum.",
+        "summary": "Vafrinn þinn getur ekki keyrt %(brand)s",
         "title": "Óstuddur vafri"
     },
     "powered_by_matrix": "Keyrt með Matrix",
     "powered_by_matrix_with_logo": "Dreifstýrt, dulritað spjall og samskipti keyrt með $matrixLogo",
     "unknown_device": "Óþekkt tæki",
+    "use_brand_on_mobile": "Nota %(brand)s í síma",
     "web_default_device_name": "%(appName)s: %(browserName)s á %(osName)s",
     "welcome_to_element": "Velkomin í Element"
 }

src/i18n/strings/it.json

@@ -21,12 +21,20 @@
         "invalid_json_generic": "JSON non valido",
         "misconfigured": "Il tuo elemento è configurato male"
     },
+    "failed_to_start": "Avvio fallito",
+    "go_to_element_io": "Vai su element.io",
     "incompatible_browser": {
+        "browser_links": "Installa <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> per una migliore esperienza.",
+        "continue_warning": "Capisco i rischi e desidero continuare",
+        "feature_warning": "Puoi comunque usare il browser attuale, ma alcune o tutte le caratteristiche potrebbero non funzionare e l'aspetto dell'applicazione potrebbe essere sbagliato.",
+        "features": "%(brand)s usa funzionalità avanzate del browser che non sono supportate dal tuo browser attuale.",
+        "summary": "Il tuo browser non può eseguire %(brand)s",
         "title": "Browser non supportato"
     },
     "powered_by_matrix": "Offerto da Matrix",
     "powered_by_matrix_with_logo": "Chat e collaborazioni criptate e decentralizzate offerte da $matrixLogo",
     "unknown_device": "Dispositivo sconosciuto",
+    "use_brand_on_mobile": "Usa %(brand)s su mobile",
     "web_default_device_name": "%(appName)s: %(browserName)s su %(osName)s",
     "welcome_to_element": "Benvenuti su Element"
 }