diff --git a/.github/workflows/element-web.yaml b/.github/workflows/element-web.yaml
deleted file mode 100644
index 8ac5e2da94..0000000000
--- a/.github/workflows/element-web.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-# Produce a build of element-web with this version of react-sdk
-# and any matching branches of element-web and js-sdk, output it
-# as an artifact and run integration tests.
-name: Element Web - Build
-on:
-    pull_request: {}
-    merge_group:
-        types: [checks_requested]
-    push:
-        branches: [develop, master]
-    repository_dispatch:
-        types: [upstream-sdk-notify]
-
-    # support triggering from other workflows
-    workflow_call:
-        inputs:
-            react-sdk-repository:
-                type: string
-                required: true
-                description: "The name of the github repository to check out and build."
-
-            matrix-js-sdk-sha:
-                type: string
-                required: false
-                description: "The Git SHA of matrix-js-sdk to build against. By default, will use a matching branch name if it exists, or develop."
-            element-web-sha:
-                type: string
-                required: false
-                description: "The Git SHA of element-web to build against. By default, will use a matching branch name if it exists, or develop."
-
-concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
-    cancel-in-progress: true
-
-env:
-    # fetchdep.sh needs to know our PR number
-    PR_NUMBER: ${{ github.event.pull_request.number }}
-
-jobs:
-    build:
-        name: "Build Element-Web"
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  repository: ${{ inputs.react-sdk-repository || github.repository }}
-
-            - uses: actions/setup-node@v4
-              with:
-                  cache: "yarn"
-
-            - name: Fetch layered build
-              id: layered_build
-              env:
-                  # tell layered.sh to check out the right sha of the JS-SDK & EW, if they were given one
-                  JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
-                  ELEMENT_WEB_GITHUB_BASE_REF: ${{ inputs.element-web-sha }}
-              run: |
-                  scripts/ci/layered.sh
-                  JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
-                  REACT_SHA=$(git rev-parse --short=12 HEAD)
-                  VECTOR_SHA=$(git -C element-web rev-parse --short=12 HEAD)
-                  echo "VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA" >> $GITHUB_OUTPUT
-
-            - name: Copy config
-              run: cp element.io/develop/config.json config.json
-              working-directory: ./element-web
-
-            - name: Build
-              env:
-                  CI_PACKAGE: true
-                  VERSION: "${{ steps.layered_build.outputs.VERSION }}"
-              run: |
-                  yarn build
-                  echo $VERSION > webapp/version
-              working-directory: ./element-web
-
-            # Record the react-sdk sha so our Playwright tests are from the same sha
-            - name: Record react-sdk SHA
-              run: |
-                  git rev-parse HEAD > element-web/webapp/sha
-
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v4
-              with:
-                  name: previewbuild
-                  path: element-web/webapp
-                  # We'll only use this in a triggered job, then we're done with it
-                  retention-days: 1
diff --git a/.github/workflows/end-to-end-tests-netlify.yaml b/.github/workflows/end-to-end-tests-netlify.yaml
new file mode 100644
index 0000000000..84c00b9f12
--- /dev/null
+++ b/.github/workflows/end-to-end-tests-netlify.yaml
@@ -0,0 +1,67 @@
+# Triggers after the playwright tests have finished,
+# taking the artifact and uploading it to Netlify for easier viewing
+name: Upload End to End Test report to Netlify
+on:
+    workflow_run:
+        workflows: ["End to End Tests"]
+        types:
+            - completed
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch || github.run_id }}
+    cancel-in-progress: ${{ github.event.workflow_run.event == 'pull_request' }}
+
+jobs:
+    report:
+        name: Report results
+        runs-on: ubuntu-latest
+        environment: Netlify
+        permissions:
+            statuses: write
+            deployments: write
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  persist-credentials: false
+
+            - uses: actions/setup-node@v4
+              with:
+                  cache: "yarn"
+
+            - name: Install dependencies
+              run: yarn install --frozen-lockfile
+
+            - name: Download blob reports from GitHub Actions Artifacts
+              uses: actions/download-artifact@v4
+              with:
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  run-id: ${{ github.event.workflow_run.id }}
+                  pattern: all-blob-reports-*
+                  path: all-blob-reports
+                  merge-multiple: true
+
+            - name: Merge into HTML Report
+              run: yarn playwright merge-reports --reporter=html,github,./playwright/flaky-reporter.ts ./all-blob-reports
+              env:
+                  # Only pass creds to the flaky-reporter on main branch runs
+                  GITHUB_TOKEN: ${{ github.event.workflow_run.head_branch == 'develop' && secrets.ELEMENT_BOT_TOKEN || '' }}
+
+            - name: Upload HTML report
+              uses: actions/upload-artifact@v4
+              with:
+                  name: html-report--attempt-${{ github.run_attempt }}
+                  path: playwright-report
+                  retention-days: 14
+
+            - name: 📤 Deploy to Netlify
+              uses: matrix-org/netlify-pr-preview@v3
+              with:
+                  path: playwright-report
+                  owner: ${{ github.event.workflow_run.head_repository.owner.login }}
+                  branch: ${{ github.event.workflow_run.head_branch }}
+                  revision: ${{ github.event.workflow_run.head_sha }}
+                  token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+                  site_id: ${{ secrets.NETLIFY_SITE_ID }}
+                  desc: Playwright Report
+                  deployment_env: EndToEndTests
+                  prefix: "e2e-"
diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
index 3228fe91b3..391197fb53 100644
--- a/.github/workflows/end-to-end-tests.yaml
+++ b/.github/workflows/end-to-end-tests.yaml
@@ -1,90 +1,121 @@
-# Triggers after the layered build has finished, taking the artifact and running Playwright on it
+# Produce a build of element-web with this version of react-sdk
+# and any matching branches of element-web and js-sdk, output it
+# as an artifact and run end-to-end tests.
 name: End to End Tests
 on:
-    workflow_run:
-        workflows: ["Element Web - Build"]
-        types:
-            - completed
+    pull_request: {}
+    merge_group:
+        types: [checks_requested]
+    push:
+        branches: [develop, master]
+    repository_dispatch:
+        types: [upstream-sdk-notify]
 
-    # support calls from other workflows for downstream testing
+    # support triggering from other workflows
     workflow_call:
         inputs:
+            skip:
+                type: boolean
+                required: false
+                default: false
+                description: "A boolean to skip the playwright check itself while still creating the passing check. Useful when only running in Merge Queues."
+
             react-sdk-repository:
                 type: string
                 required: true
                 description: "The name of the github repository to check out and build."
-        secrets:
-            ELEMENT_BOT_TOKEN:
-                required: true
+
+            matrix-js-sdk-sha:
+                type: string
+                required: false
+                description: "The Git SHA of matrix-js-sdk to build against. By default, will use a matching branch name if it exists, or develop."
+            element-web-sha:
+                type: string
+                required: false
+                description: "The Git SHA of element-web to build against. By default, will use a matching branch name if it exists, or develop."
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch || github.run_id }}
-    cancel-in-progress: ${{ github.event.workflow_run.event == 'pull_request' }}
+    group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+    cancel-in-progress: true
+
+env:
+    # fetchdep.sh needs to know our PR number
+    PR_NUMBER: ${{ github.event.pull_request.number }}
 
 jobs:
-    prepare:
-        name: Prepare
-        if: github.event.workflow_run.conclusion == 'success'
+    build:
+        name: "Build Element-Web"
         runs-on: ubuntu-latest
-        permissions:
-            statuses: write
         steps:
-            # We create the status here and then update it to success/failure in the `report` stage
-            # This provides an easy link to this workflow_run from the PR before the tests are done.
-            - uses: Sibz/github-status-action@071b5370da85afbb16637d6eed8524a06bc2053e # v1
+            - name: Checkout code
+              uses: actions/checkout@v4
               with:
-                  authToken: ${{ secrets.GITHUB_TOKEN }}
-                  state: pending
-                  context: ${{ github.workflow }} / end-to-end-tests
-                  sha: ${{ github.event.workflow_run.head_sha }}
-                  target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+                  repository: ${{ inputs.react-sdk-repository || github.repository }}
 
-    tests:
+            - uses: actions/setup-node@v4
+              with:
+                  cache: "yarn"
+
+            - name: Fetch layered build
+              id: layered_build
+              env:
+                  # tell layered.sh to check out the right sha of the JS-SDK & EW, if they were given one
+                  JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
+                  ELEMENT_WEB_GITHUB_BASE_REF: ${{ inputs.element-web-sha }}
+              run: |
+                  scripts/ci/layered.sh
+                  JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
+                  REACT_SHA=$(git rev-parse --short=12 HEAD)
+                  VECTOR_SHA=$(git -C element-web rev-parse --short=12 HEAD)
+                  echo "VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA" >> $GITHUB_OUTPUT
+
+            - name: Copy config
+              run: cp element.io/develop/config.json config.json
+              working-directory: ./element-web
+
+            - name: Build
+              env:
+                  CI_PACKAGE: true
+                  VERSION: "${{ steps.layered_build.outputs.VERSION }}"
+              run: |
+                  yarn build
+                  echo $VERSION > webapp/version
+              working-directory: ./element-web
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: webapp
+                  path: element-web/webapp
+                  retention-days: 1
+
+    playwright:
         name: "Run Tests ${{ matrix.runner }}/${{ strategy.job-total }}"
-        needs: prepare
+        needs: build
+        if: inputs.skip != true
         runs-on: ubuntu-latest
         permissions:
             actions: read
             issues: read
             pull-requests: read
-        environment: EndToEndTests
         strategy:
             fail-fast: false
             matrix:
                 # Run multiple instances in parallel to speed up the tests
                 runner: [1, 2, 3, 4, 5, 6, 7, 8]
         steps:
-            - name: 📥 Download artifact
-              uses: actions/download-artifact@v4
-              with:
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  run-id: ${{ github.event.workflow_run.id }}
-                  name: previewbuild
-                  path: webapp
-
-            # The workflow_run.head_sha is the sha of the head commit but the element-web was built using a simulated
-            # merge commit - https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request
-            # so use the sha from the tarball for the checkout of the tests
-            # to make sure we get a matching set of code and tests.
-            - name: Grab sha from webapp
-              id: sha
-              run: |
-                  echo "sha=$(cat webapp/sha)" >> $GITHUB_OUTPUT
-
             - uses: actions/checkout@v4
               with:
-                  # XXX: We're checking out untrusted code in a secure context
-                  # We need to be careful to not trust anything this code outputs/may do
-                  #
-                  # Note that (in the absence of a `react-sdk-repository` input),
-                  # we check out from the default repository, which is (for this workflow) the
-                  # *target* repository for the pull request.
-                  #
-                  ref: ${{ steps.sha.outputs.sha }}
                   persist-credentials: false
                   path: matrix-react-sdk
                   repository: ${{ inputs.react-sdk-repository || github.repository }}
 
+            - name: 📥 Download artifact
+              uses: actions/download-artifact@v4
+              with:
+                  name: webapp
+                  path: webapp
+
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
@@ -126,66 +157,11 @@ jobs:
                   path: matrix-react-sdk/blob-report
                   retention-days: 1
 
-    report:
-        name: Report results
-        needs: tests
-        runs-on: ubuntu-latest
-        environment: Netlify
+    complete:
+        name: end-to-end-tests
+        needs: playwright
         if: always()
-        permissions:
-            statuses: write
-            deployments: write
+        runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v4
-              with:
-                  persist-credentials: false
-                  repository: ${{ inputs.react-sdk-repository || github.repository }}
-
-            - uses: actions/setup-node@v4
-              with:
-                  cache: "yarn"
-
-            - name: Install dependencies
-              run: yarn install --frozen-lockfile
-
-            - name: Download blob reports from GitHub Actions Artifacts
-              uses: actions/download-artifact@v4
-              with:
-                  pattern: all-blob-reports-*
-                  path: all-blob-reports
-                  merge-multiple: true
-
-            - name: Merge into HTML Report
-              run: yarn playwright merge-reports --reporter=html,github,./playwright/flaky-reporter.ts ./all-blob-reports
-              env:
-                  # Only pass creds to the flaky-reporter on main branch runs
-                  GITHUB_TOKEN: ${{ github.event.workflow_run.head_branch == 'develop' && secrets.ELEMENT_BOT_TOKEN || '' }}
-
-            - name: Upload HTML report
-              uses: actions/upload-artifact@v4
-              with:
-                  name: html-report--attempt-${{ github.run_attempt }}
-                  path: playwright-report
-                  retention-days: 14
-
-            - uses: Sibz/github-status-action@071b5370da85afbb16637d6eed8524a06bc2053e # v1
-              if: always()
-              with:
-                  authToken: ${{ secrets.GITHUB_TOKEN }}
-                  state: ${{ needs.tests.result == 'success' && 'success' || 'failure' }}
-                  context: ${{ github.workflow }} / end-to-end-tests
-                  sha: ${{ github.event.workflow_run.head_sha }}
-                  target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
-
-            - name: 📤 Deploy to Netlify
-              uses: matrix-org/netlify-pr-preview@v3
-              with:
-                  path: playwright-report
-                  owner: ${{ github.event.workflow_run.head_repository.owner.login }}
-                  branch: ${{ github.event.workflow_run.head_branch }}
-                  revision: ${{ github.event.workflow_run.head_sha }}
-                  token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-                  site_id: ${{ secrets.NETLIFY_SITE_ID }}
-                  desc: Playwright Report
-                  deployment_env: EndToEndTests
-                  prefix: "e2e-"
+            - run: exit 1
+              if: failure() || cancelled()
diff --git a/.github/workflows/netlify.yaml b/.github/workflows/netlify.yaml
index 21c6f22df0..1fe6a9a2cc 100644
--- a/.github/workflows/netlify.yaml
+++ b/.github/workflows/netlify.yaml
@@ -3,7 +3,7 @@
 name: Upload Preview Build to Netlify
 on:
     workflow_run:
-        workflows: ["Element Web - Build"]
+        workflows: ["End to End Tests"]
         types:
             - completed
 jobs:
@@ -29,7 +29,7 @@ jobs:
               with:
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   run-id: ${{ github.event.workflow_run.id }}
-                  name: previewbuild
+                  name: webapp
                   path: webapp
 
             - name: 📤 Deploy to Netlify
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b21e44fd11..440239db81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+Changes in [3.98.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.98.0) (2024-04-23)
+=====================================================================================================
+## ✨ Features
+
+* Make empty state copy for TAC depend on the value of the setting ([#12419](https://github.com/matrix-org/matrix-react-sdk/pull/12419)). Contributed by @dbkr.
+* Linkify User Interactive Authentication errors ([#12271](https://github.com/matrix-org/matrix-react-sdk/pull/12271)). Contributed by @t3chguy.
+* Add support for device dehydration v2 ([#12316](https://github.com/matrix-org/matrix-react-sdk/pull/12316)). Contributed by @uhoreg.
+* Replace `SecurityCustomisations` with `CryptoSetupExtension` ([#12342](https://github.com/matrix-org/matrix-react-sdk/pull/12342)). Contributed by @thoraj.
+* Add activity toggle for TAC ([#12413](https://github.com/matrix-org/matrix-react-sdk/pull/12413)). Contributed by @dbkr.
+* Humanize spell check language labels ([#12409](https://github.com/matrix-org/matrix-react-sdk/pull/12409)). Contributed by @t3chguy.
+* Call Guest Access, give user the option to change the acces level so they can generate a call link. ([#12401](https://github.com/matrix-org/matrix-react-sdk/pull/12401)). Contributed by @toger5.
+* TAC: Release Announcement ([#12380](https://github.com/matrix-org/matrix-react-sdk/pull/12380)). Contributed by @florianduros.
+* Show the call and share button if the user can create a guest link. ([#12385](https://github.com/matrix-org/matrix-react-sdk/pull/12385)). Contributed by @toger5.
+* Add analytics for mark all threads unread ([#12384](https://github.com/matrix-org/matrix-react-sdk/pull/12384)). Contributed by @dbkr.
+* Add `EventType.RoomEncryption` to the auto approve capabilities of Element Call widgets ([#12386](https://github.com/matrix-org/matrix-react-sdk/pull/12386)). Contributed by @toger5.
+
+## 🐛 Bug Fixes
+
+* Fix link modal not shown after access upgrade ([#12411](https://github.com/matrix-org/matrix-react-sdk/pull/12411)). Contributed by @toger5.
+* Fix thread navigation in timeline ([#12412](https://github.com/matrix-org/matrix-react-sdk/pull/12412)). Contributed by @florianduros.
+* Fix inability to join a `knock` room via space hierarchy view ([#12404](https://github.com/matrix-org/matrix-react-sdk/pull/12404)). Contributed by @t3chguy.
+* Focus the thread panel when clicking on an item in the TAC ([#12410](https://github.com/matrix-org/matrix-react-sdk/pull/12410)). Contributed by @dbkr.
+* Fix space hierarchy tile busy state being stuck after join error ([#12405](https://github.com/matrix-org/matrix-react-sdk/pull/12405)). Contributed by @t3chguy.
+* Fix room topic in-app links not being handled correctly on topic dialog ([#12406](https://github.com/matrix-org/matrix-react-sdk/pull/12406)). Contributed by @t3chguy.
+
+
 Changes in [3.97.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.97.0) (2024-04-09)
 =====================================================================================================
 ## ✨ Features
diff --git a/package.json b/package.json
index 72cd0fee50..227f1f62c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "matrix-react-sdk",
-    "version": "3.97.0",
+    "version": "3.98.0",
     "description": "SDK for matrix.org using React",
     "author": "matrix.org",
     "repository": {
@@ -60,14 +60,14 @@
         "lint:workflows": "find .github/workflows -type f \\( -iname '*.yaml' -o -iname '*.yml' \\) | xargs -I {} sh -c 'echo \"Linting {}\"; action-validator \"{}\"'"
     },
     "resolutions": {
-        "@types/react-dom": "17.0.21",
-        "@types/react": "17.0.68",
+        "@types/react-dom": "17.0.25",
+        "@types/react": "17.0.80",
         "oidc-client-ts": "3.0.1",
         "jwt-decode": "4.0.0"
     },
     "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@matrix-org/analytics-events": "^0.19.0",
+        "@matrix-org/analytics-events": "^0.20.0",
         "@matrix-org/emojibase-bindings": "^1.1.2",
         "@matrix-org/matrix-wysiwyg": "2.17.0",
         "@matrix-org/olm": "3.2.15",
@@ -76,7 +76,7 @@
         "@sentry/browser": "^7.0.0",
         "@testing-library/react-hooks": "^8.0.1",
         "@vector-im/compound-design-tokens": "^1.2.0",
-        "@vector-im/compound-web": "^4.0.2",
+        "@vector-im/compound-web": "^4.1.0",
         "@zxcvbn-ts/core": "^3.0.4",
         "@zxcvbn-ts/language-common": "^3.0.4",
         "@zxcvbn-ts/language-en": "^3.0.2",
@@ -116,7 +116,7 @@
         "opus-recorder": "^8.0.3",
         "pako": "^2.0.3",
         "png-chunks-extract": "^1.0.0",
-        "posthog-js": "1.126.0",
+        "posthog-js": "1.130.1",
         "proposal-temporal": "^0.9.0",
         "qrcode": "1.5.3",
         "re-resizable": "^6.9.0",
@@ -176,9 +176,9 @@
         "@types/node-fetch": "^2.6.2",
         "@types/pako": "^2.0.0",
         "@types/qrcode": "^1.3.5",
-        "@types/react": "17.0.68",
+        "@types/react": "17.0.80",
         "@types/react-beautiful-dnd": "^13.0.0",
-        "@types/react-dom": "17.0.21",
+        "@types/react-dom": "17.0.25",
         "@types/react-transition-group": "^4.4.0",
         "@types/sanitize-html": "2.11.0",
         "@types/sdp-transform": "^2.4.6",
@@ -223,7 +223,7 @@
         "stylelint-config-standard": "^36.0.0",
         "stylelint-scss": "^6.0.0",
         "ts-node": "^10.9.1",
-        "typescript": "5.4.3"
+        "typescript": "5.4.5"
     },
     "peerDependencies": {
         "postcss": "^8.4.19",
diff --git a/playwright/e2e/crypto/crypto.spec.ts b/playwright/e2e/crypto/crypto.spec.ts
index 957be58711..323e1eb703 100644
--- a/playwright/e2e/crypto/crypto.spec.ts
+++ b/playwright/e2e/crypto/crypto.spec.ts
@@ -15,14 +15,17 @@ limitations under the License.
 */
 
 import type { Page } from "@playwright/test";
-import { test, expect } from "../../element-web-test";
+import { expect, test } from "../../element-web-test";
 import {
+    copyAndContinue,
+    createRoom,
     createSharedRoomWithUser,
     doTwoWaySasVerification,
-    copyAndContinue,
     enableKeyBackup,
     logIntoElement,
     logOutOfElement,
+    sendMessageInCurrentRoom,
+    verifySession,
     waitForVerificationRequest,
 } from "./utils";
 import { Bot } from "../../pages/bot";
@@ -453,8 +456,8 @@ test.describe("Cryptography", function () {
             // no e2e icon
             await expect(lastTileE2eIcon).not.toBeVisible();
 
-            // It can take up to 10 seconds for the key to be backed up. We don't really have much option other than
-            // to wait :/
+            // Workaround for https://github.com/element-hq/element-web/issues/27267. It can take up to 10 seconds for
+            // the key to be backed up.
             await page.waitForTimeout(10000);
 
             /* log out, and back in */
@@ -532,4 +535,69 @@ test.describe("Cryptography", function () {
             ).not.toBeVisible();
         });
     });
+
+    test.describe("decryption failure messages", () => {
+        test("should handle device-relative historical messages", async ({
+            homeserver,
+            page,
+            app,
+            credentials,
+            user,
+            cryptoBackend,
+        }) => {
+            test.skip(cryptoBackend === "legacy", "Not implemented for legacy crypto");
+            test.setTimeout(60000);
+
+            // Start with a logged-in session, without key backup, and send a message.
+            await createRoom(page, "Test room", true);
+            await sendMessageInCurrentRoom(page, "test test");
+
+            // Log out, discarding the key for the sent message.
+            await logOutOfElement(page, true);
+
+            // Log in again, and see how the message looks.
+            await logIntoElement(page, homeserver, credentials);
+            await app.viewRoomByName("Test room");
+            const lastTile = page.locator(".mx_EventTile").last();
+            await expect(lastTile).toContainText("Historical messages are not available on this device");
+            await expect(lastTile.locator(".mx_EventTile_e2eIcon_decryption_failure")).toBeVisible();
+
+            // Now, we set up key backup, and then send another message.
+            const secretStorageKey = await enableKeyBackup(app);
+            await app.viewRoomByName("Test room");
+            await sendMessageInCurrentRoom(page, "test2 test2");
+
+            // Workaround for https://github.com/element-hq/element-web/issues/27267. It can take up to 10 seconds for
+            // the key to be backed up.
+            await page.waitForTimeout(10000);
+
+            // Finally, log out again, and back in, skipping verification for now, and see what we see.
+            await logOutOfElement(page);
+            await logIntoElement(page, homeserver, credentials);
+            await page.locator(".mx_AuthPage").getByRole("button", { name: "Skip verification for now" }).click();
+            await page.locator(".mx_AuthPage").getByRole("button", { name: "I'll verify later" }).click();
+            await app.viewRoomByName("Test room");
+
+            // There should be two historical events in the timeline
+            const tiles = await page.locator(".mx_EventTile").all();
+            expect(tiles.length).toBeGreaterThanOrEqual(2);
+            // look at the last two tiles only
+            for (const tile of tiles.slice(-2)) {
+                await expect(tile).toContainText("You need to verify this device for access to historical messages");
+                await expect(tile.locator(".mx_EventTile_e2eIcon_decryption_failure")).toBeVisible();
+            }
+
+            // Now verify our device (setting up key backup), and check what happens
+            await verifySession(app, secretStorageKey);
+            const tilesAfterVerify = (await page.locator(".mx_EventTile").all()).slice(-2);
+
+            // The first message still cannot be decrypted, because it was never backed up. It's now a regular UTD though.
+            await expect(tilesAfterVerify[0]).toContainText("Unable to decrypt message");
+            await expect(tilesAfterVerify[0].locator(".mx_EventTile_e2eIcon_decryption_failure")).toBeVisible();
+
+            // The second message should now be decrypted, with a grey shield
+            await expect(tilesAfterVerify[1]).toContainText("test2 test2");
+            await expect(tilesAfterVerify[1].locator(".mx_EventTile_e2eIcon_normal")).toBeVisible();
+        });
+    });
 });
diff --git a/playwright/e2e/crypto/utils.ts b/playwright/e2e/crypto/utils.ts
index d43e4c7f94..5b0bf29b97 100644
--- a/playwright/e2e/crypto/utils.ts
+++ b/playwright/e2e/crypto/utils.ts
@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { type Page, expect, JSHandle } from "@playwright/test";
+import { expect, JSHandle, type Page } from "@playwright/test";
 
 import type { CryptoEvent, ICreateRoomOpts, MatrixClient } from "matrix-js-sdk/src/matrix";
 import type {
+    EmojiMapping,
+    ShowSasCallbacks,
     VerificationRequest,
     Verifier,
-    EmojiMapping,
     VerifierEvent,
-    ShowSasCallbacks,
 } from "matrix-js-sdk/src/crypto-api";
 import { Credentials, HomeserverInstance } from "../../plugins/homeserver";
 import { Client } from "../../pages/client";
@@ -148,7 +148,7 @@ export async function logIntoElement(
     // select homeserver
     await page.getByRole("button", { name: "Edit" }).click();
     await page.getByRole("textbox", { name: "Other homeserver" }).fill(homeserver.config.baseUrl);
-    await page.getByRole("button", { name: "Continue" }).click();
+    await page.getByRole("button", { name: "Continue", exact: true }).click();
 
     // wait for the dialog to go away
     await expect(page.locator(".mx_ServerPickerDialog")).not.toBeVisible();
@@ -167,15 +167,40 @@ export async function logIntoElement(
     }
 }
 
-export async function logOutOfElement(page: Page) {
+/**
+ * Click the "sign out" option in Element, and wait for the login page to load
+ *
+ * @param page - Playwright `Page` object.
+ * @param discardKeys - if true, expect a "You'll lose access to your encrypted messages" dialog, and dismiss it.
+ */
+export async function logOutOfElement(page: Page, discardKeys: boolean = false) {
     await page.getByRole("button", { name: "User menu" }).click();
     await page.locator(".mx_UserMenu_contextMenu").getByRole("menuitem", { name: "Sign out" }).click();
-    await page.locator(".mx_Dialog .mx_QuestionDialog").getByRole("button", { name: "Sign out" }).click();
+    if (discardKeys) {
+        await page.getByRole("button", { name: "I don't want my encrypted messages" }).click();
+    } else {
+        await page.locator(".mx_Dialog .mx_QuestionDialog").getByRole("button", { name: "Sign out" }).click();
+    }
 
     // Wait for the login page to load
     await page.getByRole("heading", { name: "Sign in" }).click();
 }
 
+/**
+ * Open the security settings, and verify the current session using the security key.
+ *
+ * @param app - `ElementAppPage` wrapper for the playwright `Page`.
+ * @param securityKey - The security key (i.e., 4S key), set up during a previous session.
+ */
+export async function verifySession(app: ElementAppPage, securityKey: string) {
+    const settings = await app.settings.openUserSettings("Security & Privacy");
+    await settings.getByRole("button", { name: "Verify this session" }).click();
+    await app.page.getByRole("button", { name: "Verify with Security Key" }).click();
+    await app.page.locator(".mx_Dialog").locator('input[type="password"]').fill(securityKey);
+    await app.page.getByRole("button", { name: "Continue", disabled: false }).click();
+    await app.page.getByRole("button", { name: "Done" }).click();
+}
+
 /**
  * Given a SAS verifier for a bot client:
  *   - wait for the bot to receive the emojis
@@ -289,4 +314,9 @@ export async function createRoom(page: Page, roomName: string, isEncrypted: bool
     }
 
     await dialog.getByRole("button", { name: "Create room" }).click();
+
+    // Wait for the client to process the encryption event before carrying on (and potentially sending events).
+    if (isEncrypted) {
+        await expect(page.getByText("Encryption enabled")).toBeVisible();
+    }
 }
diff --git a/playwright/e2e/read-receipts/editing-messages.spec.ts b/playwright/e2e/read-receipts/editing-messages.spec.ts
index 49db3bdfbe..5005ad62bf 100644
--- a/playwright/e2e/read-receipts/editing-messages.spec.ts
+++ b/playwright/e2e/read-receipts/editing-messages.spec.ts
@@ -187,11 +187,11 @@ test.describe("Read receipts", () => {
                 // Given we have read the thread
                 await util.goTo(room1);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Resp1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Msg1");
                 await util.assertRead(room2);
-                await util.backToThreadsList();
+                await util.assertReadThread("Resp1");
                 await util.goTo(room1);
 
                 // When a message inside it is edited
@@ -202,6 +202,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room2);
                 await util.assertReadThread("Msg1");
             });
+
             test("Reading an edit of a threaded message makes the room read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -211,11 +212,11 @@ test.describe("Read receipts", () => {
                 // Given an edited thread message appears after we read it
                 await util.goTo(room1);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Resp1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Msg1");
                 await util.assertRead(room2);
-                await util.backToThreadsList();
+                await util.assertReadThread("Resp1");
                 await util.goTo(room1);
                 await util.receiveMessages(room2, [msg.editOf("Resp1", "Edit1")]);
                 await util.assertStillRead(room2);
@@ -228,6 +229,7 @@ test.describe("Read receipts", () => {
                 await util.assertStillRead(room2);
                 await util.assertReadThread("Msg1");
             });
+
             test("Marking a room as read after an edit in a thread makes it read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -241,14 +243,16 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Msg1", "Resp1"),
                     msg.editOf("Resp1", "Edit1"),
                 ]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
 
                 // When I mark the room as read
                 await util.markAsRead(room2);
 
                 // Then it is read
                 await util.assertRead(room2);
+                await util.assertReadThread("Msg1");
             });
+
             test("Editing a thread message after marking as read leaves the room read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -258,7 +262,7 @@ test.describe("Read receipts", () => {
                 // Given a room is marked as read
                 await util.goTo(room1);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Resp1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.markAsRead(room2);
                 await util.assertRead(room2);
 
@@ -267,7 +271,9 @@ test.describe("Read receipts", () => {
 
                 // Then the room remains read
                 await util.assertStillRead(room2);
+                await util.assertReadThread("Msg1");
             });
+
             test("A room with an edited threaded message is still read after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -287,6 +293,7 @@ test.describe("Read receipts", () => {
                 // Then is it still read
                 await util.assertRead(room2);
             });
+
             test("A room where all threaded edits are read is still read after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -295,20 +302,23 @@ test.describe("Read receipts", () => {
             }) => {
                 await util.goTo(room1);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Resp1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.receiveMessages(room2, [msg.editOf("Resp1", "Edit1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
 
                 await util.goTo(room2);
 
                 await util.openThread("Msg1");
                 await util.assertRead(room2);
+                await util.assertReadThread("Msg1");
                 await util.goTo(room1); // Make sure we are looking at room1 after reload
                 await util.assertStillRead(room2);
 
                 await util.saveAndReload();
                 await util.assertRead(room2);
+                await util.assertReadThread("Msg1");
             });
+
             test("A room where all threaded edits are marked as read is still read after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -321,15 +331,17 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Msg1", "Resp1"),
                     msg.editOf("Resp1", "Edit1"),
                 ]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.markAsRead(room2);
                 await util.assertRead(room2);
+                await util.assertReadThread("Msg1");
 
                 // When I restart
                 await util.saveAndReload();
 
                 // It is still read
                 await util.assertRead(room2);
+                await util.assertReadThread("Msg1");
             });
         });
 
@@ -343,7 +355,7 @@ test.describe("Read receipts", () => {
                 // Given I have read a thread
                 await util.goTo(room1);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Resp1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Msg1");
                 await util.backToThreadsList();
@@ -361,6 +373,7 @@ test.describe("Read receipts", () => {
                 await util.assertStillRead(room2);
                 await util.assertReadThread("Edit1");
             });
+
             test("Reading an edit of a thread root leaves the room read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -386,6 +399,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room1);
                 await util.assertStillRead(room2);
             });
+
             test("Editing a thread root after reading leaves the room read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -405,6 +419,7 @@ test.describe("Read receipts", () => {
                 // Then the room stays read
                 await util.assertStillRead(room2);
             });
+
             test("Marking a room as read after an edit of a thread root keeps it read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -431,6 +446,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room1);
                 await util.assertStillRead(room2);
             });
+
             test("Editing a thread root that is a reply after marking as read leaves the room read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -444,7 +460,7 @@ test.describe("Read receipts", () => {
                     msg.replyTo("Msg", "Reply"),
                     msg.threadedOff("Reply", "InThread"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 2);
                 await util.markAsRead(room2);
                 await util.assertRead(room2);
 
@@ -458,6 +474,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room2);
                 await util.assertReadThread("Edited Reply");
             });
+
             test("Marking a room as read after an edit of a thread root that is a reply leaves it read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -472,7 +489,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Reply", "InThread"),
                 ]);
                 await util.receiveMessages(room2, [msg.editOf("Reply", "Edited Reply")]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 2);
 
                 // When I mark the room as read
                 await util.markAsRead(room2);
diff --git a/playwright/e2e/read-receipts/high-level.spec.ts b/playwright/e2e/read-receipts/high-level.spec.ts
index 897e752ac4..e237afd64a 100644
--- a/playwright/e2e/read-receipts/high-level.spec.ts
+++ b/playwright/e2e/read-receipts/high-level.spec.ts
@@ -224,15 +224,15 @@ test.describe("Read receipts", () => {
                 ...msg.manyThreadedOff("Root3", many("T", 20)),
             ]);
             await util.goTo(room2);
-            await util.assertUnread(room2, 60);
+            await util.assertRead(room2);
+            await util.assertUnreadThread("Root1");
+            await util.assertUnreadThread("Root2");
+            await util.assertUnreadThread("Root3");
             await util.openThread("Root1");
-            await util.assertUnread(room2, 40);
             await util.assertReadThread("Root1");
             await util.openThread("Root2");
-            await util.assertUnread(room2, 20);
             await util.assertReadThread("Root2");
             await util.openThread("Root3");
-            await util.assertRead(room2);
             await util.assertReadThread("Root3");
 
             // When I restart and page up to load old thread roots
@@ -247,6 +247,7 @@ test.describe("Read receipts", () => {
             await util.assertReadThread("Root2");
             await util.assertReadThread("Root3");
         });
+
         test("Paging up to find old threads that were never read keeps the room unread", async ({
             cryptoBackend,
             roomAlpha: room1,
@@ -268,7 +269,7 @@ test.describe("Read receipts", () => {
                 ...many("Msg", 100),
             ]);
             await util.goTo(room2);
-            await util.assertUnread(room2, 6);
+            await util.assertRead(room2);
             await util.assertUnreadThread("Root1");
             await util.assertUnreadThread("Root2");
             await util.assertUnreadThread("Root3");
@@ -278,20 +279,21 @@ test.describe("Read receipts", () => {
             await util.goTo(room1);
             await util.saveAndReload();
 
-            // Then the room remembers it's unread
+            // Then the room remembers it's read
             // TODO: I (andyb) think this will fall in an encrypted room
-            await util.assertUnread(room2, 6);
+            await util.assertRead(room2);
 
             // And when I page up to load old thread roots
             await util.goTo(room2);
             await util.pageUp();
 
-            // Then the room remains unread
-            await util.assertUnread(room2, 6);
+            // Then the room remains read
+            await util.assertRead(room2);
             await util.assertUnreadThread("Root1");
             await util.assertUnreadThread("Root2");
             await util.assertUnreadThread("Root3");
         });
+
         test("Looking in thread view to find old threads that were never read makes the room unread", async ({
             roomAlpha: room1,
             roomBeta: room2,
@@ -310,7 +312,7 @@ test.describe("Read receipts", () => {
                 ...many("Msg", 100),
             ]);
             await util.goTo(room2);
-            await util.assertUnread(room2, 6);
+            await util.assertRead(room2);
             await util.assertUnreadThread("Root1");
             await util.assertUnreadThread("Root2");
             await util.assertUnreadThread("Root3");
@@ -320,20 +322,21 @@ test.describe("Read receipts", () => {
             await util.goTo(room1);
             await util.saveAndReload();
 
-            // Then the room remembers it's unread
+            // Then the room remembers it's read
             // TODO: I (andyb) think this will fall in an encrypted room
-            await util.assertUnread(room2, 6);
+            await util.assertRead(room2);
 
             // And when I open the threads view
             await util.goTo(room2);
             await util.openThreadList();
 
-            // Then the room remains unread
-            await util.assertUnread(room2, 6);
+            // Then the room remains read
+            await util.assertRead(room2);
             await util.assertUnreadThread("Root1");
             await util.assertUnreadThread("Root2");
             await util.assertUnreadThread("Root3");
         });
+
         test("After marking room as read, paging up to find old threads that were never read leaves the room read", async ({
             cryptoBackend,
             roomAlpha: room1,
diff --git a/playwright/e2e/read-receipts/index.ts b/playwright/e2e/read-receipts/index.ts
index 6b9a8381d2..4dd0450fb9 100644
--- a/playwright/e2e/read-receipts/index.ts
+++ b/playwright/e2e/read-receipts/index.ts
@@ -403,7 +403,7 @@ class Helpers {
      * tests we only open the threads panel.)
      */
     async closeThreadsPanel() {
-        await this.page.locator(".mx_RightPanel").getByTitle("Close").click();
+        await this.page.locator(".mx_RightPanel").getByLabel("Close").click();
         await expect(this.page.locator(".mx_RightPanel")).not.toBeVisible();
     }
 
@@ -411,7 +411,7 @@ class Helpers {
      * Return to the list of threads, given we are viewing a single thread.
      */
     async backToThreadsList() {
-        await this.page.locator(".mx_RightPanel").getByTitle("Threads").click();
+        await this.page.locator(".mx_RightPanel").getByLabel("Threads").click();
     }
 
     /**
@@ -539,7 +539,7 @@ class Helpers {
         const threadPanel = this.page.locator(".mx_ThreadPanel");
         await expect(threadPanel).toBeVisible();
         await threadPanel.evaluate(($panel) => {
-            const $button = $panel.querySelector<HTMLElement>('.mx_BaseCard_back[title="Threads"]');
+            const $button = $panel.querySelector<HTMLElement>('.mx_BaseCard_back[aria-label="Threads"]');
             // If the Threads back button is present then click it - the
             // threads button can open either threads list or thread panel
             if ($button) {
diff --git a/playwright/e2e/read-receipts/new-messages.spec.ts b/playwright/e2e/read-receipts/new-messages.spec.ts
index 14434709ce..97308a4bb2 100644
--- a/playwright/e2e/read-receipts/new-messages.spec.ts
+++ b/playwright/e2e/read-receipts/new-messages.spec.ts
@@ -183,9 +183,13 @@ test.describe("Read receipts", () => {
                 // When I receive a threaded message
                 await util.receiveMessages(room2, [msg.threadedOff("Msg1", "Resp1")]);
 
-                // Then the room becomes unread
-                await util.assertUnread(room2, 1);
+                // Then the room stays read
+                await util.assertRead(room2);
+                // but the thread is unread
+                await util.goTo(room2);
+                await util.assertUnreadThread("Msg1");
             });
+
             test("Reading the last threaded message makes the room read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -195,15 +199,16 @@ test.describe("Read receipts", () => {
                 // Given a thread exists and is not read
                 await util.goTo(room1);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Resp1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
 
                 // When I read it
                 await util.openThread("Msg1");
 
-                // The room becomes read
-                await util.assertRead(room2);
+                // The thread becomes read
+                await util.assertReadThread("Msg1");
             });
+
             test("Reading a thread message makes the thread read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -217,19 +222,20 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Msg1", "Resp1"),
                     msg.threadedOff("Msg1", "Resp2"),
                 ]);
-                await util.assertUnread(room2, 3); // (Sanity)
+                await util.assertUnread(room2, 1); // (Sanity)
 
                 // When I read the main timeline
                 await util.goTo(room2);
 
-                // Then room does appear unread
-                await util.assertUnread(room2, 2);
+                // Then room is read
+                await util.assertRead(room2);
 
-                // Until we open the thread
+                // Reading the thread causes it to become read too
                 await util.openThread("Msg1");
                 await util.assertReadThread("Msg1");
                 await util.assertRead(room2);
             });
+
             test("Reading an older thread message leaves the thread unread", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -242,40 +248,19 @@ test.describe("Read receipts", () => {
                     "ThreadRoot",
                     ...msg.manyThreadedOff("ThreadRoot", many("InThread", 20)),
                 ]);
-                await util.assertUnread(room2, 21);
+                await util.assertUnread(room2, 1);
+                await util.goTo(room2);
+                await util.assertUnreadThread("ThreadRoot");
+                await util.goTo(room1);
 
                 // When I read an older message in the thread
                 await msg.jumpTo(room2.name, "InThread0000", true);
-                await util.assertUnreadLessThan(room2, 21);
 
                 // Then the thread is still marked as unread
                 await util.backToThreadsList();
                 await util.assertUnreadThread("ThreadRoot");
             });
-            test("Reading only one thread's message does not make the room read", async ({
-                roomAlpha: room1,
-                roomBeta: room2,
-                util,
-                msg,
-            }) => {
-                // Given two threads are unread
-                await util.goTo(room1);
-                await util.receiveMessages(room2, [
-                    "Msg1",
-                    msg.threadedOff("Msg1", "Resp1"),
-                    "Msg2",
-                    msg.threadedOff("Msg2", "Resp2"),
-                ]);
-                await util.assertUnread(room2, 4);
-                await util.goTo(room2);
-                await util.assertUnread(room2, 2);
 
-                // When I only read one of them
-                await util.openThread("Msg1");
-
-                // The room is still unread
-                await util.assertUnread(room2, 1);
-            });
             test("Reading only one thread's message makes that thread read but not others", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -290,9 +275,9 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Msg1", "Resp1"),
                     msg.threadedOff("Msg2", "Resp2"),
                 ]);
-                await util.assertUnread(room2, 4); // (Sanity)
+                await util.assertUnread(room2, 2); // (Sanity)
                 await util.goTo(room2);
-                await util.assertUnread(room2, 2);
+                await util.assertRead(room2);
                 await util.assertUnreadThread("Msg1");
                 await util.assertUnreadThread("Msg2");
 
@@ -303,6 +288,7 @@ test.describe("Read receipts", () => {
                 await util.assertReadThread("Msg1");
                 await util.assertUnreadThread("Msg2");
             });
+
             test("Reading the main timeline does not mark a thread message as read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -316,15 +302,16 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Msg1", "Resp1"),
                     msg.threadedOff("Msg1", "Resp2"),
                 ]);
-                await util.assertUnread(room2, 3); // (Sanity)
+                await util.assertUnread(room2, 1); // (Sanity)
 
                 // When I read the main timeline
                 await util.goTo(room2);
-                await util.assertUnread(room2, 2);
+                await util.assertRead(room2);
 
                 // Then thread does appear unread
                 await util.assertUnreadThread("Msg1");
             });
+
             test("Marking a room with unread threads as read makes it read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -338,14 +325,17 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Msg1", "Resp1"),
                     msg.threadedOff("Msg1", "Resp2"),
                 ]);
-                await util.assertUnread(room2, 3); // (Sanity)
+                await util.assertUnread(room2, 1); // (Sanity)
 
                 // When I mark the room as read
                 await util.markAsRead(room2);
 
                 // Then the room is read
                 await util.assertRead(room2);
+                // and so are the threads
+                await util.assertReadThread("Msg1");
             });
+
             test("Sending a new thread message after marking as read makes it unread", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -367,9 +357,11 @@ test.describe("Read receipts", () => {
                 // Then another message appears in the thread
                 await util.receiveMessages(room2, [msg.threadedOff("Msg1", "Resp3")]);
 
-                // Then the room becomes unread
-                await util.assertUnread(room2, 1);
+                // Then the thread becomes unread
+                await util.goTo(room2);
+                await util.assertUnreadThread("Msg1");
             });
+
             test("Sending a new different-thread message after marking as read makes it unread", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -381,11 +373,8 @@ test.describe("Read receipts", () => {
                 await util.receiveMessages(room2, ["Thread1", "Thread2", msg.threadedOff("Thread1", "t1a")]);
                 // Make sure the message in Thread 1 has definitely arrived, so that we know for sure
                 // that the one in Thread 2 is the latest.
-                await util.assertUnread(room2, 3);
 
                 await util.receiveMessages(room2, [msg.threadedOff("Thread2", "t2a")]);
-                // Make sure the 4th message has arrived before we mark as read.
-                await util.assertUnread(room2, 4);
 
                 // When I mark the room as read (making an unthreaded receipt for t2a)
                 await util.markAsRead(room2);
@@ -394,9 +383,11 @@ test.describe("Read receipts", () => {
                 // Then another message appears in the other thread
                 await util.receiveMessages(room2, [msg.threadedOff("Thread1", "t1b")]);
 
-                // Then the room becomes unread
-                await util.assertUnread(room2, 1);
+                // Then the other thread becomes unread
+                await util.goTo(room2);
+                await util.assertUnreadThread("Thread1");
             });
+
             test("A room with a new threaded message is still unread after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -410,21 +401,26 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Msg1", "Resp1"),
                     msg.threadedOff("Msg1", "Resp2"),
                 ]);
-                await util.assertUnread(room2, 3); // (Sanity)
+                await util.assertUnread(room2, 1); // (Sanity)
 
                 // When I read the main timeline
                 await util.goTo(room2);
 
-                // Then room does appear unread
-                await util.assertUnread(room2, 2);
+                // Then room appears read
+                await util.assertRead(room2);
+                /// but with an unread thread
+                await util.assertUnreadThread("Msg1");
 
                 await util.saveAndReload();
-                await util.assertUnread(room2, 2);
-
-                // Until we open the thread
-                await util.openThread("Msg1");
                 await util.assertRead(room2);
+                await util.goTo(room2);
+                await util.assertUnreadThread("Msg1");
+
+                // Opening the thread now marks it as read
+                await util.openThread("Msg1");
+                await util.assertReadThread("Msg1");
             });
+
             test("A room where all threaded messages are read is still read after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -438,17 +434,20 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Msg1", "Resp1"),
                     msg.threadedOff("Msg1", "Resp2"),
                 ]);
-                await util.assertUnread(room2, 3); // (Sanity)
+                await util.assertUnread(room2, 1); // (Sanity)
                 await util.goTo(room2);
-                await util.assertUnread(room2, 2);
-                await util.openThread("Msg1");
                 await util.assertRead(room2);
+                await util.assertUnreadThread("Msg1");
+                await util.openThread("Msg1");
+                await util.assertReadThread("Msg1");
 
                 // When I restart
                 await util.saveAndReload();
 
-                // Then the room is still read
+                // Then the room & thread still read
                 await util.assertRead(room2);
+                await util.goTo(room2);
+                await util.assertReadThread("Msg1");
             });
         });
 
@@ -462,15 +461,16 @@ test.describe("Read receipts", () => {
                 // Given a thread exists
                 await util.goTo(room1);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Resp1")]);
-                await util.assertUnread(room2, 2); // (Sanity)
+                await util.assertUnread(room2, 1); // (Sanity)
 
                 // When I read the main timeline
                 await util.goTo(room2);
 
-                // Then room does appear unread
-                await util.assertUnread(room2, 1);
+                // Then room doesn't appear unread but the thread does
+                await util.assertRead(room2);
                 await util.assertUnreadThread("Msg1");
             });
+
             test("Reading a thread root within the thread view marks it as read in the main timeline", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -485,7 +485,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("ThreadRoot", "InThread"),
                     ...many("afterThread", 30),
                 ]);
-                await util.assertUnread(room2, 62); // Sanity
+                await util.assertUnread(room2, 61); // Sanity
 
                 // When I jump to an old message and read the thread
                 await msg.jumpTo(room2.name, "beforeThread0000");
@@ -496,6 +496,7 @@ test.describe("Read receipts", () => {
                 // 30 remaining messages are unread - 7 messages are displayed under the thread root
                 await util.assertUnread(room2, 30 - 7);
             });
+
             test("Creating a new thread based on a reply makes the room unread", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -513,10 +514,12 @@ test.describe("Read receipts", () => {
                 // When I receive a thread message created on the reply
                 await util.receiveMessages(room2, [msg.threadedOff("Reply1", "Resp1")]);
 
-                // Then the room is unread
-                await util.assertUnread(room2, 1);
+                // Then the thread is unread
+                await util.goTo(room2);
+                await util.assertUnreadThread("Reply1");
             });
-            test("Reading a thread whose root is a reply makes the room read", async ({
+
+            test("Reading a thread whose root is a reply makes the thread read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
                 util,
@@ -529,9 +532,9 @@ test.describe("Read receipts", () => {
                     msg.replyTo("Msg1", "Reply1"),
                     msg.threadedOff("Reply1", "Resp1"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 2);
                 await util.goTo(room2);
-                await util.assertUnread(room2, 1);
+                await util.assertRead(room2);
                 await util.assertUnreadThread("Reply1");
 
                 // When I read the thread
diff --git a/playwright/e2e/read-receipts/reactions.spec.ts b/playwright/e2e/read-receipts/reactions.spec.ts
index 1063c7d19e..69208e5fc9 100644
--- a/playwright/e2e/read-receipts/reactions.spec.ts
+++ b/playwright/e2e/read-receipts/reactions.spec.ts
@@ -107,10 +107,11 @@ test.describe("Read receipts", () => {
                 await util.goTo(room1);
                 await util.assertRead(room2);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Reply1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Msg1");
                 await util.assertRead(room2);
+                await util.assertReadThread("Msg1");
                 await util.goTo(room1);
 
                 // When someone reacts to a thread message
@@ -118,7 +119,9 @@ test.describe("Read receipts", () => {
 
                 // Then the room remains read
                 await util.assertStillRead(room2);
+                await util.assertReadThread("Msg1");
             });
+
             test("Marking a room as read after a reaction in a thread makes it read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -133,7 +136,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Msg1", "Reply1"),
                     msg.reactionTo("Reply1", "🪿"),
                 ]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
 
                 // When I mark the room as read
                 await util.markAsRead(room2);
@@ -141,6 +144,7 @@ test.describe("Read receipts", () => {
                 // Then it becomes read
                 await util.assertRead(room2);
             });
+
             test("Reacting to a thread message after marking as read does not make the room unread", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -155,7 +159,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Msg1", "Reply1"),
                     msg.reactionTo("Reply1", "🪿"),
                 ]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.markAsRead(room2);
                 await util.assertRead(room2);
 
@@ -164,7 +168,10 @@ test.describe("Read receipts", () => {
 
                 // Then the room remains read
                 await util.assertStillRead(room2);
+                // as does the thread
+                await util.assertReadThread("Msg1");
             });
+
             test("A room with a reaction to a threaded message is still unread after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -175,22 +182,25 @@ test.describe("Read receipts", () => {
                 await util.goTo(room1);
                 await util.assertRead(room2);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Reply1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Msg1");
                 await util.assertRead(room2);
                 await util.goTo(room1);
 
-                // And someone reacted to it, which doesn't stop it being read
+                // And someone reacted to it, which doesn't make it read
                 await util.receiveMessages(room2, [msg.reactionTo("Reply1", "🪿")]);
                 await util.assertStillRead(room2);
+                await util.assertReadThread("Msg1");
 
                 // When I restart
                 await util.saveAndReload();
 
                 // Then the room is still read
                 await util.assertRead(room2);
+                await util.assertReadThread("Msg1");
             });
+
             test("A room where all reactions in threads are read is still read after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -213,7 +223,7 @@ test.describe("Read receipts", () => {
                     msg.reactionTo("Reply2b", "c"),
                     msg.reactionTo("Reply1b", "t"),
                 ]);
-                await util.assertUnread(room2, 6);
+                await util.assertUnread(room2, 2);
                 await util.goTo(room2);
                 await util.openThread("Msg1");
                 await util.assertReadThread("Msg1");
@@ -231,6 +241,7 @@ test.describe("Read receipts", () => {
                 await util.assertReadThread("Msg1");
                 await util.assertReadThread("Msg2");
             });
+
             test("Can remove a reaction in a thread", async ({
                 page,
                 roomAlpha: room1,
@@ -247,7 +258,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room1);
                 await util.assertRead(room2);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Reply1a")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
 
                 // When I react to a thread message
                 await util.goTo(room2);
@@ -283,10 +294,11 @@ test.describe("Read receipts", () => {
                 await util.goTo(room1);
                 await util.assertRead(room2);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Reply1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Msg1");
                 await util.assertRead(room2);
+                await util.assertReadThread("Msg1");
 
                 // When someone reacts to it
                 await util.goTo(room1);
@@ -295,7 +307,10 @@ test.describe("Read receipts", () => {
 
                 // Then the room is still read
                 await util.assertRead(room2);
+                // as is the thread
+                await util.assertReadThread("Msg1");
             });
+
             test("Reading a reaction to a thread root leaves the room read", async ({
                 page,
                 roomAlpha: room1,
@@ -307,7 +322,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room1);
                 await util.assertRead(room2);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Reply1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Msg1");
                 await util.assertRead(room2);
@@ -316,6 +331,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room1);
                 await util.receiveMessages(room2, [msg.reactionTo("Msg1", "🪿")]);
                 await util.assertRead(room2);
+                await util.assertReadThread("Msg1");
 
                 // When we read the reaction and go away again
                 await util.goTo(room2);
@@ -326,7 +342,9 @@ test.describe("Read receipts", () => {
 
                 // Then the room is still read
                 await util.assertRead(room2);
+                await util.assertReadThread("Msg1");
             });
+
             test("Reacting to a thread root after marking as read makes the room unread but not the thread", async ({
                 page,
                 roomAlpha: room1,
@@ -338,11 +356,12 @@ test.describe("Read receipts", () => {
                 await util.goTo(room1);
                 await util.assertRead(room2);
                 await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Reply1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
 
                 // And we have marked the room as read
                 await util.markAsRead(room2);
                 await util.assertRead(room2);
+                await util.assertReadThread("Msg1");
 
                 // When someone reacts to it
                 await util.receiveMessages(room2, [msg.reactionTo("Msg1", "🪿")]);
@@ -350,6 +369,8 @@ test.describe("Read receipts", () => {
 
                 // Then the room is still read
                 await util.assertRead(room2);
+                // as is the thread
+                await util.assertReadThread("Msg1");
             });
         });
     });
diff --git a/playwright/e2e/read-receipts/read-receipts.spec.ts b/playwright/e2e/read-receipts/read-receipts.spec.ts
index 36f74e2c64..dac679f6a0 100644
--- a/playwright/e2e/read-receipts/read-receipts.spec.ts
+++ b/playwright/e2e/read-receipts/read-receipts.spec.ts
@@ -16,9 +16,10 @@ limitations under the License.
 
 import type { JSHandle } from "@playwright/test";
 import type { MatrixEvent, ISendEventResponse, ReceiptType } from "matrix-js-sdk/src/matrix";
-import { test, expect } from "../../element-web-test";
+import { expect } from "../../element-web-test";
 import { ElementAppPage } from "../../pages/ElementAppPage";
 import { Bot } from "../../pages/bot";
+import { test } from ".";
 
 test.describe("Read receipts", () => {
     test.use({
@@ -189,29 +190,31 @@ test.describe("Read receipts", () => {
         page,
         app,
         bot,
+        util,
     }) => {
         // Given we sent 3 events on the main thread
         const main1 = await sendMessage(bot);
         const thread1a = await botSendThreadMessage(bot, main1.event_id);
         await botSendThreadMessage(bot, main1.event_id);
-        // 1 unread on the main thread, 2 in the new thread
-        await expect(page.getByLabel(`${otherRoomName} 3 unread messages.`)).toBeVisible();
+        // 1 unread on the main thread, 2 in the new thread that aren't shown
+        await expect(page.getByLabel(`${otherRoomName} 1 unread message.`)).toBeVisible();
 
         // When we send receipts for main, and the second-last in the thread
         await sendThreadedReadReceipt(app, main1);
         await sendThreadedReadReceipt(app, thread1a, main1);
 
         // Then the room has only one unread - the one in the thread
-        await expect(page.getByLabel(`${otherRoomName} 1 unread message.`)).toBeVisible();
+        await util.goTo(otherRoomName);
+        await util.assertUnreadThread("Message 1");
     });
 
-    test("Considers room read if there are receipts for main and other thread", async ({ page, app, bot }) => {
+    test("Considers room read if there are receipts for main and other thread", async ({ page, app, bot, util }) => {
         // Given we sent 3 events on the main thread
         const main1 = await sendMessage(bot);
         await botSendThreadMessage(bot, main1.event_id);
         const thread1b = await botSendThreadMessage(bot, main1.event_id);
-        // 1 unread on the main thread, 2 in the new thread
-        await expect(page.getByLabel(`${otherRoomName} 3 unread messages.`)).toBeVisible();
+        // 1 unread on the main thread, 2 in the new thread which don't show
+        await expect(page.getByLabel(`${otherRoomName} 1 unread message.`)).toBeVisible();
 
         // When we send receipts for main, and the last in the thread
         await sendThreadedReadReceipt(app, main1);
@@ -219,27 +222,33 @@ test.describe("Read receipts", () => {
 
         // Then the room has no unreads
         await expect(page.getByLabel(`${otherRoomName}`)).toBeVisible();
+        await util.goTo(otherRoomName);
+        await util.assertReadThread("Message 1");
     });
 
     test("Recognises unread messages on a thread after receiving a unthreaded receipt for earlier ones", async ({
         page,
         app,
         bot,
+        util,
     }) => {
         // Given we sent 3 events on the main thread
         const main1 = await sendMessage(bot);
         const thread1a = await botSendThreadMessage(bot, main1.event_id);
         await botSendThreadMessage(bot, main1.event_id);
-        // 1 unread on the main thread, 2 in the new thread
-        await expect(page.getByLabel(`${otherRoomName} 3 unread messages.`)).toBeVisible();
+        // 1 unread on the main thread, 2 in the new thread which don't count
+        await expect(page.getByLabel(`${otherRoomName} 1 unread message.`)).toBeVisible();
 
         // When we send an unthreaded receipt for the second-last in the thread
         await sendUnthreadedReadReceipt(app, thread1a);
 
         // Then the room has only one unread - the one in the
         // thread. The one in main is read because the unthreaded
-        // receipt is for a later event.
-        await expect(page.getByLabel(`${otherRoomName} 1 unread message.`)).toBeVisible();
+        // receipt is for a later event. The room should therefore be
+        // read, and the thread unread.
+        await expect(page.getByLabel(`${otherRoomName}`)).toBeVisible();
+        await util.goTo(otherRoomName);
+        await util.assertUnreadThread("Message 1");
     });
 
     test("Recognises unread messages on main after receiving a unthreaded receipt for a thread message", async ({
@@ -252,8 +261,8 @@ test.describe("Read receipts", () => {
         await botSendThreadMessage(bot, main1.event_id);
         const thread1b = await botSendThreadMessage(bot, main1.event_id);
         await sendMessage(bot);
-        // 2 unreads on the main thread, 2 in the new thread
-        await expect(page.getByLabel(`${otherRoomName} 4 unread messages.`)).toBeVisible();
+        // 2 unreads on the main thread, 2 in the new thread which don't count
+        await expect(page.getByLabel(`${otherRoomName} 2 unread messages.`)).toBeVisible();
 
         // When we send an unthreaded receipt for the last in the thread
         await sendUnthreadedReadReceipt(app, thread1b);
diff --git a/playwright/e2e/read-receipts/redactions.spec.ts b/playwright/e2e/read-receipts/redactions.spec.ts
index 1b5751acbc..f7affbed21 100644
--- a/playwright/e2e/read-receipts/redactions.spec.ts
+++ b/playwright/e2e/read-receipts/redactions.spec.ts
@@ -344,18 +344,23 @@ test.describe("Read receipts", () => {
                     "Root2",
                     msg.threadedOff("Root2", "Root2->A"),
                 ]);
-                await util.assertUnread(room2, 5);
+                await util.assertUnread(room2, 2);
 
-                // And I have read them
                 await util.goTo(room2);
                 await util.assertUnreadThread("Root1");
+                await util.assertUnreadThread("Root2");
+
+                // And I have read them
+                await util.assertUnreadThread("Root1");
                 await util.openThread("Root1");
-                await util.assertUnreadLessThan(room2, 4);
-                await util.openThread("Root2");
                 await util.assertRead(room2);
+                await util.backToThreadsList();
+                await util.assertReadThread("Root1");
+
+                await util.openThread("Root2");
+                await util.assertReadThread("Root2");
                 await util.closeThreadsPanel();
                 await util.goTo(room1);
-                await util.assertRead(room2);
 
                 // When the latest message in a thread is redacted
                 await util.receiveMessages(room2, [msg.redactionOf("ThreadMsg2")]);
@@ -365,6 +370,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room2);
                 await util.assertReadThread("Root1");
             });
+
             test("Reading an unread thread after a redaction of the latest message makes it read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -378,9 +384,9 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "ThreadMsg1"),
                     msg.threadedOff("Root", "ThreadMsg2"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.receiveMessages(room2, [msg.redactionOf("ThreadMsg2")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.assertUnreadThread("Root");
 
@@ -395,6 +401,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room2);
                 await util.assertReadThread("Root");
             });
+
             test("Reading an unread thread after a redaction of the latest message makes it read after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -408,9 +415,9 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "ThreadMsg1"),
                     msg.threadedOff("Root", "ThreadMsg2"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.receiveMessages(room2, [msg.redactionOf("ThreadMsg2")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.assertUnreadThread("Root");
                 await util.openThread("Root");
@@ -424,9 +431,12 @@ test.describe("Read receipts", () => {
                 // When I restart
                 await util.saveAndReload();
 
-                // Then the room is still read
+                // Then the room and thread are still read
                 await util.assertRead(room2);
+                await util.openThreadList();
+                await util.assertReadThread("Root");
             });
+
             test("Reading an unread thread after a redaction of an older message makes it read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -440,9 +450,9 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "ThreadMsg1"),
                     msg.threadedOff("Root", "ThreadMsg2"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.receiveMessages(room2, [msg.redactionOf("ThreadMsg1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.assertUnreadThread("Root");
 
@@ -457,6 +467,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room2);
                 await util.assertReadThread("Root");
             });
+
             test("Marking an unread thread as read after a redaction makes it read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -470,9 +481,9 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "ThreadMsg1"),
                     msg.threadedOff("Root", "ThreadMsg2"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.receiveMessages(room2, [msg.redactionOf("ThreadMsg1")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
 
                 // When I mark the room as read
                 await util.markAsRead(room2);
@@ -483,6 +494,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room2);
                 await util.assertReadThread("Root");
             });
+
             test("Sending and redacting a message after marking the thread as read leaves it read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -496,20 +508,22 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "ThreadMsg1"),
                     msg.threadedOff("Root", "ThreadMsg2"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.markAsRead(room2);
                 await util.assertRead(room2);
 
                 // When I send and redact a message
                 await util.receiveMessages(room2, [msg.threadedOff("Root", "Msg3")]);
-                await util.assertUnread(room2, 1);
+                await util.goTo(room2);
+                await util.openThreadList();
+                await util.assertUnreadThread("Root");
                 await util.receiveMessages(room2, [msg.redactionOf("Msg3")]);
 
                 // Then the room and thread are read
-                await util.assertRead(room2);
                 await util.goTo(room2);
                 await util.assertReadThread("Root");
             });
+
             test("Redacting a message after marking the thread as read leaves it read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -523,7 +537,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "ThreadMsg1"),
                     msg.threadedOff("Root", "ThreadMsg2"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.markAsRead(room2);
                 await util.assertRead(room2);
 
@@ -535,6 +549,7 @@ test.describe("Read receipts", () => {
                 await util.goTo(room2);
                 await util.assertReadThread("Root");
             });
+
             test("Reacting to a redacted message leaves the thread read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -548,21 +563,27 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg2"),
                     msg.threadedOff("Root", "Msg3"),
                 ]);
-                await util.assertUnread(room2, 3);
-                await util.receiveMessages(room2, [msg.redactionOf("Msg2")]);
-                await util.assertUnread(room2, 2);
-                await util.goTo(room2);
                 await util.assertUnread(room2, 1);
+                await util.receiveMessages(room2, [msg.redactionOf("Msg2")]);
+                await util.assertUnread(room2, 1);
+                await util.goTo(room2);
+                await util.assertRead(room2);
                 await util.openThread("Root");
                 await util.assertRead(room2);
+                await util.backToThreadsList();
+                await util.assertReadThread("Root");
                 await util.goTo(room1);
 
                 // When we receive a reaction to the redacted event
                 await util.receiveMessages(room2, [msg.reactionTo("Msg2", "z")]);
 
-                // Then the room is unread
+                // Then the room is read
                 await util.assertStillRead(room2);
+                await util.goTo(room2);
+                await util.openThreadList();
+                await util.assertReadThread("Root");
             });
+
             test("Editing a redacted message leaves the thread read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -576,13 +597,15 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg2"),
                     msg.threadedOff("Root", "Msg3"),
                 ]);
-                await util.assertUnread(room2, 3);
-                await util.receiveMessages(room2, [msg.redactionOf("Msg2")]);
-                await util.assertUnread(room2, 2);
-                await util.goTo(room2);
                 await util.assertUnread(room2, 1);
-                await util.openThread("Root");
+                await util.receiveMessages(room2, [msg.redactionOf("Msg2")]);
+                await util.assertUnread(room2, 1);
+                await util.goTo(room2);
                 await util.assertRead(room2);
+                await util.openThreadList();
+                await util.assertUnreadThread("Root");
+                await util.openThread("Root");
+                await util.assertReadThread("Root");
                 await util.goTo(room1);
 
                 // When we receive an edit of the redacted message
@@ -590,7 +613,12 @@ test.describe("Read receipts", () => {
 
                 // Then the room is unread
                 await util.assertStillRead(room2);
+                // and so is the thread
+                await util.goTo(room2);
+                await util.openThreadList();
+                await util.assertReadThread("Root");
             });
+
             test("Reading a thread after a reaction to a redacted message marks the thread as read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -605,9 +633,9 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg3"),
                     msg.reactionTo("Msg3", "x"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.receiveMessages(room2, [msg.redactionOf("Msg3")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
 
                 // When we read the thread
                 await util.goTo(room2);
@@ -617,6 +645,7 @@ test.describe("Read receipts", () => {
                 await util.assertRead(room2);
                 await util.assertReadThread("Root");
             });
+
             test("Reading a thread containing a redacted, edited message marks the thread as read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -631,7 +660,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg3"),
                     msg.editOf("Msg3", "Msg3 Edited"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.receiveMessages(room2, [msg.redactionOf("Msg3")]);
 
                 // When we read the thread
@@ -642,6 +671,7 @@ test.describe("Read receipts", () => {
                 await util.assertRead(room2);
                 await util.assertReadThread("Root");
             });
+
             test("Reading a reply to a redacted message marks the thread as read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -656,7 +686,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg3"),
                     msg.replyTo("Msg3", "Msg3Reply"),
                 ]);
-                await util.assertUnread(room2, 4);
+                await util.assertUnread(room2, 1);
                 await util.receiveMessages(room2, [msg.redactionOf("Msg3")]);
 
                 // When we read the thread, creating a receipt that points at the edit
@@ -667,6 +697,7 @@ test.describe("Read receipts", () => {
                 await util.assertRead(room2);
                 await util.assertReadThread("Root");
             });
+
             test("Reading a thread root when its only message has been redacted leaves the room read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -676,7 +707,7 @@ test.describe("Read receipts", () => {
                 // Given we had a thread
                 await util.goTo(room1);
                 await util.receiveMessages(room2, ["Root", msg.threadedOff("Root", "Msg2")]);
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
 
                 // And then redacted the message that makes it a thread
                 await util.receiveMessages(room2, [msg.redactionOf("Msg2")]);
@@ -687,7 +718,11 @@ test.describe("Read receipts", () => {
 
                 // Then the room is read
                 await util.assertRead(room2);
+                // and that thread is read
+                await util.openThreadList();
+                await util.assertReadThread("Root");
             });
+
             test("A thread with a redacted unread is still read after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -701,13 +736,13 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "ThreadMsg1"),
                     msg.threadedOff("Root", "ThreadMsg2"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Root");
                 await util.assertRead(room2);
                 await util.assertReadThread("Root");
                 await util.receiveMessages(room2, [msg.threadedOff("Root", "Msg3")]);
-                await util.assertUnread(room2, 1);
+                await util.assertRead(room2);
                 await util.receiveMessages(room2, [msg.redactionOf("Msg3")]);
                 await util.assertRead(room2);
                 await util.goTo(room2);
@@ -722,7 +757,13 @@ test.describe("Read receipts", () => {
                 await util.goTo(room2);
                 await util.assertReadThread("Root");
             });
-            test("A thread with a read redaction is still read after restart", async ({
+
+            /*
+             * Disabled: this doesn't seem to work as, at some point after syncing from cache, the redaction and redacted
+             * event get removed from the thread timeline such that we have no record of the events that the read receipt
+             * points to. I suspect this may have been passing by fluke before.
+             */
+            test.skip("A thread with a read redaction is still read after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
                 util,
@@ -737,11 +778,11 @@ test.describe("Read receipts", () => {
                     "Root2",
                     msg.threadedOff("Root2", "Root2->A"),
                 ]);
-                await util.assertUnread(room2, 5);
+                await util.assertUnread(room2, 2);
                 await util.goTo(room2);
                 await util.assertUnreadThread("Root1");
                 await util.openThread("Root1");
-                await util.assertUnreadLessThan(room2, 4);
+                await util.assertRead(room2);
                 await util.openThread("Root2");
                 await util.assertRead(room2);
                 await util.closeThreadsPanel();
@@ -757,7 +798,12 @@ test.describe("Read receipts", () => {
 
                 // Then the room is still read
                 await util.assertRead(room2);
+                // and so is the thread
+                await util.openThreadList();
+                await util.assertReadThread("Root1");
+                await util.assertReadThread("Root2");
             });
+
             test("A thread with an unread reply to a redacted message is still unread after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -772,7 +818,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg3"),
                     msg.replyTo("Msg3", "Msg3Reply"),
                 ]);
-                await util.assertUnread(room2, 4);
+                await util.assertUnread(room2, 1);
                 await util.receiveMessages(room2, [msg.redactionOf("Msg3")]);
 
                 // And we have read all this
@@ -788,6 +834,7 @@ test.describe("Read receipts", () => {
                 await util.assertRead(room2);
                 await util.assertReadThread("Root");
             });
+
             test("A thread with a read reply to a redacted message is still read after restart", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -802,7 +849,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg3"),
                     msg.replyTo("Msg3", "Msg3Reply"),
                 ]);
-                await util.assertUnread(room2, 4);
+                await util.assertUnread(room2, 1);
                 await util.receiveMessages(room2, [msg.redactionOf("Msg3")]);
 
                 // And I read it, so the room is read
@@ -836,7 +883,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg2"),
                     msg.threadedOff("Root", "Msg3"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Root");
                 await util.assertRead(room2);
@@ -848,7 +895,12 @@ test.describe("Read receipts", () => {
                 // Then the room is still read
                 await util.assertStillRead(room2);
             });
-            test("Redacting a thread root still allows us to read the thread", async ({
+
+            /*
+             * Disabled for the same reason as "A thread with a read redaction is still read after restart"
+             * above
+             */
+            test.skip("Redacting a thread root still allows us to read the thread", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
                 util,
@@ -861,23 +913,24 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg2"),
                     msg.threadedOff("Root", "Msg3"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
 
                 // When someone redacts the thread root
                 await util.receiveMessages(room2, [msg.redactionOf("Root")]);
 
                 // Then the room is still unread
-                await util.assertUnread(room2, 2);
+                await util.assertUnread(room2, 1);
 
                 // And I can open the thread and read it
                 await util.goTo(room2);
-                await util.assertUnread(room2, 2);
+                await util.assertRead(room2);
                 // The redacted message gets collapsed into, "foo was invited, joined and removed a message"
                 await util.openCollapsedMessage(1);
                 await util.openThread("Message deleted");
                 await util.assertRead(room2);
                 await util.assertReadThread("Root");
             });
+
             test("Sending a threaded message onto a redacted thread root leaves the room unread", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -891,7 +944,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg2"),
                     msg.threadedOff("Root", "Msg3"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Root");
                 await util.assertRead(room2);
@@ -901,11 +954,12 @@ test.describe("Read receipts", () => {
                 // When we receive a new message on it
                 await util.receiveMessages(room2, [msg.threadedOff("Root", "Msg4")]);
 
-                // Then the room and thread are unread
-                await util.assertUnread(room2, 1);
+                // Then the room is read but the thread is unread
+                await util.assertRead(room2);
                 await util.goTo(room2);
                 await util.assertUnreadThread("Message deleted");
             });
+
             test("Reacting to a redacted thread root leaves the room read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -919,7 +973,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg2"),
                     msg.threadedOff("Root", "Msg3"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Root");
                 await util.assertRead(room2);
@@ -931,7 +985,9 @@ test.describe("Read receipts", () => {
 
                 // Then the room is still read
                 await util.assertRead(room2);
+                await util.assertReadThread("Root");
             });
+
             test("Editing a redacted thread root leaves the room read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -945,7 +1001,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg2"),
                     msg.threadedOff("Root", "Msg3"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Root");
                 await util.assertRead(room2);
@@ -957,7 +1013,10 @@ test.describe("Read receipts", () => {
 
                 // Then the room is still read
                 await util.assertRead(room2);
+                // as is the thread
+                await util.assertReadThread("Root");
             });
+
             test("Replying to a redacted thread root makes the room unread", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -971,7 +1030,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg2"),
                     msg.threadedOff("Root", "Msg3"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Root");
                 await util.assertRead(room2);
@@ -984,6 +1043,7 @@ test.describe("Read receipts", () => {
                 // Then the room is unread
                 await util.assertUnread(room2, 1);
             });
+
             test("Reading a reply to a redacted thread root makes the room read", async ({
                 roomAlpha: room1,
                 roomBeta: room2,
@@ -998,7 +1058,7 @@ test.describe("Read receipts", () => {
                     msg.threadedOff("Root", "Msg2"),
                     msg.threadedOff("Root", "Msg3"),
                 ]);
-                await util.assertUnread(room2, 3);
+                await util.assertUnread(room2, 1);
                 await util.goTo(room2);
                 await util.openThread("Root");
                 await util.assertRead(room2);
diff --git a/playwright/e2e/spaces/threads-activity-centre/index.ts b/playwright/e2e/spaces/threads-activity-centre/index.ts
index 7ad477541a..8bafe2e804 100644
--- a/playwright/e2e/spaces/threads-activity-centre/index.ts
+++ b/playwright/e2e/spaces/threads-activity-centre/index.ts
@@ -341,7 +341,7 @@ export class Helpers {
      */
     assertThreadPanelFocused() {
         return expect(
-            this.page.locator(".mx_ThreadPanel").locator(".mx_BaseCard_header").getByTitle("Close"),
+            this.page.locator(".mx_ThreadPanel").locator(".mx_BaseCard_header").getByLabel("Close"),
         ).toBeFocused();
     }
 
diff --git a/playwright/e2e/threads/threads.spec.ts b/playwright/e2e/threads/threads.spec.ts
index 5e32516646..9b5ea46511 100644
--- a/playwright/e2e/threads/threads.spec.ts
+++ b/playwright/e2e/threads/threads.spec.ts
@@ -495,14 +495,14 @@ test.describe("Threads", () => {
         await createThread("Hello again Mr. Bot", "Hello again Mr. User in a thread");
 
         // Open thread panel
-        await page.getByRole("button", { name: "Threads" }).click();
+        await page.getByTestId("threadsButton").click();
         const threadPanel = page.locator(".mx_ThreadPanel");
         await expect(
             threadPanel.locator(".mx_EventTile_last").getByText("Hello again Mr. User in a thread"),
         ).toBeVisible();
 
         // Open threads list
-        await threadPanel.getByRole("button", { name: "Threads" }).click();
+        await page.locator(".mx_BaseCard_back").click();
         const rightPanel = page.locator(".mx_RightPanel");
         // Check that the threads are listed
         await expect(rightPanel.locator(".mx_EventTile").getByText("Hello Mr. User in a thread")).toBeVisible();
diff --git a/playwright/snapshots/settings/appearance-user-settings-tab.spec.ts/window-12px-linux.png b/playwright/snapshots/settings/appearance-user-settings-tab.spec.ts/window-12px-linux.png
index 23b77fd751..ee9eca2283 100644
Binary files a/playwright/snapshots/settings/appearance-user-settings-tab.spec.ts/window-12px-linux.png and b/playwright/snapshots/settings/appearance-user-settings-tab.spec.ts/window-12px-linux.png differ
diff --git a/playwright/snapshots/spaces/spaces.spec.ts/space-panel-collapsed-linux.png b/playwright/snapshots/spaces/spaces.spec.ts/space-panel-collapsed-linux.png
index 32e664808e..66b8af0e5b 100644
Binary files a/playwright/snapshots/spaces/spaces.spec.ts/space-panel-collapsed-linux.png and b/playwright/snapshots/spaces/spaces.spec.ts/space-panel-collapsed-linux.png differ
diff --git a/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png b/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png
index a2edd3d88f..6f55f2fd00 100644
Binary files a/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png and b/playwright/snapshots/spaces/spaces.spec.ts/space-panel-expanded-linux.png differ
diff --git a/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-layout-linux.png b/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-layout-linux.png
index 45c43f06fe..98ec9e0cf6 100644
Binary files a/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-layout-linux.png and b/playwright/snapshots/timeline/timeline.spec.ts/event-tile-reply-chains-irc-layout-linux.png differ
diff --git a/res/css/views/auth/_LoginWithQR.pcss b/res/css/views/auth/_LoginWithQR.pcss
index 6a112c7c82..c4904952b6 100644
--- a/res/css/views/auth/_LoginWithQR.pcss
+++ b/res/css/views/auth/_LoginWithQR.pcss
@@ -32,36 +32,10 @@ limitations under the License.
         margin-top: $spacing-8;
     }
 
-    .mx_LoginWithQR_separator {
-        display: flex;
-        align-items: center;
-        text-align: center;
-
-        &::before,
-        &::after {
-            content: "";
-            flex: 1;
-            border-bottom: 1px solid $quinary-content;
-        }
-
-        &:not(:empty) {
-            &::before {
-                margin-right: 1em;
-            }
-            &::after {
-                margin-left: 1em;
-            }
-        }
-    }
-
     font-size: $font-15px;
 }
 
 .mx_UserSettingsDialog .mx_LoginWithQR {
-    .mx_AccessibleButton + .mx_AccessibleButton {
-        margin-left: $spacing-12;
-    }
-
     font: var(--cpd-font-body-md-regular);
 
     h1 {
@@ -69,18 +43,14 @@ limitations under the License.
         margin-bottom: 0;
     }
 
-    li {
-        line-height: 1.8;
+    h2 {
+        margin-top: $spacing-24;
     }
 
     .mx_QRCode {
         margin: $spacing-28 0;
     }
 
-    .mx_LoginWithQR_buttons {
-        text-align: center;
-    }
-
     .mx_LoginWithQR_qrWrapper {
         display: flex;
     }
@@ -91,12 +61,6 @@ limitations under the License.
     display: flex;
     flex-direction: column;
 
-    .mx_LoginWithQR_centreTitle {
-        h1 {
-            text-align: center;
-        }
-    }
-
     h1 > svg {
         &.normal {
             color: $secondary-content;
@@ -137,11 +101,69 @@ limitations under the License.
     }
 
     ol {
-        list-style-position: inside;
         padding-inline-start: 0;
+        list-style: none; /* list markers do not support the outlined number styling we need */
 
-        li::marker {
-            color: $accent;
+        li {
+            position: relative;
+            padding-left: var(--cpd-space-7x);
+            color: 1px solid $input-placeholder;
+            margin-bottom: var(--cpd-space-4x);
+            line-height: 20px;
+            text-align: initial;
+        }
+
+        /* Circled number list item marker */
+        li::before {
+            content: counter(list-item);
+            position: absolute;
+            left: 0;
+            display: inline-block;
+            width: 20px;
+            height: 20px;
+            line-height: 20px;
+            border-radius: 50%;
+            border: 1px solid $input-placeholder;
+            box-sizing: border-box;
+            text-align: center;
+        }
+    }
+
+    label[for="mx_LoginWithQR_checkCode"] {
+        margin-top: var(--cpd-space-6x);
+        color: var(--cpd-color-text-primary);
+        margin-bottom: var(--cpd-space-1x);
+    }
+
+    .mx_LoginWithQR_icon {
+        width: 56px;
+        height: 56px;
+        border-radius: 8px;
+        box-sizing: border-box;
+        padding: var(--cpd-space-3x);
+        gap: 10px;
+
+        background-color: var(--cpd-color-bg-success-subtle);
+        svg {
+            color: var(--cpd-color-icon-success-primary);
+        }
+
+        &.mx_LoginWithQR_icon--critical {
+            background-color: var(--cpd-color-bg-critical-subtle);
+            svg {
+                color: var(--cpd-color-icon-critical-primary);
+            }
+        }
+    }
+
+    .mx_LoginWithQR_checkCode_input {
+        margin-bottom: var(--cpd-space-1x);
+        text-align: initial;
+
+        input {
+            /* Workaround for one of the input rules in _common.pcss being not specific enough */
+            padding: 0;
+            padding-inline-start: calc(40px / 2 - (1ch / 2));
         }
     }
 
@@ -164,13 +186,39 @@ limitations under the License.
 
     .mx_LoginWithQR_breadcrumbs {
         font-size: $font-13px;
-        color: var(--cpd-color-text-secondary);
+        color: $secondary-content;
     }
 
     .mx_LoginWithQR_main {
         display: flex;
         flex-direction: column;
         flex-grow: 1;
+        align-items: center;
+        color: $primary-content;
+        text-align: center;
+
+        p {
+            color: $secondary-content;
+        }
+    }
+
+    &.mx_LoginWithQR_error .mx_LoginWithQR_main {
+        max-width: 400px;
+        margin: 0 auto;
+    }
+
+    .mx_LoginWithQR_buttons {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: $spacing-16;
+        margin-top: var(--cpd-space-6x);
+
+        .mx_AccessibleButton {
+            width: 300px;
+            height: 48px;
+            box-sizing: border-box;
+        }
     }
 
     .mx_QRCode {
diff --git a/src/DecryptionFailureTracker.ts b/src/DecryptionFailureTracker.ts
index 9914704550..c842e55ec4 100644
--- a/src/DecryptionFailureTracker.ts
+++ b/src/DecryptionFailureTracker.ts
@@ -58,6 +58,8 @@ export class DecryptionFailureTracker {
                 case DecryptionFailureCode.HISTORICAL_MESSAGE_BACKUP_UNCONFIGURED:
                 case DecryptionFailureCode.HISTORICAL_MESSAGE_WORKING_BACKUP:
                     return "HistoricalMessage";
+                case DecryptionFailureCode.HISTORICAL_MESSAGE_USER_NOT_JOINED:
+                    return "ExpectedDueToMembership";
                 default:
                     return "UnknownError";
             }
diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
index 07ff3c7178..d14003dbfa 100644
--- a/src/MatrixClientPeg.ts
+++ b/src/MatrixClientPeg.ts
@@ -73,22 +73,44 @@ export interface IMatrixClientCreds {
  * you'll find a `MatrixClient` hanging on the `MatrixClientPeg`.
  */
 export interface IMatrixClientPeg {
+    /**
+     * The opts used to start the client
+     */
     opts: IStartClientOpts;
 
     /**
      * Return the server name of the user's homeserver
      * Throws an error if unable to deduce the homeserver name
-     * (eg. if the user is not logged in)
+     * (e.g. if the user is not logged in)
      *
      * @returns {string} The homeserver name, if present.
      */
     getHomeserverName(): string;
 
+    /**
+     * Get the current MatrixClient, if any
+     */
     get(): MatrixClient | null;
+
+    /**
+     * Get the current MatrixClient, throwing an error if there isn't one
+     */
     safeGet(): MatrixClient;
+
+    /**
+     * Unset the current MatrixClient
+     */
     unset(): void;
-    assign(): Promise<any>;
-    start(): Promise<any>;
+
+    /**
+     * Prepare the MatrixClient for use, including initialising the store and crypto, but do not start it
+     */
+    assign(): Promise<IStartClientOpts>;
+
+    /**
+     * Prepare the MatrixClient for use, including initialising the store and crypto, and start it
+     */
+    start(): Promise<void>;
 
     /**
      * If we've registered a user ID we set this to the ID of the
@@ -235,7 +257,7 @@ class MatrixClientPegClass implements IMatrixClientPeg {
         PlatformPeg.get()?.reload();
     };
 
-    public async assign(): Promise<any> {
+    public async assign(): Promise<IStartClientOpts> {
         if (!this.matrixClient) {
             throw new Error("createClient must be called first");
         }
@@ -273,17 +295,9 @@ class MatrixClientPegClass implements IMatrixClientPeg {
         opts.threadSupport = true;
 
         if (SettingsStore.getValue("feature_sliding_sync")) {
-            const proxyUrl = SettingsStore.getValue("feature_sliding_sync_proxy_url");
-            if (proxyUrl) {
-                logger.log("Activating sliding sync using proxy at ", proxyUrl);
-            } else {
-                logger.log("Activating sliding sync");
-            }
-            opts.slidingSync = SlidingSyncManager.instance.configure(
-                this.matrixClient,
-                proxyUrl || this.matrixClient.baseUrl,
-            );
-            SlidingSyncManager.instance.startSpidering(100, 50); // 100 rooms at a time, 50ms apart
+            opts.slidingSync = await SlidingSyncManager.instance.setup(this.matrixClient);
+        } else {
+            SlidingSyncManager.instance.checkSupport(this.matrixClient);
         }
 
         // Connect the matrix client to the dispatcher and setting handlers
@@ -362,7 +376,7 @@ class MatrixClientPegClass implements IMatrixClientPeg {
         }
     }
 
-    public async start(): Promise<any> {
+    public async start(): Promise<void> {
         const opts = await this.assign();
 
         logger.log(`MatrixClientPeg: really starting MatrixClient`);
diff --git a/src/PosthogAnalytics.ts b/src/PosthogAnalytics.ts
index 20c4ff2f33..f8518d925b 100644
--- a/src/PosthogAnalytics.ts
+++ b/src/PosthogAnalytics.ts
@@ -313,7 +313,7 @@ export class PosthogAnalytics {
                     // No point identifying again
                     return;
                 }
-                if (this.posthog.persistence?.get_user_state() === "identified") {
+                if (this.posthog.persistence?.get_property("$user_state") === "identified") {
                     // Analytics ID has changed, reset as Posthog will refuse to merge in this case
                     this.posthog.reset();
                 }
diff --git a/src/SlidingSyncManager.ts b/src/SlidingSyncManager.ts
index 5f459c0b9e..e3f420b43d 100644
--- a/src/SlidingSyncManager.ts
+++ b/src/SlidingSyncManager.ts
@@ -44,7 +44,7 @@ limitations under the License.
  *                      list ops)
  */
 
-import { MatrixClient, EventType } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, EventType, AutoDiscovery, Method, timeoutSignal } from "matrix-js-sdk/src/matrix";
 import {
     MSC3575Filter,
     MSC3575List,
@@ -56,6 +56,9 @@ import {
 import { logger } from "matrix-js-sdk/src/logger";
 import { defer, sleep } from "matrix-js-sdk/src/utils";
 
+import SettingsStore from "./settings/SettingsStore";
+import SlidingSyncController from "./settings/controllers/SlidingSyncController";
+
 // how long to long poll for
 const SLIDING_SYNC_TIMEOUT_MS = 20 * 1000;
 
@@ -323,4 +326,93 @@ export class SlidingSyncManager {
             firstTime = false;
         }
     }
+
+    /**
+     * Set up the Sliding Sync instance; configures the end point and starts spidering.
+     * The sliding sync endpoint is derived the following way:
+     *   1. The user-defined sliding sync proxy URL (legacy, for backwards compatibility)
+     *   2. The client `well-known` sliding sync proxy URL [declared at the unstable prefix](https://github.com/matrix-org/matrix-spec-proposals/blob/kegan/sync-v3/proposals/3575-sync.md#unstable-prefix)
+     *   3. The homeserver base url (for native server support)
+     * @param client The MatrixClient to use
+     * @returns A working Sliding Sync or undefined
+     */
+    public async setup(client: MatrixClient): Promise<SlidingSync | undefined> {
+        const baseUrl = client.baseUrl;
+        const proxyUrl = SettingsStore.getValue("feature_sliding_sync_proxy_url");
+        const wellKnownProxyUrl = await this.getProxyFromWellKnown(client);
+
+        const slidingSyncEndpoint = proxyUrl || wellKnownProxyUrl || baseUrl;
+
+        this.configure(client, slidingSyncEndpoint);
+        logger.info("Sliding sync activated at", slidingSyncEndpoint);
+        this.startSpidering(100, 50); // 100 rooms at a time, 50ms apart
+
+        return this.slidingSync;
+    }
+
+    /**
+     * Get the sliding sync proxy URL from the client well known
+     * @param client The MatrixClient to use
+     * @return The proxy url
+     */
+    public async getProxyFromWellKnown(client: MatrixClient): Promise<string | undefined> {
+        let proxyUrl: string | undefined;
+
+        try {
+            const clientWellKnown = await AutoDiscovery.findClientConfig(client.baseUrl);
+            proxyUrl = clientWellKnown?.["org.matrix.msc3575.proxy"]?.url;
+        } catch (e) {
+            // client.baseUrl is invalid, `AutoDiscovery.findClientConfig` has thrown
+        }
+
+        if (proxyUrl != undefined) {
+            logger.log("getProxyFromWellKnown: client well-known declares sliding sync proxy at", proxyUrl);
+        }
+        return proxyUrl;
+    }
+
+    /**
+     * Check if the server "natively" supports sliding sync (at the unstable endpoint).
+     * @param client The MatrixClient to use
+     * @return Whether the "native" (unstable) endpoint is up
+     */
+    public async nativeSlidingSyncSupport(client: MatrixClient): Promise<boolean> {
+        try {
+            await client.http.authedRequest<void>(Method.Post, "/sync", undefined, undefined, {
+                localTimeoutMs: 10 * 1000, // 10s
+                prefix: "/_matrix/client/unstable/org.matrix.msc3575",
+            });
+        } catch (e) {
+            return false; // 404, M_UNRECOGNIZED
+        }
+
+        logger.log("nativeSlidingSyncSupport: sliding sync endpoint is up");
+        return true; // 200, OK
+    }
+
+    /**
+     * Check whether our homeserver has sliding sync support, that the endpoint is up, and
+     * is a sliding sync endpoint.
+     *
+     * Sets static member `SlidingSyncController.serverSupportsSlidingSync`
+     * @param client The MatrixClient to use
+     */
+    public async checkSupport(client: MatrixClient): Promise<void> {
+        if (await this.nativeSlidingSyncSupport(client)) {
+            SlidingSyncController.serverSupportsSlidingSync = true;
+            return;
+        }
+
+        const proxyUrl = await this.getProxyFromWellKnown(client);
+        if (proxyUrl != undefined) {
+            const response = await fetch(proxyUrl + "/client/server.json", {
+                method: Method.Get,
+                signal: timeoutSignal(10 * 1000), // 10s
+            });
+            if (response.status === 200) {
+                logger.log("checkSupport: well-known sliding sync proxy is up at", proxyUrl);
+                SlidingSyncController.serverSupportsSlidingSync = true;
+            }
+        }
+    }
 }
diff --git a/src/accessibility/context_menu/ContextMenuButton.tsx b/src/accessibility/context_menu/ContextMenuButton.tsx
index 6ef6afef37..35dd986f8e 100644
--- a/src/accessibility/context_menu/ContextMenuButton.tsx
+++ b/src/accessibility/context_menu/ContextMenuButton.tsx
@@ -28,15 +28,15 @@ type Props<T extends keyof JSX.IntrinsicElements> = ComponentProps<typeof Access
 
 // Semantic component for representing the AccessibleButton which launches a <ContextMenu />
 export const ContextMenuButton = forwardRef(function <T extends keyof JSX.IntrinsicElements>(
-    { label, isExpanded, children, onClick, onContextMenu, ...props }: Props<T>,
+    { label, isExpanded, children, onClick, onContextMenu, element, ...props }: Props<T>,
     ref: Ref<HTMLElement>,
 ) {
     return (
         <AccessibleButton
             {...props}
+            element={element as keyof JSX.IntrinsicElements}
             onClick={onClick}
             onContextMenu={onContextMenu ?? onClick ?? undefined}
-            title={label}
             aria-label={label}
             aria-haspopup={true}
             aria-expanded={isExpanded}
diff --git a/src/accessibility/context_menu/ContextMenuTooltipButton.tsx b/src/accessibility/context_menu/ContextMenuTooltipButton.tsx
index 3498662760..2ae8a5de9d 100644
--- a/src/accessibility/context_menu/ContextMenuTooltipButton.tsx
+++ b/src/accessibility/context_menu/ContextMenuTooltipButton.tsx
@@ -27,12 +27,13 @@ type Props<T extends keyof JSX.IntrinsicElements> = ComponentProps<typeof Access
 
 // Semantic component for representing the AccessibleButton which launches a <ContextMenu />
 export const ContextMenuTooltipButton = forwardRef(function <T extends keyof JSX.IntrinsicElements>(
-    { isExpanded, children, onClick, onContextMenu, ...props }: Props<T>,
+    { isExpanded, children, onClick, onContextMenu, element, ...props }: Props<T>,
     ref: Ref<HTMLElement>,
 ) {
     return (
         <AccessibleTooltipButton
             {...props}
+            element={element as keyof JSX.IntrinsicElements}
             onClick={onClick}
             onContextMenu={onContextMenu ?? onClick ?? undefined}
             aria-haspopup={true}
diff --git a/src/accessibility/context_menu/MenuItem.tsx b/src/accessibility/context_menu/MenuItem.tsx
index a244602a09..db3c64468b 100644
--- a/src/accessibility/context_menu/MenuItem.tsx
+++ b/src/accessibility/context_menu/MenuItem.tsx
@@ -18,25 +18,16 @@ limitations under the License.
 
 import React from "react";
 
-import { RovingAccessibleButton, RovingAccessibleTooltipButton } from "../RovingTabIndex";
+import { RovingAccessibleButton } from "../RovingTabIndex";
 
 interface IProps extends React.ComponentProps<typeof RovingAccessibleButton> {
     label?: string;
-    tooltip?: string;
 }
 
 // Semantic component for representing a role=menuitem
-export const MenuItem: React.FC<IProps> = ({ children, label, tooltip, ...props }) => {
+export const MenuItem: React.FC<IProps> = ({ children, label, ...props }) => {
     const ariaLabel = props["aria-label"] || label;
 
-    if (tooltip) {
-        return (
-            <RovingAccessibleTooltipButton {...props} role="menuitem" aria-label={ariaLabel} title={tooltip}>
-                {children}
-            </RovingAccessibleTooltipButton>
-        );
-    }
-
     return (
         <RovingAccessibleButton {...props} role="menuitem" aria-label={ariaLabel}>
             {children}
diff --git a/src/accessibility/roving/RovingAccessibleButton.tsx b/src/accessibility/roving/RovingAccessibleButton.tsx
index 56c9052714..01e126824d 100644
--- a/src/accessibility/roving/RovingAccessibleButton.tsx
+++ b/src/accessibility/roving/RovingAccessibleButton.tsx
@@ -34,12 +34,14 @@ export const RovingAccessibleButton = <T extends keyof JSX.IntrinsicElements>({
     onFocus,
     onMouseOver,
     focusOnMouseOver,
+    element,
     ...props
 }: Props<T>): JSX.Element => {
     const [onFocusInternal, isActive, ref] = useRovingTabIndex(inputRef);
     return (
         <AccessibleButton
             {...props}
+            element={element as keyof JSX.IntrinsicElements}
             onFocus={(event: React.FocusEvent) => {
                 onFocusInternal();
                 onFocus?.(event);
diff --git a/src/accessibility/roving/RovingAccessibleTooltipButton.tsx b/src/accessibility/roving/RovingAccessibleTooltipButton.tsx
index 5607089c6e..76927c1773 100644
--- a/src/accessibility/roving/RovingAccessibleTooltipButton.tsx
+++ b/src/accessibility/roving/RovingAccessibleTooltipButton.tsx
@@ -16,27 +16,26 @@ limitations under the License.
 
 import React, { ComponentProps } from "react";
 
-import AccessibleTooltipButton from "../../components/views/elements/AccessibleTooltipButton";
 import { useRovingTabIndex } from "../RovingTabIndex";
 import { Ref } from "./types";
+import AccessibleButton from "../../components/views/elements/AccessibleButton";
 
-type Props<T extends keyof JSX.IntrinsicElements> = Omit<
-    ComponentProps<typeof AccessibleTooltipButton<T>>,
-    "tabIndex"
-> & {
+type Props<T extends keyof JSX.IntrinsicElements> = Omit<ComponentProps<typeof AccessibleButton<T>>, "tabIndex"> & {
     inputRef?: Ref;
 };
 
-// Wrapper to allow use of useRovingTabIndex for simple AccessibleTooltipButtons outside of React Functional Components.
+// Wrapper to allow use of useRovingTabIndex for simple AccessibleButtons outside of React Functional Components.
 export const RovingAccessibleTooltipButton = <T extends keyof JSX.IntrinsicElements>({
     inputRef,
     onFocus,
+    element,
     ...props
 }: Props<T>): JSX.Element => {
     const [onFocusInternal, isActive, ref] = useRovingTabIndex(inputRef);
     return (
-        <AccessibleTooltipButton
+        <AccessibleButton
             {...props}
+            element={element as keyof JSX.IntrinsicElements}
             onFocus={(event: React.FocusEvent) => {
                 onFocusInternal();
                 onFocus?.(event);
diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx
index 586cc442d6..f8dbccf28c 100644
--- a/src/components/structures/TimelinePanel.tsx
+++ b/src/components/structures/TimelinePanel.tsx
@@ -54,7 +54,6 @@ import dis from "../../dispatcher/dispatcher";
 import { Action } from "../../dispatcher/actions";
 import Timer from "../../utils/Timer";
 import shouldHideEvent from "../../shouldHideEvent";
-import { arrayFastClone } from "../../utils/arrays";
 import MessagePanel from "./MessagePanel";
 import { IScrollState } from "./ScrollPanel";
 import { ActionPayload } from "../../dispatcher/payloads";
@@ -1751,15 +1750,11 @@ export class TimelinePanel extends React.Component<IProps, IState> {
             [...mainEvents],
         );
 
-        // `arrayFastClone` performs a shallow copy of the array
-        // we want the last event to be decrypted first but displayed last
-        // `reverse` is destructive and unfortunately mutates the "events" array
-        arrayFastClone(events)
-            .reverse()
-            .forEach((event) => {
-                const client = MatrixClientPeg.safeGet();
-                client.decryptEventIfNeeded(event);
-            });
+        // We want the last event to be decrypted first
+        const client = MatrixClientPeg.safeGet();
+        for (let i = events.length - 1; i >= 0; --i) {
+            client.decryptEventIfNeeded(events[i]);
+        }
 
         const firstVisibleEventIndex = this.checkForPreJoinUISI(events);
 
diff --git a/src/components/views/auth/LoginWithQR-types.ts b/src/components/views/auth/LoginWithQR-types.ts
new file mode 100644
index 0000000000..33f709d79c
--- /dev/null
+++ b/src/components/views/auth/LoginWithQR-types.ts
@@ -0,0 +1,43 @@
+/*
+Copyright 2024 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/**
+ * The intention of this enum is to have a mode that scans a QR code instead of generating one.
+ */
+export enum Mode {
+    /**
+     * A QR code with be generated and shown
+     */
+    Show = "show",
+}
+
+export enum Phase {
+    Loading,
+    ShowingQR,
+    Connecting,
+    Connected,
+    WaitingForDevice,
+    Verifying,
+    Error,
+}
+
+export enum Click {
+    Cancel,
+    Decline,
+    Approve,
+    TryAgain,
+    Back,
+}
diff --git a/src/components/views/auth/LoginWithQR.tsx b/src/components/views/auth/LoginWithQR.tsx
index 1e2efb5106..feb869deaf 100644
--- a/src/components/views/auth/LoginWithQR.tsx
+++ b/src/components/views/auth/LoginWithQR.tsx
@@ -24,34 +24,7 @@ import { HTTPError, MatrixClient } from "matrix-js-sdk/src/matrix";
 import { _t } from "../../../languageHandler";
 import { wrapRequestWithDialog } from "../../../utils/UserInteractiveAuth";
 import LoginWithQRFlow from "./LoginWithQRFlow";
-
-/**
- * The intention of this enum is to have a mode that scans a QR code instead of generating one.
- */
-export enum Mode {
-    /**
-     * A QR code with be generated and shown
-     */
-    Show = "show",
-}
-
-export enum Phase {
-    Loading,
-    ShowingQR,
-    Connecting,
-    Connected,
-    WaitingForDevice,
-    Verifying,
-    Error,
-}
-
-export enum Click {
-    Cancel,
-    Decline,
-    Approve,
-    TryAgain,
-    Back,
-}
+import { Click, Mode, Phase } from "./LoginWithQR-types";
 
 interface IProps {
     client: MatrixClient;
diff --git a/src/components/views/auth/LoginWithQRFlow.tsx b/src/components/views/auth/LoginWithQRFlow.tsx
index 05c8d95c42..b5daddbe0c 100644
--- a/src/components/views/auth/LoginWithQRFlow.tsx
+++ b/src/components/views/auth/LoginWithQRFlow.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2022 - 2024 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,19 +14,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from "react";
-import { RendezvousFailureReason } from "matrix-js-sdk/src/rendezvous";
+import React, { ReactNode } from "react";
+import { RendezvousFailureReason as LegacyRendezvousFailureReason } from "matrix-js-sdk/src/rendezvous";
 import { Icon as ChevronLeftIcon } from "@vector-im/compound-design-tokens/icons/chevron-left.svg";
+import { Icon as CheckCircleSolidIcon } from "@vector-im/compound-design-tokens/icons/check-circle-solid.svg";
+import { Icon as ErrorIcon } from "@vector-im/compound-design-tokens/icons/error.svg";
+import { Heading, Text } from "@vector-im/compound-web";
+import classNames from "classnames";
 
 import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 import QRCode from "../elements/QRCode";
 import Spinner from "../elements/Spinner";
 import { Icon as InfoIcon } from "../../../../res/img/element-icons/i.svg";
-import { Click, FailureReason, LoginWithQRFailureReason, Phase } from "./LoginWithQR";
+import { Click, Phase } from "./LoginWithQR-types";
 import SdkConfig from "../../../SdkConfig";
+import { FailureReason, LoginWithQRFailureReason } from "./LoginWithQR";
 
-interface IProps {
+interface Props {
     phase: Phase;
     code?: string;
     onClick(type: Click): Promise<void>;
@@ -39,8 +44,8 @@ interface IProps {
  *
  * This uses the unstable feature of MSC3906: https://github.com/matrix-org/matrix-spec-proposals/pull/3906
  */
-export default class LoginWithQRFlow extends React.Component<IProps> {
-    public constructor(props: IProps) {
+export default class LoginWithQRFlow extends React.Component<Props> {
+    public constructor(props: Props) {
         super(props);
     }
 
@@ -72,49 +77,75 @@ export default class LoginWithQRFlow extends React.Component<IProps> {
         let main: JSX.Element | undefined;
         let buttons: JSX.Element | undefined;
         let backButton = true;
-        let cancellationMessage: string | undefined;
-        let centreTitle = false;
+        let className = "";
 
         switch (this.props.phase) {
-            case Phase.Error:
+            case Phase.Error: {
+                let success = false;
+                let title: string | undefined;
+                let message: ReactNode | undefined;
+
                 switch (this.props.failureReason) {
-                    case RendezvousFailureReason.Expired:
-                        cancellationMessage = _t("auth|qr_code_login|error_linking_incomplete");
+                    case LegacyRendezvousFailureReason.UnsupportedAlgorithm:
+                    case LegacyRendezvousFailureReason.UnsupportedTransport:
+                    case LegacyRendezvousFailureReason.HomeserverLacksSupport:
+                        title = _t("auth|qr_code_login|error_unsupported_protocol_title");
+                        message = _t("auth|qr_code_login|error_unsupported_protocol");
                         break;
-                    case RendezvousFailureReason.InvalidCode:
-                        cancellationMessage = _t("auth|qr_code_login|error_invalid_scanned_code");
+
+                    case LegacyRendezvousFailureReason.UserCancelled:
+                        title = _t("auth|qr_code_login|error_user_cancelled_title");
+                        message = _t("auth|qr_code_login|error_user_cancelled");
                         break;
-                    case RendezvousFailureReason.UnsupportedAlgorithm:
-                        cancellationMessage = _t("auth|qr_code_login|error_device_unsupported");
+
+                    case LegacyRendezvousFailureReason.Expired:
+                        title = _t("auth|qr_code_login|error_expired_title");
+                        message = _t("auth|qr_code_login|error_expired");
                         break;
-                    case RendezvousFailureReason.UserDeclined:
-                        cancellationMessage = _t("auth|qr_code_login|error_request_declined");
+
+                    case LegacyRendezvousFailureReason.InvalidCode:
+                        title = _t("auth|qr_code_login|error_insecure_channel_detected_title");
+                        message = (
+                            <>
+                                {_t("auth|qr_code_login|error_insecure_channel_detected")}
+
+                                <Text as="h2" size="lg" weight="semibold" data-testid="cancellation-message">
+                                    {_t("auth|qr_code_login|error_insecure_channel_detected_instructions")}
+                                </Text>
+                                <ol>
+                                    <li>{_t("auth|qr_code_login|error_insecure_channel_detected_instructions_1")}</li>
+                                    <li>{_t("auth|qr_code_login|error_insecure_channel_detected_instructions_2")}</li>
+                                    <li>{_t("auth|qr_code_login|error_insecure_channel_detected_instructions_3")}</li>
+                                </ol>
+                            </>
+                        );
                         break;
-                    case RendezvousFailureReason.OtherDeviceAlreadySignedIn:
-                        cancellationMessage = _t("auth|qr_code_login|error_device_already_signed_in");
+
+                    case LegacyRendezvousFailureReason.OtherDeviceAlreadySignedIn:
+                        success = true;
+                        title = _t("auth|qr_code_login|error_other_device_already_signed_in_title");
+                        message = _t("auth|qr_code_login|error_other_device_already_signed_in");
                         break;
-                    case RendezvousFailureReason.OtherDeviceNotSignedIn:
-                        cancellationMessage = _t("auth|qr_code_login|error_device_not_signed_in");
-                        break;
-                    case RendezvousFailureReason.UserCancelled:
-                        cancellationMessage = _t("auth|qr_code_login|error_request_cancelled");
+
+                    case LegacyRendezvousFailureReason.UserDeclined:
+                        title = _t("auth|qr_code_login|error_user_declined_title");
+                        message = _t("auth|qr_code_login|error_user_declined");
                         break;
+
                     case LoginWithQRFailureReason.RateLimited:
-                        cancellationMessage = _t("auth|qr_code_login|error_rate_limited");
-                        break;
-                    case RendezvousFailureReason.Unknown:
-                        cancellationMessage = _t("auth|qr_code_login|error_unexpected");
-                        break;
-                    case RendezvousFailureReason.HomeserverLacksSupport:
-                        cancellationMessage = _t("auth|qr_code_login|error_homeserver_lacks_support");
+                        title = _t("error|something_went_wrong");
+                        message = _t("auth|qr_code_login|error_rate_limited");
                         break;
+
+                    case LegacyRendezvousFailureReason.OtherDeviceNotSignedIn:
+                    case LegacyRendezvousFailureReason.Unknown:
                     default:
-                        cancellationMessage = _t("auth|qr_code_login|error_request_cancelled");
+                        title = _t("error|something_went_wrong");
+                        message = _t("auth|qr_code_login|error_unexpected");
                         break;
                 }
-                centreTitle = true;
+                className = "mx_LoginWithQR_error";
                 backButton = false;
-                main = <p data-testid="cancellation-message">{cancellationMessage}</p>;
                 buttons = (
                     <>
                         <AccessibleButton
@@ -127,7 +158,23 @@ export default class LoginWithQRFlow extends React.Component<IProps> {
                         {this.cancelButton()}
                     </>
                 );
+                main = (
+                    <>
+                        <div
+                            className={classNames("mx_LoginWithQR_icon", {
+                                "mx_LoginWithQR_icon--critical": !success,
+                            })}
+                        >
+                            {success ? <CheckCircleSolidIcon width="32px" /> : <ErrorIcon width="32px" />}
+                        </div>
+                        <Heading as="h1" size="sm" weight="semibold">
+                            {title}
+                        </Heading>
+                        {typeof message === "object" ? message : <p data-testid="cancellation-message">{message}</p>}
+                    </>
+                );
                 break;
+            }
             case Phase.Connected:
                 backButton = false;
                 main = (
@@ -145,13 +192,6 @@ export default class LoginWithQRFlow extends React.Component<IProps> {
 
                 buttons = (
                     <>
-                        <AccessibleButton
-                            data-testid="decline-login-button"
-                            kind="primary_outline"
-                            onClick={this.handleClick(Click.Decline)}
-                        >
-                            {_t("action|cancel")}
-                        </AccessibleButton>
                         <AccessibleButton
                             data-testid="approve-login-button"
                             kind="primary"
@@ -159,23 +199,28 @@ export default class LoginWithQRFlow extends React.Component<IProps> {
                         >
                             {_t("action|approve")}
                         </AccessibleButton>
+                        <AccessibleButton
+                            data-testid="decline-login-button"
+                            kind="primary_outline"
+                            onClick={this.handleClick(Click.Decline)}
+                        >
+                            {_t("action|cancel")}
+                        </AccessibleButton>
                     </>
                 );
                 break;
             case Phase.ShowingQR:
                 if (this.props.code) {
-                    const code = (
-                        <div className="mx_LoginWithQR_qrWrapper">
-                            <QRCode
-                                data={[{ data: Buffer.from(this.props.code ?? ""), mode: "byte" }]}
-                                className="mx_QRCode"
-                            />
-                        </div>
-                    );
+                    const data = Buffer.from(this.props.code ?? "");
+
                     main = (
                         <>
-                            <h1>{_t("auth|qr_code_login|scan_code_instruction")}</h1>
-                            {code}
+                            <Heading as="h1" size="sm" weight="semibold">
+                                {_t("auth|qr_code_login|scan_code_instruction")}
+                            </Heading>
+                            <div className="mx_LoginWithQR_qrWrapper">
+                                <QRCode data={[{ data, mode: "byte" }]} className="mx_QRCode" />
+                            </div>
                             <ol>
                                 <li>
                                     {_t("auth|qr_code_login|open_element_other_device", {
@@ -209,30 +254,27 @@ export default class LoginWithQRFlow extends React.Component<IProps> {
                 buttons = this.cancelButton();
                 break;
             case Phase.Verifying:
-                centreTitle = true;
                 main = this.simpleSpinner(_t("auth|qr_code_login|completing_setup"));
                 break;
         }
 
         return (
-            <div data-testid="login-with-qr" className="mx_LoginWithQR">
-                <div className={centreTitle ? "mx_LoginWithQR_centreTitle" : ""}>
-                    {backButton ? (
-                        <div className="mx_LoginWithQR_heading">
-                            <AccessibleButton
-                                data-testid="back-button"
-                                className="mx_LoginWithQR_BackButton"
-                                onClick={this.handleClick(Click.Back)}
-                                title="Back"
-                            >
-                                <ChevronLeftIcon />
-                            </AccessibleButton>
-                            <div className="mx_LoginWithQR_breadcrumbs">
-                                {_t("settings|sessions|title")} / {_t("settings|sessions|sign_in_with_qr")}
-                            </div>
+            <div data-testid="login-with-qr" className={classNames("mx_LoginWithQR", className)}>
+                {backButton ? (
+                    <div className="mx_LoginWithQR_heading">
+                        <AccessibleButton
+                            data-testid="back-button"
+                            className="mx_LoginWithQR_BackButton"
+                            onClick={this.handleClick(Click.Back)}
+                            title="Back"
+                        >
+                            <ChevronLeftIcon />
+                        </AccessibleButton>
+                        <div className="mx_LoginWithQR_breadcrumbs">
+                            {_t("settings|sessions|title")} / {_t("settings|sessions|sign_in_with_qr")}
                         </div>
-                    ) : null}
-                </div>
+                    </div>
+                ) : null}
                 <div className="mx_LoginWithQR_main">{main}</div>
                 <div className="mx_LoginWithQR_buttons">{buttons}</div>
             </div>
diff --git a/src/components/views/dialogs/ForwardDialog.tsx b/src/components/views/dialogs/ForwardDialog.tsx
index d59e23fe4c..7ff95edce3 100644
--- a/src/components/views/dialogs/ForwardDialog.tsx
+++ b/src/components/views/dialogs/ForwardDialog.tsx
@@ -41,8 +41,6 @@ import { avatarUrlForUser } from "../../../Avatar";
 import EventTile from "../rooms/EventTile";
 import SearchBox from "../../structures/SearchBox";
 import DecoratedRoomAvatar from "../avatars/DecoratedRoomAvatar";
-import { Alignment } from "../elements/Tooltip";
-import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
 import { StaticNotificationState } from "../../../stores/notifications/StaticNotificationState";
 import NotificationBadge from "../rooms/NotificationBadge";
@@ -54,7 +52,7 @@ import EntityTile from "../rooms/EntityTile";
 import BaseAvatar from "../avatars/BaseAvatar";
 import { Action } from "../../../dispatcher/actions";
 import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
-import { ButtonEvent } from "../elements/AccessibleButton";
+import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
 import { isLocationEvent } from "../../../utils/EventUtils";
 import { isSelfLocation, locationEventGeoUri } from "../../../utils/location";
 import { RoomContextDetails } from "../rooms/RoomContextDetails";
@@ -159,11 +157,11 @@ const Entry: React.FC<IEntryProps<any>> = ({ room, type, content, matrixClient:
             onFocus={onFocus}
             id={id}
         >
-            <AccessibleTooltipButton
+            <AccessibleButton
                 className="mx_ForwardList_roomButton"
                 onClick={jumpToRoom}
                 title={_t("forward|open_room")}
-                alignment={Alignment.Top}
+                placement="top"
                 tabIndex={isActive ? 0 : -1}
             >
                 <DecoratedRoomAvatar room={room} size="32px" tooltipProps={{ tabIndex: isActive ? 0 : -1 }} />
@@ -171,20 +169,20 @@ const Entry: React.FC<IEntryProps<any>> = ({ room, type, content, matrixClient:
                     {room.name}
                 </span>
                 <RoomContextDetails component="span" className="mx_ForwardList_entry_detail" room={room} />
-            </AccessibleTooltipButton>
-            <AccessibleTooltipButton
+            </AccessibleButton>
+            <AccessibleButton
                 kind={sendState === SendState.Failed ? "danger_outline" : "primary_outline"}
                 className={`mx_ForwardList_sendButton ${className}`}
                 onClick={send}
                 disabled={disabled}
                 title={title}
-                alignment={Alignment.Top}
+                placement="top"
                 tabIndex={isActive ? 0 : -1}
                 id={`${id}_send`}
             >
                 <div className="mx_ForwardList_sendLabel">{_t("forward|send_label")}</div>
                 {icon}
-            </AccessibleTooltipButton>
+            </AccessibleButton>
         </div>
     );
 };
diff --git a/src/components/views/dialogs/SlidingSyncOptionsDialog.tsx b/src/components/views/dialogs/SlidingSyncOptionsDialog.tsx
deleted file mode 100644
index 958c8d0876..0000000000
--- a/src/components/views/dialogs/SlidingSyncOptionsDialog.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-Copyright 2022 The Matrix.org Foundation C.I.C.
-
-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 from "react";
-import { MatrixClient, Method } from "matrix-js-sdk/src/matrix";
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { _t } from "../../../languageHandler";
-import SettingsStore from "../../../settings/SettingsStore";
-import TextInputDialog from "./TextInputDialog";
-import withValidation from "../elements/Validation";
-import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
-import { SettingLevel } from "../../../settings/SettingLevel";
-
-/**
- * Check that the server natively supports sliding sync.
- * @param cli The MatrixClient of the logged in user.
- * @throws if the proxy server is unreachable or not configured to the given homeserver
- */
-async function syncHealthCheck(cli: MatrixClient): Promise<void> {
-    await cli.http.authedRequest(Method.Post, "/sync", undefined, undefined, {
-        localTimeoutMs: 10 * 1000, // 10s
-        prefix: "/_matrix/client/unstable/org.matrix.msc3575",
-    });
-    logger.info("server natively support sliding sync OK");
-}
-
-/**
- * Check that the proxy url is in fact a sliding sync proxy endpoint and it is up.
- * @param endpoint The proxy endpoint url
- * @param hsUrl The homeserver url of the logged in user.
- * @throws if the proxy server is unreachable or not configured to the given homeserver
- */
-async function proxyHealthCheck(endpoint: string, hsUrl?: string): Promise<void> {
-    const controller = new AbortController();
-    const id = window.setTimeout(() => controller.abort(), 10 * 1000); // 10s
-    const res = await fetch(endpoint + "/client/server.json", {
-        signal: controller.signal,
-    });
-    clearTimeout(id);
-    if (res.status != 200) {
-        throw new Error(`proxyHealthCheck: proxy server returned HTTP ${res.status}`);
-    }
-    const body = await res.json();
-    if (body.server !== hsUrl) {
-        throw new Error(`proxyHealthCheck: client using ${hsUrl} but server is as ${body.server}`);
-    }
-    logger.info("sliding sync proxy is OK");
-}
-
-export const SlidingSyncOptionsDialog: React.FC<{ onFinished(enabled: boolean): void }> = ({ onFinished }) => {
-    const cli = MatrixClientPeg.safeGet();
-    const currentProxy = SettingsStore.getValue("feature_sliding_sync_proxy_url");
-    const hasNativeSupport = useAsyncMemo(
-        () =>
-            syncHealthCheck(cli).then(
-                () => true,
-                () => false,
-            ),
-        [],
-        null,
-    );
-
-    let nativeSupport: string;
-    if (hasNativeSupport === null) {
-        nativeSupport = _t("labs|sliding_sync_checking");
-    } else {
-        nativeSupport = hasNativeSupport
-            ? _t("labs|sliding_sync_server_support")
-            : _t("labs|sliding_sync_server_no_support");
-    }
-
-    const validProxy = withValidation<undefined, { error?: unknown }>({
-        async deriveData({ value }): Promise<{ error?: unknown }> {
-            if (!value) return {};
-            try {
-                await proxyHealthCheck(value, MatrixClientPeg.safeGet().baseUrl);
-                return {};
-            } catch (error) {
-                return { error };
-            }
-        },
-        rules: [
-            {
-                key: "required",
-                test: async ({ value }) => !!value || !!hasNativeSupport,
-                invalid: () => _t("labs|sliding_sync_server_specify_proxy"),
-            },
-            {
-                key: "working",
-                final: true,
-                test: async (_, { error }) => !error,
-                valid: () => _t("spotlight|public_rooms|network_dropdown_available_valid"),
-                invalid: ({ error }) => (error instanceof Error ? error.message : null),
-            },
-        ],
-    });
-
-    return (
-        <TextInputDialog
-            title={_t("labs|sliding_sync_configuration")}
-            description={
-                <div>
-                    <div>
-                        <b>{_t("labs|sliding_sync_disable_warning")}</b>
-                    </div>
-                    {nativeSupport}
-                </div>
-            }
-            placeholder={
-                hasNativeSupport
-                    ? _t("labs|sliding_sync_proxy_url_optional_label")
-                    : _t("labs|sliding_sync_proxy_url_label")
-            }
-            value={currentProxy}
-            button={_t("action|enable")}
-            validator={validProxy}
-            onFinished={(enable, proxyUrl) => {
-                if (enable) {
-                    SettingsStore.setValue("feature_sliding_sync_proxy_url", null, SettingLevel.DEVICE, proxyUrl);
-                    onFinished(true);
-                } else {
-                    onFinished(false);
-                }
-            }}
-        />
-    );
-};
diff --git a/src/components/views/dialogs/UserSettingsDialog.tsx b/src/components/views/dialogs/UserSettingsDialog.tsx
index 820617ae96..a6c82d50c2 100644
--- a/src/components/views/dialogs/UserSettingsDialog.tsx
+++ b/src/components/views/dialogs/UserSettingsDialog.tsx
@@ -1,6 +1,6 @@
 /*
 Copyright 2019 New Vector Ltd
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2024 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import React from "react";
 import TabbedView, { Tab } from "../../structures/TabbedView";
 import { _t, _td } from "../../../languageHandler";
 import GeneralUserSettingsTab from "../settings/tabs/user/GeneralUserSettingsTab";
-import SettingsStore, { CallbackFn } from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import LabsUserSettingsTab, { showLabsFlags } from "../settings/tabs/user/LabsUserSettingsTab";
 import AppearanceUserSettingsTab from "../settings/tabs/user/AppearanceUserSettingsTab";
 import SecurityUserSettingsTab from "../settings/tabs/user/SecurityUserSettingsTab";
@@ -37,6 +37,7 @@ import SessionManagerTab from "../settings/tabs/user/SessionManagerTab";
 import { UserTab } from "./UserTab";
 import { NonEmptyArray } from "../../../@types/common";
 import { SDKContext, SdkContextClass } from "../../../contexts/SDKContext";
+import { useSettingValue } from "../../../hooks/useSettings";
 
 interface IProps {
     initialTabId?: UserTab;
@@ -44,35 +45,11 @@ interface IProps {
     onFinished(): void;
 }
 
-interface IState {
-    mjolnirEnabled: boolean;
-}
+export default function UserSettingsDialog(props: IProps): JSX.Element {
+    const voipEnabled = useSettingValue<boolean>(UIFeature.Voip);
+    const mjolnirEnabled = useSettingValue<boolean>("feature_mjolnir");
 
-export default class UserSettingsDialog extends React.Component<IProps, IState> {
-    private settingsWatchers: string[] = [];
-
-    public constructor(props: IProps) {
-        super(props);
-
-        this.state = {
-            mjolnirEnabled: SettingsStore.getValue("feature_mjolnir"),
-        };
-    }
-
-    public componentDidMount(): void {
-        this.settingsWatchers = [SettingsStore.watchSetting("feature_mjolnir", null, this.mjolnirChanged)];
-    }
-
-    public componentWillUnmount(): void {
-        this.settingsWatchers.forEach((watcherRef) => SettingsStore.unwatchSetting(watcherRef));
-    }
-
-    private mjolnirChanged: CallbackFn = (settingName, roomId, atLevel, newValue) => {
-        // We can cheat because we know what levels a feature is tracked at, and how it is tracked
-        this.setState({ mjolnirEnabled: newValue });
-    };
-
-    private getTabs(): NonEmptyArray<Tab<UserTab>> {
+    const getTabs = (): NonEmptyArray<Tab<UserTab>> => {
         const tabs: Tab<UserTab>[] = [];
 
         tabs.push(
@@ -80,7 +57,7 @@ export default class UserSettingsDialog extends React.Component<IProps, IState>
                 UserTab.General,
                 _td("common|general"),
                 "mx_UserSettingsDialog_settingsIcon",
-                <GeneralUserSettingsTab closeSettingsFn={this.props.onFinished} />,
+                <GeneralUserSettingsTab closeSettingsFn={props.onFinished} />,
                 "UserSettingsGeneral",
             ),
         );
@@ -90,7 +67,6 @@ export default class UserSettingsDialog extends React.Component<IProps, IState>
                 _td("settings|sessions|title"),
                 "mx_UserSettingsDialog_sessionsIcon",
                 <SessionManagerTab />,
-                // don't track with posthog while under construction
                 undefined,
             ),
         );
@@ -117,7 +93,7 @@ export default class UserSettingsDialog extends React.Component<IProps, IState>
                 UserTab.Preferences,
                 _td("common|preferences"),
                 "mx_UserSettingsDialog_preferencesIcon",
-                <PreferencesUserSettingsTab closeSettingsFn={this.props.onFinished} />,
+                <PreferencesUserSettingsTab closeSettingsFn={props.onFinished} />,
                 "UserSettingsPreferences",
             ),
         );
@@ -140,7 +116,7 @@ export default class UserSettingsDialog extends React.Component<IProps, IState>
             ),
         );
 
-        if (SettingsStore.getValue(UIFeature.Voip)) {
+        if (voipEnabled) {
             tabs.push(
                 new Tab(
                     UserTab.Voice,
@@ -157,11 +133,11 @@ export default class UserSettingsDialog extends React.Component<IProps, IState>
                 UserTab.Security,
                 _td("room_settings|security|title"),
                 "mx_UserSettingsDialog_securityIcon",
-                <SecurityUserSettingsTab closeSettingsFn={this.props.onFinished} />,
+                <SecurityUserSettingsTab closeSettingsFn={props.onFinished} />,
                 "UserSettingsSecurityPrivacy",
             ),
         );
-        // Show the Labs tab if enabled or if there are any active betas
+
         if (showLabsFlags() || SettingsStore.getFeatureSettingNames().some((k) => SettingsStore.getBetaInfo(k))) {
             tabs.push(
                 new Tab(
@@ -173,7 +149,7 @@ export default class UserSettingsDialog extends React.Component<IProps, IState>
                 ),
             );
         }
-        if (this.state.mjolnirEnabled) {
+        if (mjolnirEnabled) {
             tabs.push(
                 new Tab(
                     UserTab.Mjolnir,
@@ -195,29 +171,23 @@ export default class UserSettingsDialog extends React.Component<IProps, IState>
         );
 
         return tabs as NonEmptyArray<Tab<UserTab>>;
-    }
+    };
 
-    public render(): React.ReactNode {
-        return (
-            // XXX: SDKContext is provided within the LoggedInView subtree.
-            // Modals function outside the MatrixChat React tree, so sdkContext is reprovided here to simulate that.
-            // The longer term solution is to move our ModalManager into the React tree to inherit contexts properly.
-            <SDKContext.Provider value={this.props.sdkContext}>
-                <BaseDialog
-                    className="mx_UserSettingsDialog"
-                    hasCancel={true}
-                    onFinished={this.props.onFinished}
-                    title={_t("common|settings")}
-                >
-                    <div className="mx_SettingsDialog_content">
-                        <TabbedView
-                            tabs={this.getTabs()}
-                            initialTabId={this.props.initialTabId}
-                            screenName="UserSettings"
-                        />
-                    </div>
-                </BaseDialog>
-            </SDKContext.Provider>
-        );
-    }
+    return (
+        // XXX: SDKContext is provided within the LoggedInView subtree.
+        // Modals function outside the MatrixChat React tree, so sdkContext is reprovided here to simulate that.
+        // The longer term solution is to move our ModalManager into the React tree to inherit contexts properly.
+        <SDKContext.Provider value={props.sdkContext}>
+            <BaseDialog
+                className="mx_UserSettingsDialog"
+                hasCancel={true}
+                onFinished={props.onFinished}
+                title={_t("common|settings")}
+            >
+                <div className="mx_SettingsDialog_content">
+                    <TabbedView tabs={getTabs()} initialTabId={props.initialTabId} screenName="UserSettings" />
+                </div>
+            </BaseDialog>
+        </SDKContext.Provider>
+    );
 }
diff --git a/src/components/views/dialogs/devtools/RoomNotifications.tsx b/src/components/views/dialogs/devtools/RoomNotifications.tsx
index 5d03ee7c3a..397db1fa4b 100644
--- a/src/components/views/dialogs/devtools/RoomNotifications.tsx
+++ b/src/components/views/dialogs/devtools/RoomNotifications.tsx
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import { NotificationCountType, Room, Thread, ReceiptType } from "matrix-js-sdk/src/matrix";
-import React, { useContext, useMemo } from "react";
+import React, { useContext } from "react";
 import { ReadReceipt } from "matrix-js-sdk/src/models/read-receipt";
 
 import MatrixClientContext from "../../../../contexts/MatrixClientContext";
@@ -25,7 +25,6 @@ import { determineUnreadState } from "../../../../RoomNotifs";
 import { humanReadableNotificationLevel } from "../../../../stores/notifications/NotificationLevel";
 import { doesRoomOrThreadHaveUnreadMessages } from "../../../../Unread";
 import BaseTool, { DevtoolsContext, IDevtoolsProps } from "./BaseTool";
-import SettingsStore from "../../../../settings/SettingsStore";
 
 function UserReadUpTo({ target }: { target: ReadReceipt<any, any> }): JSX.Element {
     const cli = useContext(MatrixClientContext);
@@ -66,12 +65,10 @@ function UserReadUpTo({ target }: { target: ReadReceipt<any, any> }): JSX.Elemen
 }
 
 export default function RoomNotifications({ onBack }: IDevtoolsProps): JSX.Element {
-    const tacEnabled = useMemo(() => SettingsStore.getValue("threadsActivityCentre"), []);
-
     const { room } = useContext(DevtoolsContext);
     const cli = useContext(MatrixClientContext);
 
-    const { level, count } = determineUnreadState(room, undefined, !tacEnabled);
+    const { level, count } = determineUnreadState(room, undefined, false);
     const [notificationState] = useNotificationState(room);
 
     return (
diff --git a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx
index ee42a59221..2ac7681afa 100644
--- a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx
+++ b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx
@@ -939,7 +939,9 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
                             setInviteLinkCopied(true);
                             copyPlaintext(ownInviteLink);
                         }}
-                        onHideTooltip={() => setInviteLinkCopied(false)}
+                        onTooltipOpenChange={(open) => {
+                            if (!open) setInviteLinkCopied(false);
+                        }}
                         title={inviteLinkCopied ? _t("common|copied") : _t("action|copy")}
                     >
                         <span className="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline">
diff --git a/src/components/views/dialogs/spotlight/TooltipOption.tsx b/src/components/views/dialogs/spotlight/TooltipOption.tsx
index 2233e762d4..0deb4b1311 100644
--- a/src/components/views/dialogs/spotlight/TooltipOption.tsx
+++ b/src/components/views/dialogs/spotlight/TooltipOption.tsx
@@ -17,18 +17,19 @@ limitations under the License.
 import classNames from "classnames";
 import React, { ComponentProps, ReactNode } from "react";
 
-import { RovingAccessibleTooltipButton } from "../../../../accessibility/roving/RovingAccessibleTooltipButton";
 import { useRovingTabIndex } from "../../../../accessibility/RovingTabIndex";
-import AccessibleTooltipButton from "../../elements/AccessibleTooltipButton";
+import AccessibleButton from "../../elements/AccessibleButton";
+import { Ref } from "../../../../accessibility/roving/types";
 
-interface TooltipOptionProps extends ComponentProps<typeof RovingAccessibleTooltipButton> {
+interface TooltipOptionProps extends ComponentProps<typeof AccessibleButton> {
     endAdornment?: ReactNode;
+    inputRef?: Ref;
 }
 
 export const TooltipOption: React.FC<TooltipOptionProps> = ({ inputRef, className, ...props }) => {
     const [onFocus, isActive, ref] = useRovingTabIndex(inputRef);
     return (
-        <AccessibleTooltipButton
+        <AccessibleButton
             {...props}
             className={classNames(className, "mx_SpotlightDialog_option")}
             onFocus={onFocus}
diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index 1eb03792b8..055818f742 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -14,8 +14,9 @@
  limitations under the License.
  */
 
-import React, { forwardRef, FunctionComponent, HTMLAttributes, InputHTMLAttributes, Ref } from "react";
+import React, { ComponentProps, forwardRef, FunctionComponent, HTMLAttributes, InputHTMLAttributes, Ref } from "react";
 import classnames from "classnames";
+import { Tooltip } from "@vector-im/compound-web";
 
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
@@ -60,6 +61,8 @@ type DynamicElementProps<T extends keyof JSX.IntrinsicElements> = Partial<
 > &
     Omit<InputHTMLAttributes<Element>, "onClick">;
 
+type TooltipProps = ComponentProps<typeof Tooltip>;
+
 /**
  * Type of props accepted by {@link AccessibleButton}.
  *
@@ -86,6 +89,23 @@ type Props<T extends keyof JSX.IntrinsicElements> = DynamicHtmlElementProps<T> &
      * Event handler for button activation. Should be implemented exactly like a normal `onClick` handler.
      */
     onClick: ((e: ButtonEvent) => void | Promise<void>) | null;
+    /**
+     * The tooltip to show on hover or focus.
+     */
+    title?: string;
+    /**
+     * The caption is a secondary text displayed under the `title` of the tooltip.
+     * Only valid when used in conjunction with `title`.
+     */
+    caption?: string;
+    /**
+     * The placement of the tooltip.
+     */
+    placement?: TooltipProps["placement"];
+    /**
+     * Callback for when the tooltip is opened or closed.
+     */
+    onTooltipOpenChange?: TooltipProps["onOpenChange"];
 };
 
 /**
@@ -116,11 +136,16 @@ const AccessibleButton = forwardRef(function <T extends keyof JSX.IntrinsicEleme
         onKeyDown,
         onKeyUp,
         triggerOnMouseDown,
+        title,
+        caption,
+        placement = "right",
+        onTooltipOpenChange,
         ...restProps
     }: Props<T>,
     ref: Ref<HTMLElement>,
 ): JSX.Element {
     const newProps: RenderedElementProps = restProps;
+    newProps["aria-label"] = newProps["aria-label"] ?? title;
     if (disabled) {
         newProps["aria-disabled"] = true;
         newProps["disabled"] = true;
@@ -182,7 +207,22 @@ const AccessibleButton = forwardRef(function <T extends keyof JSX.IntrinsicEleme
     });
 
     // React.createElement expects InputHTMLAttributes
-    return React.createElement(element, newProps, children);
+    const button = React.createElement(element, newProps, children);
+
+    if (title) {
+        return (
+            <Tooltip
+                label={title}
+                caption={caption}
+                isTriggerInteractive={true}
+                placement={placement}
+                onOpenChange={onTooltipOpenChange}
+            >
+                {button}
+            </Tooltip>
+        );
+    }
+    return button;
 });
 
 // Type assertion required due to forwardRef type workaround in react.d.ts
diff --git a/src/components/views/elements/AccessibleTooltipButton.tsx b/src/components/views/elements/AccessibleTooltipButton.tsx
index 0af5cc9625..759643da1c 100644
--- a/src/components/views/elements/AccessibleTooltipButton.tsx
+++ b/src/components/views/elements/AccessibleTooltipButton.tsx
@@ -60,8 +60,11 @@ type Props<T extends keyof JSX.IntrinsicElements> = ComponentProps<typeof Access
     onHideTooltip?(ev: SyntheticEvent): void;
 };
 
+/**
+ * @deprecated use AccessibleButton with `title` and `caption` instead.
+ */
 const AccessibleTooltipButton = forwardRef(function <T extends keyof JSX.IntrinsicElements>(
-    { title, tooltip, children, forceHide, alignment, onHideTooltip, tooltipClassName, ...props }: Props<T>,
+    { title, tooltip, children, forceHide, alignment, onHideTooltip, tooltipClassName, element, ...props }: Props<T>,
     ref: Ref<HTMLElement>,
 ) {
     const [hover, setHover] = useState(false);
@@ -97,6 +100,7 @@ const AccessibleTooltipButton = forwardRef(function <T extends keyof JSX.Intrins
     return (
         <AccessibleButton
             {...props}
+            element={element as keyof JSX.IntrinsicElements}
             onMouseOver={showTooltip}
             onMouseLeave={hideTooltip}
             onFocus={onFocus}
diff --git a/src/components/views/elements/CopyableText.tsx b/src/components/views/elements/CopyableText.tsx
index 7e92b39564..5d9946d2c1 100644
--- a/src/components/views/elements/CopyableText.tsx
+++ b/src/components/views/elements/CopyableText.tsx
@@ -20,8 +20,7 @@ import classNames from "classnames";
 
 import { _t } from "../../../languageHandler";
 import { copyPlaintext } from "../../../utils/strings";
-import { ButtonEvent } from "./AccessibleButton";
-import AccessibleTooltipButton from "./AccessibleTooltipButton";
+import AccessibleButton, { ButtonEvent } from "./AccessibleButton";
 
 interface IProps {
     children?: React.ReactNode;
@@ -53,11 +52,13 @@ const CopyableText: React.FC<IProps> = ({ children, getTextToCopy, border = true
     return (
         <div className={combinedClassName}>
             {children}
-            <AccessibleTooltipButton
+            <AccessibleButton
                 title={tooltip ?? _t("action|copy")}
                 onClick={onCopyClickInternal}
                 className="mx_CopyableText_copyButton"
-                onHideTooltip={onHideTooltip}
+                onTooltipOpenChange={(open) => {
+                    if (!open) onHideTooltip();
+                }}
             />
         </div>
     );
diff --git a/src/components/views/elements/ImageView.tsx b/src/components/views/elements/ImageView.tsx
index 6f5815e95a..ddc2769c48 100644
--- a/src/components/views/elements/ImageView.tsx
+++ b/src/components/views/elements/ImageView.tsx
@@ -21,7 +21,6 @@ import FocusLock from "react-focus-lock";
 import { MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../languageHandler";
-import AccessibleTooltipButton from "./AccessibleTooltipButton";
 import MemberAvatar from "../avatars/MemberAvatar";
 import { ContextMenuTooltipButton } from "../../../accessibility/context_menu/ContextMenuTooltipButton";
 import MessageContextMenu from "../context_menus/MessageContextMenu";
@@ -38,6 +37,7 @@ import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { presentableTextForFile } from "../../../utils/FileUtils";
+import AccessibleButton from "./AccessibleButton";
 
 // Max scale to keep gaps around the image
 const MAX_SCALE = 0.95;
@@ -513,14 +513,14 @@ export default class ImageView extends React.Component<IProps, IState> {
         }
 
         const zoomOutButton = (
-            <AccessibleTooltipButton
+            <AccessibleButton
                 className="mx_ImageView_button mx_ImageView_button_zoomOut"
                 title={_t("action|zoom_out")}
                 onClick={this.onZoomOutClick}
             />
         );
         const zoomInButton = (
-            <AccessibleTooltipButton
+            <AccessibleButton
                 className="mx_ImageView_button mx_ImageView_button_zoomIn"
                 title={_t("action|zoom_in")}
                 onClick={this.onZoomInClick}
@@ -553,23 +553,23 @@ export default class ImageView extends React.Component<IProps, IState> {
                     <div className="mx_ImageView_toolbar">
                         {zoomOutButton}
                         {zoomInButton}
-                        <AccessibleTooltipButton
+                        <AccessibleButton
                             className="mx_ImageView_button mx_ImageView_button_rotateCCW"
                             title={_t("lightbox|rotate_left")}
                             onClick={this.onRotateCounterClockwiseClick}
                         />
-                        <AccessibleTooltipButton
+                        <AccessibleButton
                             className="mx_ImageView_button mx_ImageView_button_rotateCW"
                             title={_t("lightbox|rotate_right")}
                             onClick={this.onRotateClockwiseClick}
                         />
-                        <AccessibleTooltipButton
+                        <AccessibleButton
                             className="mx_ImageView_button mx_ImageView_button_download"
                             title={_t("action|download")}
                             onClick={this.onDownloadClick}
                         />
                         {contextMenuButton}
-                        <AccessibleTooltipButton
+                        <AccessibleButton
                             className="mx_ImageView_button mx_ImageView_button_close"
                             title={_t("action|close")}
                             onClick={this.props.onFinished}
diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx
index 829ffaf3c5..c0647e504f 100644
--- a/src/components/views/elements/SSOButtons.tsx
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -30,7 +30,6 @@ import { Signup } from "@matrix-org/analytics-events/types/typescript/Signup";
 import PlatformPeg from "../../../PlatformPeg";
 import AccessibleButton from "./AccessibleButton";
 import { _t } from "../../../languageHandler";
-import AccessibleTooltipButton from "./AccessibleTooltipButton";
 import { mediaFromMxc } from "../../../customisations/Media";
 import { PosthogAnalytics } from "../../../PosthogAnalytics";
 
@@ -131,9 +130,9 @@ const SSOButton: React.FC<ISSOButtonProps> = ({
     if (mini) {
         // TODO fallback icon
         return (
-            <AccessibleTooltipButton {...props} title={label} className={classes} onClick={onClick}>
+            <AccessibleButton {...props} title={label} className={classes} onClick={onClick}>
                 {icon}
-            </AccessibleTooltipButton>
+            </AccessibleButton>
         );
     }
 
diff --git a/src/components/views/elements/ToggleSwitch.tsx b/src/components/views/elements/ToggleSwitch.tsx
index 588374d17b..8e595ff234 100644
--- a/src/components/views/elements/ToggleSwitch.tsx
+++ b/src/components/views/elements/ToggleSwitch.tsx
@@ -18,7 +18,7 @@ limitations under the License.
 import React from "react";
 import classNames from "classnames";
 
-import AccessibleTooltipButton from "./AccessibleTooltipButton";
+import AccessibleButton from "./AccessibleButton";
 
 interface IProps {
     // Whether or not this toggle is in the 'on' position.
@@ -41,7 +41,7 @@ interface IProps {
 }
 
 // Controlled Toggle Switch element, written with Accessibility in mind
-export default ({ checked, disabled = false, onChange, ...props }: IProps): JSX.Element => {
+export default ({ checked, disabled = false, onChange, title, tooltip, ...props }: IProps): JSX.Element => {
     const _onClick = (): void => {
         if (disabled) return;
         onChange(!checked);
@@ -54,15 +54,17 @@ export default ({ checked, disabled = false, onChange, ...props }: IProps): JSX.
     });
 
     return (
-        <AccessibleTooltipButton
+        <AccessibleButton
             {...props}
             className={classes}
             onClick={_onClick}
             role="switch"
+            aria-label={title}
             aria-checked={checked}
             aria-disabled={disabled}
+            title={tooltip}
         >
             <div className="mx_ToggleSwitch_ball" />
-        </AccessibleTooltipButton>
+        </AccessibleButton>
     );
 };
diff --git a/src/components/views/messages/DecryptionFailureBody.tsx b/src/components/views/messages/DecryptionFailureBody.tsx
index d3895e815f..718fa492e2 100644
--- a/src/components/views/messages/DecryptionFailureBody.tsx
+++ b/src/components/views/messages/DecryptionFailureBody.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,23 +14,41 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { forwardRef, ForwardRefExoticComponent } from "react";
+import React, { forwardRef, ForwardRefExoticComponent, useContext } from "react";
 import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { DecryptionFailureCode } from "matrix-js-sdk/src/crypto-api";
 
 import { _t } from "../../../languageHandler";
 import { IBodyProps } from "./IBodyProps";
+import { LocalDeviceVerificationStateContext } from "../../../contexts/LocalDeviceVerificationStateContext";
 
-function getErrorMessage(mxEvent?: MatrixEvent): string {
-    return mxEvent?.isEncryptedDisabledForUnverifiedDevices
-        ? _t("timeline|decryption_failure|blocked")
-        : _t("timeline|decryption_failure|unable_to_decrypt");
+function getErrorMessage(mxEvent: MatrixEvent, isVerified: boolean | undefined): string {
+    if (mxEvent.isEncryptedDisabledForUnverifiedDevices) return _t("timeline|decryption_failure|blocked");
+    switch (mxEvent.decryptionFailureReason) {
+        case DecryptionFailureCode.HISTORICAL_MESSAGE_NO_KEY_BACKUP:
+            return _t("timeline|decryption_failure|historical_event_no_key_backup");
+
+        case DecryptionFailureCode.HISTORICAL_MESSAGE_BACKUP_UNCONFIGURED:
+            if (isVerified === false) {
+                // The user seems to have a key backup, so prompt them to verify in the hope that doing so will
+                // mean we can restore from backup and we'll get the key for this message.
+                return _t("timeline|decryption_failure|historical_event_unverified_device");
+            }
+            // otherwise, use the default.
+            break;
+
+        case DecryptionFailureCode.HISTORICAL_MESSAGE_USER_NOT_JOINED:
+            return _t("timeline|decryption_failure|historical_event_user_not_joined");
+    }
+    return _t("timeline|decryption_failure|unable_to_decrypt");
 }
 
 // A placeholder element for messages that could not be decrypted
-export const DecryptionFailureBody = forwardRef<HTMLDivElement, IBodyProps>(({ mxEvent }, ref): JSX.Element => {
+export const DecryptionFailureBody = forwardRef<HTMLDivElement, IBodyProps>(({ mxEvent }, ref): React.JSX.Element => {
+    const verificationState = useContext(LocalDeviceVerificationStateContext);
     return (
         <div className="mx_DecryptionFailureBody mx_EventTile_content" ref={ref}>
-            {getErrorMessage(mxEvent)}
+            {getErrorMessage(mxEvent, verificationState)}
         </div>
     );
 }) as ForwardRefExoticComponent<IBodyProps>;
diff --git a/src/components/views/messages/MessageActionBar.tsx b/src/components/views/messages/MessageActionBar.tsx
index fa3df0ca03..b5109ee001 100644
--- a/src/components/views/messages/MessageActionBar.tsx
+++ b/src/components/views/messages/MessageActionBar.tsx
@@ -229,22 +229,16 @@ const ReplyInThreadButton: React.FC<IReplyInThreadButton> = ({ mxEvent }) => {
         }
     };
 
+    const title = !hasARelation ? _t("action|reply_in_thread") : _t("threads|error_start_thread_existing_relation");
+
     return (
         <RovingAccessibleTooltipButton
             className="mx_MessageActionBar_iconButton mx_MessageActionBar_threadButton"
             disabled={hasARelation}
-            tooltip={
-                <>
-                    <div className="mx_Tooltip_title">
-                        {!hasARelation
-                            ? _t("action|reply_in_thread")
-                            : _t("threads|error_start_thread_existing_relation")}
-                    </div>
-                </>
-            }
-            title={!hasARelation ? _t("action|reply_in_thread") : _t("threads|error_start_thread_existing_relation")}
+            title={title}
             onClick={onClick}
             onContextMenu={onClick}
+            placement="left"
         >
             <ThreadIcon />
         </RovingAccessibleTooltipButton>
@@ -508,18 +502,7 @@ class MessageActionBar extends React.PureComponent<IMessageActionBarProps> {
                     mx_MessageActionBar_iconButton: true,
                     mx_MessageActionBar_expandCollapseMessageButton: true,
                 });
-                const tooltip = (
-                    <>
-                        <div className="mx_Tooltip_title">
-                            {this.props.isQuoteExpanded
-                                ? _t("timeline|mab|collapse_reply_chain")
-                                : _t("timeline|mab|expand_reply_chain")}
-                        </div>
-                        <div className="mx_Tooltip_sub">
-                            {_t(ALTERNATE_KEY_NAME[Key.SHIFT]) + " + " + _t("action|click")}
-                        </div>
-                    </>
-                );
+
                 toolbarOpts.push(
                     <RovingAccessibleTooltipButton
                         className={expandClassName}
@@ -528,9 +511,10 @@ class MessageActionBar extends React.PureComponent<IMessageActionBarProps> {
                                 ? _t("timeline|mab|collapse_reply_chain")
                                 : _t("timeline|mab|expand_reply_chain")
                         }
-                        tooltip={tooltip}
+                        caption={_t(ALTERNATE_KEY_NAME[Key.SHIFT]) + " + " + _t("action|click")}
                         onClick={this.props.toggleThreadExpanded}
                         key="expand"
+                        placement="left"
                     >
                         {this.props.isQuoteExpanded ? <CollapseMessageIcon /> : <ExpandMessageIcon />}
                     </RovingAccessibleTooltipButton>,
diff --git a/src/components/views/pips/WidgetPip.tsx b/src/components/views/pips/WidgetPip.tsx
index 4a0d5e6618..2ba9e39e25 100644
--- a/src/components/views/pips/WidgetPip.tsx
+++ b/src/components/views/pips/WidgetPip.tsx
@@ -34,7 +34,6 @@ import { WidgetType } from "../../../widgets/WidgetType";
 import { WidgetMessagingStore } from "../../../stores/widgets/WidgetMessagingStore";
 import WidgetUtils from "../../../utils/WidgetUtils";
 import { ElementWidgetActions } from "../../../stores/widgets/ElementWidgetActions";
-import { Alignment } from "../elements/Tooltip";
 
 interface Props {
     widgetId: string;
@@ -128,9 +127,9 @@ export const WidgetPip: FC<Props> = ({ widgetId, room, viewingRoom, onStartMovin
                         <Toolbar className="mx_WidgetPip_footer">
                             <RovingAccessibleTooltipButton
                                 onClick={onLeaveClick}
-                                tooltip={_t("action|leave")}
+                                title={_t("action|leave")}
                                 aria-label={_t("action|leave")}
-                                alignment={Alignment.Top}
+                                placement="top"
                             >
                                 <HangupIcon className="mx_Icon mx_Icon_24" />
                             </RovingAccessibleTooltipButton>
diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index 2e7b9bc9ab..dbc6acb29b 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -237,7 +237,12 @@ export function DeviceItem({
         );
     } else {
         return (
-            <AccessibleButton className={classes} title={device.deviceId} onClick={onDeviceClick}>
+            <AccessibleButton
+                className={classes}
+                title={device.deviceId}
+                aria-label={deviceName}
+                onClick={onDeviceClick}
+            >
                 <div className={iconClasses} />
                 <div className="mx_UserInfo_device_name">{deviceName}</div>
                 <div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
diff --git a/src/components/views/rooms/LinkPreviewGroup.tsx b/src/components/views/rooms/LinkPreviewGroup.tsx
index 0b82b8729a..c940e9fce7 100644
--- a/src/components/views/rooms/LinkPreviewGroup.tsx
+++ b/src/components/views/rooms/LinkPreviewGroup.tsx
@@ -81,6 +81,7 @@ const LinkPreviewGroup: React.FC<IProps> = ({ links, mxEvent, onCancelClick, onH
                                 src={require("../../../../res/img/cancel.svg").default}
                                 width="18"
                                 height="18"
+                                draggable="false"
                             />
                         </AccessibleButton>
                     ) : undefined}
diff --git a/src/components/views/rooms/MessageComposerFormatBar.tsx b/src/components/views/rooms/MessageComposerFormatBar.tsx
index 0d737c4001..5893540528 100644
--- a/src/components/views/rooms/MessageComposerFormatBar.tsx
+++ b/src/components/views/rooms/MessageComposerFormatBar.tsx
@@ -127,16 +127,6 @@ interface IFormatButtonProps {
 class FormatButton extends React.PureComponent<IFormatButtonProps> {
     public render(): React.ReactNode {
         const className = `mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIcon${this.props.icon}`;
-        let shortcut;
-        if (this.props.shortcut) {
-            shortcut = <div className="mx_MessageComposerFormatBar_tooltipShortcut">{this.props.shortcut}</div>;
-        }
-        const tooltip = (
-            <div>
-                <div className="mx_Tooltip_title">{this.props.label}</div>
-                <div className="mx_Tooltip_sub">{shortcut}</div>
-            </div>
-        );
 
         // element="button" and type="button" are necessary for the buttons to work on WebKit,
         // otherwise the text is deselected before onClick can ever be called
@@ -145,8 +135,9 @@ class FormatButton extends React.PureComponent<IFormatButtonProps> {
                 element="button"
                 type="button"
                 onClick={this.props.onClick}
+                aria-label={this.props.label}
                 title={this.props.label}
-                tooltip={tooltip}
+                caption={this.props.shortcut}
                 className={className}
             />
         );
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index e8c6d1fc8d..8bd5231f4c 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -159,7 +159,7 @@ const DmAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex, dispatcher = default
                                     showSpaceInvite(activeSpace);
                                 }}
                                 disabled={!canInvite}
-                                tooltip={canInvite ? undefined : _t("spaces|error_no_permission_invite")}
+                                title={canInvite ? undefined : _t("spaces|error_no_permission_invite")}
                             />
                         )}
                     </IconizedContextMenuOptionList>
@@ -249,7 +249,7 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
                                 PosthogTrackers.trackInteraction("WebRoomListRoomsSublistPlusMenuCreateRoomItem", e);
                             }}
                             disabled={!canAddRooms}
-                            tooltip={canAddRooms ? undefined : _t("spaces|error_no_permission_create_room")}
+                            title={canAddRooms ? undefined : _t("spaces|error_no_permission_create_room")}
                         />
                         {videoRoomsEnabled && (
                             <IconizedContextMenuOption
@@ -265,7 +265,7 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
                                     );
                                 }}
                                 disabled={!canAddRooms}
-                                tooltip={canAddRooms ? undefined : _t("spaces|error_no_permission_create_room")}
+                                title={canAddRooms ? undefined : _t("spaces|error_no_permission_create_room")}
                             >
                                 <BetaPill />
                             </IconizedContextMenuOption>
@@ -280,7 +280,7 @@ const UntaggedAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
                                 showAddExistingRooms(activeSpace);
                             }}
                             disabled={!canAddRooms}
-                            tooltip={canAddRooms ? undefined : _t("spaces|error_no_permission_add_room")}
+                            title={canAddRooms ? undefined : _t("spaces|error_no_permission_add_room")}
                         />
                     </>
                 ) : null}
diff --git a/src/components/views/rooms/RoomListHeader.tsx b/src/components/views/rooms/RoomListHeader.tsx
index 690300dfa2..bcd918eaf3 100644
--- a/src/components/views/rooms/RoomListHeader.tsx
+++ b/src/components/views/rooms/RoomListHeader.tsx
@@ -267,7 +267,7 @@ const RoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
                             closePlusMenu();
                         }}
                         disabled={!canAddSubRooms}
-                        tooltip={!canAddSubRooms ? _t("spaces|error_no_permission_add_room") : undefined}
+                        title={!canAddSubRooms ? _t("spaces|error_no_permission_add_room") : undefined}
                     />
                     {canCreateSpaces && (
                         <IconizedContextMenuOption
@@ -280,7 +280,7 @@ const RoomListHeader: React.FC<IProps> = ({ onVisibilityChange }) => {
                                 closePlusMenu();
                             }}
                             disabled={!canAddSubSpaces}
-                            tooltip={!canAddSubSpaces ? _t("spaces|error_no_permission_add_space") : undefined}
+                            title={!canAddSubSpaces ? _t("spaces|error_no_permission_add_space") : undefined}
                         >
                             <BetaPill />
                         </IconizedContextMenuOption>
diff --git a/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx b/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx
index cd3cd4ccec..317afdfca1 100644
--- a/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx
+++ b/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx
@@ -23,7 +23,7 @@ import AccessibleTooltipButton from "../../elements/AccessibleTooltipButton";
 
 type Props<T extends keyof JSX.IntrinsicElements> = Omit<
     ComponentProps<typeof AccessibleTooltipButton<T>>,
-    "aria-label" | "title" | "kind" | "className" | "onClick"
+    "aria-label" | "title" | "kind" | "className" | "onClick" | "element"
 > & {
     isExpanded: boolean;
     onClick: () => void;
diff --git a/src/components/views/settings/devices/LoginWithQRSection.tsx b/src/components/views/settings/devices/LoginWithQRSection.tsx
index c85b80c3a7..b83668b6b8 100644
--- a/src/components/views/settings/devices/LoginWithQRSection.tsx
+++ b/src/components/views/settings/devices/LoginWithQRSection.tsx
@@ -35,39 +35,40 @@ interface IProps {
     wellKnown?: IClientWellKnown;
 }
 
-export default class LoginWithQRSection extends React.Component<IProps> {
-    public constructor(props: IProps) {
-        super(props);
-    }
-
-    public render(): JSX.Element | null {
-        // Needs server support for get_login_token and MSC3886:
-        // in r0 of MSC3882 it is exposed as a feature flag, but in stable and unstable r1 it is a capability
-        const capability = GET_LOGIN_TOKEN_CAPABILITY.findIn<IGetLoginTokenCapability>(this.props.capabilities);
-        const getLoginTokenSupported =
-            !!this.props.versions?.unstable_features?.["org.matrix.msc3882"] || !!capability?.enabled;
-        const msc3886Supported =
-            !!this.props.versions?.unstable_features?.["org.matrix.msc3886"] ||
-            this.props.wellKnown?.["io.element.rendezvous"]?.server;
-        const offerShowQr = getLoginTokenSupported && msc3886Supported;
-
-        // don't show anything if no method is available
-        if (!offerShowQr) {
-            return null;
-        }
-
-        return (
-            <SettingsSubsection heading={_t("settings|sessions|sign_in_with_qr")}>
-                <div className="mx_LoginWithQRSection">
-                    <p className="mx_SettingsTab_subsectionText">
-                        {_t("settings|sessions|sign_in_with_qr_description")}
-                    </p>
-                    <AccessibleButton onClick={this.props.onShowQr} kind="primary">
-                        <QrCodeIcon height={20} width={20} />
-                        {_t("settings|sessions|sign_in_with_qr_button")}
-                    </AccessibleButton>
-                </div>
-            </SettingsSubsection>
-        );
-    }
+function shouldShowQrLegacy(
+    versions?: IServerVersions,
+    wellKnown?: IClientWellKnown,
+    capabilities?: Capabilities,
+): boolean {
+    // Needs server support for (get_login_token or OIDC Device Authorization Grant) and MSC3886:
+    // in r0 of MSC3882 it is exposed as a feature flag, but in stable and unstable r1 it is a capability
+    const loginTokenCapability = GET_LOGIN_TOKEN_CAPABILITY.findIn<IGetLoginTokenCapability>(capabilities);
+    const getLoginTokenSupported =
+        !!versions?.unstable_features?.["org.matrix.msc3882"] || !!loginTokenCapability?.enabled;
+    const msc3886Supported =
+        !!versions?.unstable_features?.["org.matrix.msc3886"] || !!wellKnown?.["io.element.rendezvous"]?.server;
+    return getLoginTokenSupported && msc3886Supported;
 }
+
+const LoginWithQRSection: React.FC<IProps> = ({ onShowQr, versions, capabilities, wellKnown }) => {
+    const offerShowQr = shouldShowQrLegacy(versions, wellKnown, capabilities);
+
+    // don't show anything if no method is available
+    if (!offerShowQr) {
+        return null;
+    }
+
+    return (
+        <SettingsSubsection heading={_t("settings|sessions|sign_in_with_qr")}>
+            <div className="mx_LoginWithQRSection">
+                <p className="mx_SettingsTab_subsectionText">{_t("settings|sessions|sign_in_with_qr_description")}</p>
+                <AccessibleButton onClick={onShowQr} kind="primary">
+                    <QrCodeIcon height={20} width={20} />
+                    {_t("settings|sessions|sign_in_with_qr_button")}
+                </AccessibleButton>
+            </div>
+        </SettingsSubsection>
+    );
+};
+
+export default LoginWithQRSection;
diff --git a/src/components/views/settings/tabs/user/SessionManagerTab.tsx b/src/components/views/settings/tabs/user/SessionManagerTab.tsx
index 61c8e85f8d..c711b7e39e 100644
--- a/src/components/views/settings/tabs/user/SessionManagerTab.tsx
+++ b/src/components/views/settings/tabs/user/SessionManagerTab.tsx
@@ -32,7 +32,8 @@ import { ExtendedDevice } from "../../devices/types";
 import { deleteDevicesWithInteractiveAuth } from "../../devices/deleteDevices";
 import SettingsTab from "../SettingsTab";
 import LoginWithQRSection from "../../devices/LoginWithQRSection";
-import LoginWithQR, { Mode } from "../../../auth/LoginWithQR";
+import LoginWithQR from "../../../auth/LoginWithQR";
+import { Mode } from "../../../auth/LoginWithQR-types";
 import { useAsyncMemo } from "../../../../../hooks/useAsyncMemo";
 import QuestionDialog from "../../../dialogs/QuestionDialog";
 import { FilterVariation } from "../../devices/filter";
@@ -284,6 +285,12 @@ const SessionManagerTab: React.FC = () => {
     return (
         <SettingsTab>
             <SettingsSection heading={_t("settings|sessions|title")}>
+                <LoginWithQRSection
+                    onShowQr={onShowQrClicked}
+                    versions={clientVersions}
+                    capabilities={capabilities}
+                    wellKnown={wellKnown}
+                />
                 <SecurityRecommendations
                     devices={devices}
                     goToFilteredList={onGoToFilteredList}
@@ -337,12 +344,6 @@ const SessionManagerTab: React.FC = () => {
                         />
                     </SettingsSubsection>
                 )}
-                <LoginWithQRSection
-                    onShowQr={onShowQrClicked}
-                    versions={clientVersions}
-                    capabilities={capabilities}
-                    wellKnown={wellKnown}
-                />
             </SettingsSection>
         </SettingsTab>
     );
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index 429a18e134..8d3041ff1e 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -368,8 +368,6 @@ const SpacePanel: React.FC = () => {
         }
     });
 
-    const isThreadsActivityCentreEnabled = useSettingValue<boolean>("threadsActivityCentre");
-
     return (
         <RovingTabIndexProvider handleHomeEnd handleUpDown={!dragging}>
             {({ onKeyDownHandler, onDragEndHandler }) => (
@@ -426,9 +424,8 @@ const SpacePanel: React.FC = () => {
                             )}
                         </Droppable>
 
-                        {isThreadsActivityCentreEnabled && (
-                            <ThreadsActivityCentre displayButtonLabel={!isPanelCollapsed} />
-                        )}
+                        <ThreadsActivityCentre displayButtonLabel={!isPanelCollapsed} />
+
                         <QuickSettingsButton isPanelCollapsed={isPanelCollapsed} />
                     </nav>
                 </DragDropContext>
diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index e7f905068a..d858f0533e 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -51,7 +51,7 @@ import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 
 type ButtonProps<T extends keyof JSX.IntrinsicElements> = Omit<
     ComponentProps<typeof AccessibleTooltipButton<T>>,
-    "title" | "onClick" | "size"
+    "title" | "onClick" | "size" | "element"
 > & {
     space?: Room;
     spaceKey?: SpaceKey;
diff --git a/src/hooks/useUnreadNotifications.ts b/src/hooks/useUnreadNotifications.ts
index e0a2f1eeff..f687ee7f1d 100644
--- a/src/hooks/useUnreadNotifications.ts
+++ b/src/hooks/useUnreadNotifications.ts
@@ -15,13 +15,12 @@ limitations under the License.
 */
 
 import { RoomEvent } from "matrix-js-sdk/src/matrix";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 
 import type { NotificationCount, Room } from "matrix-js-sdk/src/matrix";
 import { determineUnreadState } from "../RoomNotifs";
 import { NotificationLevel } from "../stores/notifications/NotificationLevel";
 import { useEventEmitter } from "./useEventEmitter";
-import SettingsStore from "../settings/SettingsStore";
 
 export const useUnreadNotifications = (
     room?: Room,
@@ -31,8 +30,6 @@ export const useUnreadNotifications = (
     count: number;
     level: NotificationLevel;
 } => {
-    const tacEnabled = useMemo(() => SettingsStore.getValue("threadsActivityCentre"), []);
-
     const [symbol, setSymbol] = useState<string | null>(null);
     const [count, setCount] = useState<number>(0);
     const [level, setLevel] = useState<NotificationLevel>(NotificationLevel.None);
@@ -53,11 +50,11 @@ export const useUnreadNotifications = (
     useEventEmitter(room, RoomEvent.MyMembership, () => updateNotificationState());
 
     const updateNotificationState = useCallback(() => {
-        const { symbol, count, level } = determineUnreadState(room, threadId, !tacEnabled);
+        const { symbol, count, level } = determineUnreadState(room, threadId, false);
         setSymbol(symbol);
         setCount(count);
         setLevel(level);
-    }, [room, threadId, tacEnabled]);
+    }, [room, threadId]);
 
     useEffect(() => {
         updateNotificationState();
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 08d552101a..6967a0c16b 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -249,15 +249,7 @@
             "completing_setup": "Dokončování nastavení nového zařízení",
             "confirm_code_match": "Zkontrolujte, zda se níže uvedený kód shoduje s vaším dalším zařízením:",
             "connecting": "Připojování…",
-            "error_device_already_signed_in": "Druhé zařízení je již přihlášeno.",
-            "error_device_not_signed_in": "Druhé zařízení není přihlášeno.",
-            "error_device_unsupported": "Propojení s tímto zařízením není podporováno.",
-            "error_homeserver_lacks_support": "Domovský server nepodporuje přihlášení pomocí jiného zařízení.",
-            "error_invalid_scanned_code": "Naskenovaný kód je neplatný.",
-            "error_linking_incomplete": "Propojení nebylo dokončeno v požadovaném čase.",
             "error_rate_limited": "Příliš mnoho pokusů v krátkém čase. Počkejte chvíli, než to zkusíte znovu.",
-            "error_request_cancelled": "Požadavek byl zrušen.",
-            "error_request_declined": "Požadavek byl na druhém zařízení odmítnut.",
             "error_unexpected": "Došlo k neočekávané chybě.",
             "scan_code_instruction": "Níže uvedený QR kód naskenujte pomocí přihlašovaného zařízení.",
             "scan_qr_code": "Skenovat QR kód",
@@ -1446,18 +1438,9 @@
         "rust_crypto_optin_warning": "Přechod na Rust kryptografii vyžaduje proces migrace, který může trvat několik minut. Pro deaktivaci se budete muset odhlásit a znovu přihlásit; používejte s opatrností!",
         "rust_crypto_requires_logout": "Jakmile je Rust kryptografie povolena, lze ji vypnout pouze odhlášením a opětovným přihlášením.",
         "sliding_sync": "Režim klouzavé synchronizace",
-        "sliding_sync_checking": "Kontrola…",
-        "sliding_sync_configuration": "Nastavení klouzavé synchronizace",
         "sliding_sync_description": "V aktivním vývoji, nelze zakázat.",
-        "sliding_sync_disable_warning": "Pro deaktivaci se musíte odhlásit a znovu přihlásit, používejte s opatrností!",
         "sliding_sync_disabled_notice": "Pro vypnutí se odhlaste a znovu přihlaste",
-        "sliding_sync_proxy_url_label": "URL proxy serveru",
-        "sliding_sync_proxy_url_optional_label": "URL proxy serveru (volitelné)",
         "sliding_sync_server_no_support": "Váš server nemá nativní podporu",
-        "sliding_sync_server_specify_proxy": "Váš server nemá nativní podporu, musíte zadat proxy server",
-        "sliding_sync_server_support": "Váš server má nativní podporu",
-        "threads_activity_centre": "Centrum aktivit vláken (ve vývoji).",
-        "threads_activity_centre_description": "Upozornění: V aktivním vývoji; znovu načte %(brand)s.",
         "under_active_development": "V aktivním vývoji.",
         "unrealiable_e2e": "Nespolehlivé v šifrovaných místnostech",
         "video_rooms": "Video místnosti",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 809ffe6e4b..5704774956 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -245,15 +245,7 @@
             "completing_setup": "Schließe Anmeldung deines neuen Gerätes ab",
             "confirm_code_match": "Überprüfe, dass der unten angezeigte Code mit deinem anderen Gerät übereinstimmt:",
             "connecting": "Verbinde …",
-            "error_device_already_signed_in": "Das andere Gerät ist bereits angemeldet.",
-            "error_device_not_signed_in": "Das andere Gerät ist nicht angemeldet.",
-            "error_device_unsupported": "Die Verbindung mit diesem Gerät wird nicht unterstützt.",
-            "error_homeserver_lacks_support": "Der Heim-Server unterstützt die Anmeldung eines anderen Gerätes nicht.",
-            "error_invalid_scanned_code": "Der gescannte Code ist ungültig.",
-            "error_linking_incomplete": "Die Verbindung konnte nicht in der erforderlichen Zeit hergestellt werden.",
             "error_rate_limited": "Zu viele Versuche in zu kurzer Zeit. Warte ein wenig, bevor du es erneut versuchst.",
-            "error_request_cancelled": "Die Anfrage wurde abgebrochen.",
-            "error_request_declined": "Die Anfrage wurde auf dem anderen Gerät abgelehnt.",
             "error_unexpected": "Ein unerwarteter Fehler ist aufgetreten.",
             "scan_code_instruction": "Lese den folgenden QR-Code mit deinem nicht angemeldeten Gerät ein.",
             "scan_qr_code": "QR-Code einlesen",
@@ -1431,16 +1423,9 @@
         "report_to_moderators_description": "In Räumen, die Moderation unterstützen, lässt dich die Schaltfläche „Melden“ missbräuchliche Verwendung an die Raummoderation melden.",
         "rust_crypto": "Rust-Verschlüsselungsumsetzung",
         "sliding_sync": "Sliding-Sync-Modus",
-        "sliding_sync_checking": "Überprüfe …",
-        "sliding_sync_configuration": "Sliding-Sync-Konfiguration",
         "sliding_sync_description": "In aktiver Entwicklung, kann nicht deaktiviert werden.",
-        "sliding_sync_disable_warning": "Zum Deaktivieren musst du dich neu anmelden. Mit Vorsicht verwenden!",
         "sliding_sync_disabled_notice": "Zum Deaktivieren, melde dich ab und erneut an",
-        "sliding_sync_proxy_url_label": "Proxy-URL",
-        "sliding_sync_proxy_url_optional_label": "Proxy-URL (optional)",
         "sliding_sync_server_no_support": "Dein Server unterstützt dies nicht nativ",
-        "sliding_sync_server_specify_proxy": "Dein Server unterstützt dies nicht nativ, du musst einen Proxy angeben",
-        "sliding_sync_server_support": "Dein Server unterstützt dies nativ",
         "under_active_development": "In aktiver Entwicklung.",
         "unrealiable_e2e": "Nicht zuverlässig in verschlüsselten Räumen",
         "video_rooms": "Videoräume",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0f353c820a..d1f4016aaf 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -249,21 +249,29 @@
             "completing_setup": "Completing set up of your new device",
             "confirm_code_match": "Check that the code below matches with your other device:",
             "connecting": "Connecting…",
-            "error_device_already_signed_in": "The other device is already signed in.",
-            "error_device_not_signed_in": "The other device isn't signed in.",
-            "error_device_unsupported": "Linking with this device is not supported.",
-            "error_homeserver_lacks_support": "The homeserver doesn't support signing in another device.",
-            "error_invalid_scanned_code": "The scanned code is invalid.",
-            "error_linking_incomplete": "The linking wasn't completed in the required time.",
+            "error_expired": "Sign in expired. Please try again.",
+            "error_expired_title": "The sign in was not completed in time",
+            "error_insecure_channel_detected": "A secure connection could not be made to the new device. Your existing devices are still safe and you don't need to worry about them.",
+            "error_insecure_channel_detected_instructions": "Now what?",
+            "error_insecure_channel_detected_instructions_1": "Try signing in to the other device again with a QR code in case this was a network problem",
+            "error_insecure_channel_detected_instructions_2": "If you encounter the same problem, try a different wifi network or use your mobile data instead of wifi",
+            "error_insecure_channel_detected_instructions_3": "If that doesn't work, sign in manually",
+            "error_insecure_channel_detected_title": "Connection not secure",
+            "error_other_device_already_signed_in": "You don’t need to do anything else.",
+            "error_other_device_already_signed_in_title": "Your other device is already signed in",
             "error_rate_limited": "Too many attempts in a short time. Wait some time before trying again.",
-            "error_request_cancelled": "The request was cancelled.",
-            "error_request_declined": "The request was declined on the other device.",
-            "error_unexpected": "An unexpected error occurred.",
-            "follow_remaining_instructions": "Follow the remaining instructions to verify your other device",
+            "error_unexpected": "An unexpected error occurred. The request to connect your other device has been cancelled.",
+            "error_unsupported_protocol": "This device does not support signing in to the other device with a QR code.",
+            "error_unsupported_protocol_title": "Other device not compatible",
+            "error_user_cancelled": "The sign in was cancelled on the other device.",
+            "error_user_cancelled_title": "Sign in request cancelled",
+            "error_user_declined": "You declined the request from your other device to sign in.",
+            "error_user_declined_title": "Sign in declined",
+            "follow_remaining_instructions": "Follow the instructions to link your other device",
             "open_element_other_device": "Open %(brand)s on your other device",
             "point_the_camera": "Point the camera at the QR code shown here",
             "scan_code_instruction": "Scan the QR code with another device",
-            "scan_qr_code": "Scan QR code",
+            "scan_qr_code": "Sign in with QR code",
             "select_qr_code": "Select \"%(scanQRCode)s\"",
             "sign_in_new_device": "Sign in new device",
             "waiting_for_device": "Waiting for device to sign in"
@@ -1452,18 +1460,9 @@
         "rust_crypto_optin_warning": "Switching to the Rust cryptography requires a migration process that may take several minutes. To disable you will need to log out and back in; use with caution!",
         "rust_crypto_requires_logout": "Once enabled, Rust cryptography can only be disabled by logging out and in again",
         "sliding_sync": "Sliding Sync mode",
-        "sliding_sync_checking": "Checking…",
-        "sliding_sync_configuration": "Sliding Sync configuration",
         "sliding_sync_description": "Under active development, cannot be disabled.",
-        "sliding_sync_disable_warning": "To disable you will need to log out and back in, use with caution!",
         "sliding_sync_disabled_notice": "Log out and back in to disable",
-        "sliding_sync_proxy_url_label": "Proxy URL",
-        "sliding_sync_proxy_url_optional_label": "Proxy URL (optional)",
-        "sliding_sync_server_no_support": "Your server lacks native support",
-        "sliding_sync_server_specify_proxy": "Your server lacks native support, you must specify a proxy",
-        "sliding_sync_server_support": "Your server has native support",
-        "threads_activity_centre": "Threads Activity Centre (in development)",
-        "threads_activity_centre_description": "Warning: Under active development; reloads %(brand)s.",
+        "sliding_sync_server_no_support": "Your server lacks support",
         "under_active_development": "Under active development.",
         "unrealiable_e2e": "Unreliable in encrypted rooms",
         "video_rooms": "Video rooms",
@@ -3214,6 +3213,9 @@
         "creation_summary_room": "%(creator)s created and configured the room.",
         "decryption_failure": {
             "blocked": "The sender has blocked you from receiving this message",
+            "historical_event_no_key_backup": "Historical messages are not available on this device",
+            "historical_event_unverified_device": "You need to verify this device for access to historical messages",
+            "historical_event_user_not_joined": "You don't have access to this message",
             "unable_to_decrypt": "Unable to decrypt message"
         },
         "disambiguated_profile": "%(displayName)s (%(matrixId)s)",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 95632d2452..81e047f408 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -233,14 +233,7 @@
             "completing_setup": "Terminando de configurar tu nuevo dispositivo",
             "confirm_code_match": "Comprueba que el siguiente código también aparece en el otro dispositivo:",
             "connecting": "Conectando…",
-            "error_device_already_signed_in": "El otro dispositivo ya tiene una sesión iniciada.",
-            "error_device_not_signed_in": "El otro dispositivo no tiene una sesión iniciada.",
-            "error_homeserver_lacks_support": "Tu servidor base no es compatible con el inicio de sesión en otro dispositivo.",
-            "error_invalid_scanned_code": "El código escaneado no es válido.",
-            "error_linking_incomplete": "El proceso de enlace ha tardado demasiado tiempo, por lo que no se ha completado.",
             "error_rate_limited": "Demasiados intentos en poco tiempo. Espera un poco antes de volverlo a intentar.",
-            "error_request_cancelled": "La solicitud ha sido cancelada.",
-            "error_request_declined": "El otro dispositivo ha rechazado la solicitud.",
             "error_unexpected": "Ha ocurrido un error inesperado.",
             "scan_code_instruction": "Escanea el siguiente código QR con tu dispositivo.",
             "scan_qr_code": "Escanear código QR",
@@ -1323,16 +1316,9 @@
         "report_to_moderators_description": "En las salas que sean compatible con la moderación, el botón de «Denunciar» avisará a los moderadores de la sala.",
         "rust_crypto": "Implementación de la criptografía en Rust",
         "sliding_sync": "Modo de sincronización progresiva",
-        "sliding_sync_checking": "Comprobando…",
-        "sliding_sync_configuration": "Configuración de la sincronización progresiva",
         "sliding_sync_description": "En desarrollo, no se puede desactivar.",
-        "sliding_sync_disable_warning": "Para desactivarlo, tendrás que cerrar sesión y volverla a iniciar. ¡Ten cuidado!",
         "sliding_sync_disabled_notice": "Cierra sesión y vuélvela a abrir para desactivar",
-        "sliding_sync_proxy_url_label": "URL de servidor proxy",
-        "sliding_sync_proxy_url_optional_label": "URL de servidor proxy (opcional)",
         "sliding_sync_server_no_support": "Tu servidor no es compatible",
-        "sliding_sync_server_specify_proxy": "Tu servidor no es compatible, debes configurar un intermediario (proxy)",
-        "sliding_sync_server_support": "Tu servidor es compatible",
         "under_active_development": "Funcionalidad en desarrollo.",
         "video_rooms": "Salas de vídeo",
         "video_rooms_a_new_way_to_chat": "Una nueva forma de hablar por voz y vídeo en %(brand)s.",
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index e24b4c846d..a3e5126dab 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -249,15 +249,7 @@
             "completing_setup": "Lõpetame uue seadme seadistamise",
             "confirm_code_match": "Kontrolli, et järgnev kood klapib teises seadmes kuvatava koodiga:",
             "connecting": "Kõne on ühendamisel…",
-            "error_device_already_signed_in": "Teine seade on juba võrku loginud.",
-            "error_device_not_signed_in": "Teine seade ei ole võrku loginud.",
-            "error_device_unsupported": "Sidumine selle seadmega ei ole toetatud.",
-            "error_homeserver_lacks_support": "Koduserver ei toeta muude seadmete võrku logimise võimalust.",
-            "error_invalid_scanned_code": "Skaneeritud QR-kood on vigane.",
-            "error_linking_incomplete": "Sidumine ei lõppenud etteantud aja jooksul.",
             "error_rate_limited": "Liiga palju päringuid napis ajavahemikus. Enne uuesti proovimist palun oota veidi.",
-            "error_request_cancelled": "Päring katkestati.",
-            "error_request_declined": "Teine seade lükkas päringu tagasi.",
             "error_unexpected": "Tekkis teadmata viga.",
             "scan_code_instruction": "Loe QR-koodi seadmega, kus sa oled Matrix'i võrgust välja loginud.",
             "scan_qr_code": "Loe QR-koodi",
@@ -1439,16 +1431,9 @@
         "rust_crypto_optin_warning": "Rust'i teekidel põhineva krüptograafia kasutusele võtmine eeldab andmete ümbertõstmist ja selleks võib kuluda õige mitu minutit. Selle funktsionaalsuse väljalülitamiseks pead võrgust välja logima ning seejärel tagasi logima. Palun ole kindel, et tead, mida teed!",
         "rust_crypto_requires_logout": "Kui Rust'i põhised teegid on kasutusel, siis selle funktsionaalsuse väljalülitamiseks pead võrgust välja logima ning seejärel tagasi logima",
         "sliding_sync": "Järkjärgulise sünkroniseerimise režiim",
-        "sliding_sync_checking": "Kontrollin…",
-        "sliding_sync_configuration": "Sliding Sync konfiguratsioon",
         "sliding_sync_description": "Aktiivselt arendamisel ega ole võimalik välja lülitada.",
-        "sliding_sync_disable_warning": "Väljalülitamiseks palun logi välja ning seejärel tagasi, kuid ole sellega ettevaatlik!",
         "sliding_sync_disabled_notice": "Väljalülitamiseks logi Matrix'i võrgust välja ja seejärel tagasi",
-        "sliding_sync_proxy_url_label": "Puhverserveri aadress",
-        "sliding_sync_proxy_url_optional_label": "Puhverserveri aadress (kui vaja)",
         "sliding_sync_server_no_support": "Selle funktsionaalsuse tugi on sinu koduserveris puudu",
-        "sliding_sync_server_specify_proxy": "Selle funktsionaalsuse tugi on sinu koduserveris puudu, palun kasuta puhverserverit",
-        "sliding_sync_server_support": "Selle funktsionaalsuse tugi on sinu koduserveris olemas",
         "under_active_development": "Aktiivselt arendamisel.",
         "video_rooms": "Videotoad",
         "video_rooms_a_new_way_to_chat": "Uus võimalus videovestlusteks rakenduses %(brand)s.",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 1fecd1b6d0..acb49fe159 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -230,14 +230,7 @@
         "phone_optional_label": "Puhelin (valinnainen)",
         "qr_code_login": {
             "connecting": "Yhdistetään…",
-            "error_device_already_signed_in": "Toinen laite on jo sisäänkirjautunut.",
-            "error_device_not_signed_in": "Toinen laite ei ole sisäänkirjautunut.",
-            "error_device_unsupported": "Tämän laitteen kanssa linkittäminen ei ole tuettu.",
-            "error_invalid_scanned_code": "Skannattu koodi on virheellinen.",
-            "error_linking_incomplete": "Linkitystä ei suoritettu vaaditussa ajassa.",
             "error_rate_limited": "Liikaa yrityksiä lyhyessä ajassa. Odota hetki, ennen kuin yrität uudelleen.",
-            "error_request_cancelled": "Pyyntö peruttiin.",
-            "error_request_declined": "Pyyntö hylättiin toiselta laitteelta.",
             "error_unexpected": "Tapahtui odottamaton virhe.",
             "sign_in_new_device": "Kirjaa sisään uusi laite",
             "waiting_for_device": "Odotetaan laitteen sisäänkirjautumista"
@@ -1253,14 +1246,9 @@
         "report_to_moderators_description": "Moderointia tukevissa huoneissa väärinkäytökset voi ilmoittaa Ilmoita-painikkeella huoneen moderaattoreille.",
         "rust_crypto": "Rust-kryptografiatoteutus",
         "sliding_sync": "Liukuvan synkronoinnin tila",
-        "sliding_sync_checking": "Tarkistetaan…",
-        "sliding_sync_configuration": "Liukuvan synkronoinnin asetukset",
         "sliding_sync_description": "Työn alla, käytöstä poistaminen ei ole mahdollista.",
         "sliding_sync_disabled_notice": "Poista käytöstä kirjautumalla ulos ja takaisin sisään",
-        "sliding_sync_proxy_url_label": "Välityspalvelimen URL-osoite",
-        "sliding_sync_proxy_url_optional_label": "Välityspalvelimen URL-osoite (valinnainen)",
         "sliding_sync_server_no_support": "Palvelimellasi ei ole natiivitukea",
-        "sliding_sync_server_support": "Palvelimellasi on natiivituki",
         "under_active_development": "Aktiivisen kehityksen kohteena.",
         "video_rooms": "Videohuoneet",
         "video_rooms_a_new_way_to_chat": "Uusi tapa keskustella äänen ja videon välityksellä %(brand)sissä.",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 5e9517bf74..acb2b33490 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -249,15 +249,7 @@
             "completing_setup": "Fin de la configuration de votre nouvel appareil",
             "confirm_code_match": "Vérifiez que le code ci-dessous correspond à celui sur votre autre appareil :",
             "connecting": "Connexion…",
-            "error_device_already_signed_in": "L’autre appareil est déjà connecté.",
-            "error_device_not_signed_in": "L’autre appareil n’est pas connecté.",
-            "error_device_unsupported": "L’appairage avec cet appareil n’est pas pris en charge.",
-            "error_homeserver_lacks_support": "Le serveur d’accueil ne prend pas en charge la connexion d’un autre appareil.",
-            "error_invalid_scanned_code": "Le code scanné est invalide.",
-            "error_linking_incomplete": "L’appairage n’a pas été effectué dans le temps imparti.",
             "error_rate_limited": "Trop de tentatives consécutives. Attendez un peu avant de réessayer.",
-            "error_request_cancelled": "La demande a été annulée.",
-            "error_request_declined": "La requête a été refusée sur l’autre appareil.",
             "error_unexpected": "Une erreur inattendue s’est produite.",
             "scan_code_instruction": "Scannez le QR code ci-dessous avec l’appareil qui n’est pas connecté.",
             "scan_qr_code": "Scanner le QR code",
@@ -1445,18 +1437,9 @@
         "rust_crypto_optin_warning": "Si vous passez à la cryptographie Rust, cela démarrera un processus de migration qui peut durer plusieurs minutes. Pour la désactiver, vous devrez vous déconnecter et vous reconnecter; à utiliser prudemment !",
         "rust_crypto_requires_logout": "Une fois activée, la cryptographie Rust ne peut être désactivée qu'en se déconnectant et se reconnectant",
         "sliding_sync": "Mode synchronisation progressive",
-        "sliding_sync_checking": "Vérification…",
-        "sliding_sync_configuration": "Configuration de la synchronisation progressive",
         "sliding_sync_description": "En cours de développement, ne peut être désactivé.",
-        "sliding_sync_disable_warning": "Pour la désactiver, vous devrez vous déconnecter et vous reconnecter, faites attention !",
         "sliding_sync_disabled_notice": "Déconnectez et revenez pour désactiver",
-        "sliding_sync_proxy_url_label": "URL du serveur mandataire (proxy)",
-        "sliding_sync_proxy_url_optional_label": "URL du serveur mandataire (proxy – facultatif)",
         "sliding_sync_server_no_support": "Votre serveur manque d’un support natif",
-        "sliding_sync_server_specify_proxy": "Votre serveur manque d’un support natif, vous devez spécifier un serveur mandataire (proxy)",
-        "sliding_sync_server_support": "Votre serveur a un support natif",
-        "threads_activity_centre": "Centre d'activité des fils de discussion (en développement)",
-        "threads_activity_centre_description": "Attention: en cours de développement actif. Recharge %(brand)s",
         "under_active_development": "En cours de développement.",
         "unrealiable_e2e": "Non fiable dans les salons chiffrés",
         "video_rooms": "Salons vidéo",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index e58b0ea5ad..1150025406 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -1211,13 +1211,7 @@
         "leave_beta_reload": "Ao saír da beta volveremos a cargar %(brand)s.",
         "msc3531_hide_messages_pending_moderation": "Permitir que a moderación agoche mensaxes pendentes de moderar.",
         "pinning": "Fixando mensaxe",
-        "sliding_sync_configuration": "Configuración Sliding Sync",
-        "sliding_sync_disable_warning": "Para desactivalo tes que saír e volver a acceder, usa con precaución!",
-        "sliding_sync_proxy_url_label": "URL do Proxy",
-        "sliding_sync_proxy_url_optional_label": "URL do proxy (optativo)",
         "sliding_sync_server_no_support": "O teu servidor non ten soporte nativo",
-        "sliding_sync_server_specify_proxy": "O teu servidor non ten servidor nativo, tes que indicar un proxy",
-        "sliding_sync_server_support": "O teu servidor ten soporte nativo",
         "video_rooms": "Salas de vídeo",
         "video_rooms_a_new_way_to_chat": "Un novo xeito de conversar con voz e vídeo en %(brand)s.",
         "video_rooms_always_on_voip_channels": "As salas de vídeo son canles VoIP sempre activas dentro dunha sala en %(brand)s.",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 801aa2f69a..7d8744d2a4 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -243,14 +243,6 @@
             "completing_setup": "Új eszköz beállításának elvégzése",
             "confirm_code_match": "Ellenőrizze, hogy az alábbi kód megegyezik a másik eszközödön lévővel:",
             "connecting": "Kapcsolás…",
-            "error_device_already_signed_in": "A másik eszköz már bejelentkezett.",
-            "error_device_not_signed_in": "A másik eszköz még nincs bejelentkezve.",
-            "error_device_unsupported": "Összekötés ezzel az eszközzel nem támogatott.",
-            "error_homeserver_lacks_support": "A Matrix-kiszolgáló nem támogatja más eszköz bejelentkeztetését.",
-            "error_invalid_scanned_code": "A beolvasott kód érvénytelen.",
-            "error_linking_incomplete": "Az összekötés az elvárt időn belül nem fejeződött be.",
-            "error_request_cancelled": "A kérés megszakítva.",
-            "error_request_declined": "A kérést elutasították a másik eszközön.",
             "error_unexpected": "Nemvárt hiba történt.",
             "scan_code_instruction": "A kijelentkezett eszközzel olvasd be a QR kódot alább.",
             "scan_qr_code": "QR kód beolvasása",
@@ -1412,16 +1404,9 @@
         "report_to_moderators_description": "A moderálást támogató szobákban a problémás tartalmat a „Jelentés” gombbal lehet a moderátorok felé jelezni.",
         "rust_crypto": "Rust titkosítási implementáció",
         "sliding_sync": "Csúszó szinkronizációs mód",
-        "sliding_sync_checking": "Ellenőrzés…",
-        "sliding_sync_configuration": "Csúszó szinkronizáció beállítása",
         "sliding_sync_description": "Aktív fejlesztés alatt, nem kapcsolható ki.",
-        "sliding_sync_disable_warning": "A kikapcsoláshoz ki, majd újra be kell jelentkezni, használja óvatosan.",
         "sliding_sync_disabled_notice": "A kikapcsoláshoz ki-, és bejelentkezés szükséges",
-        "sliding_sync_proxy_url_label": "Proxy webcíme",
-        "sliding_sync_proxy_url_optional_label": "Proxy webcíme (nem kötelező)",
         "sliding_sync_server_no_support": "A kiszolgálója nem támogatja natívan",
-        "sliding_sync_server_specify_proxy": "A kiszolgálója nem támogatja natívan, proxy kiszolgálót kell beállítani",
-        "sliding_sync_server_support": "A kiszolgálója natívan támogatja",
         "under_active_development": "Aktív fejlesztés alatt.",
         "video_rooms": "Videószobák",
         "video_rooms_a_new_way_to_chat": "Új csevegési lehetőség a(z) %(brand)s alkalmazásban, hanggal és videóval.",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index b70af7df1d..9ec1be1a53 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -243,14 +243,6 @@
             "completing_setup": "Menyelesaikan penyiapan perangkat baru Anda",
             "confirm_code_match": "Periksa bahwa kode di bawah cocok dengan perangkat Anda yang lain:",
             "connecting": "Menghubungkan…",
-            "error_device_already_signed_in": "Perangkat yang lain sudah masuk.",
-            "error_device_not_signed_in": "Perangkat yang lain belum masuk.",
-            "error_device_unsupported": "Penautan dengan perangkat ini tidak didukung.",
-            "error_homeserver_lacks_support": "Homeserver tidak mendukung masuk ke perangkat lain.",
-            "error_invalid_scanned_code": "Kode yang dipindai tidak absah.",
-            "error_linking_incomplete": "Penautan tidak selesai dalam waktu yang dibutuhkan.",
-            "error_request_cancelled": "Permintaan dibatalkan.",
-            "error_request_declined": "Permintaan ditolak di perangkat yang lain.",
             "error_unexpected": "Sebuah kesalahan terjadi secara tidak terduga.",
             "scan_code_instruction": "Pindai kode QR di bawah dengan perangkat Anda yang sudah keluar dari akun.",
             "scan_qr_code": "Pindai kode QR",
@@ -1418,16 +1410,9 @@
         "report_to_moderators_description": "Dalam ruangan yang mendukung moderasi, tombol “Laporkan” memungkinkan Anda untuk melaporkan penyalahgunaan ke moderator ruangan.",
         "rust_crypto": "Implementasi kriptografi Rust",
         "sliding_sync": "Mode Sinkronisasi Geser",
-        "sliding_sync_checking": "Memeriksa…",
-        "sliding_sync_configuration": "Konfigurasi Penyinkronan Bergeser",
         "sliding_sync_description": "Dalam pengembangan aktif, tidak dapat dinonaktifkan.",
-        "sliding_sync_disable_warning": "Untuk menonaktifkan Anda harus keluar dan masuk kembali, gunakan dengan hati-hati!",
         "sliding_sync_disabled_notice": "Keluar dan masuk kembali ke akun untuk menonaktifkan",
-        "sliding_sync_proxy_url_label": "URL Proksi",
-        "sliding_sync_proxy_url_optional_label": "URL Proksi (opsional)",
         "sliding_sync_server_no_support": "Server Anda belum mendukungnya",
-        "sliding_sync_server_specify_proxy": "Server Anda belum mendukungnya, Anda harus menetapkan sebuah proksi",
-        "sliding_sync_server_support": "Server Anda mendukungnya",
         "under_active_development": "Dalam pengembangan aktif.",
         "unrealiable_e2e": "Tidak dapat diandalkan di ruangan terenkripsi",
         "video_rooms": "Ruangan video",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index e810a7f7fe..3d09037a7f 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -218,7 +218,6 @@
         "phone_label": "Sími",
         "phone_optional_label": "Sími (valfrjálst)",
         "qr_code_login": {
-            "error_invalid_scanned_code": "Skannaði kóðinn er ógildur.",
             "sign_in_new_device": "Skrá inn nýtt tæki",
             "waiting_for_device": "Bíð eftir að tækið skráist inn"
         },
@@ -1167,8 +1166,6 @@
         "pinning": "Festing skilaboða",
         "report_to_moderators": "Tilkynna til umsjónarmanna",
         "report_to_moderators_description": "Í spjallrásum sem styðja eftirlit umsjónarmanna, mun 'Kæra'-hnappurinn gefa þér færi á að tilkynna misnotkun til umsjónarmanna spjallrása.",
-        "sliding_sync_proxy_url_label": "Slóð milliþjóns",
-        "sliding_sync_proxy_url_optional_label": "Slóð milliþjóns (valfrjálst)",
         "under_active_development": "Í virkri þróun.",
         "video_rooms": "Myndspjallrásir",
         "video_rooms_a_new_way_to_chat": "Ný leið til að spjalla með tali og myndmerki í %(brand)s.",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 64bdb4223f..4153df8cf2 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -249,15 +249,7 @@
             "completing_setup": "Completamento configurazione nuovo dispositivo",
             "confirm_code_match": "Controlla che il codice sottostante corrisponda nell'altro dispositivo:",
             "connecting": "In connessione…",
-            "error_device_already_signed_in": "L'altro dispositivo ha già fatto l'accesso.",
-            "error_device_not_signed_in": "L'altro dispositivo non ha fatto l'accesso.",
-            "error_device_unsupported": "Il collegamento con questo dispositivo non è supportato.",
-            "error_homeserver_lacks_support": "L'homeserver non supporta l'accesso in un altro dispositivo.",
-            "error_invalid_scanned_code": "Il codice scansionato non è valido.",
-            "error_linking_incomplete": "Il collegamento non è stato completato nel tempo previsto.",
             "error_rate_limited": "Troppi tentativi in poco tempo. Attendi un po' prima di riprovare.",
-            "error_request_cancelled": "La richiesta è stata annullata.",
-            "error_request_declined": "La richiesta è stata negata sull'altro dispositivo.",
             "error_unexpected": "Si è verificato un errore imprevisto.",
             "scan_code_instruction": "Scansiona il codice QR sottostante con il dispositivo che è disconnesso.",
             "scan_qr_code": "Scansiona codice QR",
@@ -1445,18 +1437,9 @@
         "rust_crypto_optin_warning": "Il passaggio alla crittografia Rust richiede un processo di migrazione che può impiegare diversi minuti. Per disattivarla dovrai disconnetterti e poi riaccedere, usala con cautela!",
         "rust_crypto_requires_logout": "Una volta attivata, la crittografia Rust può essere disattivata solo disconnettendoti e riaccedendo.",
         "sliding_sync": "Modalità di sincr. con slide",
-        "sliding_sync_checking": "Controllo…",
-        "sliding_sync_configuration": "Configurazione sincr. Sliding",
         "sliding_sync_description": "In sviluppo attivo, non può essere disattivato.",
-        "sliding_sync_disable_warning": "Per disattivarlo dovrai disconnetterti e riaccedere, usare con cautela!",
         "sliding_sync_disabled_notice": "Disconnettiti e riconnettiti per disattivare",
-        "sliding_sync_proxy_url_label": "URL proxy",
-        "sliding_sync_proxy_url_optional_label": "URL proxy (facoltativo)",
         "sliding_sync_server_no_support": "Il tuo server non ha il supporto nativo",
-        "sliding_sync_server_specify_proxy": "Il tuo server non ha il supporto nativo, devi specificare un proxy",
-        "sliding_sync_server_support": "Il tuo server ha il supporto nativo",
-        "threads_activity_centre": "Centro attività in discussioni (in sviluppo).",
-        "threads_activity_centre_description": "Attenzione: in fase di sviluppo attivo; ricarica %(brand)s.",
         "under_active_development": "In sviluppo attivo.",
         "unrealiable_e2e": "Inaffidabile nelle stanze cifrate",
         "video_rooms": "Stanze video",
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index a29dab0e0d..f5aaa80913 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -233,15 +233,7 @@
             "completing_setup": "新しい端末の設定を完了しています",
             "confirm_code_match": "以下のコードが他の端末と一致していることを確認してください：",
             "connecting": "接続しています…",
-            "error_device_already_signed_in": "もう一方のデバイスは既にサインインしています。",
-            "error_device_not_signed_in": "もう一方の端末はサインインしていません。",
-            "error_device_unsupported": "この端末とのリンクはサポートしていません。",
-            "error_homeserver_lacks_support": "ホームサーバーは他の端末でのサインインをサポートしていません。",
-            "error_invalid_scanned_code": "スキャンされたコードは無効です。",
-            "error_linking_incomplete": "時間内にリンクが完了しませんでした。",
             "error_rate_limited": "再試行の数が多すぎます。少し待ってから再度試してください。",
-            "error_request_cancelled": "リクエストはキャンセルされました。",
-            "error_request_declined": "リクエストはもう一方の端末で拒否されました。",
             "error_unexpected": "予期しないエラーが発生しました。",
             "scan_code_instruction": "サインアウトした端末で以下のQRコードをスキャンしてください。",
             "scan_qr_code": "QRコードをスキャン",
@@ -1338,15 +1330,8 @@
         "report_to_moderators_description": "モデレートをサポートするルームで「報告」ボタンを使用すると、ルームのモデレーターに問題を報告できます。",
         "rust_crypto": "Rustによる暗号の実装",
         "sliding_sync": "スライド式同期モード",
-        "sliding_sync_checking": "確認しています…",
-        "sliding_sync_configuration": "スライド式同期の設定",
         "sliding_sync_description": "開発中です。無効にできません。",
-        "sliding_sync_disable_warning": "無効にするにはログアウトして、再度ログインする必要があります。注意して使用してください！",
-        "sliding_sync_proxy_url_label": "プロクシーのURL",
-        "sliding_sync_proxy_url_optional_label": "プロクシーのURL（任意）",
         "sliding_sync_server_no_support": "あなたのサーバーはネイティブでサポートしていません",
-        "sliding_sync_server_specify_proxy": "あなたのサーバーはネイティブでサポートしていません。プロクシーを指定してください",
-        "sliding_sync_server_support": "あなたのサーバーはネイティブでサポートしています",
         "under_active_development": "開発中。",
         "video_rooms": "ビデオ通話ルーム",
         "video_rooms_a_new_way_to_chat": "%(brand)sで音声と動画により会話する新しい方法です。",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 9352a3cf2f..f354686349 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -221,14 +221,6 @@
             "approve_access_warning": "Door de toegang voor dit apparaat goed te keuren, heeft het volledige toegang tot jouw account.",
             "completing_setup": "De configuratie van je nieuwe apparaat voltooien",
             "confirm_code_match": "Controleer of de onderstaande code overeenkomt met je andere apparaat:",
-            "error_device_already_signed_in": "Het andere apparaat is al aangemeld.",
-            "error_device_not_signed_in": "Het andere apparaat is niet ingelogd.",
-            "error_device_unsupported": "Koppelen met dit apparaat wordt niet ondersteund.",
-            "error_homeserver_lacks_support": "De server ondersteunt het inloggen op een ander apparaat niet.",
-            "error_invalid_scanned_code": "De gescande code is ongeldig.",
-            "error_linking_incomplete": "De koppeling is niet binnen de vereiste tijd voltooid.",
-            "error_request_cancelled": "Het verzoek is geannuleerd.",
-            "error_request_declined": "Het verzoek is afgewezen op het andere apparaat.",
             "error_unexpected": "Er is een onverwachte fout opgetreden.",
             "scan_code_instruction": "Scan de onderstaande QR-code met je apparaat dat is uitgelogd.",
             "sign_in_new_device": "Aanmelden nieuw apparaat",
@@ -1203,12 +1195,7 @@
         "leave_beta_reload": "Als je de bèta verlaat, wordt %(brand)s opnieuw geladen.",
         "msc3531_hide_messages_pending_moderation": "Laat moderators berichten verbergen in afwachting van moderatie.",
         "pinning": "Berichten vastprikken",
-        "sliding_sync_configuration": "Scrollende Synchronisatie-configuratie",
-        "sliding_sync_disable_warning": "Om uit te schakelen moet je uitloggen en weer inloggen, wees voorzichtig!",
-        "sliding_sync_proxy_url_optional_label": "Proxy-URL (optioneel)",
         "sliding_sync_server_no_support": "Jouw server heeft geen native ondersteuning",
-        "sliding_sync_server_specify_proxy": "Jouw server heeft geen native ondersteuning, je moet een proxy opgeven",
-        "sliding_sync_server_support": "Jouw server heeft native ondersteuning",
         "video_rooms": "Video kamers",
         "video_rooms_a_new_way_to_chat": "Een nieuwe manier om te chatten via spraak en video in %(brand)s.",
         "video_rooms_always_on_voip_channels": "Videoruimten zijn altijd-aan VoIP-kanalen die zijn geïntegreerd in een kamer in %(brand)s.",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 487860cfe0..58c779e2ed 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -249,15 +249,7 @@
             "completing_setup": "Kończenie konfiguracji nowego urządzenia",
             "confirm_code_match": "Potwierdź, że kod poniżej pasuje z Twoim drugim urządzeniem:",
             "connecting": "Łączenie…",
-            "error_device_already_signed_in": "Drugie urządzenie jest już zalogowane.",
-            "error_device_not_signed_in": "Drugie urządzenie nie jest zalogowane.",
-            "error_device_unsupported": "Wiązanie z tym urządzeniem nie jest wspierane.",
-            "error_homeserver_lacks_support": "Serwer domowy nie wspiera logowania innych urządzeń.",
-            "error_invalid_scanned_code": "Zeskanowany kod jest nieprawidłowy.",
-            "error_linking_incomplete": "Wiązanie nie zostało zakończone w ustalonym czasie.",
             "error_rate_limited": "Za dużo prób w krótkim odstępie czasu. Odczekaj trochę, zanim spróbujesz ponownie.",
-            "error_request_cancelled": "Żądanie zostało anulowane.",
-            "error_request_declined": "Żądanie zostało odrzucone przez drugie urządzenie.",
             "error_unexpected": "Wystąpił niespodziewany błąd.",
             "follow_remaining_instructions": "Podążaj zgodnie z pozostałymi instrukcjami, aby zweryfikować drugie urządzenie",
             "open_element_other_device": "Otwórz %(brand)s na swoim drugim urządzeniu",
@@ -1454,18 +1446,9 @@
         "rust_crypto_optin_warning": "Przejście na kryptografię Rust wymaga procesu migracji, która może potrwać kilka minut. Aby ją wyłączyć, będziesz musiał zalogować się ponownie; zachowaj ostrożność!",
         "rust_crypto_requires_logout": "Po włączeniu, kryptografia Rust może zostać wyłączona tylko po ponownym zalogowaniu.",
         "sliding_sync": "Tryb synchronizacji przesuwanej",
-        "sliding_sync_checking": "Sprawdzanie…",
-        "sliding_sync_configuration": "Konfiguracja synchronizacji przesuwanej",
         "sliding_sync_description": "W trakcie aktywnego rozwoju, nie można wyłączyć.",
-        "sliding_sync_disable_warning": "By wyłączyć, będziesz musiał się zalogować ponownie. Korzystaj z rozwagą!",
         "sliding_sync_disabled_notice": "Zaloguj się ponownie, aby wyłączyć",
-        "sliding_sync_proxy_url_label": "URL proxy",
-        "sliding_sync_proxy_url_optional_label": "URL proxy (opcjonalne)",
         "sliding_sync_server_no_support": "Twój serwer nie posiada wsparcia natywnego",
-        "sliding_sync_server_specify_proxy": "Twój serwer nie posiada wsparcia natywnego, musisz podać serwer proxy",
-        "sliding_sync_server_support": "Twój serwer posiada wsparcie natywne",
-        "threads_activity_centre": "Centrum aktywności wątków (w trakcie rozwoju)",
-        "threads_activity_centre_description": "Ostrzeżenie: W trakcie aktywnego rozwoju; przeładowuje %(brand)s.",
         "under_active_development": "W trakcie aktywnego rozwoju.",
         "unrealiable_e2e": "Problematyczny w pokojach szyfrowanych",
         "video_rooms": "Pokoje wideo",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 9c42600f78..14714fcc71 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -244,14 +244,6 @@
             "completing_setup": "Завершение настройки нового устройства",
             "confirm_code_match": "Проверьте, чтобы код ниже совпадал с тем, что показан на другом устройстве:",
             "connecting": "Подключение…",
-            "error_device_already_signed_in": "Уже выполнен вход на другом устройстве.",
-            "error_device_not_signed_in": "На другом устройстве вход не выполнен.",
-            "error_device_unsupported": "Соединение с этим устройством не поддерживается.",
-            "error_homeserver_lacks_support": "Домашний сервер не поддерживает вход с другого устройства.",
-            "error_invalid_scanned_code": "Отсканированный код недействителен.",
-            "error_linking_incomplete": "Соединение не было завершено в нужное время.",
-            "error_request_cancelled": "Запрос был отменён.",
-            "error_request_declined": "Запрос был отклонен на другом устройстве.",
             "error_unexpected": "Произошла неожиданная ошибка.",
             "scan_code_instruction": "Отсканируйте приведенный ниже QR-код на устройстве, которое вышло из системы.",
             "scan_qr_code": "Сканировать QR-код",
@@ -1430,16 +1422,9 @@
         "report_to_moderators_description": "В поддерживающих модерирование комнатах, кнопка \"Пожаловаться\" позволит вам сообщить о нарушении модераторам комнаты.",
         "rust_crypto": "Реализация криптографии Rust",
         "sliding_sync": "Режим Sliding Sync",
-        "sliding_sync_checking": "Проверка…",
-        "sliding_sync_configuration": "Настройка Sliding sync",
         "sliding_sync_description": "В активной разработке, нельзя отключить.",
-        "sliding_sync_disable_warning": "Чтобы отключить, вам нужно выйти из системы и снова войти в систему, используйте с осторожностью!",
         "sliding_sync_disabled_notice": "Выйдите из системы и снова войдите, чтобы отключить",
-        "sliding_sync_proxy_url_label": "URL-адрес прокси-сервера",
-        "sliding_sync_proxy_url_optional_label": "URL-адрес прокси-сервера (необязательно)",
         "sliding_sync_server_no_support": "На вашем сервере отсутствует встроенная поддержка",
-        "sliding_sync_server_specify_proxy": "На вашем сервере отсутствует встроенная поддержка, необходимо указать прокси-сервер",
-        "sliding_sync_server_support": "Ваш сервер имеет встроенную поддержку",
         "under_active_development": "В активной разработке.",
         "unrealiable_e2e": "Ненадежно в зашифрованных комнатах",
         "video_rooms": "Видеокомнаты",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index ac3c1ab5c0..19acabb910 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -244,14 +244,6 @@
             "completing_setup": "Dokončenie nastavenia nového zariadenia",
             "confirm_code_match": "Skontrolujte, či sa nižšie uvedený kód zhoduje s vaším druhým zariadením:",
             "connecting": "Pripájanie…",
-            "error_device_already_signed_in": "Druhé zariadenie je už prihlásené.",
-            "error_device_not_signed_in": "Druhé zariadenie nie je prihlásené.",
-            "error_device_unsupported": "Prepojenie s týmto zariadením nie je podporované.",
-            "error_homeserver_lacks_support": "Domovský server nepodporuje prihlasovanie do iného zariadenia.",
-            "error_invalid_scanned_code": "Naskenovaný kód je neplatný.",
-            "error_linking_incomplete": "Prepojenie nebolo dokončené v požadovanom čase.",
-            "error_request_cancelled": "Žiadosť bola zrušená.",
-            "error_request_declined": "Žiadosť bola na druhom zariadení zamietnutá.",
             "error_unexpected": "Vyskytla sa neočakávaná chyba.",
             "scan_code_instruction": "Naskenujte nižšie uvedený QR kód pomocou zariadenia, ktoré je odhlásené.",
             "scan_qr_code": "Skenovať QR kód",
@@ -1435,16 +1427,9 @@
         "report_to_moderators_description": "V miestnostiach, ktoré podporujú moderovanie, môžete pomocou tlačidla \"Nahlásiť\" nahlásiť porušovanie pravidiel moderátorom miestnosti.",
         "rust_crypto": "Implementácia kryptografie Rust",
         "sliding_sync": "Režim kĺzavej synchronizácie",
-        "sliding_sync_checking": "Kontrolovanie…",
-        "sliding_sync_configuration": "Konfigurácia kĺzavej synchronizácie",
         "sliding_sync_description": "V štádiu aktívneho vývoja, nie je možné to vypnúť.",
-        "sliding_sync_disable_warning": "Pre vypnutie sa musíte odhlásiť a znova prihlásiť, používajte opatrne!",
         "sliding_sync_disabled_notice": "Odhláste sa a znova sa prihláste, aby sa to vyplo",
-        "sliding_sync_proxy_url_label": "URL adresa proxy servera",
-        "sliding_sync_proxy_url_optional_label": "URL adresa proxy servera (voliteľná)",
         "sliding_sync_server_no_support": "Váš server nemá natívnu podporu",
-        "sliding_sync_server_specify_proxy": "Váš server nemá natívnu podporu, musíte zadať proxy server",
-        "sliding_sync_server_support": "Váš server má natívnu podporu",
         "under_active_development": "V štádiu aktívneho vývoja.",
         "unrealiable_e2e": "Nespoľahlivé v šifrovaných miestnostiach",
         "video_rooms": "Video miestnosti",
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 8fd413b041..b875650be7 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -235,15 +235,7 @@
             "completing_setup": "Po plotësohet ujdisja e pajisjes tuaj të re",
             "confirm_code_match": "Kontrolloni se kodi më poshtë përkon me atë në pajisjen tuaj tjetër:",
             "connecting": "Po lidhet…",
-            "error_device_already_signed_in": "Nga pajisja tjetër është bërë tashmë hyrja.",
-            "error_device_not_signed_in": "Te pajisja tjetër s’është bërë hyrja.",
-            "error_device_unsupported": "Lidhja me këtë pajisje nuk mbulohet.",
-            "error_homeserver_lacks_support": "Shërbyesi Home nuk mbulon bërje hyrjeje në një pajisje tjetër.",
-            "error_invalid_scanned_code": "Kodi i skanuar është i pavlefshëm.",
-            "error_linking_incomplete": "Lidhja s’u plotësua brenda kohës së domosdoshme.",
             "error_rate_limited": "Shumë përpjekje në një kohë të shkurtër. Prisni ca, para se të riprovoni.",
-            "error_request_cancelled": "Kërkesa u anulua.",
-            "error_request_declined": "Kërkesa u hodh poshtë në pajisjen tjetër.",
             "error_unexpected": "Ndodhi një gabim të papritur.",
             "scan_code_instruction": "Skanoni kodin QR më poshtë me pajisjen ku është bërë dalja.",
             "scan_qr_code": "Skanoni kodin QR",
@@ -1348,16 +1340,9 @@
         "report_to_moderators": "Raportojeni te moderatorët",
         "report_to_moderators_description": "Në dhoma që mbulojnë moderimin, butoni “Raportojeni” do t’ju lejojë t’u raportoni abuzim moderatorëve të dhomës.",
         "rust_crypto": "Sendërtim kriptografie Rust",
-        "sliding_sync_checking": "Po kontrollohet…",
-        "sliding_sync_configuration": "Formësim Sliding Sync-u",
         "sliding_sync_description": "Nën zhvillim aktiv, s’mund të çaktivizohet.",
-        "sliding_sync_disable_warning": "Për ta çaktivizuar do t’ju duhet të bëni daljen dhe ribëni hyrjen, përdoreni me kujdes!",
         "sliding_sync_disabled_notice": "Që të çaktivizohet, dilni dhe rihyni në llogari",
-        "sliding_sync_proxy_url_label": "URL Ndërmjetësi",
-        "sliding_sync_proxy_url_optional_label": "URL ndërmjetësi (opsionale)",
         "sliding_sync_server_no_support": "Shërbyesit tuaj i mungon mbulim i brendshëm për këtë",
-        "sliding_sync_server_specify_proxy": "Shërbyesit tuaj i mungon mbulimi së brendshmi, duhet të specifikoni një ndërmjetës",
-        "sliding_sync_server_support": "Shërbyesi juaj ka mbulim të brendshëm për këtë",
         "under_active_development": "Nën zhvillim aktiv.",
         "video_rooms": "Dhoma me video",
         "video_rooms_a_new_way_to_chat": "Një rrugë e re për të biseduar me zë dhe video në %(brand)s.",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 153aabad63..3b4e66d40a 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -249,15 +249,7 @@
             "completing_setup": "Slutför inställning av din nya enhet",
             "confirm_code_match": "Kolla att koden nedan matchar din andra enhet:",
             "connecting": "Kopplar upp …",
-            "error_device_already_signed_in": "Den andra enheten är redan inloggad.",
-            "error_device_not_signed_in": "Den andra enheten är inte inloggad.",
-            "error_device_unsupported": "Länkning med den här enheten stöds inte.",
-            "error_homeserver_lacks_support": "Hemservern stöder inte inloggning av en annan enhet.",
-            "error_invalid_scanned_code": "Den skannade koden är ogiltig.",
-            "error_linking_incomplete": "Länkningen slutfördes inte inom den krävda tiden.",
             "error_rate_limited": "För många försök under för kort tid. Vänta ett tag innan du försöker igen.",
-            "error_request_cancelled": "Förfrågan avbröts.",
-            "error_request_declined": "Förfrågan nekades på den andra enheten.",
             "error_unexpected": "Ett oväntade fel inträffade.",
             "scan_code_instruction": "Skanna QR-koden nedan med din andra enhet som är utloggad.",
             "scan_qr_code": "Skanna QR-kod",
@@ -1445,18 +1437,9 @@
         "rust_crypto_optin_warning": "Byte till Rust-kryptografi kräver en migreringsprocess som kan ta flera minuter. För att inaktivera måste du logga ut och in igen; använd med försiktighet!",
         "rust_crypto_requires_logout": "När Rust-kryptografi har aktiverats kan den endast avaktiveras genom att logga ut och logga in igen",
         "sliding_sync": "Sliding sync-läge",
-        "sliding_sync_checking": "Kontrollerar …",
-        "sliding_sync_configuration": "Sliding sync-konfiguration",
         "sliding_sync_description": "Under aktiv utveckling, kan inte inaktiveras.",
-        "sliding_sync_disable_warning": "För att inaktivera det här så behöver du logga ut och logga in igen, använd varsamt!",
         "sliding_sync_disabled_notice": "Logga ut och in igen för att inaktivera",
-        "sliding_sync_proxy_url_label": "Proxy-URL",
-        "sliding_sync_proxy_url_optional_label": "Proxy-URL (valfritt)",
         "sliding_sync_server_no_support": "Din server saknar nativt stöd",
-        "sliding_sync_server_specify_proxy": "Din server saknar nativt stöd, du måste ange en proxy",
-        "sliding_sync_server_support": "Din server har nativt stöd",
-        "threads_activity_centre": "Aktivitetscenter för trådar (under utveckling). För närvarande tar detta bara bort antalet trådaviseringar från det totala antalet i rumslistan",
-        "threads_activity_centre_description": "Varning: Under aktiv utveckling; laddar om Element.",
         "under_active_development": "Under aktiv utveckling.",
         "unrealiable_e2e": "Otillförlitlig i krypterade rum",
         "video_rooms": "Videorum",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index bdd073f27e..92c7f29ec6 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -241,15 +241,7 @@
             "completing_setup": "Завершення налаштування нового пристрою",
             "confirm_code_match": "Перевірте, чи збігається наведений внизу код з кодом на вашому іншому пристрої:",
             "connecting": "З'єднання…",
-            "error_device_already_signed_in": "На іншому пристрої вхід було виконано.",
-            "error_device_not_signed_in": "На іншому пристрої вхід не виконано.",
-            "error_device_unsupported": "Зв'язок з цим пристроєм не підтримується.",
-            "error_homeserver_lacks_support": "Домашній сервер не підтримує вхід на іншому пристрої.",
-            "error_invalid_scanned_code": "Сканований код недійсний.",
-            "error_linking_incomplete": "У встановлені терміни з'єднання не було виконано.",
             "error_rate_limited": "Забагато спроб за короткий час. Зачекайте трохи, перш ніж повторити спробу.",
-            "error_request_cancelled": "Запит було скасовано.",
-            "error_request_declined": "На іншому пристрої запит відхилено.",
             "error_unexpected": "Виникла непередбачувана помилка.",
             "scan_code_instruction": "Скануйте QR-код знизу своїм пристроєм, на якому ви вийшли.",
             "scan_qr_code": "Скануйте QR-код",
@@ -1396,16 +1388,9 @@
         "report_to_moderators_description": "У кімнатах, які підтримують модерацію, кнопка «Поскаржитися» дає змогу повідомити про зловживання модераторам кімнати.",
         "rust_crypto": "Реалізація криптографії Rust",
         "sliding_sync": "Режим ковзної синхронізації",
-        "sliding_sync_checking": "Перевірка…",
-        "sliding_sync_configuration": "Конфігурація ковзної синхронізації",
         "sliding_sync_description": "На стадії активної розробки, вимкнути не можна.",
-        "sliding_sync_disable_warning": "Для вимкнення потрібно буде вийти з системи та зайти знову, користуйтеся з обережністю!",
         "sliding_sync_disabled_notice": "Вийдіть і знову увійдіть, щоб вимкнути",
-        "sliding_sync_proxy_url_label": "URL-адреса проксі-сервера",
-        "sliding_sync_proxy_url_optional_label": "URL-адреса проксі-сервера (необов'язково)",
         "sliding_sync_server_no_support": "На вашому сервері немає вбудованої підтримки",
-        "sliding_sync_server_specify_proxy": "На вашому сервері немає вбудованої підтримки, ви повинні вказати проксі",
-        "sliding_sync_server_support": "Ваш сервер має вбудовану підтримку",
         "under_active_development": "У стадії активної розробки.",
         "video_rooms": "Відеокімнати",
         "video_rooms_a_new_way_to_chat": "Новий спосіб спілкування за допомогою голосового та відеозв’язку в %(brand)s.",
diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json
index 69c222ca6b..29f6cc2fd0 100644
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -229,9 +229,6 @@
         "password_field_weak_label": "Mật khẩu được phép, nhưng không an toàn",
         "phone_label": "Điện thoại",
         "phone_optional_label": "Điện thoại (tùy chọn)",
-        "qr_code_login": {
-            "error_invalid_scanned_code": "Mã vừa quét là không hợp lệ."
-        },
         "register_action": "Tạo tài khoản",
         "registration": {
             "continue_without_email_description": "Lưu ý là nếu bạn không thêm địa chỉ thư điện tử và quên mật khẩu, bạn có thể <b>vĩnh viễn mất quyền truy cập vào tài khoản của mình</b>.",
@@ -1291,10 +1288,7 @@
         "sliding_sync": "Chế độ đồng bộ tối ưu (Sync v3)",
         "sliding_sync_description": "Đang được phát triển tích cực, không thể vô hiệu.",
         "sliding_sync_disabled_notice": "Đăng xuất và đăng nhập lại để vô hiệu hóa",
-        "sliding_sync_proxy_url_label": "Đường dẫn máy chủ ủy nhiệm (proxy)",
         "sliding_sync_server_no_support": "Máy chủ của bạn không hoàn toàn hỗ trợ",
-        "sliding_sync_server_specify_proxy": "Máy chủ của bạn không hỗ trợ, bạn cần chỉ định máy chủ ủy nhiệm (proxy)",
-        "sliding_sync_server_support": "Máy chủ của bạn hoàn toàn hỗ trợ",
         "under_active_development": "Đang được phát triển tích cực.",
         "video_rooms": "Phòng video",
         "video_rooms_a_new_way_to_chat": "Một cách mới để trò chuyện bằng thoại và video trong %(brand)s.",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index e03a592144..7a3ce3674d 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -243,8 +243,7 @@
             "approve_access_warning": "为此设备批准访问权限后，它对你的帐户有完全的访问权限。",
             "completing_setup": "完成新设备的设置",
             "confirm_code_match": "检查以下代码是否与你的其他设备匹配：",
-            "connecting": "正在连接……",
-            "error_homeserver_lacks_support": "此服务器不支持多设备登录"
+            "connecting": "正在连接……"
         },
         "register_action": "创建账户",
         "registration": {
@@ -1309,12 +1308,7 @@
         "rust_crypto": "Rust加密实现",
         "sliding_sync": "滑动同步模式",
         "sliding_sync_description": "正在积极开发中，不能禁用。",
-        "sliding_sync_disable_warning": "要停用，你必须登出并重新登录，请小心！",
-        "sliding_sync_proxy_url_label": "代理URL",
-        "sliding_sync_proxy_url_optional_label": "代理URL（可选）",
         "sliding_sync_server_no_support": "你的服务器缺少原生支持",
-        "sliding_sync_server_specify_proxy": "你的服务器缺少原生支持，你必须指定代理",
-        "sliding_sync_server_support": "你的服务器有原生支持",
         "under_active_development": "积极开发中。",
         "video_rooms": "视频房间",
         "video_rooms_a_new_way_to_chat": "在 %(brand)s 中使用语音和视频的新方式。",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 41f63b5b18..8049491f01 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -241,15 +241,7 @@
             "completing_setup": "完成您新裝置的設定",
             "confirm_code_match": "請確認下列代碼與您另一台裝置上的代碼相符：",
             "connecting": "連線中…",
-            "error_device_already_signed_in": "其他裝置已登入。",
-            "error_device_not_signed_in": "其他裝置未登入。",
-            "error_device_unsupported": "不支援與此裝置連結。",
-            "error_homeserver_lacks_support": "家伺服器不支援在其他裝置上登入。",
-            "error_invalid_scanned_code": "掃描的代碼無效。",
-            "error_linking_incomplete": "未在要求的時間內完成連結。",
             "error_rate_limited": "短時間內嘗試太多次，請稍待一段時間後再嘗試。",
-            "error_request_cancelled": "請求已取消。",
-            "error_request_declined": "請求在另一台裝置上被拒絕。",
             "error_unexpected": "發生預料之外的錯誤。",
             "scan_code_instruction": "請用您已登出的裝置掃描下列 QR Code。",
             "scan_qr_code": "掃描 QR Code",
@@ -1399,16 +1391,9 @@
         "report_to_moderators_description": "在支援審核的聊天室中，「回報」按鈕讓您可以回報濫用行為給聊天室管理員。",
         "rust_crypto": "Rust 密碼學實作",
         "sliding_sync": "滑動同步模式",
-        "sliding_sync_checking": "正在檢查…",
-        "sliding_sync_configuration": "滑動同步設定",
         "sliding_sync_description": "正在積極開發中，無法停用。",
-        "sliding_sync_disable_warning": "要停用，您必須登出並重新登入，請小心使用！",
         "sliding_sync_disabled_notice": "登出並重新登入以停用",
-        "sliding_sync_proxy_url_label": "代理伺服器網址",
-        "sliding_sync_proxy_url_optional_label": "代理伺服器網址（選填）",
         "sliding_sync_server_no_support": "您的伺服器缺乏原生支援",
-        "sliding_sync_server_specify_proxy": "您的伺服器缺乏原生支援，您必須指定代理",
-        "sliding_sync_server_support": "您的伺服器有原生支援",
         "under_active_development": "正在積極開發中。",
         "video_rooms": "視訊聊天室",
         "video_rooms_a_new_way_to_chat": "在 %(brand)s 中透過語音及視訊聊天的新方式。",
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 6be0a6b46f..3650e51814 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -47,6 +47,7 @@ import ServerSupportUnstableFeatureController from "./controllers/ServerSupportU
 import { WatchManager } from "./WatchManager";
 import { CustomTheme } from "../theme";
 import SettingsStore from "./SettingsStore";
+import AnalyticsController from "./controllers/AnalyticsController";
 
 export const defaultWatchManager = new WatchManager();
 
@@ -406,7 +407,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         controller: new SlidingSyncController(),
     },
     "feature_sliding_sync_proxy_url": {
-        // This is not a distinct feature, it is a setting for feature_sliding_sync above
+        // This is not a distinct feature, it is a legacy setting for feature_sliding_sync above
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
         default: "",
     },
@@ -597,11 +598,13 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         displayName: _td("settings|showbold"),
         default: false,
         invertedSettingName: "feature_hidebold",
+        controller: new AnalyticsController("WebSettingsNotificationsShowBoldToggle"),
     },
     "Notifications.tac_only_notifications": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
         displayName: _td("settings|tac_only_notifications"),
         default: true,
+        controller: new AnalyticsController("WebSettingsNotificationsTACOnlyNotificationsToggle"),
     },
     "feature_ask_to_join": {
         isFeature: true,
@@ -1148,15 +1151,6 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
         default: [],
     },
-    "threadsActivityCentre": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        labsGroup: LabGroup.Threads,
-        controller: new ReloadOnChangeController(),
-        displayName: _td("labs|threads_activity_centre"),
-        description: () => _t("labs|threads_activity_centre_description", { brand: SdkConfig.get().brand }),
-        default: false,
-        isFeature: true,
-    },
     /**
      * Enable or disable the release announcement feature
      */
diff --git a/src/settings/controllers/AnalyticsController.ts b/src/settings/controllers/AnalyticsController.ts
new file mode 100644
index 0000000000..5c127ed3b9
--- /dev/null
+++ b/src/settings/controllers/AnalyticsController.ts
@@ -0,0 +1,42 @@
+/*
+Copyright 2024 The Matrix.org Foundation C.I.C.
+
+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 SettingController from "./SettingController";
+import { SettingLevel } from "../SettingLevel";
+import PosthogTrackers, { InteractionName } from "../../PosthogTrackers";
+
+/**
+ * Controller that sends events to analytics when a setting is changed.
+ * Since it will only trigger events when the setting is changed,
+ * (and the value isn't reported: only the fact that it's been toggled)
+ * it won't be useful for tracking what percentage of a userbase has a given setting
+ * enabled, but many of our settings can be set per device and Posthog only supports
+ * per-user properties, so this isn't straightforward. This is only for seeing how
+ * often people interact with the settings.
+ */
+export default class AnalyticsController extends SettingController {
+    /**
+     *
+     * @param interactionName The name of the event to send to analytics
+     */
+    public constructor(private interactionName: InteractionName) {
+        super();
+    }
+
+    public onChange(_level: SettingLevel, _roomId: string | null, _newValue: any): void {
+        PosthogTrackers.trackInteraction(this.interactionName);
+    }
+}
diff --git a/src/settings/controllers/SlidingSyncController.ts b/src/settings/controllers/SlidingSyncController.ts
index 77bdf7f42f..7d7ca78128 100644
--- a/src/settings/controllers/SlidingSyncController.ts
+++ b/src/settings/controllers/SlidingSyncController.ts
@@ -1,5 +1,6 @@
 /*
 Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 Ed Geraghty <ed@geraghty.family>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,18 +17,11 @@ limitations under the License.
 
 import SettingController from "./SettingController";
 import PlatformPeg from "../../PlatformPeg";
-import { SettingLevel } from "../SettingLevel";
-import { SlidingSyncOptionsDialog } from "../../components/views/dialogs/SlidingSyncOptionsDialog";
-import Modal from "../../Modal";
 import SettingsStore from "../SettingsStore";
 import { _t } from "../../languageHandler";
 
 export default class SlidingSyncController extends SettingController {
-    public async beforeChange(level: SettingLevel, roomId: string, newValue: any): Promise<boolean> {
-        const { finished } = Modal.createDialog(SlidingSyncOptionsDialog);
-        const [value] = await finished;
-        return newValue === value; // abort the operation if we're already in the state the user chose via modal
-    }
+    public static serverSupportsSlidingSync: boolean;
 
     public async onChange(): Promise<void> {
         PlatformPeg.get()?.reload();
@@ -38,6 +32,9 @@ export default class SlidingSyncController extends SettingController {
         if (SettingsStore.getValue("feature_sliding_sync")) {
             return _t("labs|sliding_sync_disabled_notice");
         }
+        if (!SlidingSyncController.serverSupportsSlidingSync) {
+            return _t("labs|sliding_sync_server_no_support");
+        }
 
         return false;
     }
diff --git a/src/stores/notifications/RoomNotificationStateStore.ts b/src/stores/notifications/RoomNotificationStateStore.ts
index f2d10ac4fb..502d2dcce7 100644
--- a/src/stores/notifications/RoomNotificationStateStore.ts
+++ b/src/stores/notifications/RoomNotificationStateStore.ts
@@ -42,8 +42,6 @@ export class RoomNotificationStateStore extends AsyncStoreWithClient<IState> {
     private listMap = new Map<TagID, ListNotificationState>();
     private _globalState = new SummarizedNotificationState();
 
-    private tacEnabled = SettingsStore.getValue("threadsActivityCentre");
-
     private constructor(dispatcher = defaultDispatcher) {
         super(dispatcher, {});
         SettingsStore.watchSetting("feature_dynamic_room_predecessors", null, () => {
@@ -99,7 +97,7 @@ export class RoomNotificationStateStore extends AsyncStoreWithClient<IState> {
      */
     public getRoomState(room: Room): RoomNotificationState {
         if (!this.roomMap.has(room)) {
-            this.roomMap.set(room, new RoomNotificationState(room, !this.tacEnabled));
+            this.roomMap.set(room, new RoomNotificationState(room, false));
         }
         return this.roomMap.get(room)!;
     }
diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts
index 647300f99c..a3c44084d5 100644
--- a/src/stores/room-list/MessagePreviewStore.ts
+++ b/src/stores/room-list/MessagePreviewStore.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Room, RelationType, MatrixEvent, Thread, M_POLL_START } from "matrix-js-sdk/src/matrix";
+import { Room, RelationType, MatrixEvent, Thread, M_POLL_START, RoomEvent } from "matrix-js-sdk/src/matrix";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 
 import { ActionPayload } from "../../dispatcher/payloads";
@@ -186,7 +186,7 @@ export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
     }
 
     private async generatePreview(room: Room, tagId?: TagID): Promise<void> {
-        const events = [...room.getLiveTimeline().getEvents()];
+        const events = [...room.getLiveTimeline().getEvents(), ...room.getPendingEvents()];
 
         // add last reply from each thread
         room.getThreads().forEach((thread: Thread): void => {
@@ -279,4 +279,19 @@ export class MessagePreviewStore extends AsyncStoreWithClient<IState> {
             await this.generatePreview(room, TAG_ANY);
         }
     }
+
+    protected async onReady(): Promise<void> {
+        if (!this.matrixClient) return;
+        this.matrixClient.on(RoomEvent.LocalEchoUpdated, this.onLocalEchoUpdated);
+    }
+
+    protected async onNotReady(): Promise<void> {
+        if (!this.matrixClient) return;
+        this.matrixClient.off(RoomEvent.LocalEchoUpdated, this.onLocalEchoUpdated);
+    }
+
+    protected onLocalEchoUpdated = async (ev: MatrixEvent, room: Room): Promise<void> => {
+        if (!this.previews.has(room.roomId)) return;
+        await this.generatePreview(room, TAG_ANY);
+    };
 }
diff --git a/test/DecryptionFailureTracker-test.ts b/test/DecryptionFailureTracker-test.ts
index 7a0bf65f81..305692fce8 100644
--- a/test/DecryptionFailureTracker-test.ts
+++ b/test/DecryptionFailureTracker-test.ts
@@ -388,4 +388,60 @@ describe("DecryptionFailureTracker", function () {
         // should track remapped error code
         expect(counts["XEDNI_EGASSEM_NWONKNU_MLO"]).toBe(1);
     });
+
+    it("default error code mapper maps error codes correctly", async () => {
+        const errorCodes: string[] = [];
+
+        // @ts-ignore access to private constructor
+        const tracker = new DecryptionFailureTracker(
+            (total: number, errorCode: string) => {
+                errorCodes.push(errorCode);
+            },
+            // @ts-ignore access to private member
+            DecryptionFailureTracker.instance.errorCodeMapFn,
+        );
+
+        const event1 = await createFailedDecryptionEvent(DecryptionFailureCode.MEGOLM_UNKNOWN_INBOUND_SESSION_ID);
+        tracker.addVisibleEvent(event1);
+        tracker.eventDecrypted(event1);
+
+        const event2 = await createFailedDecryptionEvent(DecryptionFailureCode.OLM_UNKNOWN_MESSAGE_INDEX);
+        tracker.addVisibleEvent(event2);
+        tracker.eventDecrypted(event2);
+
+        const event3 = await createFailedDecryptionEvent(DecryptionFailureCode.HISTORICAL_MESSAGE_NO_KEY_BACKUP);
+        tracker.addVisibleEvent(event3);
+        tracker.eventDecrypted(event3);
+
+        const event4 = await createFailedDecryptionEvent(DecryptionFailureCode.HISTORICAL_MESSAGE_BACKUP_UNCONFIGURED);
+        tracker.addVisibleEvent(event4);
+        tracker.eventDecrypted(event4);
+
+        const event5 = await createFailedDecryptionEvent(DecryptionFailureCode.HISTORICAL_MESSAGE_WORKING_BACKUP);
+        tracker.addVisibleEvent(event5);
+        tracker.eventDecrypted(event5);
+
+        const event6 = await createFailedDecryptionEvent(DecryptionFailureCode.HISTORICAL_MESSAGE_USER_NOT_JOINED);
+        tracker.addVisibleEvent(event6);
+        tracker.eventDecrypted(event6);
+
+        const event7 = await createFailedDecryptionEvent(DecryptionFailureCode.UNKNOWN_ERROR);
+        tracker.addVisibleEvent(event7);
+        tracker.eventDecrypted(event7);
+
+        // Pretend "now" is Infinity
+        tracker.checkFailures(Infinity);
+
+        tracker.trackFailures();
+
+        expect(errorCodes).toEqual([
+            "OlmKeysNotSentError",
+            "OlmIndexError",
+            "HistoricalMessage",
+            "HistoricalMessage",
+            "HistoricalMessage",
+            "ExpectedDueToMembership",
+            "UnknownError",
+        ]);
+    });
 });
diff --git a/test/PosthogAnalytics-test.ts b/test/PosthogAnalytics-test.ts
index 748c8f17f6..c131e536d1 100644
--- a/test/PosthogAnalytics-test.ts
+++ b/test/PosthogAnalytics-test.ts
@@ -36,7 +36,7 @@ const getFakePosthog = (): PostHog =>
         register: jest.fn(),
         get_distinct_id: jest.fn(),
         persistence: {
-            get_user_state: jest.fn(),
+            get_property: jest.fn(),
         },
         identifyUser: jest.fn(),
     }) as unknown as PostHog;
diff --git a/test/SlidingSyncManager-test.ts b/test/SlidingSyncManager-test.ts
index 76ebd8f15c..757a682d84 100644
--- a/test/SlidingSyncManager-test.ts
+++ b/test/SlidingSyncManager-test.ts
@@ -20,6 +20,8 @@ import { MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 
 import { SlidingSyncManager } from "../src/SlidingSyncManager";
 import { stubClient } from "./test-utils";
+import SlidingSyncController from "../src/settings/controllers/SlidingSyncController";
+import SettingsStore from "../src/settings/SettingsStore";
 
 jest.mock("matrix-js-sdk/src/sliding-sync");
 const MockSlidingSync = <jest.Mock<SlidingSync>>(<unknown>SlidingSync);
@@ -231,4 +233,53 @@ describe("SlidingSyncManager", () => {
             );
         });
     });
+    describe("checkSupport", () => {
+        beforeEach(() => {
+            SlidingSyncController.serverSupportsSlidingSync = false;
+            jest.spyOn(manager, "getProxyFromWellKnown").mockResolvedValue("proxy");
+        });
+        it("shorts out if the server has 'native' sliding sync support", async () => {
+            jest.spyOn(manager, "nativeSlidingSyncSupport").mockResolvedValue(true);
+            expect(SlidingSyncController.serverSupportsSlidingSync).toBeFalsy();
+            await manager.checkSupport(client);
+            expect(manager.getProxyFromWellKnown).not.toHaveBeenCalled(); // We return earlier
+            expect(SlidingSyncController.serverSupportsSlidingSync).toBeTruthy();
+        });
+        it("tries to find a sliding sync proxy url from the client well-known if there's no 'native' support", async () => {
+            jest.spyOn(manager, "nativeSlidingSyncSupport").mockResolvedValue(false);
+            expect(SlidingSyncController.serverSupportsSlidingSync).toBeFalsy();
+            await manager.checkSupport(client);
+            expect(manager.getProxyFromWellKnown).toHaveBeenCalled();
+            expect(SlidingSyncController.serverSupportsSlidingSync).toBeTruthy();
+        });
+    });
+    describe("setup", () => {
+        beforeEach(() => {
+            jest.spyOn(manager, "configure");
+            jest.spyOn(manager, "startSpidering");
+        });
+        it("uses the baseUrl as a proxy if no proxy is set in the client well-known and the server has no native support", async () => {
+            await manager.setup(client);
+            expect(manager.configure).toHaveBeenCalled();
+            expect(manager.configure).toHaveBeenCalledWith(client, client.baseUrl);
+            expect(manager.startSpidering).toHaveBeenCalled();
+        });
+        it("uses the proxy declared in the client well-known", async () => {
+            jest.spyOn(manager, "getProxyFromWellKnown").mockResolvedValue("proxy");
+            await manager.setup(client);
+            expect(manager.configure).toHaveBeenCalled();
+            expect(manager.configure).toHaveBeenCalledWith(client, "proxy");
+            expect(manager.startSpidering).toHaveBeenCalled();
+        });
+        it("uses the legacy `feature_sliding_sync_proxy_url` if it was set", async () => {
+            jest.spyOn(manager, "getProxyFromWellKnown").mockResolvedValue("proxy");
+            jest.spyOn(SettingsStore, "getValue").mockImplementation((name: string) => {
+                if (name === "feature_sliding_sync_proxy_url") return "legacy-proxy";
+            });
+            await manager.setup(client);
+            expect(manager.configure).toHaveBeenCalled();
+            expect(manager.configure).toHaveBeenCalledWith(client, "legacy-proxy");
+            expect(manager.startSpidering).toHaveBeenCalled();
+        });
+    });
 });
diff --git a/test/components/structures/MatrixChat-test.tsx b/test/components/structures/MatrixChat-test.tsx
index 908c7a7c04..38309b8178 100644
--- a/test/components/structures/MatrixChat-test.tsx
+++ b/test/components/structures/MatrixChat-test.tsx
@@ -61,6 +61,7 @@ import SettingsStore from "../../../src/settings/SettingsStore";
 import { SettingLevel } from "../../../src/settings/SettingLevel";
 import { MatrixClientPeg as peg } from "../../../src/MatrixClientPeg";
 import DMRoomMap from "../../../src/utils/DMRoomMap";
+import { ReleaseAnnouncementStore } from "../../../src/stores/ReleaseAnnouncementStore";
 
 jest.mock("matrix-js-sdk/src/oidc/authorize", () => ({
     completeAuthorizationCodeGrant: jest.fn(),
@@ -627,6 +628,12 @@ describe("<MatrixChat />", () => {
                         (id) => [room, spaceRoom].find((room) => room.roomId === id) || null,
                     );
                     jest.spyOn(spaceRoom, "isSpaceRoom").mockReturnValue(true);
+
+                    jest.spyOn(ReleaseAnnouncementStore.instance, "getReleaseAnnouncement").mockReturnValue(null);
+                });
+
+                afterEach(() => {
+                    jest.restoreAllMocks();
                 });
 
                 describe("leave_room", () => {
diff --git a/test/components/structures/__snapshots__/RoomView-test.tsx.snap b/test/components/structures/__snapshots__/RoomView-test.tsx.snap
index 80d6ac7c74..b6c87aaaef 100644
--- a/test/components/structures/__snapshots__/RoomView-test.tsx.snap
+++ b/test/components/structures/__snapshots__/RoomView-test.tsx.snap
@@ -397,6 +397,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
                   <button
                     aria-label="Bold"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconBold"
+                    data-state="closed"
                     role="button"
                     tabindex="0"
                     type="button"
@@ -404,6 +405,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
                   <button
                     aria-label="Italics"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconItalic"
+                    data-state="closed"
                     role="button"
                     tabindex="-1"
                     type="button"
@@ -411,6 +413,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
                   <button
                     aria-label="Strikethrough"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconStrikethrough"
+                    data-state="closed"
                     role="button"
                     tabindex="-1"
                     type="button"
@@ -418,6 +421,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
                   <button
                     aria-label="Code block"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconCode"
+                    data-state="closed"
                     role="button"
                     tabindex="-1"
                     type="button"
@@ -425,6 +429,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
                   <button
                     aria-label="Quote"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconQuote"
+                    data-state="closed"
                     role="button"
                     tabindex="-1"
                     type="button"
@@ -432,6 +437,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
                   <button
                     aria-label="Insert link"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconInsertLink"
+                    data-state="closed"
                     role="button"
                     tabindex="-1"
                     type="button"
@@ -644,6 +650,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
                   <button
                     aria-label="Bold"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconBold"
+                    data-state="closed"
                     role="button"
                     tabindex="0"
                     type="button"
@@ -651,6 +658,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
                   <button
                     aria-label="Italics"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconItalic"
+                    data-state="closed"
                     role="button"
                     tabindex="-1"
                     type="button"
@@ -658,6 +666,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
                   <button
                     aria-label="Strikethrough"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconStrikethrough"
+                    data-state="closed"
                     role="button"
                     tabindex="-1"
                     type="button"
@@ -665,6 +674,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
                   <button
                     aria-label="Code block"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconCode"
+                    data-state="closed"
                     role="button"
                     tabindex="-1"
                     type="button"
@@ -672,6 +682,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
                   <button
                     aria-label="Quote"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconQuote"
+                    data-state="closed"
                     role="button"
                     tabindex="-1"
                     type="button"
@@ -679,6 +690,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
                   <button
                     aria-label="Insert link"
                     class="mx_AccessibleButton mx_MessageComposerFormatBar_button mx_MessageComposerFormatBar_buttonIconInsertLink"
+                    data-state="closed"
                     role="button"
                     tabindex="-1"
                     type="button"
diff --git a/test/components/structures/__snapshots__/UserMenu-test.tsx.snap b/test/components/structures/__snapshots__/UserMenu-test.tsx.snap
index a43b718020..029db9bfd4 100644
--- a/test/components/structures/__snapshots__/UserMenu-test.tsx.snap
+++ b/test/components/structures/__snapshots__/UserMenu-test.tsx.snap
@@ -12,7 +12,6 @@ exports[`<UserMenu> <UserMenu> when video broadcast when rendered should render
       class="mx_AccessibleButton mx_UserMenu_contextMenuButton"
       role="button"
       tabindex="0"
-      title="User menu"
     >
       <div
         class="mx_UserMenu_userAvatar"
diff --git a/test/components/views/beacon/__snapshots__/BeaconListItem-test.tsx.snap b/test/components/views/beacon/__snapshots__/BeaconListItem-test.tsx.snap
index 1d7a958672..f3f1eceb5a 100644
--- a/test/components/views/beacon/__snapshots__/BeaconListItem-test.tsx.snap
+++ b/test/components/views/beacon/__snapshots__/BeaconListItem-test.tsx.snap
@@ -48,6 +48,7 @@ exports[`<BeaconListItem /> when a beacon is live and has locations renders beac
             <div
               aria-label="Copy"
               class="mx_AccessibleButton mx_CopyableText_copyButton"
+              data-state="closed"
               role="button"
               tabindex="0"
             />
diff --git a/test/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap b/test/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap
index 869e17d5e6..5946edd573 100644
--- a/test/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap
+++ b/test/components/views/beacon/__snapshots__/DialogSidebar-test.tsx.snap
@@ -14,11 +14,12 @@ exports[`<DialogSidebar /> renders sidebar correctly with beacons 1`] = `
         View list
       </h4>
       <div
+        aria-label="Close sidebar"
         class="mx_AccessibleButton mx_DialogSidebar_closeButton"
+        data-state="closed"
         data-testid="dialog-sidebar-close"
         role="button"
         tabindex="0"
-        title="Close sidebar"
       >
         <div
           class="mx_DialogSidebar_closeButtonIcon"
@@ -81,6 +82,7 @@ exports[`<DialogSidebar /> renders sidebar correctly with beacons 1`] = `
                 <div
                   aria-label="Copy"
                   class="mx_AccessibleButton mx_CopyableText_copyButton"
+                  data-state="closed"
                   role="button"
                   tabindex="0"
                 />
@@ -113,11 +115,12 @@ exports[`<DialogSidebar /> renders sidebar correctly without beacons 1`] = `
         View list
       </h4>
       <div
+        aria-label="Close sidebar"
         class="mx_AccessibleButton mx_DialogSidebar_closeButton"
+        data-state="closed"
         data-testid="dialog-sidebar-close"
         role="button"
         tabindex="0"
-        title="Close sidebar"
       >
         <div
           class="mx_DialogSidebar_closeButtonIcon"
diff --git a/test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap b/test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap
index b481b1f8fd..605c47e9f0 100644
--- a/test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap
+++ b/test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap
@@ -3,10 +3,11 @@
 exports[`<LeftPanelLiveShareWarning /> when user has live location monitor renders correctly when minimized 1`] = `
 <DocumentFragment>
   <div
+    aria-label="You are sharing your live location"
     class="mx_AccessibleButton mx_LeftPanelLiveShareWarning mx_LeftPanelLiveShareWarning__minimized"
+    data-state="closed"
     role="button"
     tabindex="0"
-    title="You are sharing your live location"
   >
     <div
       height="10"
diff --git a/test/components/views/beacon/__snapshots__/RoomLiveShareWarning-test.tsx.snap b/test/components/views/beacon/__snapshots__/RoomLiveShareWarning-test.tsx.snap
index 348f951b81..eebc443f12 100644
--- a/test/components/views/beacon/__snapshots__/RoomLiveShareWarning-test.tsx.snap
+++ b/test/components/views/beacon/__snapshots__/RoomLiveShareWarning-test.tsx.snap
@@ -109,11 +109,12 @@ exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is
       Retry
     </button>
     <button
+      aria-label="Stop and close"
       class="mx_AccessibleButton mx_RoomLiveShareWarning_closeButton"
+      data-state="closed"
       data-testid="room-live-share-wire-error-close-button"
       role="button"
       tabindex="0"
-      title="Stop and close"
     >
       <div
         class="mx_RoomLiveShareWarning_closeButtonIcon"
diff --git a/test/components/views/beacon/__snapshots__/ShareLatestLocation-test.tsx.snap b/test/components/views/beacon/__snapshots__/ShareLatestLocation-test.tsx.snap
index 068e4b8ca9..edebf1b0eb 100644
--- a/test/components/views/beacon/__snapshots__/ShareLatestLocation-test.tsx.snap
+++ b/test/components/views/beacon/__snapshots__/ShareLatestLocation-test.tsx.snap
@@ -19,6 +19,7 @@ exports[`<ShareLatestLocation /> renders share buttons when there is a location
     <div
       aria-label="Copy"
       class="mx_AccessibleButton mx_CopyableText_copyButton"
+      data-state="closed"
       role="button"
       tabindex="0"
     />
diff --git a/test/components/views/dialogs/UserSettingsDialog-test.tsx b/test/components/views/dialogs/UserSettingsDialog-test.tsx
index a2cd034ba3..7524f1469f 100644
--- a/test/components/views/dialogs/UserSettingsDialog-test.tsx
+++ b/test/components/views/dialogs/UserSettingsDialog-test.tsx
@@ -152,14 +152,17 @@ describe("<UserSettingsDialog />", () => {
             watchSettingCallbacks[settingName] = callback;
             return `mock-watcher-id-${settingName}`;
         });
+        mockSettingsStore.getValue.mockReturnValue(false);
 
         const { queryByTestId, unmount } = render(getComponent());
         expect(queryByTestId(`settings-tab-${UserTab.Mjolnir}`)).toBeFalsy();
 
-        expect(mockSettingsStore.watchSetting.mock.calls[0][0]).toEqual("feature_mjolnir");
+        expect(mockSettingsStore.watchSetting).toHaveBeenCalledWith("feature_mjolnir", null, expect.anything());
 
         // call the watch setting callback
+        mockSettingsStore.getValue.mockReturnValue(true);
         watchSettingCallbacks["feature_mjolnir"]("feature_mjolnir", "", SettingLevel.ACCOUNT, true, true);
+
         // tab is rendered now
         expect(queryByTestId(`settings-tab-${UserTab.Mjolnir}`)).toBeTruthy();
 
diff --git a/test/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap
index 20b79a2ccb..90198f32e8 100644
--- a/test/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap
+++ b/test/components/views/dialogs/__snapshots__/DevtoolsDialog-test.tsx.snap
@@ -41,6 +41,7 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
       <div
         aria-label="Copy"
         class="mx_AccessibleButton mx_CopyableText_copyButton"
+        data-state="closed"
         role="button"
         tabindex="0"
       />
diff --git a/test/components/views/elements/AppTile-test.tsx b/test/components/views/elements/AppTile-test.tsx
index f15f0ce560..69a3b60036 100644
--- a/test/components/views/elements/AppTile-test.tsx
+++ b/test/components/views/elements/AppTile-test.tsx
@@ -377,12 +377,12 @@ describe("AppTile", () => {
         });
 
         it("clicking 'minimise' should send the widget to the right", async () => {
-            await userEvent.click(renderResult.getByTitle("Minimise"));
+            await userEvent.click(renderResult.getByLabelText("Minimise"));
             expect(moveToContainerSpy).toHaveBeenCalledWith(r1, app1, Container.Right);
         });
 
         it("clicking 'maximise' should send the widget to the center", async () => {
-            await userEvent.click(renderResult.getByTitle("Maximise"));
+            await userEvent.click(renderResult.getByLabelText("Maximise"));
             expect(moveToContainerSpy).toHaveBeenCalledWith(r1, app1, Container.Center);
         });
 
@@ -435,7 +435,7 @@ describe("AppTile", () => {
             });
 
             it("clicking 'un-maximise' should send the widget to the top", async () => {
-                await userEvent.click(renderResult.getByTitle("Un-maximise"));
+                await userEvent.click(renderResult.getByLabelText("Un-maximise"));
                 expect(moveToContainerSpy).toHaveBeenCalledWith(r1, app1, Container.Top);
             });
         });
@@ -461,7 +461,7 @@ describe("AppTile", () => {
             });
 
             it("should display the »Popout widget« button", () => {
-                expect(renderResult.getByTitle("Popout widget")).toBeInTheDocument();
+                expect(renderResult.getByLabelText("Popout widget")).toBeInTheDocument();
             });
         });
     });
diff --git a/test/components/views/elements/ImageView-test.tsx b/test/components/views/elements/ImageView-test.tsx
new file mode 100644
index 0000000000..f0475df964
--- /dev/null
+++ b/test/components/views/elements/ImageView-test.tsx
@@ -0,0 +1,29 @@
+/*
+ *
+ * Copyright 2024 The Matrix.org Foundation C.I.C.
+ *
+ * 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 from "react";
+import { render } from "@testing-library/react";
+
+import ImageView from "../../../../src/components/views/elements/ImageView";
+
+describe("<ImageView />", () => {
+    it("renders correctly", () => {
+        const { container } = render(<ImageView src="https://example.com/image.png" onFinished={jest.fn()} />);
+        expect(container).toMatchSnapshot();
+    });
+});
diff --git a/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap b/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap
index 92b89013e1..820c458825 100644
--- a/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap
+++ b/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap
@@ -13,11 +13,12 @@ exports[`AppTile destroys non-persisted right panel widget on room change 1`] =
         class="mx_BaseCard_header"
       >
         <div
+          aria-label="Close"
           class="mx_AccessibleButton mx_BaseCard_close"
+          data-state="closed"
           data-testid="base-card-close-button"
           role="button"
           tabindex="0"
-          title="Close"
         />
         <div
           class="mx_BaseCard_headerProp"
@@ -37,7 +38,6 @@ exports[`AppTile destroys non-persisted right panel widget on room change 1`] =
               class="mx_AccessibleButton mx_BaseCard_header_title_button--option"
               role="button"
               tabindex="0"
-              title="Options"
             />
           </div>
         </div>
@@ -136,20 +136,22 @@ exports[`AppTile for a pinned widget should render 1`] = `
         class="mx_AppTileMenuBar_widgets"
       >
         <div
+          aria-label="Un-maximise"
           class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
+          data-state="closed"
           role="button"
           tabindex="0"
-          title="Un-maximise"
         >
           <div
             class="mx_Icon mx_Icon_12"
           />
         </div>
         <div
+          aria-label="Minimise"
           class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
+          data-state="closed"
           role="button"
           tabindex="0"
-          title="Minimise"
         >
           <div
             class="mx_Icon mx_Icon_12"
@@ -162,7 +164,6 @@ exports[`AppTile for a pinned widget should render 1`] = `
           class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
           role="button"
           tabindex="0"
-          title="Options"
         >
           <div
             class="mx_Icon mx_Icon_12"
@@ -223,20 +224,22 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
         class="mx_AppTileMenuBar_widgets"
       >
         <div
+          aria-label="Un-maximise"
           class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
+          data-state="closed"
           role="button"
           tabindex="0"
-          title="Un-maximise"
         >
           <div
             class="mx_Icon mx_Icon_12"
           />
         </div>
         <div
+          aria-label="Minimise"
           class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
+          data-state="closed"
           role="button"
           tabindex="0"
-          title="Minimise"
         >
           <div
             class="mx_Icon mx_Icon_12"
@@ -249,7 +252,6 @@ exports[`AppTile for a pinned widget should render permission request 1`] = `
           class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
           role="button"
           tabindex="0"
-          title="Options"
         >
           <div
             class="mx_Icon mx_Icon_12"
@@ -377,20 +379,22 @@ exports[`AppTile preserves non-persisted widget on container move 1`] = `
               class="mx_AppTileMenuBar_widgets"
             >
               <div
+                aria-label="Maximise"
                 class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
+                data-state="closed"
                 role="button"
                 tabindex="0"
-                title="Maximise"
               >
                 <div
                   class="mx_Icon mx_Icon_12"
                 />
               </div>
               <div
+                aria-label="Minimise"
                 class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
+                data-state="closed"
                 role="button"
                 tabindex="0"
-                title="Minimise"
               >
                 <div
                   class="mx_Icon mx_Icon_12"
@@ -403,7 +407,6 @@ exports[`AppTile preserves non-persisted widget on container move 1`] = `
                 class="mx_AccessibleButton mx_AppTileMenuBar_widgets_button"
                 role="button"
                 tabindex="0"
-                title="Options"
               >
                 <div
                   class="mx_Icon mx_Icon_12"
diff --git a/test/components/views/elements/__snapshots__/ImageView-test.tsx.snap b/test/components/views/elements/__snapshots__/ImageView-test.tsx.snap
new file mode 100644
index 0000000000..acd85fb633
--- /dev/null
+++ b/test/components/views/elements/__snapshots__/ImageView-test.tsx.snap
@@ -0,0 +1,88 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ImageView /> renders correctly 1`] = `
+<div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+  <div
+    aria-label="Image view"
+    class="mx_ImageView"
+    data-focus-lock-disabled="false"
+    role="dialog"
+  >
+    <div
+      class="mx_ImageView_panel"
+    >
+      <div />
+      <div
+        class="mx_ImageView_toolbar"
+      >
+        <div
+          aria-describedby="floating-ui-2"
+          aria-label="Zoom out"
+          class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_zoomOut"
+          data-state="open"
+          role="button"
+          tabindex="0"
+        />
+        <div
+          aria-label="Zoom in"
+          class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_zoomIn"
+          data-state="closed"
+          role="button"
+          tabindex="0"
+        />
+        <div
+          aria-label="Rotate Left"
+          class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_rotateCCW"
+          data-state="closed"
+          role="button"
+          tabindex="0"
+        />
+        <div
+          aria-label="Rotate Right"
+          class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_rotateCW"
+          data-state="closed"
+          role="button"
+          tabindex="0"
+        />
+        <div
+          aria-label="Download"
+          class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_download"
+          data-state="closed"
+          role="button"
+          tabindex="0"
+        />
+        <div
+          aria-label="Close"
+          class="mx_AccessibleButton mx_ImageView_button mx_ImageView_button_close"
+          data-state="closed"
+          role="button"
+          tabindex="0"
+        />
+      </div>
+    </div>
+    <div
+      class="mx_ImageView_image_wrapper"
+    >
+      <img
+        class="mx_ImageView_image "
+        draggable="true"
+        src="https://example.com/image.png"
+        style="transform: translateX(0px)
+                        translateY(0px)
+                        scale(0)
+                        rotate(0deg); cursor: zoom-out;"
+      />
+    </div>
+  </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
+</div>
+`;
diff --git a/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap b/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
index 62847f2dc4..2817a7f779 100644
--- a/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
+++ b/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
@@ -23,22 +23,24 @@ exports[`<LocationViewDialog /> renders map correctly 1`] = `
     class="mx_ZoomButtons"
   >
     <div
+      aria-label="Zoom in"
       class="mx_AccessibleButton mx_ZoomButtons_button"
+      data-state="closed"
       data-testid="map-zoom-in-button"
       role="button"
       tabindex="0"
-      title="Zoom in"
     >
       <div
         class="mx_ZoomButtons_icon"
       />
     </div>
     <div
+      aria-label="Zoom out"
       class="mx_AccessibleButton mx_ZoomButtons_button"
+      data-state="closed"
       data-testid="map-zoom-out-button"
       role="button"
       tabindex="0"
-      title="Zoom out"
     >
       <div
         class="mx_ZoomButtons_icon"
diff --git a/test/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap b/test/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap
index 6b39c3eeaf..7b02903106 100644
--- a/test/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap
+++ b/test/components/views/location/__snapshots__/ZoomButtons-test.tsx.snap
@@ -6,22 +6,24 @@ exports[`<ZoomButtons /> renders buttons 1`] = `
     class="mx_ZoomButtons"
   >
     <div
+      aria-label="Zoom in"
       class="mx_AccessibleButton mx_ZoomButtons_button"
+      data-state="closed"
       data-testid="map-zoom-in-button"
       role="button"
       tabindex="0"
-      title="Zoom in"
     >
       <div
         class="mx_ZoomButtons_icon"
       />
     </div>
     <div
+      aria-label="Zoom out"
       class="mx_AccessibleButton mx_ZoomButtons_button"
+      data-state="closed"
       data-testid="map-zoom-out-button"
       role="button"
       tabindex="0"
-      title="Zoom out"
     >
       <div
         class="mx_ZoomButtons_icon"
diff --git a/test/components/views/messages/DecryptionFailureBody-test.tsx b/test/components/views/messages/DecryptionFailureBody-test.tsx
index e8d4fce56e..6b0177a916 100644
--- a/test/components/views/messages/DecryptionFailureBody-test.tsx
+++ b/test/components/views/messages/DecryptionFailureBody-test.tsx
@@ -17,13 +17,20 @@
 import React from "react";
 import { render } from "@testing-library/react";
 import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { mkDecryptionFailureMatrixEvent } from "matrix-js-sdk/src/testing";
+import { DecryptionFailureCode } from "matrix-js-sdk/src/crypto-api";
 
 import { mkEvent } from "../../../test-utils";
 import { DecryptionFailureBody } from "../../../../src/components/views/messages/DecryptionFailureBody";
+import { LocalDeviceVerificationStateContext } from "../../../../src/contexts/LocalDeviceVerificationStateContext";
 
 describe("DecryptionFailureBody", () => {
-    function customRender(event: MatrixEvent) {
-        return render(<DecryptionFailureBody mxEvent={event} />);
+    function customRender(event: MatrixEvent, localDeviceVerified: boolean = false) {
+        return render(
+            <LocalDeviceVerificationStateContext.Provider value={localDeviceVerified}>
+                <DecryptionFailureBody mxEvent={event} />
+            </LocalDeviceVerificationStateContext.Provider>,
+        );
     }
 
     it(`Should display "Unable to decrypt message"`, () => {
@@ -60,4 +67,51 @@ describe("DecryptionFailureBody", () => {
         // Then
         expect(container).toMatchSnapshot();
     });
+
+    it("should handle historical messages with no key backup", async () => {
+        // When
+        const event = await mkDecryptionFailureMatrixEvent({
+            code: DecryptionFailureCode.HISTORICAL_MESSAGE_NO_KEY_BACKUP,
+            msg: "No backup",
+            roomId: "fakeroom",
+            sender: "fakesender",
+        });
+        const { container } = customRender(event);
+
+        // Then
+        expect(container).toHaveTextContent("Historical messages are not available on this device");
+    });
+
+    it.each([true, false])(
+        "should handle historical messages when there is a backup and device verification is %s",
+        async (verified) => {
+            // When
+            const event = await mkDecryptionFailureMatrixEvent({
+                code: DecryptionFailureCode.HISTORICAL_MESSAGE_BACKUP_UNCONFIGURED,
+                msg: "Failure",
+                roomId: "fakeroom",
+                sender: "fakesender",
+            });
+            const { container } = customRender(event, verified);
+
+            // Then
+            expect(container).toHaveTextContent(
+                verified ? "Unable to decrypt" : "You need to verify this device for access to historical messages",
+            );
+        },
+    );
+
+    it("should handle undecryptable pre-join messages", async () => {
+        // When
+        const event = await mkDecryptionFailureMatrixEvent({
+            code: DecryptionFailureCode.HISTORICAL_MESSAGE_USER_NOT_JOINED,
+            msg: "Not joined",
+            roomId: "fakeroom",
+            sender: "fakesender",
+        });
+        const { container } = customRender(event);
+
+        // Then
+        expect(container).toHaveTextContent("You don't have access to this message");
+    });
 });
diff --git a/test/components/views/right_panel/UserInfo-test.tsx b/test/components/views/right_panel/UserInfo-test.tsx
index e47b07829d..1c9e375e04 100644
--- a/test/components/views/right_panel/UserInfo-test.tsx
+++ b/test/components/views/right_panel/UserInfo-test.tsx
@@ -293,7 +293,8 @@ describe("<UserInfo />", () => {
 
         it("renders close button correctly when encryption panel with a pending verification request", () => {
             renderComponent({ phase: RightPanelPhases.EncryptionPanel, verificationRequest });
-            expect(screen.getByTestId("base-card-close-button")).toHaveAttribute("title", "Cancel");
+            screen.getByTestId("base-card-close-button").focus();
+            expect(screen.getByRole("tooltip")).toHaveTextContent("Cancel");
         });
     });
 
@@ -387,11 +388,8 @@ describe("<UserInfo />", () => {
             // click it
             await userEvent.click(devicesButton);
 
-            // there should now be a button with the device id ...
-            const deviceButton = screen.getByRole("button", { description: "d1" });
-
-            // ... which should contain the device name
-            expect(within(deviceButton).getByText("my device")).toBeInTheDocument();
+            // there should now be a button with the device id which should contain the device name
+            expect(screen.getByRole("button", { name: "my device" })).toBeInTheDocument();
         });
 
         it("renders <BasicUserInfo />", async () => {
@@ -444,10 +442,10 @@ describe("<UserInfo />", () => {
                 });
 
                 // there should now be a button with the non-dehydrated device ID
-                expect(screen.getByRole("button", { description: "d1" })).toBeInTheDocument();
+                expect(screen.getByRole("button", { name: "my device" })).toBeInTheDocument();
 
                 // but not for the dehydrated device ID
-                expect(screen.queryByRole("button", { description: "d2" })).not.toBeInTheDocument();
+                expect(screen.queryByRole("button", { name: "dehydrated device" })).not.toBeInTheDocument();
 
                 // there should be a line saying that the user has "Offline device" enabled
                 expect(screen.getByText("Offline device enabled")).toBeInTheDocument();
@@ -530,7 +528,7 @@ describe("<UserInfo />", () => {
 
                 // the dehydrated device should be shown as an unverified device, which means
                 // there should now be a button with the device id ...
-                const deviceButton = screen.getByRole("button", { description: "d2" });
+                const deviceButton = screen.getByRole("button", { name: "dehydrated device" });
 
                 // ... which should contain the device name
                 expect(within(deviceButton).getByText("dehydrated device")).toBeInTheDocument();
@@ -572,13 +570,15 @@ describe("<UserInfo />", () => {
                 });
 
                 // the dehydrated devices should be shown as an unverified device, which means
-                // there should now be a button with the first dehydrated device id ...
-                const device1Button = screen.getByRole("button", { description: "d1" });
+                // there should now be a button with the first dehydrated device...
+                const device1Button = screen.getByRole("button", { name: "dehydrated device 1" });
+                expect(device1Button).toBeVisible();
 
                 // ... which should contain the device name
                 expect(within(device1Button).getByText("dehydrated device 1")).toBeInTheDocument();
-                // and a button with the second dehydrated device id ...
-                const device2Button = screen.getByRole("button", { description: "d2" });
+                // and a button with the second dehydrated device...
+                const device2Button = screen.getByRole("button", { name: "dehydrated device 2" });
+                expect(device2Button).toBeVisible();
 
                 // ... which should contain the device name
                 expect(within(device2Button).getByText("dehydrated device 2")).toBeInTheDocument();
@@ -707,7 +707,8 @@ describe("<DeviceItem />", () => {
         renderComponent({ isUserVerified: true });
         await act(flushPromises);
 
-        expect(screen.getByRole("button", { name: `${device.displayName} Not trusted` })).toBeInTheDocument();
+        const button = screen.getByRole("button", { name: device.displayName });
+        expect(button).toHaveTextContent(`${device.displayName}Not trusted`);
     });
 
     it("with verified device only, displays no button without a label", async () => {
diff --git a/test/components/views/right_panel/__snapshots__/RoomSummaryCard-test.tsx.snap b/test/components/views/right_panel/__snapshots__/RoomSummaryCard-test.tsx.snap
index 05590b630c..b33a1035cd 100644
--- a/test/components/views/right_panel/__snapshots__/RoomSummaryCard-test.tsx.snap
+++ b/test/components/views/right_panel/__snapshots__/RoomSummaryCard-test.tsx.snap
@@ -25,11 +25,12 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           />
         </button>
         <div
+          aria-label="Close"
           class="mx_AccessibleButton mx_BaseCard_close"
+          data-state="closed"
           data-testid="base-card-close-button"
           role="button"
           tabindex="0"
-          title="Close"
         />
       </header>
       <header
diff --git a/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap b/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
index 04f43699b3..6c98f4eedc 100644
--- a/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
+++ b/test/components/views/right_panel/__snapshots__/UserInfo-test.tsx.snap
@@ -3,10 +3,11 @@
 exports[`<DeviceItem /> ambiguous display name 1`] = `
 <div>
   <div
+    aria-label="my display name (deviceId)"
     class="mx_AccessibleButton mx_UserInfo_device mx_UserInfo_device_unverified"
+    data-state="closed"
     role="button"
     tabindex="0"
-    title="deviceId"
   >
     <div
       class="mx_E2EIcon mx_E2EIcon_normal"
@@ -26,10 +27,11 @@ exports[`<DeviceItem /> ambiguous display name 1`] = `
 exports[`<DeviceItem /> with display name 1`] = `
 <div>
   <div
+    aria-label="deviceName"
     class="mx_AccessibleButton mx_UserInfo_device mx_UserInfo_device_unverified"
+    data-state="closed"
     role="button"
     tabindex="0"
-    title="deviceId"
   >
     <div
       class="mx_E2EIcon mx_E2EIcon_normal"
@@ -49,10 +51,11 @@ exports[`<DeviceItem /> with display name 1`] = `
 exports[`<DeviceItem /> without display name 1`] = `
 <div>
   <div
+    aria-label="deviceId"
     class="mx_AccessibleButton mx_UserInfo_device mx_UserInfo_device_unverified"
+    data-state="closed"
     role="button"
     tabindex="0"
-    title="deviceId"
   >
     <div
       class="mx_E2EIcon mx_E2EIcon_normal"
@@ -78,11 +81,12 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
       class="mx_BaseCard_header"
     >
       <div
+        aria-label="Close"
         class="mx_AccessibleButton mx_BaseCard_close"
+        data-state="closed"
         data-testid="base-card-close-button"
         role="button"
         tabindex="0"
-        title="Close"
       />
       <div
         class="mx_BaseCard_headerProp"
diff --git a/test/components/views/rooms/EventTile/__snapshots__/EventTileThreadToolbar-test.tsx.snap b/test/components/views/rooms/EventTile/__snapshots__/EventTileThreadToolbar-test.tsx.snap
index 133531b447..a29876f34b 100644
--- a/test/components/views/rooms/EventTile/__snapshots__/EventTileThreadToolbar-test.tsx.snap
+++ b/test/components/views/rooms/EventTile/__snapshots__/EventTileThreadToolbar-test.tsx.snap
@@ -11,6 +11,7 @@ exports[`EventTileThreadToolbar renders 1`] = `
     <div
       aria-label="View in room"
       class="mx_AccessibleButton mx_MessageActionBar_iconButton"
+      data-state="closed"
       role="button"
       tabindex="0"
     >
@@ -19,6 +20,7 @@ exports[`EventTileThreadToolbar renders 1`] = `
     <div
       aria-label="Copy link to thread"
       class="mx_AccessibleButton mx_MessageActionBar_iconButton"
+      data-state="closed"
       role="button"
       tabindex="-1"
     >
diff --git a/test/components/views/rooms/MemberList-test.tsx b/test/components/views/rooms/MemberList-test.tsx
index dbf5b270df..9098ee1e29 100644
--- a/test/components/views/rooms/MemberList-test.tsx
+++ b/test/components/views/rooms/MemberList-test.tsx
@@ -92,7 +92,7 @@ describe("MemberList", () => {
         let prevMember: RoomMember | undefined;
         for (const tile of memberTiles) {
             const memberA = prevMember;
-            const memberB = memberListRoom.currentState.members[tile.getAttribute("title")!.split(" ")[0]];
+            const memberB = memberListRoom.currentState.members[tile.getAttribute("aria-label")!.split(" ")[0]];
             prevMember = memberB; // just in case an expect fails, set this early
             if (!memberA) {
                 continue;
diff --git a/test/components/views/rooms/__snapshots__/MemberTile-test.tsx.snap b/test/components/views/rooms/__snapshots__/MemberTile-test.tsx.snap
index f40db566bb..77c87d93da 100644
--- a/test/components/views/rooms/__snapshots__/MemberTile-test.tsx.snap
+++ b/test/components/views/rooms/__snapshots__/MemberTile-test.tsx.snap
@@ -4,10 +4,11 @@ exports[`MemberTile should display an verified E2EIcon when the e2E status = Ver
 <div>
   <div>
     <div
+      aria-label="@userId:matrix.org (power 0)"
       class="mx_AccessibleButton mx_EntityTile mx_EntityTile_offline_neveractive"
+      data-state="closed"
       role="button"
       tabindex="0"
-      title="@userId:matrix.org (power 0)"
     >
       <div
         class="mx_EntityTile_avatar"
@@ -57,10 +58,11 @@ exports[`MemberTile should display an warning E2EIcon when the e2E status = Warn
 <div>
   <div>
     <div
+      aria-label="@userId:matrix.org (power 0)"
       class="mx_AccessibleButton mx_EntityTile mx_EntityTile_offline_neveractive"
+      data-state="closed"
       role="button"
       tabindex="0"
-      title="@userId:matrix.org (power 0)"
     >
       <div
         class="mx_EntityTile_avatar"
@@ -110,10 +112,11 @@ exports[`MemberTile should not display an E2EIcon when the e2E status = normal 1
 <div>
   <div>
     <div
+      aria-label="@userId:matrix.org (power 0)"
       class="mx_AccessibleButton mx_EntityTile mx_EntityTile_offline_neveractive"
+      data-state="closed"
       role="button"
       tabindex="0"
-      title="@userId:matrix.org (power 0)"
     >
       <div
         class="mx_EntityTile_avatar"
diff --git a/test/components/views/settings/devices/LoginWithQR-test.tsx b/test/components/views/settings/devices/LoginWithQR-test.tsx
index cdbb46a8b6..7a1a269064 100644
--- a/test/components/views/settings/devices/LoginWithQR-test.tsx
+++ b/test/components/views/settings/devices/LoginWithQR-test.tsx
@@ -20,7 +20,8 @@ import React from "react";
 import { MSC3906Rendezvous, RendezvousFailureReason } from "matrix-js-sdk/src/rendezvous";
 import { HTTPError, LoginTokenPostResponse } from "matrix-js-sdk/src/matrix";
 
-import LoginWithQR, { Click, Mode, Phase } from "../../../../../src/components/views/auth/LoginWithQR";
+import LoginWithQR from "../../../../../src/components/views/auth/LoginWithQR";
+import { Click, Mode, Phase } from "../../../../../src/components/views/auth/LoginWithQR-types";
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";
 
 jest.mock("matrix-js-sdk/src/rendezvous");
diff --git a/test/components/views/settings/devices/LoginWithQRFlow-test.tsx b/test/components/views/settings/devices/LoginWithQRFlow-test.tsx
index 614a8d3ffd..21863c84a4 100644
--- a/test/components/views/settings/devices/LoginWithQRFlow-test.tsx
+++ b/test/components/views/settings/devices/LoginWithQRFlow-test.tsx
@@ -19,12 +19,8 @@ import React from "react";
 import { RendezvousFailureReason } from "matrix-js-sdk/src/rendezvous";
 
 import LoginWithQRFlow from "../../../../../src/components/views/auth/LoginWithQRFlow";
-import {
-    Click,
-    Phase,
-    LoginWithQRFailureReason,
-    FailureReason,
-} from "../../../../../src/components/views/auth/LoginWithQR";
+import { LoginWithQRFailureReason, FailureReason } from "../../../../../src/components/views/auth/LoginWithQR";
+import { Click, Phase } from "../../../../../src/components/views/auth/LoginWithQR-types";
 
 describe("<LoginWithQRFlow />", () => {
     const onClick = jest.fn();
diff --git a/test/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
index a1b700c003..bd3ec55ca6 100644
--- a/test/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
@@ -139,7 +139,9 @@ exports[`<CurrentDeviceSection /> handles when device is falsy 1`] = `
         aria-disabled="true"
         aria-expanded="false"
         aria-haspopup="true"
+        aria-label="Options"
         class="mx_AccessibleButton mx_AccessibleButton_disabled"
+        data-state="closed"
         data-testid="current-session-menu"
         disabled=""
         role="button"
@@ -174,7 +176,9 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
       <div
         aria-expanded="false"
         aria-haspopup="true"
+        aria-label="Options"
         class="mx_AccessibleButton"
+        data-state="closed"
         data-testid="current-session-menu"
         role="button"
         tabindex="0"
@@ -317,7 +321,9 @@ exports[`<CurrentDeviceSection /> renders device and correct security card when
       <div
         aria-expanded="false"
         aria-haspopup="true"
+        aria-label="Options"
         class="mx_AccessibleButton"
+        data-state="closed"
         data-testid="current-session-menu"
         role="button"
         tabindex="0"
diff --git a/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap b/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
index 953e28635e..395a86f994 100644
--- a/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
+++ b/test/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
@@ -3,19 +3,28 @@
 exports[`<LoginWithQRFlow /> errors renders data_mismatch 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
+      <div
+        class="mx_LoginWithQR_icon mx_LoginWithQR_icon--critical"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        Something went wrong!
+      </h1>
       <p
         data-testid="cancellation-message"
       >
-        The request was cancelled.
+        An unexpected error occurred. The request to connect your other device has been cancelled.
       </p>
     </div>
     <div
@@ -45,19 +54,28 @@ exports[`<LoginWithQRFlow /> errors renders data_mismatch 1`] = `
 exports[`<LoginWithQRFlow /> errors renders expired 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
+      <div
+        class="mx_LoginWithQR_icon mx_LoginWithQR_icon--critical"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        The sign in was not completed in time
+      </h1>
       <p
         data-testid="cancellation-message"
       >
-        The linking wasn't completed in the required time.
+        Sign in expired. Please try again.
       </p>
     </div>
     <div
@@ -87,19 +105,28 @@ exports[`<LoginWithQRFlow /> errors renders expired 1`] = `
 exports[`<LoginWithQRFlow /> errors renders homeserver_lacks_support 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
+      <div
+        class="mx_LoginWithQR_icon mx_LoginWithQR_icon--critical"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        Other device not compatible
+      </h1>
       <p
         data-testid="cancellation-message"
       >
-        The homeserver doesn't support signing in another device.
+        This device does not support signing in to the other device with a QR code.
       </p>
     </div>
     <div
@@ -129,20 +156,42 @@ exports[`<LoginWithQRFlow /> errors renders homeserver_lacks_support 1`] = `
 exports[`<LoginWithQRFlow /> errors renders invalid_code 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
-      <p
+      <div
+        class="mx_LoginWithQR_icon mx_LoginWithQR_icon--critical"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        Connection not secure
+      </h1>
+      A secure connection could not be made to the new device. Your existing devices are still safe and you don't need to worry about them.
+      <h2
+        class="_typography_yh5dq_162 _font-body-lg-semibold_yh5dq_83"
         data-testid="cancellation-message"
       >
-        The scanned code is invalid.
-      </p>
+        Now what?
+      </h2>
+      <ol>
+        <li>
+          Try signing in to the other device again with a QR code in case this was a network problem
+        </li>
+        <li>
+          If you encounter the same problem, try a different wifi network or use your mobile data instead of wifi
+        </li>
+        <li>
+          If that doesn't work, sign in manually
+        </li>
+      </ol>
     </div>
     <div
       class="mx_LoginWithQR_buttons"
@@ -171,19 +220,28 @@ exports[`<LoginWithQRFlow /> errors renders invalid_code 1`] = `
 exports[`<LoginWithQRFlow /> errors renders other_device_already_signed_in 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
+      <div
+        class="mx_LoginWithQR_icon"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        Your other device is already signed in
+      </h1>
       <p
         data-testid="cancellation-message"
       >
-        The other device is already signed in.
+        You don’t need to do anything else.
       </p>
     </div>
     <div
@@ -213,19 +271,28 @@ exports[`<LoginWithQRFlow /> errors renders other_device_already_signed_in 1`] =
 exports[`<LoginWithQRFlow /> errors renders other_device_not_signed_in 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
+      <div
+        class="mx_LoginWithQR_icon mx_LoginWithQR_icon--critical"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        Something went wrong!
+      </h1>
       <p
         data-testid="cancellation-message"
       >
-        The other device isn't signed in.
+        An unexpected error occurred. The request to connect your other device has been cancelled.
       </p>
     </div>
     <div
@@ -255,15 +322,24 @@ exports[`<LoginWithQRFlow /> errors renders other_device_not_signed_in 1`] = `
 exports[`<LoginWithQRFlow /> errors renders rate_limited 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
+      <div
+        class="mx_LoginWithQR_icon mx_LoginWithQR_icon--critical"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        Something went wrong!
+      </h1>
       <p
         data-testid="cancellation-message"
       >
@@ -297,19 +373,28 @@ exports[`<LoginWithQRFlow /> errors renders rate_limited 1`] = `
 exports[`<LoginWithQRFlow /> errors renders unknown 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
+      <div
+        class="mx_LoginWithQR_icon mx_LoginWithQR_icon--critical"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        Something went wrong!
+      </h1>
       <p
         data-testid="cancellation-message"
       >
-        An unexpected error occurred.
+        An unexpected error occurred. The request to connect your other device has been cancelled.
       </p>
     </div>
     <div
@@ -339,19 +424,28 @@ exports[`<LoginWithQRFlow /> errors renders unknown 1`] = `
 exports[`<LoginWithQRFlow /> errors renders unsupported_algorithm 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
+      <div
+        class="mx_LoginWithQR_icon mx_LoginWithQR_icon--critical"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        Other device not compatible
+      </h1>
       <p
         data-testid="cancellation-message"
       >
-        Linking with this device is not supported.
+        This device does not support signing in to the other device with a QR code.
       </p>
     </div>
     <div
@@ -381,19 +475,28 @@ exports[`<LoginWithQRFlow /> errors renders unsupported_algorithm 1`] = `
 exports[`<LoginWithQRFlow /> errors renders unsupported_transport 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
+      <div
+        class="mx_LoginWithQR_icon mx_LoginWithQR_icon--critical"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        Other device not compatible
+      </h1>
       <p
         data-testid="cancellation-message"
       >
-        The request was cancelled.
+        This device does not support signing in to the other device with a QR code.
       </p>
     </div>
     <div
@@ -423,19 +526,28 @@ exports[`<LoginWithQRFlow /> errors renders unsupported_transport 1`] = `
 exports[`<LoginWithQRFlow /> errors renders user_cancelled 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
+      <div
+        class="mx_LoginWithQR_icon mx_LoginWithQR_icon--critical"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        Sign in request cancelled
+      </h1>
       <p
         data-testid="cancellation-message"
       >
-        The request was cancelled.
+        The sign in was cancelled on the other device.
       </p>
     </div>
     <div
@@ -465,19 +577,28 @@ exports[`<LoginWithQRFlow /> errors renders user_cancelled 1`] = `
 exports[`<LoginWithQRFlow /> errors renders user_declined 1`] = `
 <div>
   <div
-    class="mx_LoginWithQR"
+    class="mx_LoginWithQR mx_LoginWithQR_error"
     data-testid="login-with-qr"
   >
-    <div
-      class="mx_LoginWithQR_centreTitle"
-    />
     <div
       class="mx_LoginWithQR_main"
     >
+      <div
+        class="mx_LoginWithQR_icon mx_LoginWithQR_icon--critical"
+      >
+        <div
+          width="32px"
+        />
+      </div>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
+        Sign in declined
+      </h1>
       <p
         data-testid="cancellation-message"
       >
-        The request was declined on the other device.
+        You declined the request from your other device to sign in.
       </p>
     </div>
     <div
@@ -511,33 +632,32 @@ exports[`<LoginWithQRFlow /> renders QR code 1`] = `
     data-testid="login-with-qr"
   >
     <div
-      class=""
+      class="mx_LoginWithQR_heading"
     >
       <div
-        class="mx_LoginWithQR_heading"
+        aria-label="Back"
+        class="mx_AccessibleButton mx_LoginWithQR_BackButton"
+        data-state="closed"
+        data-testid="back-button"
+        role="button"
+        tabindex="0"
       >
-        <div
-          class="mx_AccessibleButton mx_LoginWithQR_BackButton"
-          data-testid="back-button"
-          role="button"
-          tabindex="0"
-          title="Back"
-        >
-          <div />
-        </div>
-        <div
-          class="mx_LoginWithQR_breadcrumbs"
-        >
-          Sessions
-           / 
-          Link new device
-        </div>
+        <div />
+      </div>
+      <div
+        class="mx_LoginWithQR_breadcrumbs"
+      >
+        Sessions
+         / 
+        Link new device
       </div>
     </div>
     <div
       class="mx_LoginWithQR_main"
     >
-      <h1>
+      <h1
+        class="_typography_yh5dq_162 _font-heading-sm-semibold_yh5dq_102"
+      >
         Scan the QR code with another device
       </h1>
       <div
@@ -561,7 +681,7 @@ exports[`<LoginWithQRFlow /> renders QR code 1`] = `
           <span>
             Select "
             <b>
-              Scan QR code
+              Sign in with QR code
             </b>
             "
           </span>
@@ -570,7 +690,7 @@ exports[`<LoginWithQRFlow /> renders QR code 1`] = `
           Point the camera at the QR code shown here
         </li>
         <li>
-          Follow the remaining instructions to verify your other device
+          Follow the instructions to link your other device
         </li>
       </ol>
     </div>
@@ -587,9 +707,6 @@ exports[`<LoginWithQRFlow /> renders code when connected 1`] = `
     class="mx_LoginWithQR"
     data-testid="login-with-qr"
   >
-    <div
-      class=""
-    />
     <div
       class="mx_LoginWithQR_main"
     >
@@ -615,14 +732,6 @@ exports[`<LoginWithQRFlow /> renders code when connected 1`] = `
     <div
       class="mx_LoginWithQR_buttons"
     >
-      <div
-        class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline"
-        data-testid="decline-login-button"
-        role="button"
-        tabindex="0"
-      >
-        Cancel
-      </div>
       <div
         class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
         data-testid="approve-login-button"
@@ -631,6 +740,14 @@ exports[`<LoginWithQRFlow /> renders code when connected 1`] = `
       >
         Approve
       </div>
+      <div
+        class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline"
+        data-testid="decline-login-button"
+        role="button"
+        tabindex="0"
+      >
+        Cancel
+      </div>
     </div>
   </div>
 </div>
@@ -643,27 +760,24 @@ exports[`<LoginWithQRFlow /> renders spinner while connecting 1`] = `
     data-testid="login-with-qr"
   >
     <div
-      class=""
+      class="mx_LoginWithQR_heading"
     >
       <div
-        class="mx_LoginWithQR_heading"
+        aria-label="Back"
+        class="mx_AccessibleButton mx_LoginWithQR_BackButton"
+        data-state="closed"
+        data-testid="back-button"
+        role="button"
+        tabindex="0"
       >
-        <div
-          class="mx_AccessibleButton mx_LoginWithQR_BackButton"
-          data-testid="back-button"
-          role="button"
-          tabindex="0"
-          title="Back"
-        >
-          <div />
-        </div>
-        <div
-          class="mx_LoginWithQR_breadcrumbs"
-        >
-          Sessions
-           / 
-          Link new device
-        </div>
+        <div />
+      </div>
+      <div
+        class="mx_LoginWithQR_breadcrumbs"
+      >
+        Sessions
+         / 
+        Link new device
       </div>
     </div>
     <div
@@ -713,27 +827,24 @@ exports[`<LoginWithQRFlow /> renders spinner while loading 1`] = `
     data-testid="login-with-qr"
   >
     <div
-      class=""
+      class="mx_LoginWithQR_heading"
     >
       <div
-        class="mx_LoginWithQR_heading"
+        aria-label="Back"
+        class="mx_AccessibleButton mx_LoginWithQR_BackButton"
+        data-state="closed"
+        data-testid="back-button"
+        role="button"
+        tabindex="0"
       >
-        <div
-          class="mx_AccessibleButton mx_LoginWithQR_BackButton"
-          data-testid="back-button"
-          role="button"
-          tabindex="0"
-          title="Back"
-        >
-          <div />
-        </div>
-        <div
-          class="mx_LoginWithQR_breadcrumbs"
-        >
-          Sessions
-           / 
-          Link new device
-        </div>
+        <div />
+      </div>
+      <div
+        class="mx_LoginWithQR_breadcrumbs"
+      >
+        Sessions
+         / 
+        Link new device
       </div>
     </div>
     <div
@@ -771,27 +882,24 @@ exports[`<LoginWithQRFlow /> renders spinner while signing in 1`] = `
     data-testid="login-with-qr"
   >
     <div
-      class=""
+      class="mx_LoginWithQR_heading"
     >
       <div
-        class="mx_LoginWithQR_heading"
+        aria-label="Back"
+        class="mx_AccessibleButton mx_LoginWithQR_BackButton"
+        data-state="closed"
+        data-testid="back-button"
+        role="button"
+        tabindex="0"
       >
-        <div
-          class="mx_AccessibleButton mx_LoginWithQR_BackButton"
-          data-testid="back-button"
-          role="button"
-          tabindex="0"
-          title="Back"
-        >
-          <div />
-        </div>
-        <div
-          class="mx_LoginWithQR_breadcrumbs"
-        >
-          Sessions
-           / 
-          Link new device
-        </div>
+        <div />
+      </div>
+      <div
+        class="mx_LoginWithQR_breadcrumbs"
+      >
+        Sessions
+         / 
+        Link new device
       </div>
     </div>
     <div
@@ -841,27 +949,24 @@ exports[`<LoginWithQRFlow /> renders spinner while verifying 1`] = `
     data-testid="login-with-qr"
   >
     <div
-      class="mx_LoginWithQR_centreTitle"
+      class="mx_LoginWithQR_heading"
     >
       <div
-        class="mx_LoginWithQR_heading"
+        aria-label="Back"
+        class="mx_AccessibleButton mx_LoginWithQR_BackButton"
+        data-state="closed"
+        data-testid="back-button"
+        role="button"
+        tabindex="0"
       >
-        <div
-          class="mx_AccessibleButton mx_LoginWithQR_BackButton"
-          data-testid="back-button"
-          role="button"
-          tabindex="0"
-          title="Back"
-        >
-          <div />
-        </div>
-        <div
-          class="mx_LoginWithQR_breadcrumbs"
-        >
-          Sessions
-           / 
-          Link new device
-        </div>
+        <div />
+      </div>
+      <div
+        class="mx_LoginWithQR_breadcrumbs"
+      >
+        Sessions
+         / 
+        Link new device
       </div>
     </div>
     <div
@@ -902,27 +1007,24 @@ exports[`<LoginWithQRFlow /> renders spinner whilst QR generating 1`] = `
     data-testid="login-with-qr"
   >
     <div
-      class=""
+      class="mx_LoginWithQR_heading"
     >
       <div
-        class="mx_LoginWithQR_heading"
+        aria-label="Back"
+        class="mx_AccessibleButton mx_LoginWithQR_BackButton"
+        data-state="closed"
+        data-testid="back-button"
+        role="button"
+        tabindex="0"
       >
-        <div
-          class="mx_AccessibleButton mx_LoginWithQR_BackButton"
-          data-testid="back-button"
-          role="button"
-          tabindex="0"
-          title="Back"
-        >
-          <div />
-        </div>
-        <div
-          class="mx_LoginWithQR_breadcrumbs"
-        >
-          Sessions
-           / 
-          Link new device
-        </div>
+        <div />
+      </div>
+      <div
+        class="mx_LoginWithQR_breadcrumbs"
+      >
+        Sessions
+         / 
+        Link new device
       </div>
     </div>
     <div
diff --git a/test/components/views/settings/tabs/room/__snapshots__/AdvancedRoomSettingsTab-test.tsx.snap b/test/components/views/settings/tabs/room/__snapshots__/AdvancedRoomSettingsTab-test.tsx.snap
index 17390e6b00..9656af6fd5 100644
--- a/test/components/views/settings/tabs/room/__snapshots__/AdvancedRoomSettingsTab-test.tsx.snap
+++ b/test/components/views/settings/tabs/room/__snapshots__/AdvancedRoomSettingsTab-test.tsx.snap
@@ -45,6 +45,7 @@ exports[`AdvancedRoomSettingsTab should render as expected 1`] = `
                   <div
                     aria-label="Copy"
                     class="mx_AccessibleButton mx_CopyableText_copyButton"
+                    data-state="closed"
                     role="button"
                     tabindex="0"
                   />
diff --git a/test/components/views/settings/tabs/room/__snapshots__/PeopleRoomSettingsTab-test.tsx.snap b/test/components/views/settings/tabs/room/__snapshots__/PeopleRoomSettingsTab-test.tsx.snap
index 81347ce2a6..1c720bf01d 100644
--- a/test/components/views/settings/tabs/room/__snapshots__/PeopleRoomSettingsTab-test.tsx.snap
+++ b/test/components/views/settings/tabs/room/__snapshots__/PeopleRoomSettingsTab-test.tsx.snap
@@ -68,10 +68,11 @@ exports[`PeopleRoomSettingsTab with requests to join renders requests fully 1`]
         </div>
       </div>
       <div
+        aria-label="Deny"
         class="mx_AccessibleButton mx_PeopleRoomSettingsTab_action mx_AccessibleButton_hasKind mx_AccessibleButton_kind_icon_primary_outline"
+        data-state="closed"
         role="button"
         tabindex="0"
-        title="Deny"
       >
         <div
           height="18"
@@ -79,10 +80,11 @@ exports[`PeopleRoomSettingsTab with requests to join renders requests fully 1`]
         />
       </div>
       <div
+        aria-label="Approve"
         class="mx_AccessibleButton mx_PeopleRoomSettingsTab_action mx_AccessibleButton_hasKind mx_AccessibleButton_kind_icon_primary"
+        data-state="closed"
         role="button"
         tabindex="0"
-        title="Approve"
       >
         <div
           height="18"
@@ -135,10 +137,11 @@ exports[`PeopleRoomSettingsTab with requests to join renders requests reduced 1`
         </span>
       </div>
       <div
+        aria-label="Deny"
         class="mx_AccessibleButton mx_PeopleRoomSettingsTab_action mx_AccessibleButton_hasKind mx_AccessibleButton_kind_icon_primary_outline"
+        data-state="closed"
         role="button"
         tabindex="0"
-        title="Deny"
       >
         <div
           height="18"
@@ -146,10 +149,11 @@ exports[`PeopleRoomSettingsTab with requests to join renders requests reduced 1`
         />
       </div>
       <div
+        aria-label="Approve"
         class="mx_AccessibleButton mx_PeopleRoomSettingsTab_action mx_AccessibleButton_hasKind mx_AccessibleButton_kind_icon_primary"
+        data-state="closed"
         role="button"
         tabindex="0"
-        title="Approve"
       >
         <div
           height="18"
diff --git a/test/components/views/settings/tabs/user/LabsUserSettingsTab-test.tsx b/test/components/views/settings/tabs/user/LabsUserSettingsTab-test.tsx
index fd9a92a225..18622d87a1 100644
--- a/test/components/views/settings/tabs/user/LabsUserSettingsTab-test.tsx
+++ b/test/components/views/settings/tabs/user/LabsUserSettingsTab-test.tsx
@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import React from "react";
-import { fireEvent, render, screen } from "@testing-library/react";
+import { render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
 
 import LabsUserSettingsTab from "../../../../../../src/components/views/settings/tabs/user/LabsUserSettingsTab";
 import SettingsStore from "../../../../../../src/settings/SettingsStore";
@@ -60,7 +61,7 @@ describe("<LabsUserSettingsTab />", () => {
         // non-beta labs section
         expect(screen.getByText("Early previews")).toBeInTheDocument();
         const labsSections = container.getElementsByClassName("mx_SettingsSubsection");
-        expect(labsSections).toHaveLength(11);
+        expect(labsSections).toHaveLength(10);
     });
 
     describe("Rust crypto setting", () => {
@@ -113,12 +114,14 @@ describe("<LabsUserSettingsTab />", () => {
                 expect(toggle.getAttribute("aria-checked")).toEqual("true");
 
                 // Hover over the toggle to make it show the tooltip
-                fireEvent.mouseOver(toggle);
+                await userEvent.hover(toggle);
 
-                const tooltip = rendered.getByRole("tooltip");
-                expect(tooltip).toHaveTextContent(
-                    "Once enabled, Rust cryptography can only be disabled by logging out and in again",
-                );
+                await waitFor(() => {
+                    const tooltip = screen.getByRole("tooltip");
+                    expect(tooltip).toHaveTextContent(
+                        "Once enabled, Rust cryptography can only be disabled by logging out and in again",
+                    );
+                });
             });
         });
 
@@ -150,12 +153,14 @@ describe("<LabsUserSettingsTab />", () => {
                 expect(toggle.getAttribute("aria-checked")).toEqual("true");
 
                 // Hover over the toggle to make it show the tooltip
-                fireEvent.mouseOver(toggle);
+                await userEvent.hover(toggle);
 
-                const tooltip = rendered.getByRole("tooltip");
-                expect(tooltip).toHaveTextContent(
-                    "Rust cryptography cannot be disabled on this deployment of BrandedClient",
-                );
+                await waitFor(() => {
+                    const tooltip = rendered.getByRole("tooltip");
+                    expect(tooltip).toHaveTextContent(
+                        "Rust cryptography cannot be disabled on this deployment of BrandedClient",
+                    );
+                });
             });
         });
     });
diff --git a/test/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap b/test/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap
index 45e1999af6..244746a909 100644
--- a/test/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap
+++ b/test/components/views/settings/tabs/user/__snapshots__/PreferencesUserSettingsTab-test.tsx.snap
@@ -289,6 +289,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   aria-disabled="true"
                   aria-label="Send read receipts"
                   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
+                  data-state="closed"
                   id="mx_SettingsFlag_GQvdMWe954DV"
                   role="switch"
                   tabindex="0"
diff --git a/test/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap b/test/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap
index b871fce465..2de6a103bc 100644
--- a/test/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap
+++ b/test/components/views/settings/tabs/user/__snapshots__/SessionManagerTab-test.tsx.snap
@@ -84,7 +84,9 @@ exports[`<SessionManagerTab /> current session section renders current session s
     <div
       aria-expanded="false"
       aria-haspopup="true"
+      aria-label="Options"
       class="mx_AccessibleButton"
+      data-state="closed"
       data-testid="current-session-menu"
       role="button"
       tabindex="0"
@@ -213,7 +215,9 @@ exports[`<SessionManagerTab /> current session section renders current session s
     <div
       aria-expanded="false"
       aria-haspopup="true"
+      aria-label="Options"
       class="mx_AccessibleButton"
+      data-state="closed"
       data-testid="current-session-menu"
       role="button"
       tabindex="0"
diff --git a/test/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap b/test/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap
index 04c3cbf31f..f355631d5f 100644
--- a/test/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap
+++ b/test/components/views/spaces/__snapshots__/SpacePanel-test.tsx.snap
@@ -16,7 +16,6 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
         class="mx_AccessibleButton mx_UserMenu_contextMenuButton"
         role="button"
         tabindex="0"
-        title="User menu"
       >
         <div
           class="mx_UserMenu_userAvatar"
@@ -226,6 +225,48 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
         </div>
       </li>
     </ul>
+    <div
+      class="mx_ThreadsActivityCentre_container"
+    >
+      <button
+        aria-controls="floating-ui-7"
+        aria-expanded="true"
+        aria-haspopup="dialog"
+        aria-label="Threads"
+        class="_icon-button_16nk7_17 mx_ThreadsActivityCentreButton"
+        data-state="closed"
+        role="button"
+        style="--cpd-icon-button-size: 32px;"
+        tabindex="0"
+      >
+        <div
+          class="_indicator-icon_133tf_26"
+          style="--cpd-icon-button-size: 100%;"
+        >
+          <div
+            class="mx_ThreadsActivityCentreButton_Icon"
+          />
+        </div>
+      </button>
+      <span
+        data-floating-ui-focus-guard=""
+        data-type="outside"
+        role="button"
+        style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
+        tabindex="0"
+      />
+      <span
+        aria-owns="undefined"
+        style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
+      />
+      <span
+        data-floating-ui-focus-guard=""
+        data-type="outside"
+        role="button"
+        style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: fixed; white-space: nowrap; width: 1px; top: 0px; left: 0px;"
+        tabindex="0"
+      />
+    </div>
     <div
       aria-expanded="false"
       aria-label="Quick settings"
diff --git a/test/settings/controllers/AnalyticsController-test.ts b/test/settings/controllers/AnalyticsController-test.ts
new file mode 100644
index 0000000000..69b624994e
--- /dev/null
+++ b/test/settings/controllers/AnalyticsController-test.ts
@@ -0,0 +1,35 @@
+/*
+Copyright 2024 The Matrix.org Foundation C.I.C.
+
+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 PosthogTrackers from "../../../src/PosthogTrackers";
+import AnalyticsController from "../../../src/settings/controllers/AnalyticsController";
+import { SettingLevel } from "../../../src/settings/SettingLevel";
+
+describe("AnalyticsController", () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it("Tracks a Posthog interaction on change", () => {
+        const trackInteractionSpy = jest.spyOn(PosthogTrackers, "trackInteraction");
+
+        const controller = new AnalyticsController("WebSettingsNotificationsTACOnlyNotificationsToggle");
+
+        controller.onChange(SettingLevel.DEVICE, null, false);
+
+        expect(trackInteractionSpy).toHaveBeenCalledWith("WebSettingsNotificationsTACOnlyNotificationsToggle");
+    });
+});
diff --git a/test/stores/room-list/MessagePreviewStore-test.ts b/test/stores/room-list/MessagePreviewStore-test.ts
index cbb045e6e9..5be2c65fd1 100644
--- a/test/stores/room-list/MessagePreviewStore-test.ts
+++ b/test/stores/room-list/MessagePreviewStore-test.ts
@@ -15,7 +15,16 @@ limitations under the License.
 */
 
 import { Mocked, mocked } from "jest-mock";
-import { EventTimeline, EventType, MatrixClient, MatrixEvent, RelationType, Room } from "matrix-js-sdk/src/matrix";
+import {
+    EventStatus,
+    EventTimeline,
+    EventType,
+    MatrixClient,
+    MatrixEvent,
+    PendingEventOrdering,
+    RelationType,
+    Room,
+} from "matrix-js-sdk/src/matrix";
 
 import { MessagePreviewStore } from "../../../src/stores/room-list/MessagePreviewStore";
 import { mkEvent, mkMessage, mkReaction, setupAsyncStoreWithClient, stubClient } from "../../test-utils";
@@ -25,6 +34,7 @@ import { mkThread } from "../../test-utils/threads";
 describe("MessagePreviewStore", () => {
     let client: Mocked<MatrixClient>;
     let room: Room;
+    let nonRenderedRoom: Room;
     let store: MessagePreviewStore;
 
     async function addEvent(
@@ -46,9 +56,35 @@ describe("MessagePreviewStore", () => {
         }
     }
 
+    async function addPendingEvent(
+        store: MessagePreviewStore,
+        room: Room,
+        event: MatrixEvent,
+        fireAction = true,
+    ): Promise<void> {
+        room.addPendingEvent(event, "txid");
+        if (fireAction) {
+            // @ts-ignore private access
+            await store.onLocalEchoUpdated(event, room);
+        }
+    }
+
+    async function updatePendingEvent(event: MatrixEvent, eventStatus: EventStatus, fireAction = true): Promise<void> {
+        room.updatePendingEvent(event, eventStatus);
+        if (fireAction) {
+            // @ts-ignore private access
+            await store.onLocalEchoUpdated(event, room);
+        }
+    }
+
     beforeEach(async () => {
         client = mocked(stubClient());
-        room = new Room("!roomId:server", client, client.getSafeUserId());
+        room = new Room("!roomId:server", client, client.getSafeUserId(), {
+            pendingEventOrdering: PendingEventOrdering.Detached,
+        });
+        nonRenderedRoom = new Room("!roomId2:server", client, client.getSafeUserId(), {
+            pendingEventOrdering: PendingEventOrdering.Detached,
+        });
         mocked(client.getRoom).mockReturnValue(room);
 
         store = MessagePreviewStore.testInstance();
@@ -286,4 +322,63 @@ describe("MessagePreviewStore", () => {
         expect(preview?.isThreadReply).toBe(false);
         expect(preview?.text).toContain("You reacted 🙃 to root event message");
     });
+
+    it("should handle local echos correctly", async () => {
+        const firstMessage = mkMessage({
+            user: "@sender:server",
+            event: true,
+            room: room.roomId,
+            msg: "First message",
+        });
+
+        await addEvent(store, room, firstMessage);
+
+        expect((await store.getPreviewForRoom(room, DefaultTagID.Untagged))?.text).toMatchInlineSnapshot(
+            `"@sender:server: First message"`,
+        );
+
+        const secondMessage = mkMessage({
+            user: "@sender:server",
+            event: true,
+            room: room.roomId,
+            msg: "Second message",
+        });
+        secondMessage.status = EventStatus.NOT_SENT;
+
+        await addPendingEvent(store, room, secondMessage);
+
+        expect((await store.getPreviewForRoom(room, DefaultTagID.Untagged))?.text).toMatchInlineSnapshot(
+            `"@sender:server: Second message"`,
+        );
+
+        await updatePendingEvent(secondMessage, EventStatus.CANCELLED);
+
+        expect((await store.getPreviewForRoom(room, DefaultTagID.Untagged))?.text).toMatchInlineSnapshot(
+            `"@sender:server: First message"`,
+        );
+    });
+
+    it("should not generate previews for rooms not rendered", async () => {
+        const firstMessage = mkMessage({
+            user: "@sender:server",
+            event: true,
+            room: nonRenderedRoom.roomId,
+            msg: "First message",
+        });
+
+        await addEvent(store, room, firstMessage);
+
+        const secondMessage = mkMessage({
+            user: "@sender:server",
+            event: true,
+            room: nonRenderedRoom.roomId,
+            msg: "Second message",
+        });
+        secondMessage.status = EventStatus.NOT_SENT;
+
+        await addPendingEvent(store, room, secondMessage);
+
+        // @ts-ignore private access
+        expect(store.previews.has(nonRenderedRoom.roomId)).toBeFalsy();
+    });
 });
diff --git a/test/test-utils/test-utils.ts b/test/test-utils/test-utils.ts
index b124af4ad1..48a6f7e7dc 100644
--- a/test/test-utils/test-utils.ts
+++ b/test/test-utils/test-utils.ts
@@ -622,6 +622,7 @@ export function mkStubRoom(
         getType: jest.fn().mockReturnValue(undefined),
         getUnfilteredTimelineSet: jest.fn(),
         getUnreadNotificationCount: jest.fn(() => 0),
+        getRoomUnreadNotificationCount: jest.fn().mockReturnValue(0),
         getVersion: jest.fn().mockReturnValue("1"),
         hasMembershipState: () => false,
         isElementVideoRoom: jest.fn().mockReturnValue(false),
diff --git a/yarn.lock b/yarn.lock
index f89fd40bf9..1f0d02ea11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -40,9 +40,9 @@
     axe-core "~4.9.0"
 
 "@babel/cli@^7.12.10":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.24.1.tgz#2e11e071e32fe82850b4fe514f56b9c9e1c44911"
-  integrity sha512-HbmrtxyFUr34LwAlV9jS+sSIjUp4FpdtIMGwgufY3AsxrIfsh/HxlMTywsONAZsU0RMYbZtbZFpUCrSGs7o0EA==
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.24.5.tgz#9eba21699f289c32e63a28aedf82f888dc134b30"
+  integrity sha512-2qg1mYtJRsOOWF6IUwLP5jI42P8Cc0hQ5TmnjLrik/4DKouO8dFJN80HEz81VmVeUs97yuuf3vQ/9j7Elrcjlg==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.25"
     commander "^4.0.1"
@@ -55,7 +55,7 @@
     "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
     chokidar "^3.4.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.2":
   version "7.24.2"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
   integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
@@ -90,20 +90,20 @@
   integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==
 
 "@babel/core@^7.0.0", "@babel/core@^7.12.10":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.4.tgz#1f758428e88e0d8c563874741bc4ffc4f71a4717"
-  integrity sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.5.tgz#15ab5b98e101972d171aeef92ac70d8d6718f06a"
+  integrity sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.24.2"
-    "@babel/generator" "^7.24.4"
+    "@babel/generator" "^7.24.5"
     "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.24.4"
-    "@babel/parser" "^7.24.4"
+    "@babel/helper-module-transforms" "^7.24.5"
+    "@babel/helpers" "^7.24.5"
+    "@babel/parser" "^7.24.5"
     "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.1"
-    "@babel/types" "^7.24.0"
+    "@babel/traverse" "^7.24.5"
+    "@babel/types" "^7.24.5"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -132,18 +132,18 @@
     semver "^6.3.1"
 
 "@babel/eslint-parser@^7.12.10":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.24.1.tgz#e27eee93ed1d271637165ef3a86e2b9332395c32"
-  integrity sha512-d5guuzMlPeDfZIbpQ8+g1NaCNuAGBBGNECh0HVqz1sjOeVLh2CEaifuOysCH18URW6R7pqXINvf5PaR/dC6jLQ==
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.24.5.tgz#3b0f7d383a540329a30a6a9937cfc89461d26217"
+  integrity sha512-gsUcqS/fPlgAw1kOtpss7uhY6E9SFFANQ6EFX5GTvzUwaV0+sGaZWk6xq22MOdeT9wfxyokW3ceCUvOiRtZciQ==
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.1"
 
 "@babel/eslint-plugin@^7.12.10":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.23.5.tgz#77d4703e9f83b81e9fc13382810372beb2f10f94"
-  integrity sha512-03+E/58Hoo/ui69gR+beFdGpplpoVK0BSIdke2iw4/Bz7eGN0ssRenNlnU4nmbkowNQOPCStKSwFr8H6DiY49g==
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.24.5.tgz#6581b9005ab76308e4aef6b50aa1788099393211"
+  integrity sha512-5n3K9Zv13VOa9SG2ZiX0WV7A0ddApRn6vsV8zBojCsxnCbYKLjCDvzDfVxS7C4STmjQDOXU1uk/ppxxDTC860w==
   dependencies:
     eslint-rule-composer "^0.3.0"
 
@@ -167,12 +167,12 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.24.1", "@babel/generator@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498"
-  integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==
+"@babel/generator@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.5.tgz#e5afc068f932f05616b66713e28d0f04e99daeb3"
+  integrity sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==
   dependencies:
-    "@babel/types" "^7.24.0"
+    "@babel/types" "^7.24.5"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
@@ -228,19 +228,19 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.24.1", "@babel/helper-create-class-features-plugin@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz#c806f73788a6800a5cfbbc04d2df7ee4d927cce3"
-  integrity sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==
+"@babel/helper-create-class-features-plugin@^7.24.1", "@babel/helper-create-class-features-plugin@^7.24.4", "@babel/helper-create-class-features-plugin@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.5.tgz#7d19da92c7e0cd8d11c09af2ce1b8e7512a6e723"
+  integrity sha512-uRc4Cv8UQWnE4NXlYTIIdM7wfFkOqlFztcC/gVXDKohKoVB3OyonfelUBaJzSwpBntZ2KYGF/9S7asCHsXwW6g==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-member-expression-to-functions" "^7.23.0"
+    "@babel/helper-member-expression-to-functions" "^7.24.5"
     "@babel/helper-optimise-call-expression" "^7.22.5"
     "@babel/helper-replace-supers" "^7.24.1"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-split-export-declaration" "^7.24.5"
     semver "^6.3.1"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
@@ -252,10 +252,10 @@
     regexpu-core "^5.3.1"
     semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.6.1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz#fadc63f0c2ff3c8d02ed905dcea747c5b0fb74fd"
-  integrity sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA==
+"@babel/helper-define-polyfill-provider@^0.6.1", "@babel/helper-define-polyfill-provider@^0.6.2":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d"
+  integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -268,7 +268,7 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-function-name@^7.21.0", "@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
+"@babel/helper-function-name@^7.21.0", "@babel/helper-function-name@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
   integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
@@ -290,12 +290,12 @@
   dependencies:
     "@babel/types" "^7.21.5"
 
-"@babel/helper-member-expression-to-functions@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
-  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
+"@babel/helper-member-expression-to-functions@^7.23.0", "@babel/helper-member-expression-to-functions@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.5.tgz#5981e131d5c7003c7d1fa1ad49e86c9b097ec475"
+  integrity sha512-4owRteeihKWKamtqg4JmWSsEZU445xpFRXPEwp44HbgbxdWlUV1b4Agg4lkA806Lil5XM/e+FJyS0vj5T6vmcA==
   dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.24.5"
 
 "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.1", "@babel/helper-module-imports@^7.24.3":
   version "7.24.3"
@@ -315,16 +315,16 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/helper-module-transforms@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
-  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+"@babel/helper-module-transforms@^7.23.3", "@babel/helper-module-transforms@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz#ea6c5e33f7b262a0ae762fd5986355c45f54a545"
+  integrity sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==
   dependencies:
     "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-module-imports" "^7.24.3"
+    "@babel/helper-simple-access" "^7.24.5"
+    "@babel/helper-split-export-declaration" "^7.24.5"
+    "@babel/helper-validator-identifier" "^7.24.5"
 
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
@@ -340,10 +340,10 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
-  integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.24.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz#a924607dd254a65695e5bd209b98b902b3b2f11a"
+  integrity sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==
 
 "@babel/helper-plugin-utils@^7.20.2":
   version "7.22.5"
@@ -380,12 +380,12 @@
     "@babel/helper-member-expression-to-functions" "^7.23.0"
     "@babel/helper-optimise-call-expression" "^7.22.5"
 
-"@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+"@babel/helper-simple-access@^7.22.5", "@babel/helper-simple-access@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz#50da5b72f58c16b07fbd992810be6049478e85ba"
+  integrity sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.5"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
   version "7.20.0"
@@ -401,27 +401,34 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
+"@babel/helper-split-export-declaration@^7.18.6":
   version "7.22.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
   integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-split-export-declaration@^7.22.6", "@babel/helper-split-export-declaration@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz#b9a67f06a46b0b339323617c8c6213b9055a78b6"
+  integrity sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==
+  dependencies:
+    "@babel/types" "^7.24.5"
+
 "@babel/helper-string-parser@^7.22.5":
   version "7.23.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
   integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
 
-"@babel/helper-string-parser@^7.23.4":
+"@babel/helper-string-parser@^7.23.4", "@babel/helper-string-parser@^7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
   integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
 
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz#918b1a7fa23056603506370089bd990d8720db62"
+  integrity sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==
 
 "@babel/helper-validator-option@^7.21.0":
   version "7.21.0"
@@ -434,13 +441,13 @@
   integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
 
 "@babel/helper-wrap-function@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
-  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.5.tgz#335f934c0962e2c1ed1fb9d79e06a56115067c09"
+  integrity sha512-/xxzuNvgRl4/HLNKvnFwdhdgN3cpLxgLROeLDl83Yx0AJ1SGvq1ak0OszTOjDfiB8Vx03eJbeDWh9r+jCCWttw==
   dependencies:
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.22.19"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/template" "^7.24.0"
+    "@babel/types" "^7.24.5"
 
 "@babel/helpers@^7.22.15":
   version "7.22.15"
@@ -451,14 +458,14 @@
     "@babel/traverse" "^7.22.15"
     "@babel/types" "^7.22.15"
 
-"@babel/helpers@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.4.tgz#dc00907fd0d95da74563c142ef4cd21f2cb856b6"
-  integrity sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==
+"@babel/helpers@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.5.tgz#fedeb87eeafa62b621160402181ad8585a22a40a"
+  integrity sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==
   dependencies:
     "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.1"
-    "@babel/types" "^7.24.0"
+    "@babel/traverse" "^7.24.5"
+    "@babel/types" "^7.24.5"
 
 "@babel/highlight@^7.22.13":
   version "7.23.4"
@@ -469,7 +476,7 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.23.4", "@babel/highlight@^7.24.2":
+"@babel/highlight@^7.23.4":
   version "7.24.2"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26"
   integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==
@@ -479,18 +486,28 @@
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.14.7", "@babel/parser@^7.18.5", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.22.16", "@babel/parser@^7.23.3", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
-  integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
+"@babel/highlight@^7.24.2":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.5.tgz#bc0613f98e1dd0720e99b2a9ee3760194a704b6e"
+  integrity sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.24.5"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1"
-  integrity sha512-qpl6vOOEEzTLLcsuqYYo8yDtrTocmu2xkGvgNebvPjT9DTtfFYGmgDqY+rBYXNlqL4s9qLDn6xkrJv4RxAPiTA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.14.7", "@babel/parser@^7.18.5", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.22.16", "@babel/parser@^7.23.3", "@babel/parser@^7.24.0", "@babel/parser@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.5.tgz#4a4d5ab4315579e5398a82dcf636ca80c3392790"
+  integrity sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==
+
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.5.tgz#4c3685eb9cd790bcad2843900fe0250c91ccf895"
+  integrity sha512-LdXRi1wEMTrHVR4Zc9F8OewC3vdm5h4QB6L71zy6StmYeqGi1b3ttIO8UC+BfZKcH9jdr4aI249rBkm+3+YvHw==
   dependencies:
     "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.24.5"
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.1":
   version "7.24.1"
@@ -758,12 +775,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-block-scoping@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.4.tgz#28f5c010b66fbb8ccdeef853bef1935c434d7012"
-  integrity sha512-nIFUZIpGKDf9O9ttyRXpHFpKC+X3Y5mtshZONuEUYBomAKoM4y029Jr+uB1bHGPhNmK8YXHevDtKDOLmtRrp6g==
+"@babel/plugin-transform-block-scoping@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.5.tgz#89574191397f85661d6f748d4b89ee4d9ee69a2a"
+  integrity sha512-sMfBc3OxghjC95BkYrYocHL3NaOplrcaunblzwXhGmlPwpmfsxr4vK+mBBt49r+S240vahmv+kUxkeKgs+haCw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.24.5"
 
 "@babel/plugin-transform-class-properties@^7.24.1":
   version "7.24.1"
@@ -782,18 +799,18 @@
     "@babel/helper-plugin-utils" "^7.24.0"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz#5bc8fc160ed96378184bc10042af47f50884dcb1"
-  integrity sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q==
+"@babel/plugin-transform-classes@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.5.tgz#05e04a09df49a46348299a0e24bfd7e901129339"
+  integrity sha512-gWkLP25DFj2dwe9Ck8uwMOpko4YsqyfZJrOmqqcegeDYEbp7rmn4U6UQZNj08UF6MaX39XenSpKRCvpDRBtZ7Q==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
     "@babel/helper-compilation-targets" "^7.23.6"
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.24.5"
     "@babel/helper-replace-supers" "^7.24.1"
-    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-split-export-declaration" "^7.24.5"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.24.1":
@@ -804,12 +821,12 @@
     "@babel/helper-plugin-utils" "^7.24.0"
     "@babel/template" "^7.24.0"
 
-"@babel/plugin-transform-destructuring@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz#b1e8243af4a0206841973786292b8c8dd8447345"
-  integrity sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw==
+"@babel/plugin-transform-destructuring@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.5.tgz#80843ee6a520f7362686d1a97a7b53544ede453c"
+  integrity sha512-SZuuLyfxvsm+Ah57I/i1HVjveBENYK9ue8MJ7qkc7ndoNjqquJiElzA7f5yaAXjyW2hKojosOTAQQRX50bPSVg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.24.5"
 
 "@babel/plugin-transform-dotall-regex@^7.24.1":
   version "7.24.1"
@@ -963,15 +980,15 @@
     "@babel/helper-plugin-utils" "^7.24.0"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-transform-object-rest-spread@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz#5a3ce73caf0e7871a02e1c31e8b473093af241ff"
-  integrity sha512-XjD5f0YqOtebto4HGISLNfiNMTTs6tbkFf2TOqJlYKYmbo+mN9Dnpl4SRoofiziuOWMIyq3sZEUqLo3hLITFEA==
+"@babel/plugin-transform-object-rest-spread@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.5.tgz#f91bbcb092ff957c54b4091c86bda8372f0b10ef"
+  integrity sha512-7EauQHszLGM3ay7a161tTQH7fj+3vVM/gThlz5HpFtnygTxjrlvoeq7MPVA1Vy9Q555OB8SnAOsMkLShNkkrHA==
   dependencies:
     "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.24.5"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.24.1"
+    "@babel/plugin-transform-parameters" "^7.24.5"
 
 "@babel/plugin-transform-object-super@^7.24.1":
   version "7.24.1"
@@ -989,12 +1006,12 @@
     "@babel/helper-plugin-utils" "^7.24.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-optional-chaining@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz#26e588acbedce1ab3519ac40cc748e380c5291e6"
-  integrity sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==
+"@babel/plugin-transform-optional-chaining@^7.24.1", "@babel/plugin-transform-optional-chaining@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.5.tgz#a6334bebd7f9dd3df37447880d0bd64b778e600f"
+  integrity sha512-xWCkmwKT+ihmA6l7SSTpk8e4qQl/274iNbSKRRS8mpqFR32ksy36+a+LWY8OXCCEefF8WFlnOHVsaDI2231wBg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.24.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
@@ -1005,12 +1022,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-parameters@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz#983c15d114da190506c75b616ceb0f817afcc510"
-  integrity sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg==
+"@babel/plugin-transform-parameters@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.5.tgz#5c3b23f3a6b8fed090f9b98f2926896d3153cc62"
+  integrity sha512-9Co00MqZ2aoky+4j2jhofErthm6QVLKbpQrvz20c3CH9KQCLHyNB+t2ya4/UrRpQGR+Wrwjg9foopoeSdnHOkA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.24.5"
 
 "@babel/plugin-transform-private-methods@^7.24.1":
   version "7.24.1"
@@ -1020,14 +1037,14 @@
     "@babel/helper-create-class-features-plugin" "^7.24.1"
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-private-property-in-object@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.1.tgz#756443d400274f8fb7896742962cc1b9f25c1f6a"
-  integrity sha512-pTHxDVa0BpUbvAgX3Gat+7cSciXqUcY9j2VZKTbSB6+VQGpNgNO9ailxTGHSXlqOnX1Hcx1Enme2+yv7VqP9bg==
+"@babel/plugin-transform-private-property-in-object@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.5.tgz#f5d1fcad36e30c960134cb479f1ca98a5b06eda5"
+  integrity sha512-JM4MHZqnWR04jPMujQDTBVRnqxpLLpx2tkn7iPn+Hmsc0Gnb79yvRWOkvqFOx3Z7P7VxiRIR22c4eGSNj87OBQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.24.1"
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-create-class-features-plugin" "^7.24.5"
+    "@babel/helper-plugin-utils" "^7.24.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
 "@babel/plugin-transform-property-literals@^7.24.1":
@@ -1126,12 +1143,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-typeof-symbol@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz#6831f78647080dec044f7e9f68003d99424f94c7"
-  integrity sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA==
+"@babel/plugin-transform-typeof-symbol@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.5.tgz#703cace5ef74155fb5eecab63cbfc39bdd25fe12"
+  integrity sha512-UTGnhYVZtTAjdwOTzT+sCyXmTn8AhaxOS/MjG9REclZ6ULHWF9KoCZur0HSGU7hk8PdBFKKbYe6+gqdXWz84Jg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.24.5"
 
 "@babel/plugin-transform-typescript@^7.24.1":
   version "7.24.1"
@@ -1175,15 +1192,15 @@
     "@babel/helper-plugin-utils" "^7.24.0"
 
 "@babel/preset-env@^7.12.11":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.4.tgz#46dbbcd608771373b88f956ffb67d471dce0d23b"
-  integrity sha512-7Kl6cSmYkak0FK/FXjSEnLJ1N9T/WA2RkMhu17gZ/dsxKJUuTYNIylahPTzqpLyJN4WhDif8X0XK1R8Wsguo/A==
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.5.tgz#6a9ac90bd5a5a9dae502af60dfc58c190551bbcd"
+  integrity sha512-UGK2ifKtcC8i5AI4cH+sbLLuLc2ktYSFJgBAXorKAsHUZmrQ1q6aQ6i3BvU24wWs2AAKqQB6kq3N9V9Gw1HiMQ==
   dependencies:
     "@babel/compat-data" "^7.24.4"
     "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.24.5"
     "@babel/helper-validator-option" "^7.23.5"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.4"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.5"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.1"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.1"
     "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.24.1"
@@ -1210,12 +1227,12 @@
     "@babel/plugin-transform-async-generator-functions" "^7.24.3"
     "@babel/plugin-transform-async-to-generator" "^7.24.1"
     "@babel/plugin-transform-block-scoped-functions" "^7.24.1"
-    "@babel/plugin-transform-block-scoping" "^7.24.4"
+    "@babel/plugin-transform-block-scoping" "^7.24.5"
     "@babel/plugin-transform-class-properties" "^7.24.1"
     "@babel/plugin-transform-class-static-block" "^7.24.4"
-    "@babel/plugin-transform-classes" "^7.24.1"
+    "@babel/plugin-transform-classes" "^7.24.5"
     "@babel/plugin-transform-computed-properties" "^7.24.1"
-    "@babel/plugin-transform-destructuring" "^7.24.1"
+    "@babel/plugin-transform-destructuring" "^7.24.5"
     "@babel/plugin-transform-dotall-regex" "^7.24.1"
     "@babel/plugin-transform-duplicate-keys" "^7.24.1"
     "@babel/plugin-transform-dynamic-import" "^7.24.1"
@@ -1235,13 +1252,13 @@
     "@babel/plugin-transform-new-target" "^7.24.1"
     "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.1"
     "@babel/plugin-transform-numeric-separator" "^7.24.1"
-    "@babel/plugin-transform-object-rest-spread" "^7.24.1"
+    "@babel/plugin-transform-object-rest-spread" "^7.24.5"
     "@babel/plugin-transform-object-super" "^7.24.1"
     "@babel/plugin-transform-optional-catch-binding" "^7.24.1"
-    "@babel/plugin-transform-optional-chaining" "^7.24.1"
-    "@babel/plugin-transform-parameters" "^7.24.1"
+    "@babel/plugin-transform-optional-chaining" "^7.24.5"
+    "@babel/plugin-transform-parameters" "^7.24.5"
     "@babel/plugin-transform-private-methods" "^7.24.1"
-    "@babel/plugin-transform-private-property-in-object" "^7.24.1"
+    "@babel/plugin-transform-private-property-in-object" "^7.24.5"
     "@babel/plugin-transform-property-literals" "^7.24.1"
     "@babel/plugin-transform-regenerator" "^7.24.1"
     "@babel/plugin-transform-reserved-words" "^7.24.1"
@@ -1249,7 +1266,7 @@
     "@babel/plugin-transform-spread" "^7.24.1"
     "@babel/plugin-transform-sticky-regex" "^7.24.1"
     "@babel/plugin-transform-template-literals" "^7.24.1"
-    "@babel/plugin-transform-typeof-symbol" "^7.24.1"
+    "@babel/plugin-transform-typeof-symbol" "^7.24.5"
     "@babel/plugin-transform-unicode-escapes" "^7.24.1"
     "@babel/plugin-transform-unicode-property-regex" "^7.24.1"
     "@babel/plugin-transform-unicode-regex" "^7.24.1"
@@ -1310,9 +1327,9 @@
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.9", "@babel/runtime@^7.23.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.24.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd"
-  integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.5.tgz#230946857c053a36ccc66e1dd03b17dd0c4ed02c"
+  integrity sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -1359,19 +1376,19 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c"
-  integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==
+"@babel/traverse@^7.24.5":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.5.tgz#972aa0bc45f16983bf64aa1f877b2dd0eea7e6f8"
+  integrity sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==
   dependencies:
-    "@babel/code-frame" "^7.24.1"
-    "@babel/generator" "^7.24.1"
+    "@babel/code-frame" "^7.24.2"
+    "@babel/generator" "^7.24.5"
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.24.1"
-    "@babel/types" "^7.24.0"
+    "@babel/helper-split-export-declaration" "^7.24.5"
+    "@babel/parser" "^7.24.5"
+    "@babel/types" "^7.24.5"
     debug "^4.3.1"
     globals "^11.1.0"
 
@@ -1384,13 +1401,13 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.24.0", "@babel/types@^7.4.4":
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
-  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
+"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.24.5", "@babel/types@^7.4.4":
+  version "7.24.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.5.tgz#7661930afc638a5383eb0c4aee59b74f38db84d7"
+  integrity sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==
   dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-string-parser" "^7.24.1"
+    "@babel/helper-validator-identifier" "^7.24.5"
     to-fast-properties "^2.0.0"
 
 "@babel/types@^7.23.3":
@@ -1402,6 +1419,15 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.23.4":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
+  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
+  dependencies:
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -1438,7 +1464,7 @@
   resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.9.tgz#feb4b7268f998956eb3ded69507869e73d005dda"
   integrity sha512-qqGuFfbn4rUmyOB0u8CVISIp5FfJ5GAR3mBrZ9/TKndHakdnm6pY0L/fbLcpPnrzwCyyTEZl1nUcXAYHEWneTA==
 
-"@csstools/selector-specificity@^3.0.2":
+"@csstools/selector-specificity@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.3.tgz#208a3929ee614967a1fc8cd6cb758d9fcbf0caae"
   integrity sha512-KEPNw4+WW5AVEIyzC80rTbWEUatTW2lXpN8+8ILC8PiPeWPjwUzrPZDIOZ2wwqDmeqOYTdSGyL3+vE5GC3FB3Q==
@@ -1858,10 +1884,10 @@
   resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"
   integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==
 
-"@matrix-org/analytics-events@^0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.19.0.tgz#e20e4df54530ed1c755ab728e9c22891e376f9e2"
-  integrity sha512-wN/hbpTpOxz2u3zHbsJgVMi88oKmK1yqeSZuif3yNW68XQnV2cc0XGUEpl0fgLOl6fj1bZOtxbDg5rCLbqf4CQ==
+"@matrix-org/analytics-events@^0.20.0":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.20.0.tgz#062a532ddcf0e2e5eb64c5576cd212cb32a11ccf"
+  integrity sha512-YCRbZrpZU9q+nrB6RsfPZ4NlKs31ySjP2F7GFUZNPKv96GcbihrnMK086td480SJOYpjPv2vttDJC+S67SFe2w==
 
 "@matrix-org/emojibase-bindings@^1.1.2":
   version "1.1.3"
@@ -1894,9 +1920,9 @@
     "@babel/runtime" "^7.17.9"
 
 "@matrix-org/spec@^1.7.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@matrix-org/spec/-/spec-1.9.0.tgz#ac43accc9b081ad443b11acd2d8d1f2919bd0e2f"
-  integrity sha512-BgPTYFhvjc10XWIEsqKsQOu5cR2BxMqpOhJ/IA/iiUeVOh4M5BjBR+ILZFGr8WV7TgH+h8rFdCy2kbaumRHkVg==
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/@matrix-org/spec/-/spec-1.10.1.tgz#6c62a7ee4524224c29fe39e67b33983e70c99944"
+  integrity sha512-ryNSzJkaJi/fwp6AQ6ujS9oqJtw60e+/+llIzwJhbuWTr1V07B6KfUA44+bFrudIFmfghdOuxRfzUnWOQ2K6gw==
 
 "@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3":
   version "2.1.8-no-fsevents.3"
@@ -2302,76 +2328,87 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
-"@sentry-internal/feedback@7.110.1":
-  version "7.110.1"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.110.1.tgz#34fc4a58366917a5d7b6526937d2ad3ed169b3cd"
-  integrity sha512-0aR3wuEW+SZKOVNamuy0pTQyPmqDjWPPLrB2GAXGT3ZjrVxjEzzVPqk6DVBYxSV2MuJaD507SZnvfoSPNgoBmw==
+"@sentry-internal/feedback@7.112.2":
+  version "7.112.2"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.112.2.tgz#3945ae9e980854e1d53560ed6a28684f02625fbc"
+  integrity sha512-z+XP8BwB8B3pa+i8xqbrPsbtDWUFUS6wo+FJbmOYUqOusJJbVFDAhBoEdKoo5ZjOcsAZG7XR6cA9zrhJynIWBA==
   dependencies:
-    "@sentry/core" "7.110.1"
-    "@sentry/types" "7.110.1"
-    "@sentry/utils" "7.110.1"
+    "@sentry/core" "7.112.2"
+    "@sentry/types" "7.112.2"
+    "@sentry/utils" "7.112.2"
 
-"@sentry-internal/replay-canvas@7.110.1":
-  version "7.110.1"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.110.1.tgz#1b0457e71fcf7ebb2891859717cebf4b62547e15"
-  integrity sha512-zdcCmWFXM4DHOau/BCZVb6jf9zozdbAiJ1MzQ6azuZEuysOl00YfktoWZBbZjjjpWT6025s+wrmFz54t0O+enw==
+"@sentry-internal/replay-canvas@7.112.2":
+  version "7.112.2"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.112.2.tgz#a29719ffb816dec01661b81def09d24704476d86"
+  integrity sha512-BCCCxrZ1wJvN6La5gg1JJbKitAhJI5MATCnhtklsZbUcHkHB9iZoj19J65+P56gwssvHz5xh63AjNiITaetIRg==
   dependencies:
-    "@sentry/core" "7.110.1"
-    "@sentry/replay" "7.110.1"
-    "@sentry/types" "7.110.1"
-    "@sentry/utils" "7.110.1"
+    "@sentry/core" "7.112.2"
+    "@sentry/replay" "7.112.2"
+    "@sentry/types" "7.112.2"
+    "@sentry/utils" "7.112.2"
 
-"@sentry-internal/tracing@7.110.1":
-  version "7.110.1"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.110.1.tgz#3bf55dca9e963144b0a4ad9a0b96aa2a759e2470"
-  integrity sha512-4kTd6EM0OP1SVWl2yLn3KIwlCpld1lyhNDeR8G1aKLm1PN+kVsR6YB/jy9KPPp4Q3lN3W9EkTSES3qhP4jVffQ==
+"@sentry-internal/tracing@7.112.2":
+  version "7.112.2"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.112.2.tgz#83460e51875ddb160c060bfee2e21833117f259c"
+  integrity sha512-fT1Y46J4lfXZkgFkb03YMNeIEs2xS6jdKMoukMFQfRfVvL9fSWEbTgZpHPd/YTT8r2i082XzjtAoQNgklm/0Hw==
   dependencies:
-    "@sentry/core" "7.110.1"
-    "@sentry/types" "7.110.1"
-    "@sentry/utils" "7.110.1"
+    "@sentry/core" "7.112.2"
+    "@sentry/types" "7.112.2"
+    "@sentry/utils" "7.112.2"
 
 "@sentry/browser@^7.0.0":
-  version "7.110.1"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.110.1.tgz#0742b72ea2fc8578f091ca9049e802e46a3bed41"
-  integrity sha512-H3TZlbdsgxuoVxhotMtBDemvAofx3UPNcS+UjQ40Bd+hKX01IIbEN3i+9RQ0jmcbU6xjf+yhjwp+Ejpm4FmYMw==
+  version "7.112.2"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.112.2.tgz#8c25b8f96257685279cf6837ba4ea6e6cba8c9e2"
+  integrity sha512-wULwavCch84+d0bueAdFm6CDm1u0TfOjN91VgY+sj/vxUV2vesvDgI8zRZfmbZEor3MYA90zerkZT3ehZQKbYw==
   dependencies:
-    "@sentry-internal/feedback" "7.110.1"
-    "@sentry-internal/replay-canvas" "7.110.1"
-    "@sentry-internal/tracing" "7.110.1"
-    "@sentry/core" "7.110.1"
-    "@sentry/replay" "7.110.1"
-    "@sentry/types" "7.110.1"
-    "@sentry/utils" "7.110.1"
+    "@sentry-internal/feedback" "7.112.2"
+    "@sentry-internal/replay-canvas" "7.112.2"
+    "@sentry-internal/tracing" "7.112.2"
+    "@sentry/core" "7.112.2"
+    "@sentry/integrations" "7.112.2"
+    "@sentry/replay" "7.112.2"
+    "@sentry/types" "7.112.2"
+    "@sentry/utils" "7.112.2"
 
-"@sentry/core@7.110.1":
-  version "7.110.1"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.110.1.tgz#0d9fd932478c4cb1f6330143ddf69dacee27bf4d"
-  integrity sha512-yC1yeUFQlmHj9u/KxKmwOMVanBmgfX+4MZnZU31QPqN95adyZTwpaYFZl4fH5kDVnz7wXJI0qRP8SxuMePtqhw==
+"@sentry/core@7.112.2":
+  version "7.112.2"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.112.2.tgz#d2e6d2acb6947fcb384298a3bd2b0c8183533dd8"
+  integrity sha512-gHPCcJobbMkk0VR18J65WYQTt3ED4qC6X9lHKp27Ddt63E+MDGkG6lvYBU1LS8cV7CdyBGC1XXDCfor61GvLsA==
   dependencies:
-    "@sentry/types" "7.110.1"
-    "@sentry/utils" "7.110.1"
+    "@sentry/types" "7.112.2"
+    "@sentry/utils" "7.112.2"
 
-"@sentry/replay@7.110.1":
-  version "7.110.1"
-  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.110.1.tgz#e32cb3dfa9be49f3bd902dbf4e3c22c1d023704c"
-  integrity sha512-R49fGOuKYsJ97EujPTzMjs3ZSuSkLTFFQmVBbsu/o6beRp4kK9l8H7r2BfLEcWJOXdWO5EU4KpRWgIxHaDK2aw==
+"@sentry/integrations@7.112.2":
+  version "7.112.2"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.112.2.tgz#2aad01719b1e4a1326f42db78f77fcf1e58d4c63"
+  integrity sha512-ioC2yyU6DqtLkdmWnm87oNvdn2+9oKctJeA4t+jkS6JaJ10DcezjCwiLscX4rhB9aWJV3IWF7Op0O6K3w0t2Hg==
   dependencies:
-    "@sentry-internal/tracing" "7.110.1"
-    "@sentry/core" "7.110.1"
-    "@sentry/types" "7.110.1"
-    "@sentry/utils" "7.110.1"
+    "@sentry/core" "7.112.2"
+    "@sentry/types" "7.112.2"
+    "@sentry/utils" "7.112.2"
+    localforage "^1.8.1"
 
-"@sentry/types@7.110.1":
-  version "7.110.1"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.110.1.tgz#0b84c0d5e075dbd80afa2ce6a486fd14680a0024"
-  integrity sha512-sZxOpM5gfyxvJeWVvNpHnxERTnlqcozjqNcIv29SZ6wonlkekmxDyJ3uCuPv85VO54WLyA4uzskPKnNFHacI8A==
-
-"@sentry/utils@7.110.1":
-  version "7.110.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.110.1.tgz#39d78734b807a959cacd42477711f85aaa02ca6e"
-  integrity sha512-eibLo2m1a7sHkOHxYYmRujr3D7ek2l9sv26F1SLoQBVDF7Afw5AKyzPmtA1D+4M9P/ux1okj7cGj3SaBrVpxXA==
+"@sentry/replay@7.112.2":
+  version "7.112.2"
+  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.112.2.tgz#4910244b80dabd32a83cc02b9fdd566ff766df34"
+  integrity sha512-7Ns/8D54WPsht1nlVj93Inf6rXyve2AZoibYN0YfcM2w3lI4NO51gPPHJU0lFEfMwzwK4ZBJWzOeW9098a+uEg==
   dependencies:
-    "@sentry/types" "7.110.1"
+    "@sentry-internal/tracing" "7.112.2"
+    "@sentry/core" "7.112.2"
+    "@sentry/types" "7.112.2"
+    "@sentry/utils" "7.112.2"
+
+"@sentry/types@7.112.2":
+  version "7.112.2"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.112.2.tgz#71ff27c668309ccd8d17b7793e044e46f81eca1b"
+  integrity sha512-kCMLt7yhY5OkWE9MeowlTNmox9pqDxcpvqguMo4BDNZM5+v9SEb1AauAdR78E1a1V8TyCzjBD7JDfXWhvpYBcQ==
+
+"@sentry/utils@7.112.2":
+  version "7.112.2"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.112.2.tgz#223f9feee5860459792a43904db4bf38fba73ed3"
+  integrity sha512-OjLh0hx0t1EcL4ZIjf+4svlmmP+tHUDGcr5qpFWH78tjmkPW4+cqPuZCZfHSuWcDdeiaXi8TnYoVRqDcJKK/eQ==
+  dependencies:
+    "@sentry/types" "7.112.2"
 
 "@sinclair/typebox@^0.27.8":
   version "0.27.8"
@@ -2767,9 +2804,9 @@
   integrity sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==
 
 "@types/prop-types@*":
-  version "15.7.11"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563"
-  integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==
+  version "15.7.12"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
+  integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==
 
 "@types/q@^1.5.1":
   version "1.5.8"
@@ -2794,16 +2831,16 @@
   integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
 
 "@types/react-beautiful-dnd@^13.0.0":
-  version "13.1.5"
-  resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.1.5.tgz#04869f2ec4658aa963e56dc3cbb91f261587dedc"
-  integrity sha512-mzohmMtV48b0bXF2dP8188LzUv9HAGHKucOORYsd5Sqq830pJ4gseFyDDAH0TR4TeD1ceG9DxTQ0FOFbtCSy4Q==
+  version "13.1.8"
+  resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.1.8.tgz#f52d3ea07e1e19159d6c3c4a48c8da3d855e60b4"
+  integrity sha512-E3TyFsro9pQuK4r8S/OL6G99eq7p8v29sX0PM7oT8Z+PJfZvSQTx4zTQbUJ+QZXioAF0e7TGBEcA1XhYhCweyQ==
   dependencies:
     "@types/react" "*"
 
-"@types/react-dom@17.0.21", "@types/react-dom@<18.0.0":
-  version "17.0.21"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.21.tgz#85d56965483ce4850f5f03f9234e54a1f47786e5"
-  integrity sha512-3rQEFUNUUz2MYiRwJJj6UekcW7rFLOtmK7ajQP7qJpjNdggInl3I/xM4I3Hq1yYPdCGVMgax1gZsB7BBTtayXg==
+"@types/react-dom@17.0.25", "@types/react-dom@<18.0.0":
+  version "17.0.25"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5"
+  integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==
   dependencies:
     "@types/react" "^17"
 
@@ -2818,19 +2855,19 @@
     redux "^4.0.0"
 
 "@types/react-transition-group@^4.4.0":
-  version "4.4.7"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.7.tgz#bf69f269d74aa78b99097673ca6dd6824a68ef1c"
-  integrity sha512-ICCyBl5mvyqYp8Qeq9B5G/fyBSRC0zx3XM3sCC6KkcMsNeAHqXBKkmat4GqdJET5jtYUpZXrxI5flve5qhi2Eg==
+  version "4.4.10"
+  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.10.tgz#6ee71127bdab1f18f11ad8fb3322c6da27c327ac"
+  integrity sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@17.0.68", "@types/react@^17":
-  version "17.0.68"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.68.tgz#99b17f567e258f5e7be855a281ac67b49a34f9f2"
-  integrity sha512-y8heXejd/Gi43S28GOqIFmr6BzhLa3anMlPojRu4rHh3MtRrrpB+BtLEcqP3XPO1urXByzBdkOLU7sodYWnpkA==
+"@types/react@*", "@types/react@17.0.80", "@types/react@^17":
+  version "17.0.80"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.80.tgz#a5dfc351d6a41257eb592d73d3a85d3b7dbcbb41"
+  integrity sha512-LrgHIu2lEtIo8M7d1FcI3BdwXWoRQwMoXOZ7+dPTW0lYREjmlHl3P0U1VD0i/9tppOuv8/sam7sOjx34TxSFbA==
   dependencies:
     "@types/prop-types" "*"
-    "@types/scheduler" "*"
+    "@types/scheduler" "^0.16"
     csstype "^3.0.2"
 
 "@types/retry@0.12.0":
@@ -2845,10 +2882,10 @@
   dependencies:
     htmlparser2 "^8.0.0"
 
-"@types/scheduler@*":
-  version "0.16.4"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.4.tgz#fedc3e5b15c26dc18faae96bf1317487cb3658cf"
-  integrity sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ==
+"@types/scheduler@^0.16":
+  version "0.16.8"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
+  integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==
 
 "@types/sdp-transform@^2.4.6":
   version "2.4.9"
@@ -2915,15 +2952,15 @@
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^7.0.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.0.tgz#bf34a02f221811505b8bf2f31060c8560c1bb0a3"
-  integrity sha512-GJWR0YnfrKnsRoluVO3PRb9r5aMZriiMMM/RHj5nnTrBy1/wIgk76XCtCKcnXGjpZQJQRFtGV9/0JJ6n30uwpQ==
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.8.0.tgz#c78e309fe967cb4de05b85cdc876fb95f8e01b6f"
+  integrity sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "7.7.0"
-    "@typescript-eslint/type-utils" "7.7.0"
-    "@typescript-eslint/utils" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
+    "@typescript-eslint/scope-manager" "7.8.0"
+    "@typescript-eslint/type-utils" "7.8.0"
+    "@typescript-eslint/utils" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.3.1"
@@ -2932,14 +2969,14 @@
     ts-api-utils "^1.3.0"
 
 "@typescript-eslint/parser@^7.0.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.7.0.tgz#6b1b3ce76c5de002c43af8ae933613b0f2b4bcc6"
-  integrity sha512-fNcDm3wSwVM8QYL4HKVBggdIPAy9Q41vcvC/GtDobw3c4ndVT3K6cqudUmjHPw8EAp4ufax0o58/xvWaP2FmTg==
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.8.0.tgz#1e1db30c8ab832caffee5f37e677dbcb9357ddc8"
+  integrity sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "7.7.0"
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/typescript-estree" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
+    "@typescript-eslint/scope-manager" "7.8.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/typescript-estree" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@6.21.0":
@@ -2950,21 +2987,21 @@
     "@typescript-eslint/types" "6.21.0"
     "@typescript-eslint/visitor-keys" "6.21.0"
 
-"@typescript-eslint/scope-manager@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.7.0.tgz#3f0db079b275bb8b0cb5be7613fb3130cfb5de77"
-  integrity sha512-/8INDn0YLInbe9Wt7dK4cXLDYp0fNHP5xKLHvZl3mOT5X17rK/YShXaiNmorl+/U4VKCVIjJnx4Ri5b0y+HClw==
+"@typescript-eslint/scope-manager@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.8.0.tgz#bb19096d11ec6b87fb6640d921df19b813e02047"
+  integrity sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==
   dependencies:
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
 
-"@typescript-eslint/type-utils@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.7.0.tgz#36792ff4209a781b058de61631a48df17bdefbc5"
-  integrity sha512-bOp3ejoRYrhAlnT/bozNQi3nio9tIgv3U5C0mVDdZC7cpcQEDZXvq8inrHYghLVwuNABRqrMW5tzAv88Vy77Sg==
+"@typescript-eslint/type-utils@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.8.0.tgz#9de166f182a6e4d1c5da76e94880e91831e3e26f"
+  integrity sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==
   dependencies:
-    "@typescript-eslint/typescript-estree" "7.7.0"
-    "@typescript-eslint/utils" "7.7.0"
+    "@typescript-eslint/typescript-estree" "7.8.0"
+    "@typescript-eslint/utils" "7.8.0"
     debug "^4.3.4"
     ts-api-utils "^1.3.0"
 
@@ -2973,10 +3010,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
   integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
 
-"@typescript-eslint/types@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.7.0.tgz#23af4d24bf9ce15d8d301236e3e3014143604f27"
-  integrity sha512-G01YPZ1Bd2hn+KPpIbrAhEWOn5lQBrjxkzHkWvP6NucMXFtfXoevK82hzQdpfuQYuhkvFDeQYbzXCjR1z9Z03w==
+"@typescript-eslint/types@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.8.0.tgz#1fd2577b3ad883b769546e2d1ef379f929a7091d"
+  integrity sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==
 
 "@typescript-eslint/typescript-estree@6.21.0":
   version "6.21.0"
@@ -2992,13 +3029,13 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/typescript-estree@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.0.tgz#b5dd6383b4c6a852d7b256a37af971e8982be97f"
-  integrity sha512-8p71HQPE6CbxIBy2kWHqM1KGrC07pk6RJn40n0DSc6bMOBBREZxSDJ+BmRzc8B5OdaMh1ty3mkuWRg4sCFiDQQ==
+"@typescript-eslint/typescript-estree@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.8.0.tgz#b028a9226860b66e623c1ee55cc2464b95d2987c"
+  integrity sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==
   dependencies:
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/visitor-keys" "7.7.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/visitor-keys" "7.8.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -3006,17 +3043,17 @@
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.7.0.tgz#3d2b6606a60ac34f3c625facfb3b3ab7e126f58d"
-  integrity sha512-LKGAXMPQs8U/zMRFXDZOzmMKgFv3COlxUQ+2NMPhbqgVm6R1w+nU1i4836Pmxu9jZAuIeyySNrN/6Rc657ggig==
+"@typescript-eslint/utils@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.8.0.tgz#57a79f9c0c0740ead2f622e444cfaeeb9fd047cd"
+  integrity sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.15"
     "@types/semver" "^7.5.8"
-    "@typescript-eslint/scope-manager" "7.7.0"
-    "@typescript-eslint/types" "7.7.0"
-    "@typescript-eslint/typescript-estree" "7.7.0"
+    "@typescript-eslint/scope-manager" "7.8.0"
+    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/typescript-estree" "7.8.0"
     semver "^7.6.0"
 
 "@typescript-eslint/utils@^6.0.0":
@@ -3040,12 +3077,12 @@
     "@typescript-eslint/types" "6.21.0"
     eslint-visitor-keys "^3.4.1"
 
-"@typescript-eslint/visitor-keys@7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.0.tgz#950148cf1ac11562a2d903fdf7acf76714a2dc9e"
-  integrity sha512-h0WHOj8MhdhY8YWkzIF30R379y0NqyOHExI9N9KCzvmu05EgG4FumeYa3ccfKUSphyWkWQE1ybVrgz/Pbam6YA==
+"@typescript-eslint/visitor-keys@7.8.0":
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.8.0.tgz#7285aab991da8bee411a42edbd5db760d22fdd91"
+  integrity sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==
   dependencies:
-    "@typescript-eslint/types" "7.7.0"
+    "@typescript-eslint/types" "7.8.0"
     eslint-visitor-keys "^3.4.3"
 
 "@ungap/structured-clone@^1.2.0":
@@ -3060,10 +3097,10 @@
   dependencies:
     svg2vectordrawable "^2.9.1"
 
-"@vector-im/compound-web@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-4.0.2.tgz#cd89ca076b9b0528718e45110a4c8126e7556c63"
-  integrity sha512-MBqmSbtcWC6KJjuTWPZ6FYc83YrUJ9dOageUdbayjhVGZ/de/a+nl/vPIAX+5ic2QWUN7nn9hujfzQF69mbIeg==
+"@vector-im/compound-web@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-4.1.0.tgz#45fa22e4e91b5fd4c2f535e040072990d5a33712"
+  integrity sha512-FQSJK7PaJ3dR1c1Q3TYVSShJBl9TwlrhKadnTWsPIX6xE+rvCAeujE50QbcEWdDlWeaJ9Hi0bVPlEssJ+eRwtQ==
   dependencies:
     "@floating-ui/react" "^0.26.9"
     "@floating-ui/react-dom" "^2.0.8"
@@ -3168,14 +3205,14 @@ ajv@^6.12.4, ajv@^6.12.5:
     uri-js "^4.2.2"
 
 ajv@^8.0.1:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.13.0.tgz#a3939eaec9fb80d217ddf0c3376948c023f28c91"
+  integrity sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==
   dependencies:
-    fast-deep-equal "^3.1.1"
+    fast-deep-equal "^3.1.3"
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
-    uri-js "^4.2.2"
+    uri-js "^4.4.1"
 
 another-json@^0.2.0:
   version "0.2.0"
@@ -3471,12 +3508,12 @@ babel-plugin-jest-hoist@^29.6.3:
     "@types/babel__traverse" "^7.0.6"
 
 babel-plugin-polyfill-corejs2@^0.4.10:
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz#276f41710b03a64f6467433cab72cbc2653c38b1"
-  integrity sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ==
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33"
+  integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==
   dependencies:
     "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.6.1"
+    "@babel/helper-define-polyfill-provider" "^0.6.2"
     semver "^6.3.1"
 
 babel-plugin-polyfill-corejs3@^0.10.1, babel-plugin-polyfill-corejs3@^0.10.4:
@@ -3488,11 +3525,11 @@ babel-plugin-polyfill-corejs3@^0.10.1, babel-plugin-polyfill-corejs3@^0.10.4:
     core-js-compat "^3.36.1"
 
 babel-plugin-polyfill-regenerator@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.1.tgz#4f08ef4c62c7a7f66a35ed4c0d75e30506acc6be"
-  integrity sha512-JfTApdE++cgcTWjsiCQlLyFBMbTUft9ja17saCc93lgV33h4tuCVj7tlvu//qpLwaG+3yEz7/KhahGrUMkVq9g==
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e"
+  integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.6.1"
+    "@babel/helper-define-polyfill-provider" "^0.6.2"
 
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
@@ -3686,9 +3723,9 @@ caniuse-lite@^1.0.30001449:
   integrity sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==
 
 caniuse-lite@^1.0.30001587:
-  version "1.0.30001610"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz#2f44ed6e21d359e914271ae35b68903632628ccf"
-  integrity sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==
+  version "1.0.30001614"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001614.tgz#f894b4209376a0bf923d67d9c361d96b1dfebe39"
+  integrity sha512-jmZQ1VpmlRwHgdP1/uiKzgiAuGOfLEJsYFP4+GBou/QQ4U6IOJCB4NP1c+1p9RGLpwObcT94jA5/uO+F1vBbog==
 
 chalk@5.2.0:
   version "5.2.0"
@@ -3922,9 +3959,9 @@ cookie@0.6.0:
   integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
 
 core-js-compat@^3.31.0, core-js-compat@^3.36.1:
-  version "3.36.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.36.1.tgz#1818695d72c99c25d621dca94e6883e190cea3c8"
-  integrity sha512-Dk997v9ZCt3X/npqzyGdTlq6t7lDBhZwGvV94PKzDArjp7BTRm7WlDAXYd/OWdeFHO8OChQYRJNJvUCqCbrtKA==
+  version "3.37.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.0.tgz#d9570e544163779bb4dff1031c7972f44918dc73"
+  integrity sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA==
   dependencies:
     browserslist "^4.23.0"
 
@@ -4010,10 +4047,10 @@ css-box-model@^1.2.0:
   dependencies:
     tiny-invariant "^1.0.6"
 
-css-functions-list@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.1.tgz#2eb205d8ce9f9ce74c5c1d7490b66b77c45ce3ea"
-  integrity sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==
+css-functions-list@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.2.tgz#9a54c6dd8416ed25c1079cd88234e927526c1922"
+  integrity sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==
 
 css-select@^4.1.3:
   version "4.3.0"
@@ -4092,9 +4129,9 @@ cssstyle@^2.3.0:
     cssom "~0.3.6"
 
 csstype@^3.0.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
-  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
+  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
 damerau-levenshtein@^1.0.8:
   version "1.0.8"
@@ -4407,9 +4444,9 @@ electron-to-chromium@^1.4.284:
   integrity sha512-L9zlje9bIw0h+CwPQumiuVlfMcV4boxRjFIWDcLfFqTZNbkwOExBzfmswytHawObQX4OUhtNv8gIiB21kOurIg==
 
 electron-to-chromium@^1.4.668:
-  version "1.4.737"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.737.tgz#3a774a58e04980741f65d440f5fdf57af18b6dde"
-  integrity sha512-QvLTxaLHKdy5YxvixAw/FfHq2eWLUL9KvsPjp0aHK1gI5d3EDuDgITkvj0nFO2c6zUY3ZqVAJQiBYyQP9tQpfw==
+  version "1.4.751"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.751.tgz#b5b19742a435c589de02f60c16618150498bbd59"
+  integrity sha512-2DEPi++qa89SMGRhufWTiLmzqyuGmNF3SK4+PQetW1JKiZdEpF4XQonJXJCzyuYSA6mauiMhbyVhqYAP45Hvfw==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -4864,9 +4901,9 @@ eslint-plugin-import@^2.25.4:
     tsconfig-paths "^3.15.0"
 
 eslint-plugin-jest@^28.0.0:
-  version "28.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-28.2.0.tgz#863e2b2bda95eb41981ba9bcf4c44f57dce40a73"
-  integrity sha512-yRDti/a+f+SMSmNTiT9/M/MzXGkitl8CfzUxnpoQcTyfq8gUrXMriVcWU36W1X6BZSUoyUCJrDAWWUA2N4hE5g==
+  version "28.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-28.3.0.tgz#d52dea5e4f191fde061cbf1cea44c8a0a23e62ec"
+  integrity sha512-5LjCSSno8E+IUCOX4hJiIb/upPIgpkaDEcaN/40gOcw26t/5UTLHFc4JdxKjOOvGTh0XdCu+fNr0fpOVNvcxMA==
   dependencies:
     "@typescript-eslint/utils" "^6.0.0"
 
@@ -4898,9 +4935,9 @@ eslint-plugin-matrix-org@1.2.1:
   integrity sha512-A3cDjhG7RHwfCS8o3bOip8hSCsxtmgk2ahvqE5v/Ic2kPEZxixY6w8zLj7hFGsrRmPSEpLWqkVLt8uvQBapiQA==
 
 eslint-plugin-react-hooks@^4.3.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
-  integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
+  integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
 
 eslint-plugin-react@^7.28.0:
   version "7.34.1"
@@ -6806,6 +6843,13 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+lie@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  integrity sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==
+  dependencies:
+    immediate "~3.0.5"
+
 lie@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
@@ -6847,6 +6891,13 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
+localforage@^1.8.1:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
+  integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==
+  dependencies:
+    lie "3.1.1"
+
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
@@ -7015,8 +7066,8 @@ matrix-events-sdk@0.0.1:
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "32.0.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/82ed7bd86ae4c8c703f886a490573110035cfe34"
+  version "32.1.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1da5e8f56a29afef0197dd4c3553d2ee4dfbd576"
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/matrix-sdk-crypto-wasm" "^4.9.0"
@@ -7724,10 +7775,10 @@ postcss@^8.4.38:
     picocolors "^1.0.0"
     source-map-js "^1.2.0"
 
-posthog-js@1.126.0:
-  version "1.126.0"
-  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.126.0.tgz#52ca294505d3ddc3ba34aeaafe388676113ff82f"
-  integrity sha512-8qCdPE9RZkyXI3kKCnkXWxK0jn2mLZg6g5a6KezDPqH7mHTG66v7ANU31hcwzQGV5F5UW1GXw0xL0PaC3HkA6g==
+posthog-js@1.130.1:
+  version "1.130.1"
+  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.130.1.tgz#e8d037043f801d438f785f441843cce7d8af7ec3"
+  integrity sha512-BC283kxeJnVIeAxn7ZPHf5sCTA6oXs4uvo9fdGAsbKwwfmF9g09rnJOOaoF95J/auf8HT4YB6Vt2KytqtJD44w==
   dependencies:
     fflate "^0.4.8"
     preact "^10.19.3"
@@ -7916,9 +7967,9 @@ raw-loader@^4.0.2:
     schema-utils "^3.0.0"
 
 re-resizable@^6.9.0:
-  version "6.9.11"
-  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.11.tgz#f356e27877f12d926d076ab9ad9ff0b95912b475"
-  integrity sha512-a3hiLWck/NkmyLvGWUuvkAmN1VhwAz4yOhS6FdMTaxCUVN9joIWkT11wsO68coG/iEYuwn+p/7qAmfQzRhiPLQ==
+  version "6.9.16"
+  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.16.tgz#d040a3ba9ccb25a3cc85b7622d4eafdee48cf2c2"
+  integrity sha512-D9+ofwgPQRC6PL6cwavCZO9MUR8TKKxV1nHjbutSdNaFHK9v5k8m6DcESMXrw1+mRJn7fBHJRhZpa7EQ1ZWEEA==
 
 react-beautiful-dnd@^13.1.0:
   version "13.1.1"
@@ -7962,9 +8013,9 @@ react-error-boundary@^3.1.0:
     "@babel/runtime" "^7.12.5"
 
 react-focus-lock@^2.5.1:
-  version "2.11.3"
-  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.11.3.tgz#a7c98b4ab11fd270d78f90a7c9a9e69352c2af6d"
-  integrity sha512-CfWYS86y6KvAIGxYzO1/HlWI2zGON9Fa3L2xfREDGMNFAtYj3m/ZRvnsMH4H75dj5FpgDy2LWA1Vyx+twV80vw==
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.12.1.tgz#0eaefd5fc34de8998967043d902e426352393349"
+  integrity sha512-lfp8Dve4yJagkHiFrC1bGtib3mF2ktqwPJw4/WGcgPW+pJ/AVQA5X2vI7xgp13FcxFEpYBBHpXai/N2DBNC0Jw==
   dependencies:
     "@babel/runtime" "^7.0.0"
     focus-lock "^1.3.5"
@@ -8827,19 +8878,19 @@ stylelint-scss@^6.0.0:
     postcss-value-parser "^4.2.0"
 
 stylelint@^16.1.0:
-  version "16.3.1"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.3.1.tgz#006cc6cd4bd8e7b3acb1607bb8e8de85121b7847"
-  integrity sha512-/JOwQnBvxEKOT2RtNgGpBVXnCSMBgKOL2k7w0K52htwCyJls4+cHvc4YZgXlVoAZS9QJd2DgYAiRnja96pTgxw==
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.4.0.tgz#8811005be82ca06224bc9bc3b4cf2fce30b347ae"
+  integrity sha512-uSx7VMuXwLuYcNSIg+0/fFNv0WinsfLAqsVVy7h7p80clKOHiGE8pfY6UjqwylTHiJrRIahTl6a8FPxGezhWoA==
   dependencies:
     "@csstools/css-parser-algorithms" "^2.6.1"
     "@csstools/css-tokenizer" "^2.2.4"
     "@csstools/media-query-list-parser" "^2.1.9"
-    "@csstools/selector-specificity" "^3.0.2"
+    "@csstools/selector-specificity" "^3.0.3"
     "@dual-bundle/import-meta-resolve" "^4.0.0"
     balanced-match "^2.0.0"
     colord "^2.9.3"
     cosmiconfig "^9.0.0"
-    css-functions-list "^3.2.1"
+    css-functions-list "^3.2.2"
     css-tree "^2.3.1"
     debug "^4.3.4"
     fast-glob "^3.3.2"
@@ -8868,7 +8919,7 @@ stylelint@^16.1.0:
     strip-ansi "^7.1.0"
     supports-hyperlinks "^3.0.0"
     svg-tags "^1.0.0"
-    table "^6.8.1"
+    table "^6.8.2"
     write-file-atomic "^5.0.1"
 
 supercluster@^7.1.5:
@@ -8971,7 +9022,7 @@ tabbable@^6.0.0:
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
   integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
 
-table@^6.8.1:
+table@^6.8.2:
   version "6.8.2"
   resolved "https://registry.yarnpkg.com/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58"
   integrity sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==
@@ -9192,10 +9243,10 @@ typed-array-length@^1.0.4, typed-array-length@^1.0.5:
     is-typed-array "^1.1.13"
     possible-typed-array-names "^1.0.0"
 
-typescript@5.4.3:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff"
-  integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==
+typescript@5.4.5:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
 ua-parser-js@^1.0.2:
   version "1.0.37"
@@ -9276,7 +9327,7 @@ update-browserslist-db@^1.0.13:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-uri-js@^4.2.2:
+uri-js@^4.2.2, uri-js@^4.4.1:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
   integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==