Simplify

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Iterate
2025-12-07 01:21:02 +00:00 · 2025-03-27 13:25:53 +00:00 · 2025-03-27 13:17:43 +00:00 · 2025-03-27 13:12:41 +00:00 · 2025-03-27 12:35:46 +00:00 · 2025-03-18 23:52:58 +00:00
605 changed files with 11739 additions and 15912 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -30,10 +30,6 @@ module.exports = {
                ["window.innerHeight", "window.innerWidth", "window.visualViewport"],
                "Use UIStore to access window dimensions instead.",
            ),
-            ...buildRestrictedPropertiesOptions(
-                ["React.forwardRef", "*.forwardRef", "forwardRef"],
-                "Use ref props instead.",
-            ),
            ...buildRestrictedPropertiesOptions(
                ["*.mxcUrlToHttp", "*.getHttpUriForMxc"],
                "Use Media helper instead to centralise access for customisation.",
@@ -59,11 +55,6 @@ module.exports = {
            "error",
            {
                paths: [
-                    {
-                        name: "react",
-                        importNames: ["forwardRef"],
-                        message: "Use ref props instead.",
-                    },
                    {
                        name: "@testing-library/react",
                        message: "Please use jest-matrix-react instead",
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -132,7 +132,7 @@ jobs:
                  cosign sign --yes ${images}

            - name: Update repo description
-              uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4
+              uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4
              if: github.event_name != 'pull_request'
              continue-on-error: true
              with:
--- a/.github/workflows/release_prepare.yml
+++ b/.github/workflows/release_prepare.yml
@@ -100,7 +100,7 @@ jobs:
                  repo: matrix-org/matrix-js-sdk
                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                  wait-interval: 10
-                  check-name: "draft / draft"
+                  check-name: draft
                  allowed-conclusions: success

            - name: Wait for element-web draft
@@ -111,7 +111,7 @@ jobs:
                  repo: element-hq/element-web
                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                  wait-interval: 10
-                  check-name: "draft / draft"
+                  check-name: draft
                  allowed-conclusions: success

            - name: Wait for element-desktop draft
@@ -122,5 +122,5 @@ jobs:
                  repo: element-hq/element-desktop
                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                  wait-interval: 10
-                  check-name: "draft / draft"
+                  check-name: draft
                  allowed-conclusions: success
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@@ -51,7 +51,6 @@ jobs:
                error|invalid_json
                error|misconfigured
                welcome_to_element
-                devtools|settings|elementCallUrl

    rethemendex_lint:
        name: "Rethemendex Check"
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -104,7 +104,7 @@ jobs:

            - name: Skip SonarCloud in merge queue
              if: github.event_name == 'merge_group' || inputs.disable_coverage == 'true'
-              uses: guibranco/github-status-action-v2@5f2b01ce1394109f70954ae6b69ef41cf7928e63
+              uses: guibranco/github-status-action-v2@fe98467f9071758c7fc214af9dbac7f301bd23d4
              with:
                  authToken: ${{ secrets.GITHUB_TOKEN }}
                  state: success
--- a/.github/workflows/triage-assigned.yml
+++ b/.github/workflows/triage-assigned.yml
@@ -11,8 +11,7 @@ jobs:
        runs-on: ubuntu-24.04
        if: |
            contains(github.event.issue.assignees.*.login, 't3chguy') ||
-            contains(github.event.issue.assignees.*.login, 'florianduros') ||
-            contains(github.event.issue.assignees.*.login, 'dbkr') ||
+            contains(github.event.issue.assignees.*.login, 'andybalaam') ||
            contains(github.event.issue.assignees.*.login, 'MidhunSureshR')
        steps:
            - uses: actions/add-to-project@main
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ electron/pub
 .env
 /coverage
 # Auto-generated file
+/src/modules.ts
 /src/modules.js
 /build_config.yaml
 /book
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,77 +1,3 @@
-Changes in [1.11.99](https://github.com/element-hq/element-web/releases/tag/v1.11.99) (2025-04-23)
-==================================================================================================
-No changes, just bumping the version to accommodate a new Element Desktop release
-
-Changes in [1.11.98](https://github.com/element-hq/element-web/releases/tag/v1.11.98) (2025-04-22)
-==================================================================================================
-## ✨ Features
-
-* print better errors in the search view instead of a blocking modal ([#29724](https://github.com/element-hq/element-web/pull/29724)). Contributed by @Jujure.
-* New room list: video room and video call decoration  ([#29693](https://github.com/element-hq/element-web/pull/29693)). Contributed by @florianduros.
-* Remove Secure Backup, Cross-signing and Cryptography sections in `Security & Privacy` user settings ([#29088](https://github.com/element-hq/element-web/pull/29088)). Contributed by @florianduros.
-* Allow reporting a room when rejecting an invite. ([#29570](https://github.com/element-hq/element-web/pull/29570)). Contributed by @Half-Shot.
-* RoomListViewModel: Reset primary and secondary filters on space change ([#29672](https://github.com/element-hq/element-web/pull/29672)). Contributed by @MidhunSureshR.
-* RoomListStore: Support specific sorting requirements for muted rooms ([#29665](https://github.com/element-hq/element-web/pull/29665)). Contributed by @MidhunSureshR.
-* New room list: add notification options menu ([#29639](https://github.com/element-hq/element-web/pull/29639)). Contributed by @florianduros.
-* Room List: Scroll to top of the list when active room is not in the list ([#29650](https://github.com/element-hq/element-web/pull/29650)). Contributed by @MidhunSureshR.
-
-## 🐛 Bug Fixes
-
-* Fix unwanted form submit behaviour in memberlist ([#29747](https://github.com/element-hq/element-web/pull/29747)). Contributed by @MidhunSureshR.
-* New room list: fix public room icon visibility when filter change ([#29737](https://github.com/element-hq/element-web/pull/29737)). Contributed by @florianduros.
-* Fix custom theme support for short hex \& rgba hex strings ([#29726](https://github.com/element-hq/element-web/pull/29726)). Contributed by @t3chguy.
-* New room list: minor visual fixes ([#29723](https://github.com/element-hq/element-web/pull/29723)). Contributed by @florianduros.
-* Fix getOidcCallbackUrl for Element Desktop ([#29711](https://github.com/element-hq/element-web/pull/29711)). Contributed by @t3chguy.
-* Fix some webp images improperly marked as animated ([#29713](https://github.com/element-hq/element-web/pull/29713)). Contributed by @Petersmit27.
-* Revert deletion of hydrateSession ([#29703](https://github.com/element-hq/element-web/pull/29703)). Contributed by @Jujure.
-* Fix converttoroom \& converttodm not working ([#29705](https://github.com/element-hq/element-web/pull/29705)). Contributed by @t3chguy.
-* Ensure forceCloseAllModals also closes priority/static modals ([#29706](https://github.com/element-hq/element-web/pull/29706)). Contributed by @t3chguy.
-* Continue button is disabled when uploading a recovery key file ([#29695](https://github.com/element-hq/element-web/pull/29695)). Contributed by @Giwayume.
-* Catch errors after syncing recovery ([#29691](https://github.com/element-hq/element-web/pull/29691)). Contributed by @andybalaam.
-* New room list: fix multiple visual issues ([#29673](https://github.com/element-hq/element-web/pull/29673)). Contributed by @florianduros.
-* New Room List: Fix mentions filter matching rooms with any highlight ([#29668](https://github.com/element-hq/element-web/pull/29668)). Contributed by @MidhunSureshR.
-*  Fix truncated emoji label during emoji SAS ([#29643](https://github.com/element-hq/element-web/pull/29643)). Contributed by @florianduros.
-* Remove duplicate jitsi link ([#29642](https://github.com/element-hq/element-web/pull/29642)). Contributed by @dbkr.
-
-
-Changes in [1.11.97](https://github.com/element-hq/element-web/releases/tag/v1.11.97) (2025-04-08)
-==================================================================================================
-## ✨ Features
-
-* New room list: reduce padding between avatar and room list border ([#29634](https://github.com/element-hq/element-web/pull/29634)). Contributed by @florianduros.
-* Bundle Element Call with Element Web packages ([#29309](https://github.com/element-hq/element-web/pull/29309)). Contributed by @t3chguy.
-* Hide an event notification if it is redacted ([#29605](https://github.com/element-hq/element-web/pull/29605)). Contributed by @Half-Shot.
-* Docker: Use nginx-unprivileged as base image ([#29353](https://github.com/element-hq/element-web/pull/29353)). Contributed by @AndrewFerr.
-* Switch away from nesting React trees and mangling the DOM ([#29586](https://github.com/element-hq/element-web/pull/29586)). Contributed by @t3chguy.
-* New room list: add notification decoration ([#29552](https://github.com/element-hq/element-web/pull/29552)). Contributed by @florianduros.
-* RoomListStore: Unread filter should match rooms that were marked as unread ([#29580](https://github.com/element-hq/element-web/pull/29580)). Contributed by @MidhunSureshR.
-* Add support for hiding videos ([#29496](https://github.com/element-hq/element-web/pull/29496)). Contributed by @Half-Shot.
-* Use an outline icon for the report room button ([#29573](https://github.com/element-hq/element-web/pull/29573)). Contributed by @robintown.
-* Generate/load pickle key on SSO ([#29568](https://github.com/element-hq/element-web/pull/29568)). Contributed by @Jujure.
-* Add report room dialog button/dialog. ([#29513](https://github.com/element-hq/element-web/pull/29513)). Contributed by @Half-Shot.
-* RoomListViewModel: Make the active room sticky in the list ([#29551](https://github.com/element-hq/element-web/pull/29551)). Contributed by @MidhunSureshR.
-* Replace checkboxes with Compound checkboxes, and appropriately label each checkbox. ([#29363](https://github.com/element-hq/element-web/pull/29363)). Contributed by @Half-Shot.
-* New room list: add selection decoration ([#29531](https://github.com/element-hq/element-web/pull/29531)). Contributed by @florianduros.
-* Simplified Sliding Sync ([#28515](https://github.com/element-hq/element-web/pull/28515)). Contributed by @dbkr.
-* Add ability to hide images after clicking "show image" ([#29467](https://github.com/element-hq/element-web/pull/29467)). Contributed by @Half-Shot.
-
-## 🐛 Bug Fixes
-
-* Fix scroll issues in memberlist ([#29392](https://github.com/element-hq/element-web/pull/29392)). Contributed by @MidhunSureshR.
-* Ensure clicks on spoilers do not get handled by the hidden content ([#29618](https://github.com/element-hq/element-web/pull/29618)). Contributed by @t3chguy.
-* New room list: add cursor pointer on room list item ([#29627](https://github.com/element-hq/element-web/pull/29627)). Contributed by @florianduros.
-* Fix missing ambiguous url tooltips on Element Desktop ([#29619](https://github.com/element-hq/element-web/pull/29619)). Contributed by @t3chguy.
-* New room list: fix spacing and padding ([#29607](https://github.com/element-hq/element-web/pull/29607)). Contributed by @florianduros.
-* Make fetchdep check out matching branch name ([#29601](https://github.com/element-hq/element-web/pull/29601)). Contributed by @dbkr.
-* Fix MFileBody fileName not considering `filename` ([#29589](https://github.com/element-hq/element-web/pull/29589)). Contributed by @t3chguy.
-* Fix token expiry racing with login causing wrong error to be shown ([#29566](https://github.com/element-hq/element-web/pull/29566)). Contributed by @t3chguy.
-* Fix bug which caused startup to hang if the clock was wound back since a previous session ([#29558](https://github.com/element-hq/element-web/pull/29558)). Contributed by @richvdh.
-* RoomListViewModel: Reset any primary filter on secondary filter change ([#29562](https://github.com/element-hq/element-web/pull/29562)). Contributed by @MidhunSureshR.
-* RoomListStore: Unread filter should only filter rooms having unread counts ([#29555](https://github.com/element-hq/element-web/pull/29555)). Contributed by @MidhunSureshR.
-* In force-verify mode, prevent bypassing by cancelling device verification ([#29487](https://github.com/element-hq/element-web/pull/29487)). Contributed by @andybalaam.
-* Add title attribute to user identifier ([#29547](https://github.com/element-hq/element-web/pull/29547)). Contributed by @arpitbatra123.
-
-
 Changes in [1.11.96](https://github.com/element-hq/element-web/releases/tag/v1.11.96) (2025-03-25)
 ==================================================================================================
 ## ✨ Features
--- a/14
+++ b/14
@@ -1,4 +1,4 @@
-# syntax=docker.io/docker/dockerfile:1.15-labs
+# syntax=docker.io/docker/dockerfile:1.14-labs

 # Builder
 FROM --platform=$BUILDPLATFORM node:22-bullseye AS builder
@@ -19,10 +19,7 @@ RUN /src/scripts/docker-package.sh
 RUN cp /src/config.sample.json /src/webapp/config.json

 # App
-FROM nginxinc/nginx-unprivileged:alpine-slim
-
-# Need root user to install packages & manipulate the usr directory
-USER root
+FROM nginx:alpine-slim

 # Install jq and moreutils for sponge, both used by our entrypoints
 RUN apk add jq moreutils
@@ -34,6 +31,13 @@ COPY --from=builder /src/webapp /app
 COPY /docker/nginx-templates/* /etc/nginx/templates/
 COPY /docker/docker-entrypoint.d/* /docker-entrypoint.d/

+# Tell nginx to put its pidfile elsewhere, so it can run as non-root
+RUN sed -i -e 's,/var/run/nginx.pid,/tmp/nginx.pid,' /etc/nginx/nginx.conf
+
+# nginx user must own the cache and etc directory to write cache and tweak the nginx config
+RUN chown -R nginx:0 /var/cache/nginx /etc/nginx
+RUN chmod -R g+w /var/cache/nginx /etc/nginx
+
 RUN rm -rf /usr/share/nginx/html \
  && ln -s /app /usr/share/nginx/html

--- a/contribute.json
+++ b/contribute.json
@@ -0,0 +1,13 @@
+{
+    "name": "Element",
+    "description": "A glossy Matrix collaboration client for the web.",
+    "repository": {
+        "url": "https://github.com/element-hq/element-web",
+        "license": "AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial"
+    },
+    "bugs": {
+        "list": "https://github.com/element-hq/element-web/issues",
+        "report": "https://github.com/element-hq/element-web/issues/new/choose"
+    },
+    "keywords": ["chat", "riot", "matrix"]
+}
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -46,6 +46,7 @@
 - [Skinning](skinning.md)
 - [Cider editor](ciderEditor.md)
 - [Iconography](icons.md)
+- [Jitsi](jitsi.md)
 - [Local echo](local-echo-dev.md)
 - [Media](media-handling.md)
 - [Room List Store](room-list-store.md)
--- a/docs/config.md
+++ b/docs/config.md
@@ -384,6 +384,8 @@ The VoIP and Jitsi options are:
 5. `audio_stream_url`: Optional URL to pass to Jitsi to enable live streaming. This option is considered experimental and may be removed
   at any time without notice.
 6. `element_call`: Optional configuration for native group calls using Element Call, with the following subkeys:
+    - `url`: The URL of the Element Call instance to use for native group calls. This option is considered experimental
+      and may be removed at any time without notice. Defaults to `https://call.element.io`.
    - `use_exclusively`: A boolean specifying whether Element Call should be used exclusively as the only VoIP stack in
      the app, removing the ability to start legacy 1:1 calls or Jitsi calls. Defaults to `false`.
    - `participant_limit`: The maximum number of users who can join a call; if
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -101,6 +101,10 @@ Under the hood this stops Element Web from adding the `perParticipantE2EE` flag

 This is useful while we experiment with encryption and to make calling compatible with platforms that don't use encryption yet.

+## Rich text in room topics (`feature_html_topic`) [In Development]
+
+Enables rendering of MD / HTML in room topics.
+
 ## Enable the notifications panel in the room header (`feature_notifications`)

 Unreliable in encrypted rooms.
--- a/knip.ts
+++ b/knip.ts
@@ -40,8 +40,6 @@ export default {
        // Used by webpack
        "process",
        "util",
-        // Embedded into webapp
-        "@element-hq/element-call-embedded",
    ],
    ignoreBinaries: [
        // Used in scripts & workflows
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "element-web",
-    "version": "1.11.99",
+    "version": "1.11.96",
    "description": "Element: the future of secure communication",
    "author": "New Vector Ltd.",
    "repository": {
@@ -22,7 +22,8 @@
        "LICENSE",
        "README.md",
        "AUTHORS.rst",
-        "package.json"
+        "package.json",
+        "contribute.json"
    ],
    "style": "bundle.css",
    "matrix_i18n_extra_translation_funcs": [
@@ -68,14 +69,13 @@
        "postinstall": "patch-package"
    },
    "resolutions": {
-        "**/pretty-format/react-is": "19.1.0",
-        "@playwright/test": "1.52.0",
-        "@types/react": "19.1.2",
-        "@types/react-dom": "19.1.2",
+        "@playwright/test": "1.51.1",
+        "@types/react": "18.3.18",
+        "@types/react-dom": "18.3.5",
        "oidc-client-ts": "3.2.0",
        "jwt-decode": "4.0.0",
-        "caniuse-lite": "1.0.30001715",
-        "testcontainers": "10.24.2",
+        "caniuse-lite": "1.0.30001704",
+        "testcontainers": "10.21.0",
        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0",
        "wrap-ansi": "npm:wrap-ansi@^7.0.0"
    },
@@ -93,8 +93,8 @@
        "@types/png-chunks-extract": "^1.0.2",
        "@types/react-virtualized": "^9.21.30",
        "@vector-im/compound-design-tokens": "^4.0.0",
-        "@vector-im/compound-web": "^7.10.2",
-        "@vector-im/matrix-wysiwyg": "2.38.3",
+        "@vector-im/compound-web": "^7.9.0",
+        "@vector-im/matrix-wysiwyg": "2.38.2",
        "@zxcvbn-ts/core": "^3.0.4",
        "@zxcvbn-ts/language-common": "^3.0.4",
        "@zxcvbn-ts/language-en": "^3.0.2",
@@ -138,22 +138,22 @@
        "opus-recorder": "^8.0.3",
        "pako": "^2.0.3",
        "png-chunks-extract": "^1.0.0",
-        "posthog-js": "1.236.7",
+        "posthog-js": "1.157.2",
        "qrcode": "1.5.4",
        "re-resizable": "6.11.2",
-        "react": "^19.0.0",
+        "react": "^18.3.1",
        "react-beautiful-dnd": "^13.1.0",
        "react-blurhash": "^0.3.0",
-        "react-dom": "^19.0.0",
+        "react-dom": "^18.3.1",
        "react-focus-lock": "^2.5.1",
        "react-string-replace": "^1.1.1",
        "react-transition-group": "^4.4.1",
        "react-virtualized": "^9.22.5",
        "rfc4648": "^1.4.0",
        "sanitize-filename": "^1.6.3",
-        "sanitize-html": "2.16.0",
+        "sanitize-html": "2.14.0",
        "tar-js": "^0.3.0",
-        "temporal-polyfill": "^0.3.0",
+        "temporal-polyfill": "^0.2.5",
        "ua-parser-js": "^1.0.2",
        "uuid": "^11.0.0",
        "what-input": "^5.2.10"
@@ -180,14 +180,12 @@
        "@babel/preset-typescript": "^7.12.7",
        "@babel/runtime": "^7.12.5",
        "@casualbot/jest-sonar-reporter": "2.2.7",
-        "@element-hq/element-call-embedded": "0.10.0",
        "@element-hq/element-web-playwright-common": "^1.1.5",
        "@peculiar/webcrypto": "^1.4.3",
        "@playwright/test": "^1.50.1",
        "@principalstudio/html-webpack-inject-preload": "^1.2.7",
-        "@rrweb/types": "^2.0.0-alpha.18",
        "@sentry/webpack-plugin": "^3.0.0",
-        "@stylistic/eslint-plugin": "^4.0.0",
+        "@stylistic/eslint-plugin": "^3.0.0",
        "@svgr/webpack": "^8.0.0",
        "@testing-library/dom": "^10.4.0",
        "@testing-library/jest-dom": "^6.4.8",
@@ -212,11 +210,11 @@
        "@types/node-fetch": "^2.6.2",
        "@types/pako": "^2.0.0",
        "@types/qrcode": "^1.3.5",
-        "@types/react": "19.1.2",
+        "@types/react": "18.3.18",
        "@types/react-beautiful-dnd": "^13.0.0",
-        "@types/react-dom": "19.1.2",
+        "@types/react-dom": "18.3.5",
        "@types/react-transition-group": "^4.4.0",
-        "@types/sanitize-html": "2.15.0",
+        "@types/sanitize-html": "2.13.0",
        "@types/semver": "^7.5.8",
        "@types/tar-js": "^0.3.5",
        "@types/ua-parser-js": "^0.7.36",
@@ -247,7 +245,7 @@
        "eslint-plugin-react-compiler": "^19.0.0-beta-df7b47d-20241124",
        "eslint-plugin-react-hooks": "^5.0.0",
        "eslint-plugin-unicorn": "^56.0.0",
-        "express": "^5.0.0",
+        "express": "^4.18.2",
        "fake-indexeddb": "^6.0.0",
        "fetch-mock": "9.11.0",
        "fetch-mock-jest": "^1.5.1",
@@ -287,13 +285,13 @@
        "semver": "^7.5.2",
        "source-map-loader": "^5.0.0",
        "stylelint": "^16.13.0",
-        "stylelint-config-standard": "^38.0.0",
+        "stylelint-config-standard": "^37.0.0",
        "stylelint-scss": "^6.0.0",
        "stylelint-value-no-unknown-custom-properties": "^6.0.1",
        "terser-webpack-plugin": "^5.3.9",
        "testcontainers": "^10.20.0",
        "ts-node": "^10.9.1",
-        "typescript": "5.8.3",
+        "typescript": "5.8.2",
        "util": "^0.12.5",
        "web-streams-polyfill": "^4.0.0",
        "webpack": "^5.89.0",
--- a/patches/@types+react+18.3.18.patch
+++ b/patches/@types+react+18.3.18.patch
@@ -0,0 +1,76 @@
+diff --git a/node_modules/@types/react/index.d.ts b/node_modules/@types/react/index.d.ts
+index 6ea73ef..cb51757 100644
+--- a/node_modules/@types/react/index.d.ts
+++ b/node_modules/@types/react/index.d.ts
+@@ -151,7 +151,7 @@ declare namespace React {
+         /**
+          * The current value of the ref.
+          */
+-        readonly current: T | null;
+        current: T;
+     }
+ 
+     interface DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES {
+@@ -186,7 +186,7 @@ declare namespace React {
+      * @see {@link RefObject}
+      */
+ 
+-    type Ref<T> = RefCallback<T> | RefObject<T> | null;
+    type Ref<T> = RefCallback<T> | RefObject<T | null> | null;
+     /**
+      * A legacy implementation of refs where you can pass a string to a ref prop.
+      *
+@@ -300,7 +300,7 @@ declare namespace React {
+          *
+          * @see {@link https://react.dev/learn/referencing-values-with-refs#refs-and-the-dom React Docs}
+          */
+-        ref?: LegacyRef<T> | undefined;
+        ref?: LegacyRef<T | null> | undefined;
+     }
+ 
+     /**
+@@ -1234,7 +1234,7 @@ declare namespace React {
+      *
+      * @see {@link ForwardRefRenderFunction}
+      */
+-    type ForwardedRef<T> = ((instance: T | null) => void) | MutableRefObject<T | null> | null;
+    type ForwardedRef<T> = ((instance: T | null) => void) | RefObject<T | null> | null;
+ 
+     /**
+      * The type of the function passed to {@link forwardRef}. This is considered different
+@@ -1565,7 +1565,7 @@ declare namespace React {
+         [propertyName: string]: any;
+     }
+ 
+-    function createRef<T>(): RefObject<T>;
+    function createRef<T>(): RefObject<T | null>;
+ 
+     /**
+      * The type of the component returned from {@link forwardRef}.
+@@ -1989,7 +1989,7 @@ declare namespace React {
+      * @version 16.8.0
+      * @see {@link https://react.dev/reference/react/useRef}
+      */
+-    function useRef<T>(initialValue: T): MutableRefObject<T>;
+    function useRef<T>(initialValue: T): RefObject<T>;
+     // convenience overload for refs given as a ref prop as they typically start with a null value
+     /**
+      * `useRef` returns a mutable ref object whose `.current` property is initialized to the passed argument
+@@ -2004,7 +2004,7 @@ declare namespace React {
+      * @version 16.8.0
+      * @see {@link https://react.dev/reference/react/useRef}
+      */
+-    function useRef<T>(initialValue: T | null): RefObject<T>;
+    function useRef<T>(initialValue: T | null): RefObject<T | null>;
+     // convenience overload for potentially undefined initialValue / call with 0 arguments
+     // has a default to stop it from defaulting to {} instead
+     /**
+@@ -2017,7 +2017,7 @@ declare namespace React {
+      * @version 16.8.0
+      * @see {@link https://react.dev/reference/react/useRef}
+      */
+-    function useRef<T = undefined>(initialValue?: undefined): MutableRefObject<T | undefined>;
+    function useRef<T>(initialValue: T | undefined): RefObject<T | undefined>;
+     /**
+      * The signature is identical to `useEffect`, but it fires synchronously after all DOM mutations.
+      * Use this to read layout from the DOM and synchronously re-render. Updates scheduled inside
--- a/patches/@types+react+19.0.10.patch
+++ b/patches/@types+react+19.0.10.patch
@@ -1,31 +0,0 @@
-diff --git a/node_modules/@types/react/index.d.ts b/node_modules/@types/react/index.d.ts
-index 2272032..18bd20a 100644
--- a/node_modules/@types/react/index.d.ts
-+++ b/node_modules/@types/react/index.d.ts
-@@ -134,7 +134,7 @@ declare namespace React {
-             props: P,
-         ) => ReactNode | Promise<ReactNode>)
-         // constructor signature must match React.Component
-        | (new(props: P) => Component<any, any>);
-+        | (new(props: P, context?: any) => Component<any, any>);
- 
-     /**
-      * Created by {@link createRef}, or {@link useRef} when passed `null`.
-@@ -941,7 +941,7 @@ declare namespace React {
-         context: unknown;
- 
-         // Keep in sync with constructor signature of JSXElementConstructor and ComponentClass.
-        constructor(props: P);
-+        constructor(props: P, context?: unknown);
- 
-         // We MUST keep setState() as a unified signature because it allows proper checking of the method return type.
-         // See: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/18365#issuecomment-351013257
-@@ -1113,7 +1113,7 @@ declare namespace React {
-      */
-     interface ComponentClass<P = {}, S = ComponentState> extends StaticLifecycle<P, S> {
-         // constructor signature must match React.Component
-        new(props: P): Component<P, S>;
-+        new(props: P, context?: any): Component<P, S>;
-         /**
-          * Ignored by React.
-          * @deprecated Only kept in types for backwards compatibility. Will be removed in a future major release.
--- a/patches/react-blurhash+0.3.0.patch
+++ b/patches/react-blurhash+0.3.0.patch
@@ -1,22 +0,0 @@
-diff --git a/node_modules/react-blurhash/dist/index.d.ts b/node_modules/react-blurhash/dist/index.d.ts
-index 3adbd0a..32e8c13 100644
--- a/node_modules/react-blurhash/dist/index.d.ts
-+++ b/node_modules/react-blurhash/dist/index.d.ts
-@@ -19,7 +19,7 @@ declare class Blurhash extends React.PureComponent<Props$1> {
-         resolutionY: number;
-     };
-     componentDidUpdate(): void;
-    render(): JSX.Element;
-+    render(): React.JSX.Element;
- }
- 
- declare type Props = React.CanvasHTMLAttributes<HTMLCanvasElement> & {
-@@ -37,7 +37,7 @@ declare class BlurhashCanvas extends React.PureComponent<Props> {
-     componentDidUpdate(): void;
-     handleRef: (canvas: HTMLCanvasElement) => void;
-     draw: () => void;
-    render(): JSX.Element;
-+    render(): React.JSX.Element;
- }
- 
- export { Blurhash, BlurhashCanvas };
--- a/playwright/e2e/crypto/backups.spec.ts
+++ b/playwright/e2e/crypto/backups.spec.ts
@@ -0,0 +1,108 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2023 The Matrix.org Foundation C.I.C.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { type Page } from "@playwright/test";
+
+import { test, expect } from "../../element-web-test";
+import { isDendrite } from "../../plugins/homeserver/dendrite";
+import { completeCreateSecretStorageDialog } from "./utils.ts";
+
+async function expectBackupVersionToBe(page: Page, version: string) {
+    await expect(page.locator(".mx_SecureBackupPanel_statusList tr:nth-child(5) td")).toHaveText(
+        version + " (Algorithm: m.megolm_backup.v1.curve25519-aes-sha2)",
+    );
+
+    await expect(page.locator(".mx_SecureBackupPanel_statusList tr:nth-child(6) td")).toHaveText(version);
+}
+
+test.describe("Backups", () => {
+    test.skip(isDendrite, "Dendrite lacks support for MSC3967 so requires additional auth here");
+    test.use({
+        displayName: "Hanako",
+    });
+
+    test(
+        "Create, delete and recreate a keys backup",
+        { tag: "@no-webkit" },
+        async ({ page, user, app }, workerInfo) => {
+            // Create a backup
+            const securityTab = await app.settings.openUserSettings("Security & Privacy");
+
+            await expect(securityTab.getByRole("heading", { name: "Secure Backup" })).toBeVisible();
+            await securityTab.getByRole("button", { name: "Set up", exact: true }).click();
+
+            const securityKey = await completeCreateSecretStorageDialog(page);
+
+            // Open the settings again
+            await app.settings.openUserSettings("Security & Privacy");
+            await expect(securityTab.getByRole("heading", { name: "Secure Backup" })).toBeVisible();
+
+            // expand the advanced section to see the active version in the reports
+            await page
+                .locator(".mx_Dialog .mx_SettingsSubsection_content details .mx_SecureBackupPanel_advanced")
+                .locator("..")
+                .click();
+
+            await expectBackupVersionToBe(page, "1");
+
+            await securityTab.getByRole("button", { name: "Delete Backup", exact: true }).click();
+            const currentDialogLocator = page.locator(".mx_Dialog");
+            await expect(currentDialogLocator.getByRole("heading", { name: "Delete Backup" })).toBeVisible();
+            // Delete it
+            await currentDialogLocator.getByTestId("dialog-primary-button").click(); // Click "Delete Backup"
+
+            // Create another
+            await securityTab.getByRole("button", { name: "Set up", exact: true }).click();
+            await expect(currentDialogLocator.getByRole("heading", { name: "Recovery Key" })).toBeVisible();
+            await currentDialogLocator.getByLabel("Recovery Key").fill(securityKey);
+            await currentDialogLocator.getByRole("button", { name: "Continue", exact: true }).click();
+
+            // Should be successful
+            await expect(currentDialogLocator.getByRole("heading", { name: "Success!" })).toBeVisible();
+            await currentDialogLocator.getByRole("button", { name: "OK", exact: true }).click();
+
+            // Open the settings again
+            await app.settings.openUserSettings("Security & Privacy");
+            await expect(securityTab.getByRole("heading", { name: "Secure Backup" })).toBeVisible();
+
+            // expand the advanced section to see the active version in the reports
+            await page
+                .locator(".mx_Dialog .mx_SettingsSubsection_content details .mx_SecureBackupPanel_advanced")
+                .locator("..")
+                .click();
+
+            await expectBackupVersionToBe(page, "2");
+
+            // ==
+            // Ensure that if you don't have the secret storage passphrase the backup won't be created
+            // ==
+
+            // First delete version 2
+            await securityTab.getByRole("button", { name: "Delete Backup", exact: true }).click();
+            await expect(currentDialogLocator.getByRole("heading", { name: "Delete Backup" })).toBeVisible();
+            // Click "Delete Backup"
+            await currentDialogLocator.getByTestId("dialog-primary-button").click();
+
+            // Try to create another
+            await securityTab.getByRole("button", { name: "Set up", exact: true }).click();
+            await expect(currentDialogLocator.getByRole("heading", { name: "Recovery Key" })).toBeVisible();
+            // But cancel the recovery key dialog, to simulate not having the secret storage passphrase
+            await currentDialogLocator.getByTestId("dialog-cancel-button").click();
+
+            await expect(currentDialogLocator.getByRole("heading", { name: "Starting backup…" })).toBeVisible();
+            // check that it failed
+            await expect(currentDialogLocator.getByText("Unable to create key backup")).toBeVisible();
+            // cancel
+            await currentDialogLocator.getByTestId("dialog-cancel-button").click();
+
+            // go back to the settings to check that no backup was created (the setup button should still be there)
+            await app.settings.openUserSettings("Security & Privacy");
+            await expect(securityTab.getByRole("button", { name: "Set up", exact: true })).toBeVisible();
+        },
+    );
+});
--- a/playwright/e2e/crypto/crypto.spec.ts
+++ b/playwright/e2e/crypto/crypto.spec.ts
@@ -8,7 +8,14 @@ Please see LICENSE files in the repository root for full details.

 import type { Page } from "@playwright/test";
 import { expect, test } from "../../element-web-test";
-import { autoJoin, createSharedRoomWithUser, enableKeyBackup, verify } from "./utils";
+import {
+    autoJoin,
+    completeCreateSecretStorageDialog,
+    copyAndContinue,
+    createSharedRoomWithUser,
+    enableKeyBackup,
+    verify,
+} from "./utils";
 import { type Bot } from "../../pages/bot";
 import { type ElementAppPage } from "../../pages/ElementAppPage";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
@@ -77,43 +84,86 @@ test.describe("Cryptography", function () {
        },
    });

-    /**
-     * Verify that the `m.cross_signing.${keyType}` key is available on the account data on the server
-     * @param keyType
-     */
-    async function verifyKey(app: ElementAppPage, keyType: "master" | "self_signing" | "user_signing") {
-        const accountData: { encrypted: Record<string, Record<string, string>> } = await app.client.evaluate(
-            (cli, keyType) => cli.getAccountDataFromServer(`m.cross_signing.${keyType}`),
-            keyType,
-        );
+    for (const isDeviceVerified of [true, false]) {
+        test.describe(`setting up secure key backup should work isDeviceVerified=${isDeviceVerified}`, () => {
+            /**
+             * Verify that the `m.cross_signing.${keyType}` key is available on the account data on the server
+             * @param keyType
+             */
+            async function verifyKey(app: ElementAppPage, keyType: "master" | "self_signing" | "user_signing") {
+                const accountData: { encrypted: Record<string, Record<string, string>> } = await app.client.evaluate(
+                    (cli, keyType) => cli.getAccountDataFromServer(`m.cross_signing.${keyType}`),
+                    keyType,
+                );
+                expect(accountData.encrypted).toBeDefined();
+                const keys = Object.keys(accountData.encrypted);
+                const key = accountData.encrypted[keys[0]];
+                expect(key.ciphertext).toBeDefined();
+                expect(key.iv).toBeDefined();
+                expect(key.mac).toBeDefined();
+            }

-        expect(accountData.encrypted).toBeDefined();
-        const keys = Object.keys(accountData.encrypted);
-        const key = accountData.encrypted[keys[0]];
-        expect(key.ciphertext).toBeDefined();
-        expect(key.iv).toBeDefined();
-        expect(key.mac).toBeDefined();
+            test("by recovery code", async ({ page, app, user: aliceCredentials }) => {
+                // Verified the device
+                if (isDeviceVerified) {
+                    await app.client.bootstrapCrossSigning(aliceCredentials);
+                }
+
+                await page.route("**/_matrix/client/v3/keys/signatures/upload", async (route) => {
+                    // We delay this API otherwise the `Setting up keys` may happen too quickly and cause flakiness
+                    await new Promise((resolve) => setTimeout(resolve, 500));
+                    await route.continue();
+                });
+
+                await app.settings.openUserSettings("Security & Privacy");
+                await page.getByRole("button", { name: "Set up Secure Backup" }).click();
+
+                await completeCreateSecretStorageDialog(page);
+
+                // Verify that the SSSS keys are in the account data stored in the server
+                await verifyKey(app, "master");
+                await verifyKey(app, "self_signing");
+                await verifyKey(app, "user_signing");
+            });
+
+            test("by passphrase", async ({ page, app, user: aliceCredentials }) => {
+                // Verified the device
+                if (isDeviceVerified) {
+                    await app.client.bootstrapCrossSigning(aliceCredentials);
+                }
+
+                await app.settings.openUserSettings("Security & Privacy");
+                await page.getByRole("button", { name: "Set up Secure Backup" }).click();
+
+                const dialog = page.locator(".mx_Dialog");
+                // Select passphrase option
+                await dialog.getByText("Enter a Security Phrase").click();
+                await dialog.getByRole("button", { name: "Continue" }).click();
+
+                // Fill passphrase input
+                await dialog.locator("input").fill("new passphrase for setting up a secure key backup");
+                await dialog.locator(".mx_Dialog_primary:not([disabled])", { hasText: "Continue" }).click();
+                // Confirm passphrase
+                await dialog.locator("input").fill("new passphrase for setting up a secure key backup");
+                await dialog.locator(".mx_Dialog_primary:not([disabled])", { hasText: "Continue" }).click();
+
+                await copyAndContinue(page);
+
+                await expect(dialog.getByText("Secure Backup successful")).toBeVisible();
+                await dialog.getByRole("button", { name: "Done" }).click();
+                await expect(dialog.getByText("Secure Backup successful")).not.toBeVisible();
+
+                // Verify that the SSSS keys are in the account data stored in the server
+                await verifyKey(app, "master");
+                await verifyKey(app, "self_signing");
+                await verifyKey(app, "user_signing");
+            });
+        });
    }

-    test("Setting up key backup by recovery key", async ({ page, app, user: aliceCredentials }) => {
-        await app.client.bootstrapCrossSigning(aliceCredentials);
-
-        await enableKeyBackup(app);
-
-        // Wait for the cross signing keys to be uploaded
-        // Waiting for "Change the recovery key" button ensure that all the secrets are uploaded and cached locally
-        const encryptionTab = await app.settings.openUserSettings("Encryption");
-        await expect(encryptionTab.getByRole("button", { name: "Change recovery key" })).toBeVisible();
-
-        // Verify that the SSSS keys are in the account data stored in the server
-        await verifyKey(app, "master");
-        await verifyKey(app, "self_signing");
-        await verifyKey(app, "user_signing");
-    });
-
    test("Can reset cross-signing keys", async ({ page, app, user: aliceCredentials }) => {
        await app.client.bootstrapCrossSigning(aliceCredentials);
-        await enableKeyBackup(app);
+        const secretStorageKey = await enableKeyBackup(app);

        // Fetch the current cross-signing keys
        async function fetchMasterKey() {
@@ -127,15 +177,18 @@ test.describe("Cryptography", function () {
                return k;
            });
        }
-
        const masterKey1 = await fetchMasterKey();

-        // Find "the Reset cryptographic identity" button
-        const encryptionTab = await app.settings.openUserSettings("Encryption");
-        await encryptionTab.getByRole("button", { name: "Reset cryptographic identity" }).click();
+        // Find the "reset cross signing" button, and click it
+        await app.settings.openUserSettings("Security & Privacy");
+        await page.locator("div.mx_CrossSigningPanel_buttonRow").getByRole("button", { name: "Reset" }).click();

        // Confirm
-        await encryptionTab.getByRole("button", { name: "Continue" }).click();
+        await page.getByRole("button", { name: "Clear cross-signing keys" }).click();
+
+        // Enter the 4S key
+        await page.getByPlaceholder("Recovery Key").fill(secretStorageKey);
+        await page.getByRole("button", { name: "Continue" }).click();

        // Enter the password
        await page.getByPlaceholder("Password").fill(aliceCredentials.password);
@@ -145,6 +198,9 @@ test.describe("Cryptography", function () {
            const masterKey2 = await fetchMasterKey();
            expect(masterKey1).not.toEqual(masterKey2);
        }).toPass();
+
+        // The dialog should have gone away
+        await expect(page.locator(".mx_Dialog")).toHaveCount(1);
    });

    test(
--- a/playwright/e2e/crypto/dehydration.spec.ts
+++ b/playwright/e2e/crypto/dehydration.spec.ts
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.

 import { test, expect } from "../../element-web-test";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
-import { createBot, logIntoElement } from "./utils.ts";
+import { completeCreateSecretStorageDialog, createBot, logIntoElement } from "./utils.ts";
 import { type Client } from "../../pages/client.ts";
 import { type ElementAppPage } from "../../pages/ElementAppPage.ts";

@@ -28,27 +28,21 @@ test.describe("Dehydration", () => {
    test.skip(isDendrite, "does not yet support dehydration v2");

    test("Verify device and reset creates dehydrated device", async ({ page, user, credentials, app }, workerInfo) => {
-        // Verify the device by resetting the identity key, and then set up recovery (which will create SSSS, and dehydrated device)
+        // Verify the device by resetting the key (which will create SSSS, and dehydrated device)

        const securityTab = await app.settings.openUserSettings("Security & Privacy");
        await expect(securityTab.getByText("Offline device enabled")).not.toBeVisible();

        await app.closeDialog();

-        // Reset the identity key
+        // Verify the device by resetting the key
        const settings = await app.settings.openUserSettings("Encryption");
        await settings.getByRole("button", { name: "Verify this device" }).click();
        await page.getByRole("button", { name: "Proceed with reset" }).click();
        await page.getByRole("button", { name: "Continue" }).click();
-
-        // Set up recovery
-        await page.getByRole("button", { name: "Set up recovery" }).click();
+        await page.getByRole("button", { name: "Copy" }).click();
        await page.getByRole("button", { name: "Continue" }).click();
-        const recoveryKey = await page.getByTestId("recoveryKey").innerText();
-        await page.getByRole("button", { name: "Continue" }).click();
-        await page.getByRole("textbox").fill(recoveryKey);
-        await page.getByRole("button", { name: "Finish set up" }).click();
-        await page.getByRole("button", { name: "Close" }).click();
+        await page.getByRole("button", { name: "Done" }).click();

        await expectDehydratedDeviceEnabled(app);

@@ -86,7 +80,7 @@ test.describe("Dehydration", () => {
        await expectDehydratedDeviceEnabled(app);
    });

-    test("Reset identity during login and set up recovery re-creates dehydrated device", async ({
+    test("Reset recovery key during login re-creates dehydrated device", async ({
        page,
        homeserver,
        app,
@@ -105,26 +99,16 @@ test.describe("Dehydration", () => {
        // Log in our client
        await logIntoElement(page, credentials);

-        // Oh no, we forgot our recovery key - reset our identity
+        // Oh no, we forgot our recovery key
        await page.locator(".mx_AuthPage").getByRole("button", { name: "Reset all" }).click();
-        await expect(
-            page.getByRole("heading", { name: "Are you sure you want to reset your identity?" }),
-        ).toBeVisible();
-        await page.getByRole("button", { name: "Continue", exact: true }).click();
-        await page.getByPlaceholder("Password").fill(credentials.password);
-        await page.getByRole("button", { name: "Continue" }).click();
+        await page.locator(".mx_AuthPage").getByRole("button", { name: "Proceed with reset" }).click();

-        // And set up recovery
-        const settings = await app.settings.openUserSettings("Encryption");
-        await settings.getByRole("button", { name: "Set up recovery" }).click();
-        await settings.getByRole("button", { name: "Continue" }).click();
-        const recoveryKey = await settings.getByTestId("recoveryKey").innerText();
-        await settings.getByRole("button", { name: "Continue" }).click();
-        await settings.getByRole("textbox").fill(recoveryKey);
-        await settings.getByRole("button", { name: "Finish set up" }).click();
+        await completeCreateSecretStorageDialog(page, { accountPassword: credentials.password });

        // There should be a brand new dehydrated device
-        await expectDehydratedDeviceEnabled(app);
+        const dehydratedDeviceIds = await getDehydratedDeviceIds(app.client);
+        expect(dehydratedDeviceIds.length).toBe(1);
+        expect(dehydratedDeviceIds[0]).not.toEqual(initialDehydratedDeviceIds[0]);
    });

    test("'Reset cryptographic identity' removes dehydrated device", async ({ page, homeserver, app, credentials }) => {
--- a/playwright/e2e/left-panel/room-list-panel/room-list-filter-sort.spec.ts
+++ b/playwright/e2e/left-panel/room-list-panel/room-list-filter-sort.spec.ts
@@ -6,7 +6,7 @@
 */

 import { expect, test } from "../../../element-web-test";
-import type { Locator, Page } from "@playwright/test";
+import type { Page } from "@playwright/test";

 test.describe("Room list filters and sort", () => {
    test.use({
@@ -18,75 +18,24 @@ test.describe("Room list filters and sort", () => {
        labsFlags: ["feature_new_room_list"],
    });

-    function getPrimaryFilters(page: Page): Locator {
+    function getPrimaryFilters(page: Page) {
        return page.getByRole("listbox", { name: "Room list filters" });
    }

-    function getSecondaryFilters(page: Page): Locator {
-        return page.getByRole("button", { name: "Filter" });
-    }
-
-    /**
-     * Get the room list
-     * @param page
-     */
-    function getRoomList(page: Page) {
-        return page.getByTestId("room-list");
-    }
-
    test.beforeEach(async ({ page, app, bot, user }) => {
        // The notification toast is displayed above the search section
        await app.closeNotificationToast();
    });

-    test.describe("Scroll behaviour", () => {
-        test("should scroll to the top of list when filter is applied and active room is not in filtered list", async ({
-            page,
-            app,
-        }) => {
-            const createFavouriteRoom = async (name: string) => {
-                const id = await app.client.createRoom({
-                    name,
-                });
-                await app.client.evaluate(async (client, favouriteId) => {
-                    await client.setRoomTag(favouriteId, "m.favourite", { order: 0.5 });
-                }, id);
-            };
-
-            // Create 5 favourite rooms
-            let i = 0;
-            for (; i < 5; i++) {
-                await createFavouriteRoom(`room${i}-fav`);
-            }
-
-            // Create a non-favourite room
-            await app.client.createRoom({ name: `room-non-fav` });
-
-            // Create rest of the favourite rooms
-            for (; i < 20; i++) {
-                await createFavouriteRoom(`room${i}-fav`);
-            }
-
-            // Open the non-favourite room
-            const roomListView = getRoomList(page);
-            const tile = roomListView.getByRole("gridcell", { name: "Open room room-non-fav" });
-            await tile.scrollIntoViewIfNeeded();
-            await tile.click();
-
-            // Enable Favourite filter
-            const primaryFilters = getPrimaryFilters(page);
-            await primaryFilters.getByRole("option", { name: "Favourite" }).click();
-            await expect(tile).not.toBeVisible();
-
-            // Ensure the room list is not scrolled
-            const isScrolledDown = await page
-                .getByRole("grid", { name: "Room list" })
-                .evaluate((e) => e.scrollTop !== 0);
-            expect(isScrolledDown).toStrictEqual(false);
-        });
-    });
-
    test.describe("Room list", () => {
+        /**
+         * Get the room list
+         * @param page
+         */
+        function getRoomList(page: Page) {
+            return page.getByTestId("room-list");
+        }
+
        let unReadDmId: string | undefined;
        let unReadRoomId: string | undefined;

@@ -110,11 +59,6 @@ test.describe("Room list filters and sort", () => {
            await app.client.evaluate(async (client, favouriteId) => {
                await client.setRoomTag(favouriteId, "m.favourite", { order: 0.5 });
            }, favouriteId);
-
-            const lowPrioId = await app.client.createRoom({ name: "Low prio room" });
-            await app.client.evaluate(async (client, id) => {
-                await client.setRoomTag(id, "m.lowpriority", { order: 0.5 });
-            }, lowPrioId);
        });

        test("should filter the list (with primary filters)", { tag: "@screenshot" }, async ({ page, app, user }) => {
@@ -146,50 +90,32 @@ test.describe("Room list filters and sort", () => {
            await expect(roomList.getByRole("gridcell", { name: "unread room" })).toBeVisible();
            await expect(roomList.getByRole("gridcell", { name: "favourite room" })).toBeVisible();
            await expect(roomList.getByRole("gridcell", { name: "empty room" })).toBeVisible();
-            expect(await roomList.locator("role=gridcell").count()).toBe(4);
+            expect(await roomList.locator("role=gridcell").count()).toBe(3);
        });

-        test("should filter the list (with secondary filters)", { tag: "@screenshot" }, async ({ page, app, user }) => {
-            const roomList = getRoomList(page);
-            const secondaryFilters = getSecondaryFilters(page);
-            await secondaryFilters.click();
+        test("unread filter should only match unread rooms that have a count", async ({ page, app, bot }) => {
+            const roomListView = getRoomList(page);

-            await expect(page.getByRole("menu", { name: "Filter" })).toMatchScreenshot("filter-menu.png");
+            // Let's configure unread dm room so that we only get notification for mentions and keywords
+            await app.viewRoomById(unReadDmId);
+            await app.settings.openRoomSettings("Notifications");
+            await page.getByText("@mentions & keywords").click();
+            await app.settings.closeDialog();

-            await page.getByRole("menuitem", { name: "Low priority" }).click();
-            await expect(roomList.getByRole("gridcell", { name: "Low prio room" })).toBeVisible();
-            expect(await roomList.locator("role=gridcell").count()).toBe(1);
+            // Let's open a room other than unread room or unread dm
+            await roomListView.getByRole("gridcell", { name: "Open room favourite room" }).click();
+
+            // Let's make the bot send a new message in both rooms
+            await bot.sendMessage(unReadDmId, "Hello!");
+            await bot.sendMessage(unReadRoomId, "Hello!");
+
+            // Let's activate the unread filter now
+            await page.getByRole("option", { name: "Unread" }).click();
+
+            // Unread filter should only show unread room and not unread dm!
+            await expect(roomListView.getByRole("gridcell", { name: "Open room unread room" })).toBeVisible();
+            await expect(roomListView.getByRole("gridcell", { name: "Open room unread dm" })).not.toBeVisible();
        });
-
-        test(
-            "unread filter should only match unread rooms that have a count",
-            { tag: "@screenshot" },
-            async ({ page, app, bot }) => {
-                const roomListView = getRoomList(page);
-
-                // Let's configure unread dm room so that we only get notification for mentions and keywords
-                await app.viewRoomById(unReadDmId);
-                await app.settings.openRoomSettings("Notifications");
-                await page.getByText("@mentions & keywords").click();
-                await app.settings.closeDialog();
-
-                // Let's open a room other than unread room or unread dm
-                await roomListView.getByRole("gridcell", { name: "Open room favourite room" }).click();
-
-                // Let's make the bot send a new message in both rooms
-                await bot.sendMessage(unReadDmId, "Hello!");
-                await bot.sendMessage(unReadRoomId, "Hello!");
-
-                // Let's activate the unread filter now
-                await page.getByRole("option", { name: "Unread" }).click();
-
-                // Unread filter should only show unread room and not unread dm!
-                const unreadDm = roomListView.getByRole("gridcell", { name: "Open room unread room" });
-                await expect(unreadDm).toBeVisible();
-                await expect(unreadDm).toMatchScreenshot("unread-dm.png");
-                await expect(roomListView.getByRole("gridcell", { name: "Open room unread dm" })).not.toBeVisible();
-            },
-        );
    });

    test.describe("Empty room list", () => {
--- a/playwright/e2e/left-panel/room-list-panel/room-list.spec.ts
+++ b/playwright/e2e/left-panel/room-list-panel/room-list.spec.ts
@@ -7,7 +7,7 @@

 import { type Page } from "@playwright/test";

-import { expect, test } from "../../../element-web-test";
+import { test, expect } from "../../../element-web-test";

 test.describe("Room list", () => {
    test.use({
@@ -85,48 +85,6 @@ test.describe("Room list", () => {
            await expect(roomItem).not.toBeVisible();
        });

-        test("should open the notification options menu", { tag: "@screenshot" }, async ({ page, app, user }) => {
-            const roomListView = getRoomList(page);
-
-            const roomItem = roomListView.getByRole("gridcell", { name: "Open room room29" });
-            await roomItem.hover();
-
-            await expect(roomItem).toMatchScreenshot("room-list-item-hover.png");
-            let roomItemMenu = roomItem.getByRole("button", { name: "Notification options" });
-            await roomItemMenu.click();
-
-            // Default settings should be selected
-            await expect(page.getByRole("menuitem", { name: "Match default settings" })).toHaveAttribute(
-                "aria-selected",
-                "true",
-            );
-            await expect(page).toMatchScreenshot("room-list-item-open-notification-options.png");
-
-            // It should make the room muted
-            await page.getByRole("menuitem", { name: "Mute room" }).click();
-
-            // Remove hover on the room list item
-            await roomListView.hover();
-
-            // Scroll to the bottom of the list
-            await page.getByRole("grid", { name: "Room list" }).evaluate((e) => {
-                e.scrollTop = e.scrollHeight;
-            });
-
-            // The room decoration should have the muted icon
-            await expect(roomItem.getByTestId("notification-decoration")).toBeVisible();
-
-            await roomItem.hover();
-            // On hover, the room should show the muted icon
-            await expect(roomItem).toMatchScreenshot("room-list-item-hover-silent.png");
-
-            roomItemMenu = roomItem.getByRole("button", { name: "Notification options" });
-            await roomItemMenu.click();
-            // The Mute room option should be selected
-            await expect(page.getByRole("menuitem", { name: "Mute room" })).toHaveAttribute("aria-selected", "true");
-            await expect(page).toMatchScreenshot("room-list-item-open-notification-options-selection.png");
-        });
-
        test("should scroll to the current room", async ({ page, app, user }) => {
            const roomListView = getRoomList(page);
            await roomListView.hover();
@@ -142,73 +100,6 @@ test.describe("Room list", () => {
            await filters.getByRole("option", { name: "People" }).click();
            await expect(roomListView.getByRole("gridcell", { name: "Open room room0" })).toBeVisible();
        });
-
-        test.describe("Shortcuts", () => {
-            test("should select the next room", async ({ page, app, user }) => {
-                const roomListView = getRoomList(page);
-                await roomListView.getByRole("gridcell", { name: "Open room room29" }).click();
-                await page.keyboard.press("Alt+ArrowDown");
-
-                await expect(page.getByRole("heading", { name: "room28", level: 1 })).toBeVisible();
-            });
-
-            test("should select the previous room", async ({ page, app, user }) => {
-                const roomListView = getRoomList(page);
-                await roomListView.getByRole("gridcell", { name: "Open room room28" }).click();
-                await page.keyboard.press("Alt+ArrowUp");
-
-                await expect(page.getByRole("heading", { name: "room29", level: 1 })).toBeVisible();
-            });
-
-            test("should select the last room", async ({ page, app, user }) => {
-                const roomListView = getRoomList(page);
-                await roomListView.getByRole("gridcell", { name: "Open room room29" }).click();
-                await page.keyboard.press("Alt+ArrowUp");
-
-                await expect(page.getByRole("heading", { name: "room0", level: 1 })).toBeVisible();
-            });
-
-            test("should select the next unread room", async ({ page, app, user, bot }) => {
-                const roomListView = getRoomList(page);
-
-                const roomId = await app.client.createRoom({ name: "1 notification" });
-                await app.client.inviteUser(roomId, bot.credentials.userId);
-                await bot.joinRoom(roomId);
-                await bot.sendMessage(roomId, "I am a robot. Beep.");
-
-                await roomListView.getByRole("gridcell", { name: "Open room room20" }).click();
-
-                await page.keyboard.press("Alt+Shift+ArrowDown");
-
-                await expect(page.getByRole("heading", { name: "1 notification", level: 1 })).toBeVisible();
-            });
-        });
-    });
-
-    test.describe("Avatar decoration", () => {
-        test.use({ labsFlags: ["feature_video_rooms", "feature_new_room_list"] });
-
-        test("should be a public room", { tag: "@screenshot" }, async ({ page, app, user }) => {
-            // @ts-ignore Visibility enum is not accessible
-            await app.client.createRoom({ name: "public room", visibility: "public" });
-            const roomListView = getRoomList(page);
-            const publicRoom = roomListView.getByRole("gridcell", { name: "public room" });
-
-            await expect(publicRoom).toBeVisible();
-            await expect(publicRoom).toMatchScreenshot("room-list-item-public.png");
-        });
-
-        test("should be a video room", { tag: "@screenshot" }, async ({ page, app, user }) => {
-            await page.getByTestId("room-list-panel").getByRole("button", { name: "Add" }).click();
-            await page.getByRole("menuitem", { name: "New video room" }).click();
-            await page.getByRole("textbox", { name: "Name" }).fill("video room");
-            await page.getByRole("button", { name: "Create video room" }).click();
-
-            const roomListView = getRoomList(page);
-            const videoRoom = roomListView.getByRole("gridcell", { name: "video room" });
-            await expect(videoRoom).toBeVisible();
-            await expect(videoRoom).toMatchScreenshot("room-list-item-video.png");
-        });
    });

    test.describe("Notification decoration", () => {
@@ -271,22 +162,6 @@ test.describe("Room list", () => {
            await expect(room).toMatchScreenshot("room-list-item-mention.png");
        });

-        test("should render a message preview", { tag: "@screenshot" }, async ({ page, app, user, bot }) => {
-            const roomListView = getRoomList(page);
-
-            await page.getByRole("button", { name: "Room Options" }).click();
-            await page.getByRole("menuitemcheckbox", { name: "Show message previews" }).click();
-
-            const roomId = await app.client.createRoom({ name: "activity" });
-            await app.client.inviteUser(roomId, bot.credentials.userId);
-            await bot.joinRoom(roomId);
-            await bot.sendMessage(roomId, "I am a robot. Beep.");
-
-            const room = roomListView.getByRole("gridcell", { name: "activity" });
-            await expect(room.getByText("I am a robot. Beep.")).toBeVisible();
-            await expect(room).toMatchScreenshot("room-list-item-message-preview.png");
-        });
-
        test("should render an activity decoration", { tag: "@screenshot" }, async ({ page, app, user, bot }) => {
            const roomListView = getRoomList(page);

--- a/playwright/e2e/login/login-consent.spec.ts
+++ b/playwright/e2e/login/login-consent.spec.ts
@@ -288,43 +288,6 @@ test.describe("Login", () => {
                    await expect(h1).toBeVisible();
                });
            });
-
-            test("Can reset identity to become verified", async ({ page, homeserver, request, credentials }) => {
-                // Log in
-                const res = await request.post(`${homeserver.baseUrl}/_matrix/client/v3/keys/device_signing/upload`, {
-                    headers: { Authorization: `Bearer ${credentials.accessToken}` },
-                    data: DEVICE_SIGNING_KEYS_BODY,
-                });
-                if (!res.ok()) {
-                    console.log(`Uploading dummy keys failed with HTTP status ${res.status}`, await res.json());
-                    throw new Error("Uploading dummy keys failed");
-                }
-
-                await page.goto("/");
-                await login(page, homeserver, credentials);
-
-                await expect(page.getByRole("heading", { name: "Verify this device", level: 1 })).toBeVisible();
-
-                // Start the reset process
-                await page.getByRole("button", { name: "Proceed with reset" }).click();
-
-                // First try cancelling and restarting
-                await page.getByRole("button", { name: "Cancel" }).click();
-                await page.getByRole("button", { name: "Proceed with reset" }).click();
-
-                // Then click outside the dialog and restart
-                await page.getByRole("link", { name: "Powered by Matrix" }).click({ force: true });
-                await page.getByRole("button", { name: "Proceed with reset" }).click();
-
-                // Finally we actually continue
-                await page.getByRole("button", { name: "Continue" }).click();
-                await page.getByPlaceholder("Password").fill(credentials.password);
-                await page.getByRole("button", { name: "Continue" }).click();
-
-                // We end up at the Home screen
-                await expect(page).toHaveURL(/\/#\/home$/, { timeout: 10000 });
-                await expect(page.getByRole("heading", { name: "Welcome Dave", exact: true })).toBeVisible();
-            });
        });
    });

--- a/playwright/e2e/regression-tests/pills-click-in-app.spec.ts
+++ b/playwright/e2e/regression-tests/pills-click-in-app.spec.ts
@@ -43,7 +43,6 @@ test.describe("Pills", () => {

        // go back to the message room and try to click on the pill text, as a user would
        await app.viewRoomByName(messageRoom);
-        await expect(page).toHaveURL(new RegExp(`/#/room/${messageRoomId}`));
        const pillText = page.locator(".mx_EventTile_body .mx_Pill .mx_Pill_text");
        await expect(pillText).toHaveCSS("pointer-events", "none");
        await pillText.click({ force: true }); // force is to ensure we bypass pointer-events
--- a/playwright/e2e/right-panel/right-panel.spec.ts
+++ b/playwright/e2e/right-panel/right-panel.spec.ts
@@ -11,7 +11,6 @@ import { type Locator, type Page } from "@playwright/test";
 import { test, expect } from "../../element-web-test";
 import { checkRoomSummaryCard, viewRoomSummaryByName } from "./utils";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
-import { Bot } from "../../pages/bot";

 const ROOM_NAME = "Test room";
 const ROOM_NAME_LONG =
@@ -22,23 +21,20 @@ const ROOM_NAME_LONG =
    "officia deserunt mollit anim id est laborum.";
 const SPACE_NAME = "Test space";
 const NAME = "Alice";
-const LONG_NAME = "Bob long long long long long long long long long long long long long long long name";
-
 const ROOM_ADDRESS_LONG =
    "loremIpsumDolorSitAmetConsecteturAdipisicingElitSedDoEiusmodTemporIncididuntUtLaboreEtDoloreMagnaAliqua";

 function getMemberTileByName(page: Page, name: string): Locator {
-    return page.locator(".mx_MemberListView .mx_MemberTileView_name").filter({ hasText: name });
+    return page.locator(`.mx_MemberTileView, [title="${name}"]`);
 }

 test.describe("RightPanel", () => {
-    let testRoomId: string;
    test.use({
        displayName: NAME,
    });

    test.beforeEach(async ({ app, user }) => {
-        testRoomId = await app.client.createRoom({ name: ROOM_NAME });
+        await app.client.createRoom({ name: ROOM_NAME });
        await app.client.createSpace({ name: SPACE_NAME });
    });

@@ -138,63 +134,15 @@ test.describe("RightPanel", () => {
            await page.getByLabel("Room info").nth(1).click();
            await checkRoomSummaryCard(page, ROOM_NAME);
        });
-
-        test(
-            "should handle viewing long room member name",
-            { tag: "@screenshot" },
-            async ({ page, homeserver, app }) => {
-                const bobLongName = new Bot(page, homeserver, { displayName: LONG_NAME });
-                await bobLongName.prepareClient();
-                await app.client.inviteUser(testRoomId, bobLongName.credentials.userId);
-                await bobLongName.joinRoom(testRoomId);
-
-                await viewRoomSummaryByName(page, app, ROOM_NAME);
-
-                await page.locator(".mx_RightPanel").getByRole("menuitem", { name: "People" }).click();
-                await expect(page.locator(".mx_MemberListView")).toBeVisible();
-
-                await getMemberTileByName(page, LONG_NAME).click();
-                await expect(page.locator(".mx_UserInfo")).toBeVisible();
-                await expect(page.locator(".mx_UserInfo_profile").getByText(LONG_NAME)).toBeVisible();
-
-                await expect(page.locator(".mx_UserInfo")).toMatchScreenshot("with-long-name.png", {
-                    mask: [page.locator(".mx_UserInfo_profile_mxid")],
-                    css: `
-                        /* Use monospace font for consistent mask width */
-                        .mx_UserInfo_profile_mxid {
-                            font-family: Inconsolata !important;
-                        }
-                    `,
-                });
-            },
-        );
-
        test.describe("room reporting", () => {
            test.skip(isDendrite, "Dendrite does not implement room reporting");
-            test("should handle reporting a room", { tag: "@screenshot" }, async ({ page, app }) => {
+            test("should handle reporting a room", async ({ page, app }) => {
                await viewRoomSummaryByName(page, app, ROOM_NAME);
-
                await page.getByRole("menuitem", { name: "Report room" }).click();
                const dialog = await page.getByRole("dialog", { name: "Report Room" });
                await dialog.getByLabel("reason").fill("This room should be reported");
-                await expect(dialog).toMatchScreenshot("room-report-dialog.png");
                await dialog.getByRole("button", { name: "Send report" }).click();
-
-                // Dialog should have gone
-                await expect(page.locator(".mx_Dialog")).toHaveCount(0);
-            });
-            test("should handle reporting a room and leaving the room", async ({ page, app }) => {
-                await viewRoomSummaryByName(page, app, ROOM_NAME);
-
-                await page.getByRole("menuitem", { name: "Report room" }).click();
-                const dialog = await page.getByRole("dialog", { name: "Report room" });
-                await dialog.getByRole("switch", { name: "Leave room" }).click();
-                await dialog.getByLabel("reason").fill("This room should be reported");
-                await dialog.getByRole("button", { name: "Send report" }).click();
-                await page.getByRole("dialog", { name: "Leave room" }).getByRole("button", { name: "Leave" }).click();
-
-                // Dialog should have gone
-                await expect(page.locator(".mx_Dialog")).toHaveCount(0);
+                await expect(page.getByText("Your report was sent.")).toBeVisible();
            });
        });
    });
--- a/playwright/e2e/room/invites.spec.ts
+++ b/playwright/e2e/room/invites.spec.ts
@@ -1,74 +0,0 @@
-/*
-Copyright 2025 New Vector Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import { test, expect } from "../../element-web-test";
-
-test.describe("Invites", () => {
-    test.use({
-        displayName: "Alice",
-        botCreateOpts: {
-            displayName: "Bob",
-        },
-    });
-
-    test("should render an invite view", { tag: "@screenshot" }, async ({ page, homeserver, user, bot, app }) => {
-        const roomId = await bot.createRoom({ is_direct: true });
-        await bot.inviteUser(roomId, user.userId);
-        await app.viewRoomByName("Bob");
-        await expect(page.locator(".mx_RoomView")).toMatchScreenshot("Invites_room_view.png", {
-            // Hide the mxid, which is not stable.
-            css: `
-                .mx_RoomPreviewBar_inviter_mxid {
-                    display: none !important;
-                }
-            `,
-        });
-    });
-
-    test("should be able to decline an invite", async ({ page, homeserver, user, bot, app }) => {
-        const roomId = await bot.createRoom({ is_direct: true });
-        await bot.inviteUser(roomId, user.userId);
-        await app.viewRoomByName("Bob");
-        await page.getByRole("button", { name: "Decline", exact: true }).click();
-        await expect(page.getByRole("heading", { name: "Welcome Alice", exact: true })).toBeVisible();
-        await expect(
-            page.getByRole("tree", { name: "Rooms" }).getByRole("treeitem", { name: "Bob", exact: true }),
-        ).not.toBeVisible();
-    });
-
-    test(
-        "should be able to decline an invite, report the room and ignore the user",
-        { tag: "@screenshot" },
-        async ({ page, homeserver, user, bot, app }) => {
-            const roomId = await bot.createRoom({ is_direct: true });
-            await bot.inviteUser(roomId, user.userId);
-            await app.viewRoomByName("Bob");
-            await page.getByRole("button", { name: "Decline and block" }).click();
-            await page.getByLabel("Ignore user").click();
-            await page.getByLabel("Report room").click();
-            await page.getByLabel("Reason").fill("Do not want the room");
-            const roomReported = page.waitForRequest(
-                (req) =>
-                    req.url().endsWith(`/_matrix/client/v3/rooms/${encodeURIComponent(roomId)}/report`) &&
-                    req.method() === "POST",
-            );
-            await expect(page.getByRole("dialog", { name: "Decline invitation" })).toMatchScreenshot(
-                "Invites_reject_dialog.png",
-            );
-            await page.getByRole("button", { name: "Decline invite" }).click();
-
-            // Check room was reported.
-            await roomReported;
-
-            // Check user is ignored.
-            await app.settings.openUserSettings("Security & Privacy");
-            const ignoredUsersList = page.getByRole("list", { name: "Ignored users" });
-            await ignoredUsersList.scrollIntoViewIfNeeded();
-            await expect(ignoredUsersList.getByRole("listitem", { name: bot.credentials.userId })).toBeVisible();
-        },
-    );
-});
--- a/playwright/e2e/settings/encryption-user-tab/encryption-tab.spec.ts
+++ b/playwright/e2e/settings/encryption-user-tab/encryption-tab.spec.ts
@@ -19,162 +19,126 @@ import {
 test.describe("Encryption tab", () => {
    test.use({ displayName: "Alice" });

-    test.describe("when encryption is set up", () => {
-        let recoveryKey: GeneratedSecretStorageKey;
-        let expectedBackupVersion: string;
+    let recoveryKey: GeneratedSecretStorageKey;
+    let expectedBackupVersion: string;

-        test.beforeEach(async ({ page, homeserver, credentials }) => {
-            // The bot bootstraps cross-signing, creates a key backup and sets up a recovery key
-            const res = await createBot(page, homeserver, credentials);
-            recoveryKey = res.recoveryKey;
-            expectedBackupVersion = res.expectedBackupVersion;
-        });
+    test.beforeEach(async ({ page, homeserver, credentials }) => {
+        // The bot bootstraps cross-signing, creates a key backup and sets up a recovery key
+        const res = await createBot(page, homeserver, credentials);
+        recoveryKey = res.recoveryKey;
+        expectedBackupVersion = res.expectedBackupVersion;
+    });

-        test(
-            "should show a 'Verify this device' button if the device is unverified",
-            { tag: "@screenshot" },
-            async ({ page, app, util }) => {
-                const dialog = await util.openEncryptionTab();
-                const content = util.getEncryptionTabContent();
+    test(
+        "should show a 'Verify this device' button if the device is unverified",
+        { tag: "@screenshot" },
+        async ({ page, app, util }) => {
+            const dialog = await util.openEncryptionTab();
+            const content = util.getEncryptionTabContent();

-                // The user's device is in an unverified state, therefore the only option available to them here is to verify it
-                const verifyButton = dialog.getByRole("button", { name: "Verify this device" });
-                await expect(verifyButton).toBeVisible();
-                await expect(content).toMatchScreenshot("verify-device-encryption-tab.png");
-                await verifyButton.click();
+            // The user's device is in an unverified state, therefore the only option available to them here is to verify it
+            const verifyButton = dialog.getByRole("button", { name: "Verify this device" });
+            await expect(verifyButton).toBeVisible();
+            await expect(content).toMatchScreenshot("verify-device-encryption-tab.png");
+            await verifyButton.click();

-                await util.verifyDevice(recoveryKey);
+            await util.verifyDevice(recoveryKey);

-                await expect(content).toMatchScreenshot("default-tab.png", {
-                    mask: [content.getByTestId("deviceId"), content.getByTestId("sessionKey")],
-                });
+            await expect(content).toMatchScreenshot("default-tab.png", {
+                mask: [content.getByTestId("deviceId"), content.getByTestId("sessionKey")],
+            });

-                // Check that our device is now cross-signed
-                await checkDeviceIsCrossSigned(app);
+            // Check that our device is now cross-signed
+            await checkDeviceIsCrossSigned(app);

-                // Check that the current device is connected to key backup
-                // The backup decryption key should be in cache also, as we got it directly from the 4S
-                await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, true);
-            },
-        );
+            // Check that the current device is connected to key backup
+            // The backup decryption key should be in cache also, as we got it directly from the 4S
+            await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, true);
+        },
+    );

-        // Test what happens if the cross-signing secrets are in secret storage but are not cached in the local DB.
-        //
-        // This can happen if we verified another device and secret-gossiping failed, or the other device itself lacked the secrets.
-        // We simulate this case by deleting the cached secrets in the indexedDB.
-        test(
-            "should prompt to enter the recovery key when the secrets are not cached locally",
-            { tag: "@screenshot" },
-            async ({ page, app, util }) => {
-                await verifySession(app, recoveryKey.encodedPrivateKey);
-                // We need to delete the cached secrets
-                await deleteCachedSecrets(page);
-
-                await util.openEncryptionTab();
-                // We ask the user to enter the recovery key
-                const dialog = util.getEncryptionTabContent();
-                const enterKeyButton = dialog.getByRole("button", { name: "Enter recovery key" });
-                await expect(enterKeyButton).toBeVisible();
-                await expect(dialog).toMatchScreenshot("out-of-sync-recovery.png");
-                await enterKeyButton.click();
-
-                // Fill the recovery key
-                await util.enterRecoveryKey(recoveryKey);
-                await expect(dialog).toMatchScreenshot("default-tab.png", {
-                    mask: [dialog.getByTestId("deviceId"), dialog.getByTestId("sessionKey")],
-                });
-
-                // Check that our device is now cross-signed
-                await checkDeviceIsCrossSigned(app);
-
-                // Check that the current device is connected to key backup
-                // The backup decryption key should be in cache also, as we got it directly from the 4S
-                await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, true);
-            },
-        );
-
-        test("should display the reset identity panel when the user clicks on 'Forgot recovery key?'", async ({
-            page,
-            app,
-            util,
-        }) => {
+    // Test what happens if the cross-signing secrets are in secret storage but are not cached in the local DB.
+    //
+    // This can happen if we verified another device and secret-gossiping failed, or the other device itself lacked the secrets.
+    // We simulate this case by deleting the cached secrets in the indexedDB.
+    test(
+        "should prompt to enter the recovery key when the secrets are not cached locally",
+        { tag: "@screenshot" },
+        async ({ page, app, util }) => {
            await verifySession(app, recoveryKey.encodedPrivateKey);
            // We need to delete the cached secrets
            await deleteCachedSecrets(page);

-            // The "Key storage is out sync" section is displayed and the user click on the "Forgot recovery key?" button
            await util.openEncryptionTab();
+            // We ask the user to enter the recovery key
            const dialog = util.getEncryptionTabContent();
-            await dialog.getByRole("button", { name: "Forgot recovery key?" }).click();
+            const enterKeyButton = dialog.getByRole("button", { name: "Enter recovery key" });
+            await expect(enterKeyButton).toBeVisible();
+            await expect(dialog).toMatchScreenshot("out-of-sync-recovery.png");
+            await enterKeyButton.click();

-            // The user is prompted to reset their identity
-            await expect(
-                dialog.getByText("Forgot your recovery key? You’ll need to reset your identity."),
-            ).toBeVisible();
-        });
+            // Fill the recovery key
+            await util.enterRecoveryKey(recoveryKey);
+            await expect(dialog).toMatchScreenshot("default-tab.png", {
+                mask: [dialog.getByTestId("deviceId"), dialog.getByTestId("sessionKey")],
+            });

-        test("should warn before turning off key storage", { tag: "@screenshot" }, async ({ page, app, util }) => {
-            await verifySession(app, recoveryKey.encodedPrivateKey);
-            await util.openEncryptionTab();
+            // Check that our device is now cross-signed
+            await checkDeviceIsCrossSigned(app);

-            await page.getByRole("checkbox", { name: "Allow key storage" }).click();
+            // Check that the current device is connected to key backup
+            // The backup decryption key should be in cache also, as we got it directly from the 4S
+            await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, true);
+        },
+    );

-            await expect(
-                page.getByRole("heading", { name: "Are you sure you want to turn off key storage and delete it?" }),
-            ).toBeVisible();
+    test("should display the reset identity panel when the user clicks on 'Forgot recovery key?'", async ({
+        page,
+        app,
+        util,
+    }) => {
+        await verifySession(app, recoveryKey.encodedPrivateKey);
+        // We need to delete the cached secrets
+        await deleteCachedSecrets(page);

-            await expect(util.getEncryptionTabContent()).toMatchScreenshot("delete-key-storage-confirm.png");
+        // The "Key storage is out sync" section is displayed and the user click on the "Forgot recovery key?" button
+        await util.openEncryptionTab();
+        const dialog = util.getEncryptionTabContent();
+        await dialog.getByRole("button", { name: "Forgot recovery key?" }).click();

-            const deleteRequestPromises = [
-                page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.master")),
-                page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.self_signing")),
-                page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.user_signing")),
-                page.waitForRequest((req) => req.url().endsWith("/account_data/m.megolm_backup.v1")),
-                page.waitForRequest((req) => req.url().endsWith("/account_data/m.secret_storage.default_key")),
-                page.waitForRequest((req) => req.url().includes("/account_data/m.secret_storage.key.")),
-            ];
-
-            await page.getByRole("button", { name: "Delete key storage" }).click();
-
-            await expect(page.getByRole("checkbox", { name: "Allow key storage" })).not.toBeChecked();
-
-            for (const prom of deleteRequestPromises) {
-                const request = await prom;
-                expect(request.method()).toBe("PUT");
-                expect(request.postData()).toBe(JSON.stringify({}));
-            }
-        });
+        // The user is prompted to reset their identity
+        await expect(dialog.getByText("Forgot your recovery key? You’ll need to reset your identity.")).toBeVisible();
    });

-    test.describe("when encryption is not set up", () => {
-        test("'Verify this device' allows us to become verified", async ({
-            page,
-            user,
-            credentials,
-            app,
-        }, workerInfo) => {
-            const settings = await app.settings.openUserSettings("Encryption");
+    test("should warn before turning off key storage", { tag: "@screenshot" }, async ({ page, app, util }) => {
+        await verifySession(app, recoveryKey.encodedPrivateKey);
+        await util.openEncryptionTab();

-            // Initially, our device is not verified
-            await expect(settings.getByRole("heading", { name: "Device not verified" })).toBeVisible();
+        await page.getByRole("checkbox", { name: "Allow key storage" }).click();

-            // We will reset our identity
-            await settings.getByRole("button", { name: "Verify this device" }).click();
-            await page.getByRole("button", { name: "Proceed with reset" }).click();
+        await expect(
+            page.getByRole("heading", { name: "Are you sure you want to turn off key storage and delete it?" }),
+        ).toBeVisible();

-            // First try cancelling and restarting
-            await page.getByRole("button", { name: "Cancel" }).click();
-            await page.getByRole("button", { name: "Proceed with reset" }).click();
+        await expect(util.getEncryptionTabContent()).toMatchScreenshot("delete-key-storage-confirm.png");

-            // Then click outside the dialog and restart
-            await page.locator("li").filter({ hasText: "Encryption" }).click({ force: true });
-            await page.getByRole("button", { name: "Proceed with reset" }).click();
+        const deleteRequestPromises = [
+            page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.master")),
+            page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.self_signing")),
+            page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.user_signing")),
+            page.waitForRequest((req) => req.url().endsWith("/account_data/m.megolm_backup.v1")),
+            page.waitForRequest((req) => req.url().endsWith("/account_data/m.secret_storage.default_key")),
+            page.waitForRequest((req) => req.url().includes("/account_data/m.secret_storage.key.")),
+        ];

-            // Finally we actually continue
-            await page.getByRole("button", { name: "Continue" }).click();
+        await page.getByRole("button", { name: "Delete key storage" }).click();

-            // Now we are verified, so we see the Key storage toggle
-            await expect(settings.getByRole("heading", { name: "Key storage" })).toBeVisible();
-        });
+        await expect(page.getByRole("checkbox", { name: "Allow key storage" })).not.toBeChecked();
+
+        for (const prom of deleteRequestPromises) {
+            const request = await prom;
+            expect(request.method()).toBe("PUT");
+            expect(request.postData()).toBe(JSON.stringify({}));
+        }
    });
 });
--- a/playwright/e2e/settings/preferences-user-settings-tab.spec.ts
+++ b/playwright/e2e/settings/preferences-user-settings-tab.spec.ts
@@ -28,10 +28,7 @@ test.describe("Preferences user settings tab", () => {
        const tab = await app.settings.openUserSettings("Preferences");
        // Assert that the top heading is rendered
        await expect(tab.getByRole("heading", { name: "Preferences" })).toBeVisible();
-        await expect(tab).toMatchScreenshot("Preferences-user-settings-tab-should-be-rendered-properly-1.png", {
-            // masked due to daylight saving time
-            mask: [tab.locator("#mx_dropdownUserTimezone_value")],
-        });
+        await expect(tab).toMatchScreenshot("Preferences-user-settings-tab-should-be-rendered-properly-1.png");
    });

    test("should be able to change the app language", { tag: ["@no-firefox", "@no-webkit"] }, async ({ uut, user }) => {
--- a/playwright/e2e/settings/roles-permissions-room-settings-tab.spec.ts
+++ b/playwright/e2e/settings/roles-permissions-room-settings-tab.spec.ts
@@ -37,15 +37,6 @@ test.describe("Roles & Permissions room settings tab", () => {
        // Change the role of Alice to Moderator (50)
        await combobox.selectOption("Moderator");
        await expect(combobox).toHaveValue("50");
-
-        // Should display a modal to warn that we are demoting the only admin user
-        const modal = await page.locator(".mx_Dialog", {
-            hasText: "Warning",
-        });
-        await expect(modal).toBeVisible();
-        // Click on the continue button in the modal
-        await modal.getByRole("button", { name: "Continue" }).click();
-
        const respPromise = page.waitForRequest("**/state/**");
        await applyButton.click();
        await respPromise;
--- a/playwright/e2e/sliding-sync/sliding-sync.spec.ts
+++ b/playwright/e2e/sliding-sync/sliding-sync.spec.ts
@@ -255,8 +255,8 @@ test.describe("Sliding Sync", () => {
        // Select the room to reject
        await page.getByRole("treeitem", { name: "Room to Reject" }).click();

-        // Decline the invite
-        await page.locator(".mx_RoomView").getByRole("button", { name: "Decline", exact: true }).click();
+        // Reject the invite
+        await page.locator(".mx_RoomView").getByRole("button", { name: "Reject", exact: true }).click();

        await expect(
            page.getByRole("group", { name: "Invites" }).locator(".mx_RoomSublist_tiles").getByRole("treeitem"),
--- a/playwright/e2e/timeline/media-preview-settings.spec.ts
+++ b/playwright/e2e/timeline/media-preview-settings.spec.ts
@@ -1,139 +0,0 @@
-/*
-Copyright 2025 New Vector Ltd.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-import * as fs from "node:fs";
-import { type EventType, type MsgType, type RoomJoinRulesEventContent } from "matrix-js-sdk/src/types";
-
-import { test, expect } from "../../element-web-test";
-
-const MEDIA_FILE = fs.readFileSync("playwright/sample-files/riot.png");
-
-test.describe("Media preview settings", () => {
-    test.use({
-        displayName: "Alan",
-        botCreateOpts: {
-            displayName: "Bob",
-        },
-        room: async ({ app, page, homeserver, bot, user }, use) => {
-            const mxc = (await bot.uploadContent(MEDIA_FILE, { name: "image.png", type: "image/png" })).content_uri;
-            const roomId = await bot.createRoom({
-                name: "Test room",
-                invite: [user.userId],
-                initial_state: [{ type: "m.room.avatar", content: { url: mxc }, state_key: "" }],
-            });
-            await bot.sendEvent(roomId, null, "m.room.message" as EventType, {
-                msgtype: "m.image" as MsgType,
-                body: "image.png",
-                url: mxc,
-            });
-
-            await use({ roomId });
-        },
-    });
-
-    test("should be able to hide avatars of inviters", { tag: "@screenshot" }, async ({ page, app, room, user }) => {
-        let settings = await app.settings.openUserSettings("Preferences");
-        await settings.getByLabel("Hide avatars of room and inviter").click();
-        await app.closeDialog();
-        await app.viewRoomById(room.roomId);
-        await expect(
-            page.getByRole("complementary").filter({ hasText: "Do you want to join Test room" }),
-        ).toMatchScreenshot("invite-no-avatar.png", {
-            // Hide the mxid, which is not stable.
-            css: `
-                .mx_RoomPreviewBar_inviter_mxid {
-                    display: none !important;
-                }
-            `,
-        });
-        await expect(
-            page.getByRole("tree", { name: "Rooms" }).getByRole("treeitem", { name: "Test room" }),
-        ).toMatchScreenshot("invite-room-tree-no-avatar.png");
-
-        // And then go back to being visible
-        settings = await app.settings.openUserSettings("Preferences");
-        await settings.getByLabel("Hide avatars of room and inviter").click();
-        await app.closeDialog();
-        await page.goto("#/home");
-        await app.viewRoomById(room.roomId);
-        await expect(
-            page.getByRole("complementary").filter({ hasText: "Do you want to join Test room" }),
-        ).toMatchScreenshot("invite-with-avatar.png", {
-            // Hide the mxid, which is not stable.
-            css: `
-                .mx_RoomPreviewBar_inviter_mxid {
-                    display: none !important;
-                }
-            `,
-        });
-        await expect(
-            page.getByRole("tree", { name: "Rooms" }).getByRole("treeitem", { name: "Test room" }),
-        ).toMatchScreenshot("invite-room-tree-with-avatar.png");
-    });
-
-    test("should be able to hide media in rooms globally", async ({ page, app, room, user }) => {
-        const settings = await app.settings.openUserSettings("Preferences");
-        await settings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always hide" }).click();
-        await app.closeDialog();
-        await app.viewRoomById(room.roomId);
-        await page.getByRole("button", { name: "Accept" }).click();
-        await expect(page.getByText("Show image")).toBeVisible();
-    });
-    test("should be able to hide media in non-private rooms globally", async ({ page, app, room, user, bot }) => {
-        await bot.sendStateEvent(room.roomId, "m.room.join_rules", {
-            join_rule: "public",
-        });
-        const settings = await app.settings.openUserSettings("Preferences");
-        await settings.getByLabel("Show media in timeline").getByLabel("In private rooms").click();
-        await app.closeDialog();
-        await app.viewRoomById(room.roomId);
-        await page.getByRole("button", { name: "Accept" }).click();
-        await expect(page.getByText("Show image")).toBeVisible();
-        for (const joinRule of ["invite", "knock", "restricted"] as RoomJoinRulesEventContent["join_rule"][]) {
-            await bot.sendStateEvent(room.roomId, "m.room.join_rules", {
-                join_rule: joinRule,
-            } satisfies RoomJoinRulesEventContent);
-            await expect(page.getByText("Show image")).not.toBeVisible();
-        }
-    });
-    test("should be able to show media in rooms globally", async ({ page, app, room, user }) => {
-        const settings = await app.settings.openUserSettings("Preferences");
-        await settings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always show" }).click();
-        await app.closeDialog();
-        await app.viewRoomById(room.roomId);
-        await page.getByRole("button", { name: "Accept" }).click();
-        await expect(page.getByText("Show image")).not.toBeVisible();
-    });
-    test("should be able to hide media in an individual room", async ({ page, app, room, user }) => {
-        const settings = await app.settings.openUserSettings("Preferences");
-        await settings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always show" }).click();
-        await app.closeDialog();
-
-        await app.viewRoomById(room.roomId);
-        await page.getByRole("button", { name: "Accept" }).click();
-
-        const roomSettings = await app.settings.openRoomSettings("General");
-        await roomSettings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always hide" }).click();
-        await app.closeDialog();
-
-        await expect(page.getByText("Show image")).toBeVisible();
-    });
-    test("should be able to show media in an individual room", async ({ page, app, room, user }) => {
-        const settings = await app.settings.openUserSettings("Preferences");
-        await settings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always hide" }).click();
-        await app.closeDialog();
-
-        await app.viewRoomById(room.roomId);
-        await page.getByRole("button", { name: "Accept" }).click();
-
-        const roomSettings = await app.settings.openRoomSettings("General");
-        await roomSettings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always show" }).click();
-        await app.closeDialog();
-
-        await expect(page.getByText("Show image")).not.toBeVisible();
-    });
-});
--- a/playwright/e2e/timeline/timeline.spec.ts
+++ b/playwright/e2e/timeline/timeline.spec.ts
@@ -1341,44 +1341,4 @@ test.describe("Timeline", () => {
            );
        });
    });
-
-    test.describe("spoilers", { tag: "@screenshot" }, () => {
-        test("clicking a spoiler containing the pill de-spoilers on 1st click, then follows link on 2nd", async ({
-            page,
-            user,
-            app,
-            room,
-        }) => {
-            // View room
-            await page.goto(`/#/room/${room.roomId}`);
-
-            // Send a spoilered pill
-            await app.client.sendMessage(room.roomId, {
-                msgtype: "m.text",
-                body: user.userId,
-                format: "org.matrix.custom.html",
-                formatted_body: `<span data-mx-spoiler>https://matrix.to/#/${user.userId}</span>`,
-            });
-
-            const screenshotOptions = {
-                css: `
-                    .mx_MessageTimestamp {
-                        display: none !important;
-                    }
-                `,
-            };
-
-            const eventTile = page.locator(".mx_RoomView_body .mx_EventTile_last");
-            await expect(eventTile).toMatchScreenshot("spoiler.png", screenshotOptions);
-
-            const rightPanelButton = page.getByText("Share profile");
-            const pill = page.locator(".mx_UserPill");
-            await pill.click({ force: true }); // force to click the spoiler wrapper instead
-            await expect(eventTile).toMatchScreenshot("spoiler-uncovered.png", screenshotOptions);
-            await expect(rightPanelButton).not.toBeVisible(); // assert the right panel is not yet open
-
-            await pill.click();
-            await expect(rightPanelButton).toBeVisible(); // assert the right panel is open
-        });
-    });
 });
--- a/playwright/pages/ElementAppPage.ts
+++ b/playwright/pages/ElementAppPage.ts
@@ -114,7 +114,7 @@ export class ElementAppPage {
     * @param isRightPanel whether to select the right panel composer, otherwise the main timeline composer
     */
    public getComposerField(isRightPanel?: boolean): Locator {
-        return this.getComposer(isRightPanel).locator("div[contenteditable]");
+        return this.getComposer(isRightPanel).locator("[contenteditable]");
    }

    /**
--- a/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-linux.png
+++ b/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-linux.png
--- a/playwright/snapshots/chat-export/html-export.spec.ts/html-export-linux.png
+++ b/playwright/snapshots/chat-export/html-export.spec.ts/html-export-linux.png
--- a/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-with-user-pill-linux.png
+++ b/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-with-user-pill-linux.png
--- a/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-without-user-linux.png
+++ b/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-dm-without-user-linux.png
--- a/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-room-with-user-pill-linux.png
+++ b/playwright/snapshots/invite/invite-dialog.spec.ts/invite-dialog-room-with-user-pill-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/filter-menu-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/filter-menu-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/room-panel-empty-room-list-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/room-panel-empty-room-list-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-dm-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-dm-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-primary-filters-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-primary-filters-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unselected-primary-filters-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unselected-primary-filters-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-compose-menu-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-compose-menu-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-space-menu-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-space-menu-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-activity-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-activity-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-silent-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-hover-silent-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-invited-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-invited-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mark-as-unread-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mark-as-unread-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mention-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-mention-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-message-preview-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-message-preview-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-notification-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-notification-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-more-options-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-open-notification-options-selection-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-public-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-public-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-silent-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-silent-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-video-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-item-video-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-scrolled-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list.spec.ts/room-list-scrolled-linux.png
--- a/playwright/snapshots/messages/messages.spec.ts/basic-message-ltr-rtldisplayname-linux.png
+++ b/playwright/snapshots/messages/messages.spec.ts/basic-message-ltr-rtldisplayname-linux.png
--- a/playwright/snapshots/messages/messages.spec.ts/basic-message-rtl-rtldisplayname-linux.png
+++ b/playwright/snapshots/messages/messages.spec.ts/basic-message-rtl-rtldisplayname-linux.png
--- a/playwright/snapshots/messages/messages.spec.ts/edited-message-ltr-rtldisplayname-linux.png
+++ b/playwright/snapshots/messages/messages.spec.ts/edited-message-ltr-rtldisplayname-linux.png
--- a/playwright/snapshots/messages/messages.spec.ts/edited-message-rtl-rtldisplayname-linux.png
+++ b/playwright/snapshots/messages/messages.spec.ts/edited-message-rtl-rtldisplayname-linux.png
--- a/playwright/snapshots/messages/messages.spec.ts/emote-ltr-rtldisplayname-linux.png
+++ b/playwright/snapshots/messages/messages.spec.ts/emote-ltr-rtldisplayname-linux.png
--- a/playwright/snapshots/messages/messages.spec.ts/emote-rich-ltr-rtldisplayname-linux.png
+++ b/playwright/snapshots/messages/messages.spec.ts/emote-rich-ltr-rtldisplayname-linux.png
--- a/playwright/snapshots/messages/messages.spec.ts/emote-rich-rtl-rtldisplayname-linux.png
+++ b/playwright/snapshots/messages/messages.spec.ts/emote-rich-rtl-rtldisplayname-linux.png
--- a/playwright/snapshots/messages/messages.spec.ts/emote-rtl-rtldisplayname-linux.png
+++ b/playwright/snapshots/messages/messages.spec.ts/emote-rtl-rtldisplayname-linux.png
--- a/playwright/snapshots/messages/messages.spec.ts/reply-message-ltr-rtldisplayname-linux.png
+++ b/playwright/snapshots/messages/messages.spec.ts/reply-message-ltr-rtldisplayname-linux.png
--- a/playwright/snapshots/messages/messages.spec.ts/reply-message-trl-rtldisplayname-linux.png
+++ b/playwright/snapshots/messages/messages.spec.ts/reply-message-trl-rtldisplayname-linux.png
--- a/playwright/snapshots/oidc/oidc-native.spec.ts/token-expired-linux.png
+++ b/playwright/snapshots/oidc/oidc-native.spec.ts/token-expired-linux.png
--- a/playwright/snapshots/polls/polls.spec.ts/Polls-Timeline-tile-no-votes-linux.png
+++ b/playwright/snapshots/polls/polls.spec.ts/Polls-Timeline-tile-no-votes-linux.png
--- a/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png
+++ b/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png
--- a/playwright/snapshots/register/register.spec.ts/server-picker-linux.png
+++ b/playwright/snapshots/register/register.spec.ts/server-picker-linux.png
--- a/playwright/snapshots/right-panel/file-panel.spec.ts/empty-linux.png
+++ b/playwright/snapshots/right-panel/file-panel.spec.ts/empty-linux.png
--- a/playwright/snapshots/right-panel/right-panel.spec.ts/room-report-dialog-linux.png
+++ b/playwright/snapshots/right-panel/right-panel.spec.ts/room-report-dialog-linux.png
--- a/playwright/snapshots/right-panel/right-panel.spec.ts/with-leave-room-linux.png
+++ b/playwright/snapshots/right-panel/right-panel.spec.ts/with-leave-room-linux.png
--- a/playwright/snapshots/right-panel/right-panel.spec.ts/with-long-name-linux.png
+++ b/playwright/snapshots/right-panel/right-panel.spec.ts/with-long-name-linux.png
--- a/playwright/snapshots/room/invites.spec.ts/Invites-reject-dialog-linux.png
+++ b/playwright/snapshots/room/invites.spec.ts/Invites-reject-dialog-linux.png
--- a/playwright/snapshots/room/invites.spec.ts/Invites-room-view-linux.png
+++ b/playwright/snapshots/room/invites.spec.ts/Invites-room-view-linux.png
--- a/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-linux.png
+++ b/playwright/snapshots/settings/account-user-settings-tab.spec.ts/account-linux.png
--- a/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png
+++ b/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/appearance-tab-linux.png
--- a/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png
+++ b/playwright/snapshots/settings/appearance-user-settings-tab/appearance-user-settings-tab.spec.ts/window-12px-linux.png
--- a/playwright/snapshots/settings/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-bubble-linux.png
+++ b/playwright/snapshots/settings/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-bubble-linux.png
--- a/playwright/snapshots/settings/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-modern-linux.png
+++ b/playwright/snapshots/settings/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-modern-linux.png
--- a/playwright/snapshots/settings/appearance-user-settings-tab/theme-choice-panel.spec.ts/theme-panel-dark-linux.png
+++ b/playwright/snapshots/settings/appearance-user-settings-tab/theme-choice-panel.spec.ts/theme-panel-dark-linux.png
--- a/playwright/snapshots/settings/encryption-user-tab/advanced.spec.ts/encryption-details-linux.png
+++ b/playwright/snapshots/settings/encryption-user-tab/advanced.spec.ts/encryption-details-linux.png
--- a/playwright/snapshots/settings/encryption-user-tab/advanced.spec.ts/reset-cryptographic-identity-linux.png
+++ b/playwright/snapshots/settings/encryption-user-tab/advanced.spec.ts/reset-cryptographic-identity-linux.png
--- a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/default-tab-linux.png
+++ b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/default-tab-linux.png
--- a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/delete-key-storage-confirm-linux.png
+++ b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/delete-key-storage-confirm-linux.png
--- a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/out-of-sync-recovery-linux.png
+++ b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/out-of-sync-recovery-linux.png
--- a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/verify-device-encryption-tab-linux.png
+++ b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/verify-device-encryption-tab-linux.png
--- a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-1-encryption-tab-linux.png
+++ b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-1-encryption-tab-linux.png
--- a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-2-encryption-tab-linux.png
+++ b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-2-encryption-tab-linux.png
--- a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/default-recovery-linux.png
+++ b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/default-recovery-linux.png
--- a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-1-encryption-tab-linux.png
+++ b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-1-encryption-tab-linux.png
--- a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-2-encryption-tab-linux.png
+++ b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-2-encryption-tab-linux.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Telatynski	7121498caa	Simplify Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2025-03-27 13:25:53 +00:00
Michael Telatynski	19f7aabb61	Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2025-03-27 13:17:43 +00:00
Michael Telatynski	dd54f7b35e	Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2025-03-27 13:12:41 +00:00
Michael Telatynski	d55d66ed55	Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/react19/refs # Conflicts: # src/components/views/elements/AppTile.tsx # src/components/views/elements/PersistentApp.tsx # src/components/views/messages/CodeBlock.tsx # src/components/views/rooms/wysiwyg_composer/EditWysiwygComposer.tsx # src/components/views/rooms/wysiwyg_composer/SendWysiwygComposer.tsx # src/components/views/rooms/wysiwyg_composer/components/PlainTextComposer.tsx	2025-03-27 12:35:46 +00:00
Michael Telatynski	98bfb6cccd	Update usages of refs for React 19 compatibility Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2025-03-18 23:52:58 +00:00