Use cache for Playwright testcontainers images

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

.eslintignore

@@ -7,4 +7,3 @@ test/end-to-end-tests/lib/
 src/component-index.js
 # Auto-generated file
 src/modules.ts
-src/modules.js

.eslintrc.js

@@ -1,5 +1,5 @@
 module.exports = {
-    plugins: ["matrix-org", "eslint-plugin-react-compiler"],
+    plugins: ["matrix-org"],
     extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react", "plugin:matrix-org/a11y"],
     parserOptions: {
         project: ["./tsconfig.json"],
@@ -170,8 +170,6 @@ module.exports = {
         "jsx-a11y/role-supports-aria-props": "off",
 
         "matrix-org/require-copyright-header": "error",
-
-        "react-compiler/react-compiler": "error",
     },
     overrides: [
         {
@@ -264,7 +262,6 @@ module.exports = {
 
                 // These are fine in tests
                 "no-restricted-globals": "off",
-                "react-compiler/react-compiler": "off",
             },
         },
         {
@@ -274,7 +271,6 @@ module.exports = {
             },
             rules: {
                 "react-hooks/rules-of-hooks": ["off"],
-                "@typescript-eslint/no-floating-promises": ["error"],
             },
         },
         {

.github/CODEOWNERS

@@ -3,18 +3,13 @@
 /package.json             @element-hq/element-web-team
 /yarn.lock                @element-hq/element-web-team
 
-/src/SecurityManager.ts                                                 @element-hq/element-crypto-web-reviewers
-/test/SecurityManager-test.ts                                           @element-hq/element-crypto-web-reviewers
-/src/async-components/views/dialogs/security/                           @element-hq/element-crypto-web-reviewers
-/src/components/views/dialogs/security/                                 @element-hq/element-crypto-web-reviewers
-/test/components/views/dialogs/security/                                @element-hq/element-crypto-web-reviewers
-/src/stores/SetupEncryptionStore.ts                                     @element-hq/element-crypto-web-reviewers
-/test/stores/SetupEncryptionStore-test.ts                               @element-hq/element-crypto-web-reviewers
-/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx  @element-hq/element-crypto-web-reviewers
-/src/src/components/views/settings/encryption/                          @element-hq/element-crypto-web-reviewers
-/test/unit-tests/components/views/settings/encryption/                  @element-hq/element-crypto-web-reviewers
-/playwright/e2e/settings/encryption-user-tab/                           @element-hq/element-crypto-web-reviewers
-/src/components/views/dialogs/devtools/Crypto.tsx                       @element-hq/element-crypto-web-reviewers
+/src/SecurityManager.ts                           @element-hq/element-crypto-web-reviewers
+/test/SecurityManager-test.ts                     @element-hq/element-crypto-web-reviewers
+/src/async-components/views/dialogs/security/     @element-hq/element-crypto-web-reviewers
+/src/components/views/dialogs/security/           @element-hq/element-crypto-web-reviewers
+/test/components/views/dialogs/security/          @element-hq/element-crypto-web-reviewers
+/src/stores/SetupEncryptionStore.ts               @element-hq/element-crypto-web-reviewers
+/test/stores/SetupEncryptionStore-test.ts         @element-hq/element-crypto-web-reviewers
 
 # Ignore translations as those will be updated by GHA for Localazy download
 /src/i18n/strings

.github/labels.yml

@@ -235,15 +235,6 @@
 - name: "Z-Flaky-Test"
   description: "A test is raising false alarms"
   color: "ededed"
-- name: "Z-Flaky-Test-Chrome"
-  description: "Flaky playwright test in Chrome"
-  color: "ededed"
-- name: "Z-Flaky-Test-Firefox"
-  description: "Flaky playwright test in Firefox"
-  color: "ededed"
-- name: "Z-Flaky-Test-Webkit"
-  description: "Flaky playwright test in Webkit"
-  color: "ededed"
 - name: "Z-Flaky-Jest-Test"
   description: "A Jest test is raising false alarms"
   color: "ededed"

.github/workflows/build.yml

@@ -27,17 +27,10 @@ jobs:
                     - macos-14
                 isDevelop:
                     - ${{ github.event_name == 'push' && github.ref_name == 'develop' }}
-                isPullRequest:
-                    - ${{ github.event_name == 'pull_request' }}
                 # Skip the ubuntu-24.04 build for the develop branch as the dedicated CD build_develop workflow handles that
-                # Skip the non-linux builds for pull requests as Windows is awfully slow, so run in merge queue only
                 exclude:
                     - isDevelop: true
                       image: ubuntu-24.04
-                    - isPullRequest: true
-                      image: windows-2022
-                    - isPullRequest: true
-                      image: macos-14
         runs-on: ${{ matrix.image }}
         defaults:
             run:

.github/workflows/build_develop.yml

@@ -26,12 +26,6 @@ jobs:
             R2_URL: ${{ vars.CF_R2_S3_API }}
             R2_PUBLIC_URL: "https://element-web-develop.element.io"
         steps:
-            # Workaround for https://www.cloudflarestatus.com/incidents/t5nrjmpxc1cj
-            - uses: unfor19/install-aws-cli-action@v1
-              with:
-                  version: 2.22.35
-                  verbose: false
-                  arch: amd64
             - uses: actions/checkout@v4
 
             - uses: actions/setup-node@v4

.github/workflows/deploy.yml

@@ -96,4 +96,3 @@ jobs:
                   projectName: ${{ env.SITE == 'staging.element.io' && 'element-web-staging' || 'element-web' }}
                   directory: _deploy
                   gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-                  branch: main

.github/workflows/dockerhub.yaml

@@ -51,7 +51,7 @@ jobs:
 
             - name: Build and push
               id: build-and-push
-              uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6
+              uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6
               with:
                   context: .
                   push: true

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

@@ -48,6 +48,7 @@ jobs:
         outputs:
             num-runners: ${{ env.NUM_RUNNERS }}
             runners-matrix: ${{ steps.runner-vars.outputs.matrix }}
+            docker-cache-key: ${{ steps.runner-vars.outputs.docker-cache-key }}
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
@@ -80,6 +81,12 @@ jobs:
               run: |
                   yarn build
 
+            # Heuristic for calculating a cache key which is based on all images we pass to testcontainers
+            - name: Calculate docker cache key
+              run: |
+                  grep -hr "Container(\"" --exclude-dir=snapshots --exclude-dir=sample-files playwright >> _docker_cache_key
+                  grep -hr -C1 "super(" playwright/testcontainers/ >> _docker_cache_key
+
             - name: Upload Artifact
               uses: actions/upload-artifact@v4
               with:
@@ -90,11 +97,14 @@ jobs:
             - name: Calculate runner variables
               id: runner-vars
               uses: actions/github-script@v7
+              env:
+                  DOCKER_CACHE_KEY: ${{ hashFiles('_docker_cache_key') }}
               with:
                   script: |
                       const numRunners = parseInt(process.env.NUM_RUNNERS, 10);
                       const matrix = Array.from({ length: numRunners }, (_, i) => i + 1);
                       core.setOutput("matrix", JSON.stringify(matrix));
+                      core.setOutput("docker-cache-key", process.env.DOCKER_CACHE_KEY);
 
     playwright:
         name: "Run Tests [${{ matrix.project }}] ${{ matrix.runner }}/${{ needs.build.outputs.num-runners }}"
@@ -114,8 +124,6 @@ jobs:
                     - Chrome
                     - Firefox
                     - WebKit
-                    - Dendrite
-                    - Pinecone
                 runAllTests:
                     - ${{ github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'X-Run-All-Tests') }}
                 # Skip the Firefox & Safari runs unless this was a cron trigger or PR has X-Run-All-Tests label
@@ -124,10 +132,6 @@ jobs:
                       project: Firefox
                     - runAllTests: false
                       project: WebKit
-                    - runAllTests: false
-                      project: Dendrite
-                    - runAllTests: false
-                      project: Pinecone
         steps:
             - uses: actions/checkout@v4
               with:
@@ -170,6 +174,11 @@ jobs:
               if: matrix.project == 'WebKit' && steps.playwright-cache.outputs.cache-hit == 'true'
               run: yarn playwright install-deps webkit
 
+            - name: Docker image cache
+              uses: ScribeMD/docker-cache@fb28c93772363301b8d0a6072ce850224b73f74e # 0.5.0
+              with:
+                  key: ${{ needs.build.outputs.docker-cache-key }}
+
             # We skip tests tagged with @mergequeue when running on PRs, but run them in MQ and everywhere else
             - name: Run Playwright tests
               run: |

.github/workflows/playwright-image-updates.yaml

@@ -17,7 +17,7 @@ jobs:
                   docker pull "$IMAGE"
                   INSPECT=$(docker inspect --format='{{index .RepoDigests 0}}' "$IMAGE")
                   DIGEST=${INSPECT#*@}
-                  sed -i "s/const TAG.*/const TAG = \"develop@$DIGEST\";/" playwright/testcontainers/synapse.ts
+                  sed -i "s,`$IMAGE.*`,`$IMAGE@$DIGEST`," playwright/testcontainers/synapse.ts
               env:
                   IMAGE: ghcr.io/element-hq/synapse:develop
 

.github/workflows/static_analysis.yaml

@@ -132,3 +132,9 @@ jobs:
 
             - name: Run linter
               run: "yarn run lint:knip"
+
+            - name: Install Deps
+              run: "scripts/layered.sh"
+
+            - name: Dead Code Analysis
+              run: "yarn run analyse:unused-exports"

.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@ecd54a02cf761e85a8fb328fe937710fd4227cda
+              uses: guibranco/github-status-action-v2@56cd38caf0615dd03f49d42ed301f1469911ac61
               with:
                   authToken: ${{ secrets.GITHUB_TOKEN }}
                   state: success

.gitignore

@@ -26,7 +26,6 @@ electron/pub
 /coverage
 # Auto-generated file
 /src/modules.ts
-/src/modules.js
 /build_config.yaml
 /book
 /index.html

.prettierignore

@@ -17,7 +17,6 @@ electron/pub
 /coverage
 # Auto-generated file
 /src/modules.ts
-/src/modules.js
 /src/i18n/strings
 /build_config.yaml
 # Raises an error because it contains a template var breaking the script tag

.stylelintrc.js

@@ -33,15 +33,19 @@ module.exports = {
         "import-notation": null,
         "value-keyword-case": null,
         "declaration-block-no-redundant-longhand-properties": null,
+        "declaration-block-no-duplicate-properties": [
+            true,
+            // useful for fallbacks
+            { ignore: ["consecutive-duplicates-with-different-values"] },
+        ],
         "shorthand-property-no-redundant-values": null,
         "property-no-vendor-prefix": null,
+        "value-no-vendor-prefix": null,
         "selector-no-vendor-prefix": null,
         "media-feature-name-no-vendor-prefix": null,
         "number-max-precision": null,
         "no-invalid-double-slash-comments": true,
         "media-feature-range-notation": null,
-        "declaration-property-value-no-unknown": null,
-        "declaration-property-value-keyword-no-deprecated": null,
         "csstools/value-no-unknown-custom-properties": [
             true,
             {

CHANGELOG.md

@@ -1,72 +1,3 @@
-Changes in [1.11.92](https://github.com/element-hq/element-web/releases/tag/v1.11.92) (2025-02-11)
-==================================================================================================
-## ✨ Features
-
-* [Backport staging] Log when we show, and hide, encryption setup toasts ([#29238](https://github.com/element-hq/element-web/pull/29238)). Contributed by @richvdh.
-* Make profile header section match the designs ([#29163](https://github.com/element-hq/element-web/pull/29163)). Contributed by @MidhunSureshR.
-* Always show back button in the right panel ([#29128](https://github.com/element-hq/element-web/pull/29128)). Contributed by @MidhunSureshR.
-* Schedule dehydration on reload if the dehydration key is already cached locally ([#29021](https://github.com/element-hq/element-web/pull/29021)). Contributed by @uhoreg.
-* update to twemoji 15.1.0 ([#29115](https://github.com/element-hq/element-web/pull/29115)). Contributed by @ara4n.
-* Update matrix-widget-api ([#29112](https://github.com/element-hq/element-web/pull/29112)). Contributed by @toger5.
-* Allow navigating through the memberlist using up/down keys ([#28949](https://github.com/element-hq/element-web/pull/28949)). Contributed by @MidhunSureshR.
-* Style room header icons and facepile for toggled state ([#28968](https://github.com/element-hq/element-web/pull/28968)). Contributed by @MidhunSureshR.
-* Move threads header below base card header ([#28969](https://github.com/element-hq/element-web/pull/28969)). Contributed by @MidhunSureshR.
-* Add `Advanced` section to the user settings encryption tab ([#28804](https://github.com/element-hq/element-web/pull/28804)). Contributed by @florianduros.
-* Fix outstanding UX issues with replies/mentions/keyword notifs ([#28270](https://github.com/element-hq/element-web/pull/28270)). Contributed by @taffyko.
-* Distinguish room state and timeline events when dealing with widgets ([#28681](https://github.com/element-hq/element-web/pull/28681)). Contributed by @robintown.
-* Switch OIDC primarily to new `/auth_metadata` API ([#29019](https://github.com/element-hq/element-web/pull/29019)). Contributed by @t3chguy.
-* More memberlist changes ([#29069](https://github.com/element-hq/element-web/pull/29069)). Contributed by @MidhunSureshR.
-
-## 🐛 Bug Fixes
-
-* [Backport staging] Wire up the "Forgot recovery key" button for the "Key storage out of sync" toast ([#29190](https://github.com/element-hq/element-web/pull/29190)). Contributed by @RiotRobot.
-* Encryption tab: hide `Advanced` section when the key storage is out of sync ([#29129](https://github.com/element-hq/element-web/pull/29129)). Contributed by @florianduros.
-* Fix share button in discovery settings being disabled incorrectly ([#29151](https://github.com/element-hq/element-web/pull/29151)). Contributed by @t3chguy.
-* Ensure switching rooms does not wrongly focus timeline search ([#29153](https://github.com/element-hq/element-web/pull/29153)). Contributed by @t3chguy.
-* Stop showing a dialog prompting the user to enter an old recovery key ([#29143](https://github.com/element-hq/element-web/pull/29143)). Contributed by @richvdh.
-* Make themed widgets reflect the effective theme ([#28342](https://github.com/element-hq/element-web/pull/28342)). Contributed by @robintown.
-* support non-VS16 emoji ligatures in TwemojiMozilla ([#29100](https://github.com/element-hq/element-web/pull/29100)). Contributed by @ara4n.
-* e2e test: Verify session with the encryption tab instead of the security \& privacy tab ([#29090](https://github.com/element-hq/element-web/pull/29090)). Contributed by @florianduros.
-* Work around cloudflare R2 / aws client incompatability ([#29086](https://github.com/element-hq/element-web/pull/29086)). Contributed by @dbkr.
-* Fix identity server settings visibility ([#29083](https://github.com/element-hq/element-web/pull/29083)). Contributed by @dbkr.
-
-
-Changes in [1.11.91](https://github.com/element-hq/element-web/releases/tag/v1.11.91) (2025-01-28)
-==================================================================================================
-## ✨ Features
-
-* Implement changes to memberlist from feedback ([#29029](https://github.com/element-hq/element-web/pull/29029)). Contributed by @MidhunSureshR.
-* Add toast for recovery keys being out of sync ([#28946](https://github.com/element-hq/element-web/pull/28946)). Contributed by @dbkr.
-* Refactor LegacyCallHandler event emitter to use TypedEventEmitter ([#29008](https://github.com/element-hq/element-web/pull/29008)). Contributed by @t3chguy.
-* Add `Recovery` section in the new user settings `Encryption` tab ([#28673](https://github.com/element-hq/element-web/pull/28673)). Contributed by @florianduros.
-* Retry loading chunks to make the app more resilient ([#29001](https://github.com/element-hq/element-web/pull/29001)). Contributed by @t3chguy.
-* Clear account idb table on logout ([#28996](https://github.com/element-hq/element-web/pull/28996)). Contributed by @t3chguy.
-* Implement new memberlist design with MVVM architecture  ([#28874](https://github.com/element-hq/element-web/pull/28874)). Contributed by @MidhunSureshR.
-
-## 🐛 Bug Fixes
-
-* [Backport staging] Switch to secure random strings ([#29035](https://github.com/element-hq/element-web/pull/29035)). Contributed by @RiotRobot.
-* React to MatrixEvent sender/target being updated for rendering state events ([#28947](https://github.com/element-hq/element-web/pull/28947)). Contributed by @t3chguy.
-
-
-Changes in [1.11.90](https://github.com/element-hq/element-web/releases/tag/v1.11.90) (2025-01-14)
-==================================================================================================
-## ✨ Features
-
-* Docker: run as non-root ([#28849](https://github.com/element-hq/element-web/pull/28849)). Contributed by @richvdh.
-* Docker: allow configuration of HTTP listen port via env var ([#28840](https://github.com/element-hq/element-web/pull/28840)). Contributed by @richvdh.
-* Update matrix-wysiwyg to consume WASM asset ([#28838](https://github.com/element-hq/element-web/pull/28838)). Contributed by @t3chguy.
-* OIDC settings tweaks ([#28787](https://github.com/element-hq/element-web/pull/28787)). Contributed by @t3chguy.
-* Delabs native OIDC support ([#28615](https://github.com/element-hq/element-web/pull/28615)). Contributed by @t3chguy.
-* Move room header info button to right-most position ([#28754](https://github.com/element-hq/element-web/pull/28754)). Contributed by @t3chguy.
-* Enable key backup by default ([#28691](https://github.com/element-hq/element-web/pull/28691)). Contributed by @dbkr.
-
-## 🐛 Bug Fixes
-
-* Fix building the automations mermaid diagram ([#28881](https://github.com/element-hq/element-web/pull/28881)). Contributed by @dbkr.
-* Playwright: wait for the network listener on the postgres db ([#28808](https://github.com/element-hq/element-web/pull/28808)). Contributed by @dbkr.
-
-
 Changes in [1.11.89](https://github.com/element-hq/element-web/releases/tag/v1.11.89) (2024-12-18)
 ==================================================================================================
 This is a patch release to fix a bug which could prevent loading stored crypto state from storage, and also to fix URL previews when switching back to a room.

__mocks__/maplibre-gl.js

@@ -17,7 +17,6 @@ class MockMap extends EventEmitter {
     setCenter = jest.fn();
     setStyle = jest.fn();
     fitBounds = jest.fn();
-    remove = jest.fn();
 }
 const MockMapInstance = new MockMap();
 

docs/playwright.md

@@ -66,20 +66,17 @@ as is typical for Playwright tests. Likewise, tests live in `playwright/e2e`.
 of Synapse/Dendrite. These servers are what Element-web runs against in the tests.
 
 Synapse can be launched with different configurations in order to test element
-in different configurations. You can specify `synapseConfig` as such:
+in different configurations. You can specify `synapseConfigOptions` as such:
 
 ```typescript
 test.use({
-    synapseConfig: {
+    synapseConfigOptions: {
         // The config options to pass to the Synapse instance
     },
 });
 ```
 
 The appropriate homeserver will be launched by the Playwright worker and reused for all tests which match the worker configuration.
-Due to homeservers being reused between tests, please use unique names for any rooms put into the room directory as
-they may be visible from other tests, the suggested approach is to use `testInfo.testId` within the name or lodash's uniqueId.
-We remove public rooms from the room directory between tests but deleting users doesn't have a homeserver agnostic solution.
 The logs from testcontainers will be attached to any reports output from Playwright.
 
 ## Writing Tests

docs/release.md

@@ -8,13 +8,11 @@
 
 #### develop
 
-The develop branch holds the very latest and greatest code we have to offer, as such it may be less stable.
-It is auto-deployed on every commit to element-web or matrix-js-sdk to develop.element.io via GitHub Actions `build_develop.yml`.
+The develop branch holds the very latest and greatest code we have to offer, as such it may be less stable. It corresponds to the develop.element.io CD platform.
 
 #### staging
 
 The staging branch corresponds to the very latest release regardless of whether it is an RC or not. Deployed to staging.element.io manually.
-It is auto-deployed on every release of element-web to staging.element.io via GitHub Actions `deploy.yml`.
 
 #### master
 
@@ -217,7 +215,7 @@ We ship Element Web to dockerhub, `*.element.io`, and packages.element.io.
 We ship Element Desktop to packages.element.io.
 
 - [ ] Check that element-web has shipped to dockerhub
-- [ ] Check that the staging [deployment](https://github.com/element-hq/element-web/actions/workflows/deploy.yml) has completed successfully
+- [ ] Deploy staging.element.io. [See docs.](https://handbook.element.io/books/element-web-team/page/deploying-appstagingelementio)
 - [ ] Test staging.element.io
 
 For final releases additionally do these steps:
@@ -227,9 +225,6 @@ For final releases additionally do these steps:
 - [ ] Ensure Element Web package has shipped to packages.element.io
 - [ ] Ensure Element Desktop packages have shipped to packages.element.io
 
-If you need to roll back a deployment to staging.element.io,
-you can run the `deploy.yml` automation choosing an older tag which you wish to deploy.
-
 # Housekeeping
 
 We have some manual housekeeping to do in order to prepare for the next release.

knip.ts

@@ -10,13 +10,13 @@ export default {
         "playwright/**",
         "test/**",
         "res/decoder-ring/**",
-        "res/jitsi_external_api.min.js",
-        "docs/**",
-        // Used by jest
-        "__mocks__/maplibre-gl.js",
     ],
     project: ["**/*.{js,ts,jsx,tsx}"],
     ignore: [
+        "docs/**",
+        "res/jitsi_external_api.min.js",
+        // Used by jest
+        "__mocks__/maplibre-gl.js",
         // Keep for now
         "src/hooks/useLocalStorageState.ts",
         "src/components/views/elements/InfoTooltip.tsx",
@@ -37,8 +37,13 @@ export default {
         // False positive
         "sw.js",
         // Used by webpack
+        "buffer",
         "process",
         "util",
+        // Used by workflows
+        "ts-prune",
+        // Required due to bug in bloom-filters https://github.com/Callidon/bloom-filters/issues/75
+        "@types/seedrandom",
     ],
     ignoreBinaries: [
         // Used in scripts & workflows

module_system/installer.ts

@@ -23,9 +23,10 @@ const MODULES_TS_HEADER = `
  * You are not a salmon.
  */
 
+import { RuntimeModule } from "@matrix-org/react-sdk-module-api/lib/RuntimeModule";
 `;
 const MODULES_TS_DEFINITIONS = `
-export const INSTALLED_MODULES = [];
+export const INSTALLED_MODULES: RuntimeModule[] = [];
 `;
 
 export function installer(config: BuildConfig): void {
@@ -77,8 +78,8 @@ export function installer(config: BuildConfig): void {
             return; // hit the finally{} block before exiting
         }
 
-        // If we reach here, everything seems fine. Write modules.js and log some output
-        // Note: we compile modules.js in two parts for developer friendliness if they
+        // If we reach here, everything seems fine. Write modules.ts and log some output
+        // Note: we compile modules.ts in two parts for developer friendliness if they
         // happen to look at it.
         console.log("The following modules have been installed: ", installedModules);
         let modulesTsHeader = MODULES_TS_HEADER;
@@ -192,5 +193,5 @@ function isModuleVersionCompatible(ourApiVersion: string, moduleApiVersion: stri
 }
 
 function writeModulesTs(content: string): void {
-    fs.writeFileSync("./src/modules.js", content, "utf-8");
+    fs.writeFileSync("./src/modules.ts", content, "utf-8");
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.92",
+    "version": "1.11.89",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -66,6 +66,7 @@
         "test:playwright:screenshots:build": "docker build playwright -t element-web-playwright",
         "test:playwright:screenshots:run": "docker run --rm --network host -e BASE_URL -e CI -v $(pwd):/work/ -v $(node -e 'console.log(require(`path`).dirname(require.resolve(`matrix-js-sdk/package.json`)))'):/work/node_modules/matrix-js-sdk -v /var/run/docker.sock:/var/run/docker.sock -v /tmp/:/tmp/ -it element-web-playwright --grep @screenshot --project=Chrome",
         "coverage": "yarn test --coverage",
+        "analyse:unused-exports": "ts-node ./scripts/analyse_unused_exports.ts",
         "analyse:webpack-bundles": "webpack-bundle-analyzer webpack-stats.json webapp",
         "update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js"
     },
@@ -74,7 +75,7 @@
         "@types/react-dom": "18.3.5",
         "oidc-client-ts": "3.1.0",
         "jwt-decode": "4.0.0",
-        "caniuse-lite": "1.0.30001692",
+        "caniuse-lite": "1.0.30001690",
         "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0",
         "wrap-ansi": "npm:wrap-ansi@^7.0.0"
     },
@@ -84,14 +85,13 @@
         "@fontsource/inter": "^5",
         "@formatjs/intl-segmenter": "^11.5.7",
         "@matrix-org/analytics-events": "^0.29.0",
-        "@matrix-org/emojibase-bindings": "^1.3.4",
+        "@matrix-org/emojibase-bindings": "^1.3.3",
         "@matrix-org/react-sdk-module-api": "^2.4.0",
         "@matrix-org/spec": "^1.7.0",
         "@sentry/browser": "^8.0.0",
         "@types/png-chunks-extract": "^1.0.2",
-        "@types/react-virtualized": "^9.21.30",
         "@vector-im/compound-design-tokens": "^2.1.0",
-        "@vector-im/compound-web": "^7.6.1",
+        "@vector-im/compound-web": "^7.5.0",
         "@vector-im/matrix-wysiwyg": "2.38.0",
         "@zxcvbn-ts/core": "^3.0.4",
         "@zxcvbn-ts/language-common": "^3.0.4",
@@ -127,7 +127,7 @@
         "maplibre-gl": "^5.0.0",
         "matrix-encrypt-attachment": "^1.0.3",
         "matrix-events-sdk": "0.0.1",
-        "matrix-js-sdk": "36.2.0",
+        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
         "matrix-widget-api": "^1.10.0",
         "memoize-one": "^6.0.0",
         "mime": "^4.0.4",
@@ -144,7 +144,6 @@
         "react-dom": "^18.3.1",
         "react-focus-lock": "^2.5.1",
         "react-transition-group": "^4.4.1",
-        "react-virtualized": "^9.22.5",
         "rfc4648": "^1.4.0",
         "sanitize-filename": "^1.6.3",
         "sanitize-html": "2.14.0",
@@ -152,7 +151,9 @@
         "temporal-polyfill": "^0.2.5",
         "ua-parser-js": "^1.0.2",
         "uuid": "^11.0.0",
-        "what-input": "^5.2.10"
+        "what-input": "^5.2.10",
+        "@types/react-virtualized": "^9.21.30",
+        "react-virtualized": "^9.22.5"
     },
     "devDependencies": {
         "@action-validator/cli": "^0.6.0",
@@ -178,7 +179,7 @@
         "@peculiar/webcrypto": "^1.4.3",
         "@playwright/test": "^1.40.1",
         "@principalstudio/html-webpack-inject-preload": "^1.2.7",
-        "@sentry/webpack-plugin": "^3.0.0",
+        "@sentry/webpack-plugin": "^2.7.1",
         "@stylistic/eslint-plugin": "^2.9.0",
         "@svgr/webpack": "^8.0.0",
         "@testcontainers/postgresql": "^10.16.0",
@@ -230,14 +231,13 @@
         "dotenv": "^16.0.2",
         "eslint": "8.57.1",
         "eslint-config-google": "^0.14.0",
-        "eslint-config-prettier": "^10.0.0",
+        "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-deprecate": "0.8.5",
         "eslint-plugin-import": "^2.25.4",
         "eslint-plugin-jest": "^28.0.0",
         "eslint-plugin-jsx-a11y": "^6.5.1",
         "eslint-plugin-matrix-org": "^2.0.2",
         "eslint-plugin-react": "^7.28.0",
-        "eslint-plugin-react-compiler": "^19.0.0-beta-df7b47d-20241124",
         "eslint-plugin-react-hooks": "^5.0.0",
         "eslint-plugin-unicorn": "^56.0.0",
         "express": "^4.18.2",
@@ -256,7 +256,7 @@
         "jsqr": "^1.4.0",
         "knip": "^5.36.2",
         "lint-staged": "^15.0.2",
-        "mailpit-api": "^1.0.5",
+        "mailhog": "^4.16.0",
         "matrix-web-i18n": "^3.2.1",
         "mini-css-extract-plugin": "2.9.2",
         "minimist": "^1.2.6",
@@ -280,21 +280,21 @@
         "semver": "^7.5.2",
         "source-map-loader": "^5.0.0",
         "strip-ansi": "^7.1.0",
-        "stylelint": "^16.13.0",
-        "stylelint-config-standard": "^37.0.0",
+        "stylelint": "^16.1.0",
+        "stylelint-config-standard": "^36.0.0",
         "stylelint-scss": "^6.0.0",
         "stylelint-value-no-unknown-custom-properties": "^6.0.1",
         "terser-webpack-plugin": "^5.3.9",
         "testcontainers": "^10.16.0",
         "ts-node": "^10.9.1",
-        "typescript": "5.7.3",
+        "ts-prune": "^0.10.3",
+        "typescript": "5.7.2",
         "util": "^0.12.5",
         "web-streams-polyfill": "^4.0.0",
         "webpack": "^5.89.0",
         "webpack-bundle-analyzer": "^4.8.0",
         "webpack-cli": "^6.0.0",
         "webpack-dev-server": "^5.0.0",
-        "webpack-retry-chunk-load-plugin": "^3.1.1",
         "webpack-version-file-plugin": "^0.5.0",
         "yaml": "^2.3.3"
     },

playwright.config.ts

@@ -8,25 +8,19 @@ Please see LICENSE files in the repository root for full details.
 
 import { defineConfig, devices } from "@playwright/test";
 
-import { Options } from "./playwright/services";
-
 const baseURL = process.env["BASE_URL"] ?? "http://localhost:8080";
 
-const chromeProject = {
-    ...devices["Desktop Chrome"],
-    channel: "chromium",
-    permissions: ["clipboard-write", "clipboard-read", "microphone"],
-    launchOptions: {
-        args: ["--use-fake-ui-for-media-stream", "--use-fake-device-for-media-stream", "--mute-audio"],
-    },
-};
-
-export default defineConfig<Options>({
+export default defineConfig({
     projects: [
         {
             name: "Chrome",
             use: {
-                ...chromeProject,
+                ...devices["Desktop Chrome"],
+                channel: "chromium",
+                permissions: ["clipboard-write", "clipboard-read", "microphone"],
+                launchOptions: {
+                    args: ["--use-fake-ui-for-media-stream", "--use-fake-device-for-media-stream", "--mute-audio"],
+                },
             },
         },
         {
@@ -54,22 +48,6 @@ export default defineConfig<Options>({
             },
             ignoreSnapshots: true,
         },
-        {
-            name: "Dendrite",
-            use: {
-                ...chromeProject,
-                homeserverType: "dendrite",
-            },
-            ignoreSnapshots: true,
-        },
-        {
-            name: "Pinecone",
-            use: {
-                ...chromeProject,
-                homeserverType: "pinecone",
-            },
-            ignoreSnapshots: true,
-        },
     ],
     use: {
         viewport: { width: 1280, height: 720 },

playwright/e2e/accessibility/keyboard-navigation.spec.ts

@@ -123,7 +123,7 @@ test.describe("Landmark navigation tests", () => {
         await expect(page.getByText("Bob joined the room")).toBeVisible();
 
         // Close the room
-        await page.goto("/#/home");
+        page.goto("/#/home");
 
         // Pressing Control+F6 will first focus the space button
         await page.keyboard.press("ControlOrMeta+F6");

playwright/e2e/app-loading/guest-registration.spec.ts

@@ -13,7 +13,7 @@ Please see LICENSE files in the repository root for full details.
 import { expect, test } from "../../element-web-test";
 
 test.use({
-    synapseConfig: {
+    synapseConfigOptions: {
         allow_guest_access: true,
     },
 });

playwright/e2e/audio-player/audio-player.spec.ts

@@ -13,14 +13,6 @@ import { SettingLevel } from "../../../src/settings/SettingLevel";
 import { Layout } from "../../../src/settings/enums/Layout";
 import { ElementAppPage } from "../../pages/ElementAppPage";
 
-// Find and click "Reply" button
-const clickButtonReply = async (tile: Locator) => {
-    await expect(async () => {
-        await tile.hover();
-        await tile.getByRole("button", { name: "Reply", exact: true }).click();
-    }).toPass();
-};
-
 test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
     test.use({
         displayName: "Hanako",
@@ -230,7 +222,8 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
 
             // Find and click "Reply" button on MessageActionBar
             const tile = page.locator(".mx_EventTile_last");
-            await clickButtonReply(tile);
+            await tile.hover();
+            await tile.getByRole("button", { name: "Reply", exact: true }).click();
 
             // Reply to the player with another audio file
             await uploadFile(page, "playwright/sample-files/1sec.ogg");
@@ -258,12 +251,18 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
 
             const tile = page.locator(".mx_EventTile_last");
 
+            // Find and click "Reply" button
+            const clickButtonReply = async () => {
+                await tile.hover();
+                await tile.getByRole("button", { name: "Reply", exact: true }).click();
+            };
+
             await uploadFile(page, "playwright/sample-files/upload-first.ogg");
 
             // Assert that the audio player is rendered
             await expect(page.locator(".mx_EventTile_last .mx_AudioPlayer_container")).toBeVisible();
 
-            await clickButtonReply(tile);
+            await clickButtonReply();
 
             // Reply to the player with another audio file
             await uploadFile(page, "playwright/sample-files/upload-second.ogg");
@@ -271,7 +270,7 @@ test.describe("Audio player", { tag: ["@no-firefox", "@no-webkit"] }, () => {
             // Assert that the audio player is rendered
             await expect(page.locator(".mx_EventTile_last .mx_AudioPlayer_container")).toBeVisible();
 
-            await clickButtonReply(tile);
+            await clickButtonReply();
 
             // Reply to the player with yet another audio file to create a reply chain
             await uploadFile(page, "playwright/sample-files/upload-third.ogg");

playwright/e2e/chat-export/html-export.spec.ts

@@ -95,7 +95,7 @@ test.describe("HTML Export", () => {
         async ({ page, app, room }) => {
             // Set a fixed time rather than masking off the line with the time in it: we don't need to worry
             // about the width changing and we can actually test this line looks correct.
-            await page.clock.setSystemTime(new Date("2024-01-01T00:00:00Z"));
+            page.clock.setSystemTime(new Date("2024-01-01T00:00:00Z"));
 
             // Send a bunch of messages to populate the room
             for (let i = 1; i < 10; i++) {

playwright/e2e/composer/RTE.spec.ts

@@ -165,7 +165,7 @@ test.describe("Composer", () => {
             // Type another
             await page.locator("div[contenteditable=true]").pressSequentially("my message 1");
             // Send message
-            await page.locator("div[contenteditable=true]").press("Enter");
+            page.locator("div[contenteditable=true]").press("Enter");
             // It was sent
             await expect(page.locator(".mx_EventTile_last .mx_EventTile_body").getByText("my message 1")).toBeVisible();
         });

playwright/e2e/create-room/create-room.spec.ts

@@ -27,7 +27,7 @@ test.describe("Create Room", () => {
         // Submit
         await dialog.getByRole("button", { name: "Create room" }).click();
 
-        await expect(page).toHaveURL(new RegExp(`/#/room/#test-room-1:${user.homeServer}`));
+        await expect(page).toHaveURL(/\/#\/room\/#test-room-1:localhost/);
         const header = page.locator(".mx_RoomHeader");
         await expect(header).toContainText(name);
     });

playwright/e2e/crypto/backups-mas.spec.ts

@@ -13,25 +13,25 @@ import { TestClientServerAPI } from "../csAPI";
 import { masHomeserver } from "../../plugins/homeserver/synapse/masHomeserver.ts";
 
 // These tests register an account with MAS because then we go through the "normal" registration flow
-// and crypto gets set up. Using the 'user' fixture create a user and synthesizes an existing login,
+// and crypto gets set up. Using the 'user' fixture create a a user an synthesizes an existing login,
 // which is faster but leaves us without crypto set up.
 test.use(masHomeserver);
 test.describe("Encryption state after registration", () => {
     test.skip(isDendrite, "does not yet support MAS");
 
-    test("Key backup is enabled by default", async ({ page, mailpitClient, app }, testInfo) => {
+    test("Key backup is enabled by default", async ({ page, mailhogClient, app }) => {
         await page.goto("/#/login");
         await page.getByRole("button", { name: "Continue" }).click();
-        await registerAccountMas(page, mailpitClient, `alice_${testInfo.testId}`, "alice@email.com", "Pa$sW0rD!");
+        await registerAccountMas(page, mailhogClient, "alice", "alice@email.com", "Pa$sW0rD!");
 
         await app.settings.openUserSettings("Security & Privacy");
         await expect(page.getByText("This session is backing up your keys.")).toBeVisible();
     });
 
-    test("user is prompted to set up recovery", async ({ page, mailpitClient, app }, testInfo) => {
+    test("user is prompted to set up recovery", async ({ page, mailhogClient, app }) => {
         await page.goto("/#/login");
         await page.getByRole("button", { name: "Continue" }).click();
-        await registerAccountMas(page, mailpitClient, `alice_${testInfo.testId}`, "alice@email.com", "Pa$sW0rD!");
+        await registerAccountMas(page, mailhogClient, "alice", "alice@email.com", "Pa$sW0rD!");
 
         await page.getByRole("button", { name: "Add room" }).click();
         await page.getByRole("menuitem", { name: "New room" }).click();
@@ -45,13 +45,8 @@ test.describe("Encryption state after registration", () => {
 test.describe("Key backup reset from elsewhere", () => {
     test.skip(isDendrite, "does not yet support MAS");
 
-    test("Key backup is disabled when reset from elsewhere", async ({
-        page,
-        mailpitClient,
-        request,
-        homeserver,
-    }, testInfo) => {
-        const testUsername = `alice_${testInfo.testId}`;
+    test("Key backup is disabled when reset from elsewhere", async ({ page, mailhogClient, request, homeserver }) => {
+        const testUsername = "alice";
         const testPassword = "Pa$sW0rD!";
 
         // there's a delay before keys are uploaded so the error doesn't appear immediately: use a fake
@@ -60,14 +55,15 @@ test.describe("Key backup reset from elsewhere", () => {
 
         await page.goto("/#/login");
         await page.getByRole("button", { name: "Continue" }).click();
-        await registerAccountMas(page, mailpitClient, testUsername, "alice@email.com", testPassword);
+        await registerAccountMas(page, mailhogClient, testUsername, "alice@email.com", testPassword);
 
         await page.getByRole("button", { name: "Add room" }).click();
         await page.getByRole("menuitem", { name: "New room" }).click();
         await page.getByRole("textbox", { name: "Name" }).fill("test room");
         await page.getByRole("button", { name: "Create room" }).click();
 
-        const accessToken = await page.evaluate(() => window.mxMatrixClientPeg.get().getAccessToken());
+        // @ts-ignore - this runs in the browser scope where mxMatrixClientPeg is a thing. Here, it is not.
+        const accessToken = await page.evaluate(() => mxMatrixClientPeg.get().getAccessToken());
 
         const csAPI = new TestClientServerAPI(request, homeserver, accessToken);
 

playwright/e2e/crypto/backups.spec.ts

@@ -9,8 +9,6 @@ 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(
@@ -21,7 +19,6 @@ async function expectBackupVersionToBe(page: Page, version: string) {
 }
 
 test.describe("Backups", () => {
-    test.skip(isDendrite, "Dendrite lacks support for MSC3967 so requires additional auth here");
     test.use({
         displayName: "Hanako",
     });
@@ -36,7 +33,19 @@ test.describe("Backups", () => {
             await expect(securityTab.getByRole("heading", { name: "Secure Backup" })).toBeVisible();
             await securityTab.getByRole("button", { name: "Set up", exact: true }).click();
 
-            const securityKey = await completeCreateSecretStorageDialog(page);
+            const currentDialogLocator = page.locator(".mx_Dialog");
+
+            // It's the first time and secure storage is not set up, so it will create one
+            await expect(currentDialogLocator.getByRole("heading", { name: "Set up Secure Backup" })).toBeVisible();
+            await currentDialogLocator.getByRole("button", { name: "Continue", exact: true }).click();
+            await expect(currentDialogLocator.getByRole("heading", { name: "Save your Security Key" })).toBeVisible();
+            await currentDialogLocator.getByRole("button", { name: "Copy", exact: true }).click();
+            // copy the recovery key to use it later
+            const securityKey = await app.getClipboard();
+            await currentDialogLocator.getByRole("button", { name: "Continue", exact: true }).click();
+
+            await expect(currentDialogLocator.getByRole("heading", { name: "Secure Backup successful" })).toBeVisible();
+            await currentDialogLocator.getByRole("button", { name: "Done", exact: true }).click();
 
             // Open the settings again
             await app.settings.openUserSettings("Security & Privacy");
@@ -51,7 +60,6 @@ test.describe("Backups", () => {
             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"

playwright/e2e/crypto/complete-security.spec.ts

@@ -8,10 +8,8 @@ Please see LICENSE files in the repository root for full details.
 
 import { test, expect } from "../../element-web-test";
 import { logIntoElement } from "./utils";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Complete security", () => {
-    test.skip(isDendrite, "Dendrite lacks support for MSC3967 so requires additional auth here");
     test.use({
         displayName: "Jeff",
     });

playwright/e2e/crypto/crypto.spec.ts

@@ -8,17 +8,9 @@ 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,
-    completeCreateSecretStorageDialog,
-    copyAndContinue,
-    createSharedRoomWithUser,
-    enableKeyBackup,
-    verify,
-} from "./utils";
+import { autoJoin, copyAndContinue, createSharedRoomWithUser, enableKeyBackup, verify } from "./utils";
 import { Bot } from "../../pages/bot";
 import { ElementAppPage } from "../../pages/ElementAppPage";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 const checkDMRoom = async (page: Page) => {
     const body = page.locator(".mx_RoomView_body");
@@ -75,7 +67,6 @@ const bobJoin = async (page: Page, bob: Bot) => {
 };
 
 test.describe("Cryptography", function () {
-    test.skip(isDendrite, "Dendrite lacks support for MSC3967 so requires additional auth here");
     test.use({
         displayName: "Alice",
         botCreateOpts: {
@@ -118,7 +109,18 @@ test.describe("Cryptography", function () {
                 await app.settings.openUserSettings("Security & Privacy");
                 await page.getByRole("button", { name: "Set up Secure Backup" }).click();
 
-                await completeCreateSecretStorageDialog(page);
+                const dialog = page.locator(".mx_Dialog");
+                // Recovery key is selected by default
+                await dialog.getByRole("button", { name: "Continue" }).click();
+                await copyAndContinue(page);
+
+                // If the device is unverified, there should be a "Setting up keys" step; however, it
+                // can be quite quick, and playwright can miss it, so we can't test for it.
+
+                // Either way, we end up at a success dialog:
+                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");

playwright/e2e/crypto/decryption-failure-messages.spec.ts

@@ -28,8 +28,6 @@ test.describe("Cryptography", function () {
     });
 
     test.describe("decryption failure messages", () => {
-        test.skip(isDendrite, "Dendrite lacks support for MSC3967 so requires additional auth here");
-
         test("should handle device-relative historical messages", async ({
             homeserver,
             page,

playwright/e2e/crypto/dehydration.spec.ts

@@ -11,8 +11,6 @@ import { Locator, type Page } from "@playwright/test";
 import { test, expect } from "../../element-web-test";
 import { viewRoomSummaryByName } from "../right-panel/utils";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
-import { completeCreateSecretStorageDialog, createBot, logIntoElement } from "./utils.ts";
-import { Client } from "../../pages/client.ts";
 
 const ROOM_NAME = "Test room";
 const NAME = "Alice";
@@ -23,7 +21,7 @@ function getMemberTileByName(page: Page, name: string): Locator {
 
 test.use({
     displayName: NAME,
-    synapseConfig: {
+    synapseConfigOptions: {
         experimental_features: {
             msc2697_enabled: false,
             msc3814_enabled: true,
@@ -46,7 +44,7 @@ test.use({
 test.describe("Dehydration", () => {
     test.skip(isDendrite, "does not yet support dehydration v2");
 
-    test("'Set up secure backup' creates dehydrated device", async ({ page, user, app }, workerInfo) => {
+    test("Create dehydrated device", async ({ page, user, app }, workerInfo) => {
         // Create a backup (which will create SSSS, and dehydrated device)
 
         const securityTab = await app.settings.openUserSettings("Security & Privacy");
@@ -55,7 +53,17 @@ test.describe("Dehydration", () => {
         await expect(securityTab.getByText("Offline device enabled")).not.toBeVisible();
         await securityTab.getByRole("button", { name: "Set up", exact: true }).click();
 
-        await completeCreateSecretStorageDialog(page);
+        const currentDialogLocator = page.locator(".mx_Dialog");
+
+        // It's the first time and secure storage is not set up, so it will create one
+        await expect(currentDialogLocator.getByRole("heading", { name: "Set up Secure Backup" })).toBeVisible();
+        await currentDialogLocator.getByRole("button", { name: "Continue", exact: true }).click();
+        await expect(currentDialogLocator.getByRole("heading", { name: "Save your Security Key" })).toBeVisible();
+        await currentDialogLocator.getByRole("button", { name: "Copy", exact: true }).click();
+        await currentDialogLocator.getByRole("button", { name: "Continue", exact: true }).click();
+
+        await expect(currentDialogLocator.getByRole("heading", { name: "Secure Backup successful" })).toBeVisible();
+        await currentDialogLocator.getByRole("button", { name: "Done", exact: true }).click();
 
         // Open the settings again
         await app.settings.openUserSettings("Security & Privacy");
@@ -88,49 +96,4 @@ test.describe("Dehydration", () => {
         await expect(page.locator(".mx_UserInfo_devices").getByText("Offline device enabled")).toBeVisible();
         await expect(page.locator(".mx_UserInfo_devices").getByText("Dehydrated device")).not.toBeVisible();
     });
-
-    test("Reset recovery key during login re-creates dehydrated device", async ({
-        page,
-        homeserver,
-        app,
-        credentials,
-    }) => {
-        // Set up cross-signing and recovery
-        const { botClient } = await createBot(page, homeserver, credentials);
-        // ... and dehydration
-        await botClient.evaluate(async (client) => await client.getCrypto().startDehydration());
-
-        const initialDehydratedDeviceIds = await getDehydratedDeviceIds(botClient);
-        expect(initialDehydratedDeviceIds.length).toBe(1);
-
-        await botClient.evaluate(async (client) => client.stopClient());
-
-        // Log in our client
-        await logIntoElement(page, credentials);
-
-        // Oh no, we forgot our recovery key
-        await page.locator(".mx_AuthPage").getByRole("button", { name: "Reset all" }).click();
-        await page.locator(".mx_AuthPage").getByRole("button", { name: "Proceed with reset" }).click();
-
-        await completeCreateSecretStorageDialog(page, { accountPassword: credentials.password });
-
-        // There should be a brand new dehydrated device
-        const dehydratedDeviceIds = await getDehydratedDeviceIds(app.client);
-        expect(dehydratedDeviceIds.length).toBe(1);
-        expect(dehydratedDeviceIds[0]).not.toEqual(initialDehydratedDeviceIds[0]);
-    });
 });
-
-async function getDehydratedDeviceIds(client: Client): Promise<string[]> {
-    return await client.evaluate(async (client) => {
-        const userId = client.getUserId();
-        const devices = await client.getCrypto().getUserDeviceInfo([userId]);
-        return Array.from(
-            devices
-                .get(userId)
-                .values()
-                .filter((d) => d.dehydrated)
-                .map((d) => d.deviceId),
-        );
-    });
-}

playwright/e2e/crypto/device-verification.spec.ts

@@ -15,7 +15,6 @@ import {
     awaitVerifier,
     checkDeviceIsConnectedKeyBackup,
     checkDeviceIsCrossSigned,
-    createBot,
     doTwoWaySasVerification,
     logIntoElement,
     waitForVerificationRequest,
@@ -29,9 +28,29 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
     let expectedBackupVersion: string;
 
     test.beforeEach(async ({ page, homeserver, credentials }) => {
-        const res = await createBot(page, homeserver, credentials);
-        aliceBotClient = res.botClient;
-        expectedBackupVersion = res.expectedBackupVersion;
+        // Visit the login page of the app, to load the matrix sdk
+        await page.goto("/#/login");
+
+        // wait for the page to load
+        await page.waitForSelector(".mx_AuthPage", { timeout: 30000 });
+
+        // Create a new device for alice
+        aliceBotClient = new Bot(page, homeserver, {
+            bootstrapCrossSigning: true,
+            bootstrapSecretStorage: true,
+        });
+        aliceBotClient.setCredentials(credentials);
+
+        // Backup is prepared in the background. Poll until it is ready.
+        const botClientHandle = await aliceBotClient.prepareClient();
+        await expect
+            .poll(async () => {
+                expectedBackupVersion = await botClientHandle.evaluate((cli) =>
+                    cli.getCrypto()!.getActiveSessionBackupVersion(),
+                );
+                return expectedBackupVersion;
+            })
+            .not.toBe(null);
     });
 
     // Click the "Verify with another device" button, and have the bot client auto-accept it.
@@ -68,8 +87,8 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
 
         // Check that the current device is connected to key backup
         // For now we don't check that the backup key is in cache because it's a bit flaky,
-        // as we need to wait for the secret gossiping to happen.
-        await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, false);
+        // as we need to wait for the secret gossiping to happen and the settings dialog doesn't refresh automatically.
+        await checkDeviceIsConnectedKeyBackup(page, expectedBackupVersion, false);
     });
 
     test("Verify device with QR code during login", async ({ page, app, credentials, homeserver }) => {
@@ -112,7 +131,9 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
         await checkDeviceIsCrossSigned(app);
 
         // Check that the current device is connected to key backup
-        await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, true);
+        // For now we don't check that the backup key is in cache because it's a bit flaky,
+        // as we need to wait for the secret gossiping to happen and the settings dialog doesn't refresh automatically.
+        await checkDeviceIsConnectedKeyBackup(page, expectedBackupVersion, false);
     });
 
     test("Verify device with Security Phrase during login", async ({ page, app, credentials, homeserver }) => {
@@ -133,7 +154,7 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
 
         // 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 checkDeviceIsConnectedKeyBackup(page, expectedBackupVersion, true);
     });
 
     test("Verify device with Security Key during login", async ({ page, app, credentials, homeserver }) => {
@@ -156,7 +177,7 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
 
         // 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 checkDeviceIsConnectedKeyBackup(page, expectedBackupVersion, true);
     });
 
     test("Handle incoming verification request with SAS", async ({ page, credentials, homeserver, toasts }) => {
@@ -191,17 +212,16 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
         /* on the bot side, wait for the verifier to exist ... */
         const verifier = await awaitVerifier(botVerificationRequest);
         // ... confirm ...
-        void botVerificationRequest.evaluate((verificationRequest) => verificationRequest.verifier.verify());
+        botVerificationRequest.evaluate((verificationRequest) => verificationRequest.verifier.verify());
         // ... and then check the emoji match
         await doTwoWaySasVerification(page, verifier);
 
         /* And we're all done! */
         const infoDialog = page.locator(".mx_InfoDialog");
         await infoDialog.getByRole("button", { name: "They match" }).click();
-        // We don't assert the full string as the device name is unset on Synapse but set to the user ID on Dendrite
-        await expect(infoDialog.getByText(`You've successfully verified`)).toContainText(
-            `(${aliceBotClient.credentials.deviceId})`,
-        );
+        await expect(
+            infoDialog.getByText(`You've successfully verified (${aliceBotClient.credentials.deviceId})!`),
+        ).toBeVisible();
         await infoDialog.getByRole("button", { name: "Got it" }).click();
     });
 });

playwright/e2e/crypto/event-shields.spec.ts

@@ -66,9 +66,6 @@ test.describe("Cryptography", function () {
             // Bob has a second, not cross-signed, device
             const bobSecondDevice = await createSecondBotDevice(page, homeserver, bob);
 
-            // Dismiss the toast nagging us to set up recovery otherwise it gets in the way of clicking the room list
-            await page.getByRole("button", { name: "Not now" }).click();
-
             await bob.sendEvent(testRoomId, null, "m.room.encrypted", {
                 algorithm: "m.megolm.v1.aes-sha2",
                 ciphertext: "the bird is in the hand",

playwright/e2e/crypto/invisible-crypto.spec.ts

@@ -11,7 +11,6 @@ import { bootstrapCrossSigningForClient } from "../../pages/client.ts";
 
 /** Tests for the "invisible crypto" behaviour -- i.e., when the "exclude insecure devices" setting is enabled */
 test.describe("Invisible cryptography", () => {
-    test.slow();
     test.use({
         displayName: "Alice",
         botCreateOpts: { displayName: "Bob" },

playwright/e2e/crypto/logout.spec.ts

@@ -8,10 +8,8 @@ Please see LICENSE files in the repository root for full details.
 
 import { test, expect } from "../../element-web-test";
 import { createRoom, enableKeyBackup, logIntoElement, sendMessageInCurrentRoom } from "./utils";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Logout tests", () => {
-    test.skip(isDendrite, "Dendrite lacks support for MSC3967 so requires additional auth here");
     test.beforeEach(async ({ page, homeserver, credentials }) => {
         await logIntoElement(page, credentials);
     });

playwright/e2e/crypto/toasts.spec.ts

@@ -1,54 +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 { GeneratedSecretStorageKey } from "matrix-js-sdk/src/crypto-api";
-
-import { test, expect } from "../../element-web-test";
-import { createBot, deleteCachedSecrets, logIntoElement } from "./utils";
-
-test.describe("Key storage out of sync toast", () => {
-    let recoveryKey: GeneratedSecretStorageKey;
-
-    test.beforeEach(async ({ page, homeserver, credentials }) => {
-        const res = await createBot(page, homeserver, credentials);
-        recoveryKey = res.recoveryKey;
-
-        await logIntoElement(page, credentials, recoveryKey.encodedPrivateKey);
-
-        await deleteCachedSecrets(page);
-
-        // We won't be prompted for crypto setup unless we have an e2e room, so make one
-        await page.getByRole("button", { name: "Add room" }).click();
-        await page.getByRole("menuitem", { name: "New room" }).click();
-        await page.getByRole("textbox", { name: "Name" }).fill("Test room");
-        await page.getByRole("button", { name: "Create room" }).click();
-    });
-
-    test("should prompt for recovery key if 'enter recovery key' pressed", { tag: "@screenshot" }, async ({ page }) => {
-        // Need to wait for 2 to appear since playwright only evaluates 'first()' initially, so the waiting won't work
-        await expect(page.getByRole("alert")).toHaveCount(2);
-        await expect(page.getByRole("alert").first()).toMatchScreenshot("key-storage-out-of-sync-toast.png");
-
-        await page.getByRole("button", { name: "Enter recovery key" }).click();
-        await page.locator(".mx_Dialog").getByRole("button", { name: "use your Security Key" }).click();
-
-        await page.getByRole("textbox", { name: "Security key" }).fill(recoveryKey.encodedPrivateKey);
-        await page.getByRole("button", { name: "Continue" }).click();
-
-        await expect(page.getByRole("button", { name: "Enter recovery key" })).not.toBeVisible();
-    });
-
-    test("should open settings to reset flow if 'forgot recovery key' pressed", async ({ page, app, credentials }) => {
-        await expect(page.getByRole("button", { name: "Enter recovery key" })).toBeVisible();
-
-        await page.getByRole("button", { name: "Forgot recovery key?" }).click();
-
-        await expect(
-            page.getByRole("heading", { name: "Forgot your recovery key? You’ll need to reset your identity." }),
-        ).toBeVisible();
-    });
-});

playwright/e2e/crypto/user-verification.spec.ts

@@ -74,7 +74,7 @@ test.describe("User verification", () => {
         /* on the bot side, wait for the verifier to exist ... */
         const botVerifier = await awaitVerifier(bobVerificationRequest);
         // ... confirm ...
-        void botVerifier.evaluate((verifier) => verifier.verify());
+        botVerifier.evaluate((verifier) => verifier.verify());
         // ... and then check the emoji match
         await doTwoWaySasVerification(page, botVerifier);
 

playwright/e2e/crypto/utils.ts

@@ -12,7 +12,6 @@ import type { ICreateRoomOpts, MatrixClient } from "matrix-js-sdk/src/matrix";
 import type {
     CryptoEvent,
     EmojiMapping,
-    GeneratedSecretStorageKey,
     ShowSasCallbacks,
     VerificationRequest,
     Verifier,
@@ -23,46 +22,6 @@ import { Client } from "../../pages/client";
 import { ElementAppPage } from "../../pages/ElementAppPage";
 import { Bot } from "../../pages/bot";
 
-/**
- * Create a bot client using the supplied credentials, and wait for the key backup to be ready.
- * @param page - the playwright `page` fixture
- * @param homeserver - the homeserver to use
- * @param credentials - the credentials to use for the bot client
- */
-export async function createBot(
-    page: Page,
-    homeserver: HomeserverInstance,
-    credentials: Credentials,
-): Promise<{ botClient: Bot; recoveryKey: GeneratedSecretStorageKey; expectedBackupVersion: string }> {
-    // Visit the login page of the app, to load the matrix sdk
-    await page.goto("/#/login");
-
-    // wait for the page to load
-    await page.waitForSelector(".mx_AuthPage", { timeout: 30000 });
-
-    // Create a new bot client
-    const botClient = new Bot(page, homeserver, {
-        bootstrapCrossSigning: true,
-        bootstrapSecretStorage: true,
-    });
-    botClient.setCredentials(credentials);
-    // Backup is prepared in the background. Poll until it is ready.
-    const botClientHandle = await botClient.prepareClient();
-    let expectedBackupVersion: string;
-    await expect
-        .poll(async () => {
-            expectedBackupVersion = await botClientHandle.evaluate((cli) =>
-                cli.getCrypto()!.getActiveSessionBackupVersion(),
-            );
-            return expectedBackupVersion;
-        })
-        .not.toBe(null);
-
-    const recoveryKey = await botClient.getRecoveryKey();
-
-    return { botClient, recoveryKey, expectedBackupVersion };
-}
-
 /**
  * wait for the given client to receive an incoming verification request, and automatically accept it
  *
@@ -100,7 +59,7 @@ export function handleSasVerification(verifier: JSHandle<Verifier>): Promise<Emo
         return new Promise<EmojiMapping[]>((resolve) => {
             const onShowSas = (event: ShowSasCallbacks) => {
                 verifier.off("show_sas" as VerifierEvent, onShowSas);
-                void event.confirm();
+                event.confirm();
                 resolve(event.sas.emoji);
             };
 
@@ -139,14 +98,14 @@ export async function checkDeviceIsCrossSigned(app: ElementAppPage): Promise<voi
  * Check that the current device is connected to the expected key backup.
  * Also checks that the decryption key is known and cached locally.
  *
- * @param app -` ElementAppPage` wrapper for the playwright `Page`.
+ * @param page - the page to check
  * @param expectedBackupVersion - the version of the backup we expect to be connected to.
- * @param checkBackupPrivateKeyInCache - whether to check that the backup decryption key is cached locally
+ * @param checkBackupKeyInCache - whether to check that the backup key is cached locally.
  */
 export async function checkDeviceIsConnectedKeyBackup(
-    app: ElementAppPage,
+    page: Page,
     expectedBackupVersion: string,
-    checkBackupPrivateKeyInCache: boolean,
+    checkBackupKeyInCache: boolean,
 ): Promise<void> {
     // Sanity check the given backup version: if it's null, something went wrong earlier in the test.
     if (!expectedBackupVersion) {
@@ -155,48 +114,23 @@ export async function checkDeviceIsConnectedKeyBackup(
         );
     }
 
-    const backupData = await app.client.evaluate(async (client: MatrixClient) => {
-        const crypto = client.getCrypto();
-        if (!crypto) return;
+    await page.getByRole("button", { name: "User menu" }).click();
+    await page.locator(".mx_UserMenu_contextMenu").getByRole("menuitem", { name: "Security & Privacy" }).click();
+    await expect(page.locator(".mx_Dialog").getByRole("button", { name: "Restore from Backup" })).toBeVisible();
 
-        const backupInfo = await crypto.getKeyBackupInfo();
-        const backupKeyIn4S = Boolean(await client.isKeyBackupKeyStored());
-        const backupPrivateKeyFromCache = await crypto.getSessionBackupPrivateKey();
-        const hasBackupPrivateKeyFromCache = Boolean(backupPrivateKeyFromCache);
-        const backupPrivateKeyWellFormed = backupPrivateKeyFromCache instanceof Uint8Array;
-        const activeBackupVersion = await crypto.getActiveSessionBackupVersion();
+    // expand the advanced section to see the active version in the reports
+    await page.locator(".mx_SecureBackupPanel_advanced").locator("..").click();
 
-        return {
-            backupInfo,
-            hasBackupPrivateKeyFromCache,
-            backupPrivateKeyWellFormed,
-            backupKeyIn4S,
-            activeBackupVersion,
-        };
-    });
-
-    if (!backupData) {
-        throw new Error("Crypto module is not available");
+    if (checkBackupKeyInCache) {
+        const cacheDecryptionKeyStatusElement = page.locator(".mx_SecureBackupPanel_statusList tr:nth-child(2) td");
+        await expect(cacheDecryptionKeyStatusElement).toHaveText("cached locally, well formed");
     }
 
-    const { backupInfo, backupKeyIn4S, hasBackupPrivateKeyFromCache, backupPrivateKeyWellFormed, activeBackupVersion } =
-        backupData;
+    await expect(page.locator(".mx_SecureBackupPanel_statusList tr:nth-child(5) td")).toHaveText(
+        expectedBackupVersion + " (Algorithm: m.megolm_backup.v1.curve25519-aes-sha2)",
+    );
 
-    // We have a key backup
-    expect(backupInfo).toBeDefined();
-    // The key backup version is as expected
-    expect(backupInfo.version).toBe(expectedBackupVersion);
-    // The active backup version is as expected
-    expect(activeBackupVersion).toBe(expectedBackupVersion);
-    // The backup key is stored in 4S
-    expect(backupKeyIn4S).toBe(true);
-
-    if (checkBackupPrivateKeyInCache) {
-        // The backup key is available locally
-        expect(hasBackupPrivateKeyFromCache).toBe(true);
-        // The backup key is well-formed
-        expect(backupPrivateKeyWellFormed).toBe(true);
-    }
+    await expect(page.locator(".mx_SecureBackupPanel_statusList tr:nth-child(6) td")).toHaveText(expectedBackupVersion);
 }
 
 /**
@@ -214,11 +148,6 @@ export async function logIntoElement(page: Page, credentials: Credentials, secur
     // if a securityKey was given, verify the new device
     if (securityKey !== undefined) {
         await page.locator(".mx_AuthPage").getByRole("button", { name: "Verify with Security Key" }).click();
-
-        const useSecurityKey = page.locator(".mx_Dialog").getByRole("button", { name: "use your Security Key" });
-        if (await useSecurityKey.isVisible()) {
-            await useSecurityKey.click();
-        }
         // Fill in the security key
         await page.locator(".mx_Dialog").locator('input[type="password"]').fill(securityKey);
         await page.locator(".mx_Dialog_primary:not([disabled])", { hasText: "Continue" }).click();
@@ -246,19 +175,18 @@ export async function logOutOfElement(page: Page, discardKeys: boolean = false)
 }
 
 /**
- * Open the encryption settings, and verify the current session using the security key.
+ * Open the security settings, and verify the current session using the security key.
  *
  * @param app - `ElementAppPage` wrapper for the playwright `Page`.
  * @param securityKey - The security key (i.e., 4S key), set up during a previous session.
  */
 export async function verifySession(app: ElementAppPage, securityKey: string) {
-    const settings = await app.settings.openUserSettings("Encryption");
-    await settings.getByRole("button", { name: "Verify this device" }).click();
+    const settings = await app.settings.openUserSettings("Security & Privacy");
+    await settings.getByRole("button", { name: "Verify this session" }).click();
     await app.page.getByRole("button", { name: "Verify with Security Key" }).click();
     await app.page.locator(".mx_Dialog").locator('input[type="password"]').fill(securityKey);
     await app.page.getByRole("button", { name: "Continue", disabled: false }).click();
     await app.page.getByRole("button", { name: "Done" }).click();
-    await app.settings.closeDialog();
 }
 
 /**
@@ -293,52 +221,19 @@ export async function doTwoWaySasVerification(page: Page, verifier: JSHandle<Ver
 export async function enableKeyBackup(app: ElementAppPage): Promise<string> {
     await app.settings.openUserSettings("Security & Privacy");
     await app.page.getByRole("button", { name: "Set up Secure Backup" }).click();
+    const dialog = app.page.locator(".mx_Dialog");
+    // Recovery key is selected by default
+    await dialog.getByRole("button", { name: "Continue" }).click({ timeout: 60000 });
 
-    return await completeCreateSecretStorageDialog(app.page);
-}
+    // copy the text ourselves
+    const securityKey = await dialog.locator(".mx_CreateSecretStorageDialog_recoveryKey code").textContent();
+    await copyAndContinue(app.page);
 
-/**
- * Go through the "Set up Secure Backup" dialog (aka the `CreateSecretStorageDialog`).
- *
- * Assumes the dialog is already open for some reason (see also {@link enableKeyBackup}).
- *
- * @param page - The playwright `Page` fixture.
- * @param opts - Options object
- * @param opts.accountPassword - The user's account password. If we are also resetting cross-signing, then we will need
- *   to upload the public cross-signing keys, which will cause the app to prompt for the password.
- *
- * @returns the new recovery key.
- */
-export async function completeCreateSecretStorageDialog(
-    page: Page,
-    opts?: { accountPassword?: string },
-): Promise<string> {
-    const currentDialogLocator = page.locator(".mx_Dialog");
+    await expect(dialog.getByText("Secure Backup successful")).toBeVisible();
+    await dialog.getByRole("button", { name: "Done" }).click();
+    await expect(dialog.getByText("Secure Backup successful")).not.toBeVisible();
 
-    await expect(currentDialogLocator.getByRole("heading", { name: "Set up Secure Backup" })).toBeVisible();
-    // "Generate a Security Key" is selected by default
-    await currentDialogLocator.getByRole("button", { name: "Continue", exact: true }).click();
-    await expect(currentDialogLocator.getByRole("heading", { name: "Save your Security Key" })).toBeVisible();
-    await currentDialogLocator.getByRole("button", { name: "Copy", exact: true }).click();
-    // copy the recovery key to use it later
-    const recoveryKey = await page.evaluate(() => navigator.clipboard.readText());
-    await currentDialogLocator.getByRole("button", { name: "Continue", exact: true }).click();
-
-    // If the device is unverified, there should be a "Setting up keys" step.
-    // If this is not the first time we are setting up cross-signing, the app will prompt for our password; otherwise
-    // the step is quite quick, and playwright can miss it, so we can't test for it.
-    if (opts && Object.hasOwn(opts, "accountPassword")) {
-        await expect(currentDialogLocator.getByRole("heading", { name: "Setting up keys" })).toBeVisible();
-        await page.getByPlaceholder("Password").fill(opts!.accountPassword);
-        await currentDialogLocator.getByRole("button", { name: "Continue" }).click();
-    }
-
-    // Either way, we end up at a success dialog:
-    await expect(currentDialogLocator.getByRole("heading", { name: "Secure Backup successful" })).toBeVisible();
-    await currentDialogLocator.getByRole("button", { name: "Done", exact: true }).click();
-    await expect(currentDialogLocator.getByText("Secure Backup successful")).not.toBeVisible();
-
-    return recoveryKey;
+    return securityKey;
 }
 
 /**
@@ -418,7 +313,7 @@ export async function autoJoin(client: Client) {
     await client.evaluate((cli) => {
         cli.on(window.matrixcs.RoomMemberEvent.Membership, (event, member) => {
             if (member.membership === "invite" && member.userId === cli.getUserId()) {
-                void cli.joinRoom(member.roomId);
+                cli.joinRoom(member.roomId);
             }
         });
     });
@@ -477,25 +372,3 @@ export async function createSecondBotDevice(page: Page, homeserver: HomeserverIn
     await bobSecondDevice.prepareClient();
     return bobSecondDevice;
 }
-
-/**
- * Remove the cached secrets from the indexedDB
- * This is a workaround to simulate the case where the secrets are not cached.
- */
-export async function deleteCachedSecrets(page: Page) {
-    await page.evaluate(async () => {
-        const removeCachedSecrets = new Promise((resolve) => {
-            const request = window.indexedDB.open("matrix-js-sdk::matrix-sdk-crypto");
-            request.onsuccess = (event: Event & { target: { result: IDBDatabase } }) => {
-                const db = event.target.result;
-                const request = db.transaction("core", "readwrite").objectStore("core").delete("private_identity");
-                request.onsuccess = () => {
-                    db.close();
-                    resolve(undefined);
-                };
-            };
-        });
-        await removeCachedSecrets;
-    });
-    await page.reload();
-}

playwright/e2e/csAPI.ts

@@ -9,24 +9,24 @@ import { APIRequestContext } from "playwright-core";
 import { KeyBackupInfo } from "matrix-js-sdk/src/crypto-api";
 
 import { HomeserverInstance } from "../plugins/homeserver";
-import { ClientServerApi } from "../plugins/utils/api.ts";
 
 /**
  * A small subset of the Client-Server API used to manipulate the state of the
  * account on the homeserver independently of the client under test.
  */
-export class TestClientServerAPI extends ClientServerApi {
+export class TestClientServerAPI {
     public constructor(
-        request: APIRequestContext,
-        homeserver: HomeserverInstance,
+        private request: APIRequestContext,
+        private homeserver: HomeserverInstance,
         private accessToken: string,
-    ) {
-        super(homeserver.baseUrl);
-        this.setRequest(request);
-    }
+    ) {}
 
     public async getCurrentBackupInfo(): Promise<KeyBackupInfo | null> {
-        return this.request("GET", `/v3/room_keys/version`, this.accessToken);
+        const res = await this.request.get(`${this.homeserver.baseUrl}/_matrix/client/v3/room_keys/version`, {
+            headers: { Authorization: `Bearer ${this.accessToken}` },
+        });
+
+        return await res.json();
     }
 
     /**
@@ -34,6 +34,15 @@ export class TestClientServerAPI extends ClientServerApi {
      * @param version The version to delete
      */
     public async deleteBackupVersion(version: string): Promise<void> {
-        await this.request("DELETE", `/v3/room_keys/version/${version}`, this.accessToken);
+        const res = await this.request.delete(
+            `${this.homeserver.baseUrl}/_matrix/client/v3/room_keys/version/${version}`,
+            {
+                headers: { Authorization: `Bearer ${this.accessToken}` },
+            },
+        );
+
+        if (!res.ok) {
+            throw new Error(`Failed to delete backup version: ${res.status}`);
+        }
     }
 }

playwright/e2e/editing/editing.spec.ts

@@ -12,7 +12,6 @@ import type { EventType, IContent, ISendEventResponse, MsgType, Visibility } fro
 import { expect, test } from "../../element-web-test";
 import { ElementAppPage } from "../../pages/ElementAppPage";
 import { SettingLevel } from "../../../src/settings/SettingLevel";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 async function sendEvent(app: ElementAppPage, roomId: string): Promise<ISendEventResponse> {
     return app.client.sendEvent(roomId, null, "m.room.message" as EventType, {
@@ -32,8 +31,6 @@ function mkPadding(n: number): IContent {
 }
 
 test.describe("Editing", () => {
-    test.skip(isDendrite, "due to a Dendrite bug https://github.com/element-hq/dendrite/issues/3488");
-
     // Edit "Message"
     const editLastMessage = async (page: Page, edit: string) => {
         const eventTile = page.locator(".mx_RoomView_MessageList .mx_EventTile_last");

playwright/e2e/forgot-password/forgot-password.spec.ts

@@ -6,25 +6,16 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { expect, test as base } from "../../element-web-test";
+import { expect, test } from "../../element-web-test";
 import { selectHomeserver } from "../utils";
 import { emailHomeserver } from "../../plugins/homeserver/synapse/emailHomeserver.ts";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
-import { Credentials } from "../../plugins/homeserver";
 
+const username = "user1234";
+// this has to be password-like enough to please zxcvbn. Needless to say it's just from pwgen.
+const password = "oETo7MPf0o";
 const email = "user@nowhere.dummy";
 
-const test = base.extend<{ credentials: Pick<Credentials, "username" | "password"> }>({
-    // eslint-disable-next-line no-empty-pattern
-    credentials: async ({}, use, testInfo) => {
-        await use({
-            username: `user_${testInfo.testId}`,
-            // this has to be password-like enough to please zxcvbn. Needless to say it's just from pwgen.
-            password: "oETo7MPf0o",
-        });
-    },
-});
-
 test.use(emailHomeserver);
 test.use({
     config: {
@@ -54,35 +45,31 @@ test.describe("Forgot Password", () => {
         await expect(page.getByRole("main")).toMatchScreenshot("forgot-password.png");
     });
 
-    test(
-        "renders email verification dialog properly",
-        { tag: "@screenshot" },
-        async ({ page, homeserver, credentials }) => {
-            const user = await homeserver.registerUser(credentials.username, credentials.password);
+    test("renders email verification dialog properly", { tag: "@screenshot" }, async ({ page, homeserver }) => {
+        const user = await homeserver.registerUser(username, password);
 
-            await homeserver.setThreepid(user.userId, "email", email);
+        await homeserver.setThreepid(user.userId, "email", email);
 
-            await page.goto("/");
+        await page.goto("/");
 
-            await page.getByRole("link", { name: "Sign in" }).click();
-            await selectHomeserver(page, homeserver.baseUrl);
+        await page.getByRole("link", { name: "Sign in" }).click();
+        await selectHomeserver(page, homeserver.baseUrl);
 
-            await page.getByRole("button", { name: "Forgot password?" }).click();
+        await page.getByRole("button", { name: "Forgot password?" }).click();
 
-            await page.getByRole("textbox", { name: "Email address" }).fill(email);
+        await page.getByRole("textbox", { name: "Email address" }).fill(email);
 
-            await page.getByRole("button", { name: "Send email" }).click();
+        await page.getByRole("button", { name: "Send email" }).click();
 
-            await page.getByRole("button", { name: "Next" }).click();
+        await page.getByRole("button", { name: "Next" }).click();
 
-            await page.getByRole("textbox", { name: "New Password", exact: true }).fill(credentials.password);
-            await page.getByRole("textbox", { name: "Confirm new password", exact: true }).fill(credentials.password);
+        await page.getByRole("textbox", { name: "New Password", exact: true }).fill(password);
+        await page.getByRole("textbox", { name: "Confirm new password", exact: true }).fill(password);
 
-            await page.getByRole("button", { name: "Reset password" }).click();
+        await page.getByRole("button", { name: "Reset password" }).click();
 
-            await expect(page.getByRole("button", { name: "Resend" })).toBeInViewport();
+        await expect(page.getByRole("button", { name: "Resend" })).toBeInViewport();
 
-            await expect(page.locator(".mx_Dialog")).toMatchScreenshot("forgot-password-verify-email.png");
-        },
-    );
+        await expect(page.locator(".mx_Dialog")).toMatchScreenshot("forgot-password-verify-email.png");
+    });
 });

playwright/e2e/integration-manager/kick.spec.ts

@@ -69,13 +69,29 @@ async function sendActionFromIntegrationManager(
     await iframe.getByRole("button", { name: "Press to send action" }).click();
 }
 
+async function clickUntilGone(page: Page, selector: string, attempt = 0) {
+    if (attempt === 11) {
+        throw new Error("clickUntilGone attempt count exceeded");
+    }
+
+    await page.locator(selector).last().click();
+
+    const count = await page.locator(selector).count();
+    if (count > 0) {
+        return clickUntilGone(page, selector, ++attempt);
+    }
+}
+
 async function expectKickedMessage(page: Page, shouldExist: boolean) {
-    await expect(async () => {
-        await page.locator(".mx_GenericEventListSummary_toggle[aria-expanded=false]").last().click();
-        await expect(page.getByText(`${USER_DISPLAY_NAME} removed ${BOT_DISPLAY_NAME}: ${KICK_REASON}`)).toBeVisible({
-            visible: shouldExist,
-        });
-    }).toPass();
+    // Expand any event summaries, we can't use a click multiple here because clicking one might de-render others
+    // This is quite horrible but seems the most stable way of clicking 0-N buttons,
+    // one at a time with a full re-evaluation after each click
+    await clickUntilGone(page, ".mx_GenericEventListSummary_toggle[aria-expanded=false]");
+
+    // Check for the event message (or lack thereof)
+    await expect(page.getByText(`${USER_DISPLAY_NAME} removed ${BOT_DISPLAY_NAME}: ${KICK_REASON}`)).toBeVisible({
+        visible: shouldExist,
+    });
 }
 
 test.describe("Integration Manager: Kick", () => {

playwright/e2e/knock/create-knock-room.spec.ts

@@ -9,10 +9,8 @@ Please see LICENSE files in the repository root for full details.
 import { test, expect } from "../../element-web-test";
 import { waitForRoom } from "../utils";
 import { Filter } from "../../pages/Spotlight";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Create Knock Room", () => {
-    test.skip(isDendrite, "Dendrite does not have support for knocking");
     test.use({
         displayName: "Alice",
         labsFlags: ["feature_ask_to_join"],
@@ -81,7 +79,6 @@ test.describe("Create Knock Room", () => {
 
         const spotlightDialog = await app.openSpotlight();
         await spotlightDialog.filter(Filter.PublicRooms);
-        await spotlightDialog.search("Cyber");
         await expect(spotlightDialog.results.nth(0)).toContainText("Cybersecurity");
     });
 });

playwright/e2e/knock/knock-into-room.spec.ts

@@ -13,10 +13,8 @@ import { type Visibility } from "matrix-js-sdk/src/matrix";
 import { test, expect } from "../../element-web-test";
 import { waitForRoom } from "../utils";
 import { Filter } from "../../pages/Spotlight";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Knock Into Room", () => {
-    test.skip(isDendrite, "Dendrite does not have support for knocking");
     test.use({
         displayName: "Alice",
         labsFlags: ["feature_ask_to_join"],
@@ -284,7 +282,6 @@ test.describe("Knock Into Room", () => {
 
         const spotlightDialog = await app.openSpotlight();
         await spotlightDialog.filter(Filter.PublicRooms);
-        await spotlightDialog.search("Cyber");
         await expect(spotlightDialog.results.nth(0)).toContainText("Cybersecurity");
         await spotlightDialog.results.nth(0).click();
 

playwright/e2e/knock/manage-knocks.spec.ts

@@ -10,10 +10,8 @@ Please see LICENSE files in the repository root for full details.
 
 import { test, expect } from "../../element-web-test";
 import { waitForRoom } from "../utils";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Manage Knocks", () => {
-    test.skip(isDendrite, "Dendrite does not have support for knocking");
     test.use({
         displayName: "Alice",
         labsFlags: ["feature_ask_to_join"],
@@ -52,7 +50,7 @@ test.describe("Manage Knocks", () => {
     });
 
     test("should deny knock using bar", async ({ page, app, bot, room }) => {
-        await bot.knockRoom(room.roomId);
+        bot.knockRoom(room.roomId);
 
         const roomKnocksBar = page.locator(".mx_RoomKnocksBar");
         await expect(roomKnocksBar.getByRole("heading", { name: "Asking to join" })).toBeVisible();

playwright/e2e/lazy-loading/lazy-loading.spec.ts

@@ -10,12 +10,8 @@ import { Bot } from "../../pages/bot";
 import type { Locator, Page } from "@playwright/test";
 import type { ElementAppPage } from "../../pages/ElementAppPage";
 import { test, expect } from "../../element-web-test";
-import { Credentials } from "../../plugins/homeserver";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Lazy Loading", () => {
-    test.skip(isDendrite, "due to a Dendrite bug https://github.com/element-hq/dendrite/issues/3488");
-
     const charlies: Bot[] = [];
 
     test.use({
@@ -39,18 +35,12 @@ test.describe("Lazy Loading", () => {
     });
 
     const name = "Lazy Loading Test";
+    const alias = "#lltest:localhost";
     const charlyMsg1 = "hi bob!";
     const charlyMsg2 = "how's it going??";
     let roomId: string;
 
-    async function setupRoomWithBobAliceAndCharlies(
-        page: Page,
-        app: ElementAppPage,
-        user: Credentials,
-        bob: Bot,
-        charlies: Bot[],
-    ) {
-        const alias = `#lltest:${user.homeServer}`;
+    async function setupRoomWithBobAliceAndCharlies(page: Page, app: ElementAppPage, bob: Bot, charlies: Bot[]) {
         const visibility = await page.evaluate(() => (window as any).matrixcs.Visibility.Public);
         roomId = await bob.createRoom({
             name,
@@ -105,13 +95,7 @@ test.describe("Lazy Loading", () => {
         }
     }
 
-    async function joinCharliesWhileAliceIsOffline(
-        page: Page,
-        app: ElementAppPage,
-        user: Credentials,
-        charlies: Bot[],
-    ) {
-        const alias = `#lltest:${user.homeServer}`;
+    async function joinCharliesWhileAliceIsOffline(page: Page, app: ElementAppPage, charlies: Bot[]) {
         await app.client.network.goOffline();
         for (const charly of charlies) {
             await charly.joinRoom(alias);
@@ -123,19 +107,19 @@ test.describe("Lazy Loading", () => {
         await app.client.waitForNextSync();
     }
 
-    test("should handle lazy loading properly even when offline", async ({ page, app, bot, user }) => {
+    test("should handle lazy loading properly even when offline", async ({ page, app, bot }) => {
         test.slow();
         const charly1to5 = charlies.slice(0, 5);
         const charly6to10 = charlies.slice(5);
 
         // Set up room with alice, bob & charlies 1-5
-        await setupRoomWithBobAliceAndCharlies(page, app, user, bot, charly1to5);
+        await setupRoomWithBobAliceAndCharlies(page, app, bot, charly1to5);
         // Alice should see 2 messages from every charly with the correct display name
         await checkPaginatedDisplayNames(app, charly1to5);
 
         await openMemberlist(app);
         await checkMemberList(page, charly1to5);
-        await joinCharliesWhileAliceIsOffline(page, app, user, charly6to10);
+        await joinCharliesWhileAliceIsOffline(page, app, charly6to10);
         await checkMemberList(page, charly6to10);
 
         for (const charly of charlies) {

playwright/e2e/login/login-consent.spec.ts

@@ -12,7 +12,6 @@ import { expect, test } from "../../element-web-test";
 import { selectHomeserver } from "../utils";
 import { Credentials, HomeserverInstance } from "../../plugins/homeserver";
 import { consentHomeserver } from "../../plugins/homeserver/synapse/consentHomeserver.ts";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 // This test requires fixed credentials for the device signing keys below to work
 const username = "user1234";
@@ -78,9 +77,6 @@ async function login(page: Page, homeserver: HomeserverInstance, credentials: Cr
     await page.getByRole("button", { name: "Sign in" }).click();
 }
 
-// This test suite uses the same userId for all tests in the suite
-// due to DEVICE_SIGNING_KEYS_BODY being specific to that userId,
-// so we restart the Synapse container to make it forget everything.
 test.use(consentHomeserver);
 test.use({
     config: {
@@ -92,11 +88,6 @@ test.use({
             },
         },
     },
-    context: async ({ context, homeserver }, use) => {
-        // Restart the homeserver to wipe its in-memory db so we can reuse the same user ID without cross-signing prompts
-        await homeserver.restart();
-        await use(context);
-    },
     credentials: async ({ context, homeserver }, use) => {
         const displayName = "Dave";
         const credentials = await homeserver.registerUser(username, password, displayName);
@@ -106,16 +97,11 @@ test.use({
             ...credentials,
             displayName,
         });
-
-        // Restart the homeserver to wipe its in-memory db so we can reuse the same user ID without cross-signing prompts
-        await homeserver.restart();
     },
 });
 
 test.describe("Login", () => {
     test.describe("Password login", () => {
-        test.skip(isDendrite, "Dendrite lacks support for MSC3967 so requires additional auth here");
-
         test("Loads the welcome page by default; then logs in with an existing account and lands on the home screen", async ({
             credentials,
             page,

playwright/e2e/login/login-sso.spec.ts

@@ -17,13 +17,13 @@ test.use(legacyOAuthHomeserver);
 test.describe("SSO login", () => {
     test.skip(isDendrite, "does not yet support SSO");
 
-    test("logs in with SSO and lands on the home screen", async ({ page, homeserver }, testInfo) => {
+    test("logs in with SSO and lands on the home screen", async ({ page, homeserver }) => {
         // If this test fails with a screen showing "Timeout connecting to remote server", it is most likely due to
         // your firewall settings: Synapse is unable to reach the OIDC server.
         //
         // If you are using ufw, try something like:
         //    sudo ufw allow in on docker0
         //
-        await doTokenRegistration(page, homeserver, testInfo);
+        await doTokenRegistration(page, homeserver);
     });
 });

playwright/e2e/login/soft_logout_oauth.spec.ts

@@ -26,8 +26,8 @@ test.use({
 test.use(legacyOAuthHomeserver);
 test.describe("Soft logout with SSO user", () => {
     test.use({
-        user: async ({ page, homeserver }, use, testInfo) => {
-            const user = await doTokenRegistration(page, homeserver, testInfo);
+        user: async ({ page, homeserver }, use) => {
+            const user = await doTokenRegistration(page, homeserver);
 
             // Eventually, we should end up at the home screen.
             await expect(page).toHaveURL(/\/#\/home$/);

playwright/e2e/login/utils.ts

@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { Page, expect, TestInfo } from "@playwright/test";
+import { Page, expect } from "@playwright/test";
 
 import { Credentials, HomeserverInstance } from "../../plugins/homeserver";
 
@@ -15,7 +15,6 @@ import { Credentials, HomeserverInstance } from "../../plugins/homeserver";
 export async function doTokenRegistration(
     page: Page,
     homeserver: HomeserverInstance,
-    testInfo: TestInfo,
 ): Promise<Credentials & { displayName: string }> {
     await page.goto("/#/login");
 
@@ -36,7 +35,7 @@ export async function doTokenRegistration(
 
     // Synapse prompts us to pick a user ID
     await expect(page.getByRole("heading", { name: "Create your account" })).toBeVisible();
-    await page.getByRole("textbox", { name: "Username (required)" }).fill(`alice_${testInfo.testId}`);
+    await page.getByRole("textbox", { name: "Username (required)" }).fill("alice");
 
     // wait for username validation to start, and complete
     await expect(page.locator("#field-username-output")).toHaveText("");
@@ -93,7 +92,7 @@ export async function interceptRequestsWithSoftLogout(page: Page, user: Credenti
     // do something to make the active /sync return: create a new room
     await page.evaluate(() => {
         // don't wait for this to complete: it probably won't, because of the broken sync
-        void window.mxMatrixClientPeg.get().createRoom({});
+        window.mxMatrixClientPeg.get().createRoom({});
     });
 
     await promise;

playwright/e2e/messages/messages.spec.ts

@@ -58,16 +58,6 @@ async function editMessage(page: Page, message: Locator, newMsg: string): Promis
     await editComposer.press("Enter");
 }
 
-const screenshotOptions = (page?: Page) => ({
-    mask: page ? [page.locator(".mx_MessageTimestamp")] : undefined,
-    // Hide the jump to bottom button in the timeline to avoid flakiness
-    css: `
-        .mx_JumpToBottomButton {
-            display: none !important;
-        }
-    `,
-});
-
 test.describe("Message rendering", () => {
     [
         { direction: "ltr", displayName: "Quentin" },
@@ -89,10 +79,9 @@ test.describe("Message rendering", () => {
                     await page.goto(`#/room/${room.roomId}`);
 
                     const msgTile = await sendMessage(page, "Hello, world!");
-                    await expect(msgTile).toMatchScreenshot(
-                        `basic-message-ltr-${direction}displayname.png`,
-                        screenshotOptions(page),
-                    );
+                    await expect(msgTile).toMatchScreenshot(`basic-message-ltr-${direction}displayname.png`, {
+                        mask: [page.locator(".mx_MessageTimestamp")],
+                    });
                 },
             );
 
@@ -100,17 +89,14 @@ test.describe("Message rendering", () => {
                 await page.goto(`#/room/${room.roomId}`);
 
                 const msgTile = await sendMessage(page, "/me lays an egg");
-                await expect(msgTile).toMatchScreenshot(`emote-ltr-${direction}displayname.png`, screenshotOptions());
+                await expect(msgTile).toMatchScreenshot(`emote-ltr-${direction}displayname.png`);
             });
 
             test("should render an LTR rich text emote", async ({ page, user, app, room }) => {
                 await page.goto(`#/room/${room.roomId}`);
 
                 const msgTile = await sendMessage(page, "/me lays a *free range* egg");
-                await expect(msgTile).toMatchScreenshot(
-                    `emote-rich-ltr-${direction}displayname.png`,
-                    screenshotOptions(),
-                );
+                await expect(msgTile).toMatchScreenshot(`emote-rich-ltr-${direction}displayname.png`);
             });
 
             test("should render an edited LTR message", async ({ page, user, app, room }) => {
@@ -120,10 +106,9 @@ test.describe("Message rendering", () => {
 
                 await editMessage(page, msgTile, "Hello, universe!");
 
-                await expect(msgTile).toMatchScreenshot(
-                    `edited-message-ltr-${direction}displayname.png`,
-                    screenshotOptions(page),
-                );
+                await expect(msgTile).toMatchScreenshot(`edited-message-ltr-${direction}displayname.png`, {
+                    mask: [page.locator(".mx_MessageTimestamp")],
+                });
             });
 
             test("should render a reply of a LTR message", async ({ page, user, app, room }) => {
@@ -137,37 +122,32 @@ test.describe("Message rendering", () => {
                 ]);
 
                 await replyMessage(page, msgTile, "response to multiline message");
-                await expect(msgTile).toMatchScreenshot(
-                    `reply-message-ltr-${direction}displayname.png`,
-                    screenshotOptions(page),
-                );
+                await expect(msgTile).toMatchScreenshot(`reply-message-ltr-${direction}displayname.png`, {
+                    mask: [page.locator(".mx_MessageTimestamp")],
+                });
             });
 
             test("should render a basic RTL text message", async ({ page, user, app, room }) => {
                 await page.goto(`#/room/${room.roomId}`);
 
                 const msgTile = await sendMessage(page, "مرحبا بالعالم!");
-                await expect(msgTile).toMatchScreenshot(
-                    `basic-message-rtl-${direction}displayname.png`,
-                    screenshotOptions(page),
-                );
+                await expect(msgTile).toMatchScreenshot(`basic-message-rtl-${direction}displayname.png`, {
+                    mask: [page.locator(".mx_MessageTimestamp")],
+                });
             });
 
             test("should render an RTL emote", async ({ page, user, app, room }) => {
                 await page.goto(`#/room/${room.roomId}`);
 
                 const msgTile = await sendMessage(page, "/me يضع بيضة");
-                await expect(msgTile).toMatchScreenshot(`emote-rtl-${direction}displayname.png`, screenshotOptions());
+                await expect(msgTile).toMatchScreenshot(`emote-rtl-${direction}displayname.png`);
             });
 
             test("should render a richtext RTL emote", async ({ page, user, app, room }) => {
                 await page.goto(`#/room/${room.roomId}`);
 
                 const msgTile = await sendMessage(page, "/me أضع بيضة *حرة النطاق*");
-                await expect(msgTile).toMatchScreenshot(
-                    `emote-rich-rtl-${direction}displayname.png`,
-                    screenshotOptions(),
-                );
+                await expect(msgTile).toMatchScreenshot(`emote-rich-rtl-${direction}displayname.png`);
             });
 
             test("should render an edited RTL message", async ({ page, user, app, room }) => {
@@ -177,10 +157,9 @@ test.describe("Message rendering", () => {
 
                 await editMessage(page, msgTile, "مرحبا بالكون!");
 
-                await expect(msgTile).toMatchScreenshot(
-                    `edited-message-rtl-${direction}displayname.png`,
-                    screenshotOptions(page),
-                );
+                await expect(msgTile).toMatchScreenshot(`edited-message-rtl-${direction}displayname.png`, {
+                    mask: [page.locator(".mx_MessageTimestamp")],
+                });
             });
 
             test("should render a reply of a RTL message", async ({ page, user, app, room }) => {
@@ -194,10 +173,9 @@ test.describe("Message rendering", () => {
                 ]);
 
                 await replyMessage(page, msgTile, "مرحبا بالعالم!");
-                await expect(msgTile).toMatchScreenshot(
-                    `reply-message-trl-${direction}displayname.png`,
-                    screenshotOptions(page),
-                );
+                await expect(msgTile).toMatchScreenshot(`reply-message-trl-${direction}displayname.png`, {
+                    mask: [page.locator(".mx_MessageTimestamp")],
+                });
             });
         });
     });

playwright/e2e/oidc/index.ts

@@ -6,14 +6,14 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { MailpitClient } from "mailpit-api";
+import { API, Messages } from "mailhog";
 import { Page } from "@playwright/test";
 
 import { expect } from "../../element-web-test";
 
 export async function registerAccountMas(
     page: Page,
-    mailpit: MailpitClient,
+    mailhog: API,
     username: string,
     email: string,
     password: string,
@@ -27,13 +27,13 @@ export async function registerAccountMas(
     await page.getByRole("textbox", { name: "Confirm Password" }).fill(password);
     await page.getByRole("button", { name: "Continue" }).click();
 
-    let code: string;
+    let messages: Messages;
     await expect(async () => {
-        const messages = await mailpit.listMessages();
-        expect(messages.messages[0].To[0].Address).toEqual(email);
-        const text = await mailpit.renderMessageText(messages.messages[0].ID);
-        [, code] = text.match(/Your verification code to confirm this email address is: (\d{6})/);
+        messages = await mailhog.messages();
+        expect(messages.items).toHaveLength(1);
     }).toPass();
+    expect(messages.items[0].to).toEqual(`${username} <${email}>`);
+    const [code] = messages.items[0].text.match(/(\d{6})/);
 
     await page.getByRole("textbox", { name: "6-digit code" }).fill(code);
     await page.getByRole("button", { name: "Continue" }).click();

playwright/e2e/oidc/oidc-native.spec.ts

@@ -9,21 +9,15 @@ Please see LICENSE files in the repository root for full details.
 import { test, expect } from "../../element-web-test.ts";
 import { registerAccountMas } from ".";
 import { ElementAppPage } from "../../pages/ElementAppPage.ts";
+import { isDendrite } from "../../plugins/homeserver/dendrite";
 import { masHomeserver } from "../../plugins/homeserver/synapse/masHomeserver.ts";
 
 test.use(masHomeserver);
 test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
+    test.skip(isDendrite, "does not yet support MAS");
     test.slow(); // trace recording takes a while here
 
-    test("can register the oauth2 client and an account", async ({
-        context,
-        page,
-        homeserver,
-        mailpitClient,
-        mas,
-    }, testInfo) => {
-        await page.clock.install();
-
+    test("can register the oauth2 client and an account", async ({ context, page, homeserver, mailhogClient, mas }) => {
         const tokenUri = `${mas.baseUrl}/oauth2/token`;
         const tokenApiPromise = page.waitForRequest(
             (request) => request.url() === tokenUri && request.postDataJSON()["grant_type"] === "authorization_code",
@@ -31,14 +25,11 @@ test.describe("OIDC Native", { tag: ["@no-firefox", "@no-webkit"] }, () => {
 
         await page.goto("/#/login");
         await page.getByRole("button", { name: "Continue" }).click();
-
-        const userId = `alice_${testInfo.testId}`;
-        await registerAccountMas(page, mailpitClient, userId, "alice@email.com", "Pa$sW0rD!");
+        await registerAccountMas(page, mailhogClient, "alice", "alice@email.com", "Pa$sW0rD!");
 
         // Eventually, we should end up at the home screen.
         await expect(page).toHaveURL(/\/#\/home$/, { timeout: 10000 });
-        await expect(page.getByRole("heading", { name: `Welcome ${userId}`, exact: true })).toBeVisible();
-        await page.clock.runFor(20000); // run the timer so we see the token request
+        await expect(page.getByRole("heading", { name: "Welcome alice", exact: true })).toBeVisible();
 
         const tokenApiRequest = await tokenApiPromise;
         expect(tokenApiRequest.postDataJSON()["grant_type"]).toBe("authorization_code");

playwright/e2e/one-to-one-chat/one-to-one-chat.spec.ts

@@ -9,19 +9,16 @@ Please see LICENSE files in the repository root for full details.
 
 import { test as base, expect } from "../../element-web-test";
 import { Credentials } from "../../plugins/homeserver";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 const test = base.extend<{
     user2?: Credentials;
 }>({});
 
 test.describe("1:1 chat room", () => {
-    test.skip(isDendrite, "due to a Dendrite bug https://github.com/element-hq/dendrite/issues/3492");
-
     test.use({
         displayName: "Jeff",
-        user2: async ({ homeserver }, use, testInfo) => {
-            const credentials = await homeserver.registerUser(`user2_${testInfo.testId}`, "p4s5W0rD", "Timmy");
+        user2: async ({ homeserver }, use) => {
+            const credentials = await homeserver.registerUser("user1234", "p4s5W0rD", "Timmy");
             await use(credentials);
         },
     });

playwright/e2e/permalinks/permalinks.spec.ts

@@ -31,7 +31,7 @@ test.describe("permalinks", () => {
         await charlotte.prepareClient();
 
         // We don't use a bot for danielle as we want a stable MXID.
-        const danielleId = `@danielle:${user.homeServer}`;
+        const danielleId = "@danielle:localhost";
 
         const room1Id = await app.client.createRoom({ name: room1Name });
         const room2Id = await app.client.createRoom({ name: room2Name });

playwright/e2e/pinned-messages/pinned-messages.spec.ts

@@ -35,10 +35,10 @@ test.describe("Pinned messages", () => {
                 mask: [tile.locator(".mx_MessageTimestamp")],
                 // Hide the jump to bottom button in the timeline to avoid flakiness
                 css: `
-                    .mx_JumpToBottomButton {
-                        display: none !important;
-                    }
-                `,
+                .mx_JumpToBottomButton {
+                    display: none !important;
+                }
+            `,
             });
         },
     );

playwright/e2e/polls/pollHistory.spec.ts

@@ -134,7 +134,7 @@ test.describe("Poll history", () => {
 
         await expect(dialog.getByText(pollParams2.title)).toBeAttached();
         await expect(dialog.getByText(pollParams1.title)).toBeAttached();
-        await dialog.getByText("Active polls").click();
+        dialog.getByText("Active polls").click();
 
         // no more active polls
         await expect(page.getByText("There are no active polls in this room")).toBeAttached();

playwright/e2e/polls/polls.spec.ts

@@ -11,11 +11,8 @@ import { Bot } from "../../pages/bot";
 import { SettingLevel } from "../../../src/settings/SettingLevel";
 import { Layout } from "../../../src/settings/enums/Layout";
 import type { Locator, Page } from "@playwright/test";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Polls", () => {
-    test.skip(isDendrite, "due to a Dendrite bug https://github.com/element-hq/dendrite/issues/3492");
-
     type CreatePollOptions = {
         title: string;
         options: string[];

playwright/e2e/read-receipts/editing-messages-in-threads.spec.ts

@@ -9,11 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.describe("editing messages", () => {
         test.describe("in threads", () => {
             test("An edit of a threaded message makes the room unread", async ({

playwright/e2e/read-receipts/editing-messages-main-timeline.spec.ts

@@ -9,11 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.describe("editing messages", () => {
         test.describe("in the main timeline", () => {
             test("Editing a message leaves a room read", async ({ roomAlpha: room1, roomBeta: room2, util, msg }) => {

playwright/e2e/read-receipts/editing-messages-thread-roots.spec.ts

@@ -9,11 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.describe("editing messages", () => {
         test.describe("thread roots", () => {
             test("An edit of a thread root leaves the room read", async ({

playwright/e2e/read-receipts/high-level.spec.ts

@@ -9,10 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { customEvent, many, test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
     test.slow();
 
     test.describe("Ignored events", () => {

playwright/e2e/read-receipts/index.ts

@@ -526,10 +526,9 @@ class Helpers {
         await expect(threadPanel).toBeVisible();
         await threadPanel.evaluate(($panel) => {
             const $button = $panel.querySelector<HTMLElement>('[data-testid="base-card-back-button"]');
-            const title = $panel.querySelector<HTMLElement>(".mx_BaseCard_header_title")?.textContent;
             // If the Threads back button is present then click it - the
             // threads button can open either threads list or thread panel
-            if ($button && title !== "Threads") {
+            if ($button) {
                 $button.click();
             }
         });

playwright/e2e/read-receipts/new-messages-in-threads.spec.ts

@@ -9,11 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { many, test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.describe("new messages", () => {
         test.describe("in threads", () => {
             test("Receiving a message makes a room unread", async ({

playwright/e2e/read-receipts/new-messages-main-timeline.spec.ts

@@ -9,11 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { many, test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.describe("new messages", () => {
         test.describe("in the main timeline", () => {
             test("Receiving a message makes a room unread", async ({

playwright/e2e/read-receipts/new-messages-thread-roots.spec.ts

@@ -9,11 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { many, test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.describe("new messages", () => {
         test.describe("thread roots", () => {
             test("Reading a thread root does not mark the thread as read", async ({

playwright/e2e/read-receipts/reactions-in-threads.spec.ts

@@ -9,11 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { test, expect } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.describe("reactions", () => {
         test.describe("in threads", () => {
             test("A reaction to a threaded message does not make the room unread", async ({
@@ -73,7 +70,11 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
                 // Given a thread exists and I have marked it as read
                 await util.goTo(room1);
                 await util.assertRead(room2);
-                await util.receiveMessages(room2, ["Msg1", msg.threadedOff("Msg1", "Reply1")]);
+                await util.receiveMessages(room2, [
+                    "Msg1",
+                    msg.threadedOff("Msg1", "Reply1"),
+                    msg.reactionTo("Reply1", "🪿"),
+                ]);
                 await util.assertUnread(room2, 1);
                 await util.markAsRead(room2);
                 await util.assertRead(room2);

playwright/e2e/read-receipts/reactions-main-timeline.spec.ts

@@ -9,11 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.describe("reactions", () => {
         test.describe("in the main timeline", () => {
             test("Receiving a reaction to a message does not make a room unread", async ({

playwright/e2e/read-receipts/reactions-thread-roots.spec.ts

@@ -9,10 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
     test.describe("reactions", () => {
         test.describe("thread roots", () => {
             test("A reaction to a thread root does not make the room unread", async ({

playwright/e2e/read-receipts/read-receipts.spec.ts

@@ -12,10 +12,8 @@ import { expect } from "../../element-web-test";
 import { ElementAppPage } from "../../pages/ElementAppPage";
 import { Bot } from "../../pages/bot";
 import { test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
     test.use({
         displayName: "Mae",
         botCreateOpts: { displayName: "Other User" },
@@ -102,7 +100,12 @@ test.describe("Read receipts", { tag: "@mergequeue" }, () => {
         await page.goto(`/#/room/${selectedRoomId}`);
     });
 
-    test("With sync accumulator, considers main thread and unthreaded receipts #24629", async ({ page, app, bot }) => {
+    // Disabled due to flakiness: https://github.com/element-hq/element-web/issues/26895
+    test.skip("With sync accumulator, considers main thread and unthreaded receipts #24629", async ({
+        page,
+        app,
+        bot,
+    }) => {
         // Details are in https://github.com/vector-im/element-web/issues/24629
         // This proves we've fixed one of the "stuck unreads" issues.
 

playwright/e2e/read-receipts/redactions-in-threads.spec.ts

@@ -9,11 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.describe("redactions", () => {
         test.describe("in threads", () => {
             test("Redacting the threaded message pointed to by my receipt leaves the room read", async ({

playwright/e2e/read-receipts/redactions-main-timeline.spec.ts

@@ -9,11 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.describe("redactions", () => {
         test.describe("in the main timeline", () => {
             test("Redacting the message pointed to by my receipt leaves the room read", async ({

playwright/e2e/read-receipts/redactions-thread-roots.spec.ts

@@ -9,11 +9,8 @@ Please see LICENSE files in the repository root for full details.
 /* See readme.md for tips on writing these tests. */
 
 import { test } from ".";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Read receipts", { tag: "@mergequeue" }, () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.describe("redactions", () => {
         test.describe("thread roots", () => {
             test("Redacting a thread root after it was read leaves the room read", async ({

playwright/e2e/register/email.spec.ts

@@ -32,9 +32,9 @@ test.describe("Email Registration", async () => {
     });
 
     test(
-        "registers an account and lands on the home page",
+        "registers an account and lands on the use case selection screen",
         { tag: "@screenshot" },
-        async ({ page, mailpitClient, request, checkA11y }) => {
+        async ({ page, mailhogClient, request, checkA11y }) => {
             await expect(page.getByRole("textbox", { name: "Username" })).toBeVisible();
             // Hide the server text as it contains the randomly allocated Homeserver port
             const screenshotOptions = { mask: [page.locator(".mx_ServerPicker_server")] };
@@ -51,14 +51,13 @@ test.describe("Email Registration", async () => {
 
             await expect(page.getByText("An error was encountered when sending the email")).not.toBeVisible();
 
-            const messages = await mailpitClient.listMessages();
-            expect(messages.messages).toHaveLength(1);
-            expect(messages.messages[0].To[0].Address).toEqual("alice@email.com");
-            const text = await mailpitClient.renderMessageText(messages.messages[0].ID);
-            const [emailLink] = text.match(/http.+/);
+            const messages = await mailhogClient.messages();
+            expect(messages.items).toHaveLength(1);
+            expect(messages.items[0].to).toEqual("alice@email.com");
+            const [emailLink] = messages.items[0].text.match(/http.+/);
             await request.get(emailLink); // "Click" the link in the email
 
-            await expect(page.getByText("Welcome alice")).toBeVisible();
+            await expect(page.locator(".mx_UseCaseSelection_skip")).toBeVisible();
         },
     );
 });

playwright/e2e/register/register.spec.ts

@@ -8,7 +8,6 @@ Please see LICENSE files in the repository root for full details.
 
 import { test, expect } from "../../element-web-test";
 import { consentHomeserver } from "../../plugins/homeserver/synapse/consentHomeserver.ts";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.use(consentHomeserver);
 test.use({
@@ -24,8 +23,6 @@ test.use({
 });
 
 test.describe("Registration", () => {
-    test.skip(isDendrite, "Dendrite lacks support for MSC3967 so requires additional auth here");
-
     test.beforeEach(async ({ page }) => {
         await page.goto("/#/register");
     });
@@ -74,6 +71,12 @@ test.describe("Registration", () => {
             await expect(termsPolicy.getByLabel("Privacy Policy")).toBeVisible();
 
             await page.getByRole("button", { name: "Accept", exact: true }).click();
+
+            await expect(page.locator(".mx_UseCaseSelection_skip")).toBeVisible();
+            await expect(page).toMatchScreenshot("use-case-selection.png", screenshotOptions);
+            await checkA11y();
+            await page.getByRole("button", { name: "Skip", exact: true }).click();
+
             await expect(page).toHaveURL(/\/#\/home$/);
 
             /*

playwright/e2e/right-panel/file-panel.spec.ts

@@ -10,7 +10,6 @@ import { Download, type Page } from "@playwright/test";
 
 import { test, expect } from "../../element-web-test";
 import { viewRoomSummaryByName } from "./utils";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 const ROOM_NAME = "Test room";
 const NAME = "Alice";
@@ -182,8 +181,6 @@ test.describe("FilePanel", () => {
     });
 
     test.describe("download", () => {
-        test.skip(isDendrite, "due to a Dendrite sending Content-Disposition inline");
-
         test("should download an image via the link on the panel", async ({ page, context }) => {
             // Upload an image file
             await uploadFile(page, "playwright/sample-files/riot.png");

playwright/e2e/right-panel/memberlist.spec.ts

@@ -12,7 +12,7 @@ const ROOM_NAME = "Test room";
 const NAME = "Alice";
 
 test.use({
-    synapseConfig: {
+    synapseConfigOptions: {
         presence: {
             enabled: false,
             include_offline_users_on_sync: false,
@@ -42,7 +42,7 @@ test.describe("Memberlist", () => {
         await app.viewRoomByName(ROOM_NAME);
         const memberlist = await app.toggleMemberlistPanel();
         await expect(memberlist.locator(".mx_MemberTileView")).toHaveCount(4);
-        await expect(memberlist.getByText("Invited")).toHaveCount(1);
+        await expect(memberlist.getByText("(Invited)")).toHaveCount(1);
         await expect(page.locator(".mx_MemberListView")).toMatchScreenshot("with-four-members.png");
     });
 });

playwright/e2e/right-panel/right-panel.spec.ts

@@ -38,34 +38,29 @@ test.describe("RightPanel", () => {
     });
 
     test.describe("in rooms", () => {
-        test(
-            "should handle long room address and long room name",
-            { tag: "@screenshot" },
-            async ({ page, app, user }) => {
-                await app.client.createRoom({ name: ROOM_NAME_LONG });
-                await viewRoomSummaryByName(page, app, ROOM_NAME_LONG);
+        test("should handle long room address and long room name", { tag: "@screenshot" }, async ({ page, app }) => {
+            await app.client.createRoom({ name: ROOM_NAME_LONG });
+            await viewRoomSummaryByName(page, app, ROOM_NAME_LONG);
 
-                await app.settings.openRoomSettings();
+            await app.settings.openRoomSettings();
 
-                // Set a local room address
-                const localAddresses = page.locator(".mx_SettingsFieldset", { hasText: "Local Addresses" });
-                await localAddresses.getByRole("textbox").fill(ROOM_ADDRESS_LONG);
-                await expect(page.getByText("This address is available to use")).toBeVisible();
-                await localAddresses.getByRole("button", { name: "Add" }).click();
-                await expect(localAddresses.getByText(`#${ROOM_ADDRESS_LONG}:${user.homeServer}`)).toHaveClass(
-                    "mx_EditableItem_item",
-                );
+            // Set a local room address
+            const localAddresses = page.locator(".mx_SettingsFieldset", { hasText: "Local Addresses" });
+            await localAddresses.getByRole("textbox").fill(ROOM_ADDRESS_LONG);
+            await localAddresses.getByRole("button", { name: "Add" }).click();
+            await expect(localAddresses.getByText(`#${ROOM_ADDRESS_LONG}:localhost`)).toHaveClass(
+                "mx_EditableItem_item",
+            );
 
-                await app.closeDialog();
+            await app.closeDialog();
 
-                // Close and reopen the right panel to render the room address
-                await app.toggleRoomInfoPanel();
-                await expect(page.locator(".mx_RightPanel")).not.toBeVisible();
-                await app.toggleRoomInfoPanel();
+            // Close and reopen the right panel to render the room address
+            await app.toggleRoomInfoPanel();
+            await expect(page.locator(".mx_RightPanel")).not.toBeVisible();
+            await app.toggleRoomInfoPanel();
 
-                await expect(page.locator(".mx_RightPanel")).toMatchScreenshot("with-name-and-address.png");
-            },
-        );
+            await expect(page.locator(".mx_RightPanel")).toMatchScreenshot("with-name-and-address.png");
+        });
 
         test("should handle clicking add widgets", async ({ page, app }) => {
             await viewRoomSummaryByName(page, app, ROOM_NAME);

playwright/e2e/room-directory/room-directory.spec.ts

@@ -10,7 +10,6 @@ import type { Preset, Visibility } from "matrix-js-sdk/src/matrix";
 import { test, expect } from "../../element-web-test";
 
 test.describe("Room Directory", () => {
-    test.skip(({ homeserverType }) => homeserverType === "pinecone", "Pinecone's /publicRooms API takes forever");
     test.use({
         displayName: "Ray",
         botCreateOpts: { displayName: "Paul" },
@@ -31,16 +30,15 @@ test.describe("Room Directory", () => {
             // First add a local address `gaming`
             const localAddresses = page.locator(".mx_SettingsFieldset", { hasText: "Local Addresses" });
             await localAddresses.getByRole("textbox").fill("gaming");
-            await expect(page.getByText("This address is available to use")).toBeVisible();
             await localAddresses.getByRole("button", { name: "Add" }).click();
-            await expect(localAddresses.getByText(`#gaming:${user.homeServer}`)).toHaveClass("mx_EditableItem_item");
+            await expect(localAddresses.getByText("#gaming:localhost")).toHaveClass("mx_EditableItem_item");
 
             // Publish into the public rooms directory
             const publishedAddresses = page.locator(".mx_SettingsFieldset", { hasText: "Published Addresses" });
-            await expect(publishedAddresses.locator("#canonicalAlias")).toHaveValue(`#gaming:${user.homeServer}`);
+            await expect(publishedAddresses.locator("#canonicalAlias")).toHaveValue("#gaming:localhost");
             const checkbox = publishedAddresses
                 .locator(".mx_SettingsFlag", {
-                    hasText: `Publish this room to the public in ${user.homeServer}'s room directory?`,
+                    hasText: "Publish this room to the public in localhost's room directory?",
                 })
                 .getByRole("switch");
             await checkbox.check();
@@ -88,7 +86,7 @@ test.describe("Room Directory", () => {
                 .getByRole("button", { name: "Join" })
                 .click();
 
-            await expect(page).toHaveURL(`/#/room/#test1234:${user.homeServer}`);
+            await expect(page).toHaveURL("/#/room/#test1234:localhost");
         },
     );
 });

playwright/e2e/room/room-header.spec.ts

@@ -111,10 +111,6 @@ test.describe("Room Header", () => {
                 async ({ page, app, user }) => {
                     await createVideoRoom(page, app);
 
-                    // Dismiss a toast that is otherwise in the way (it's the other
-                    // side but there's no need to have it in the screenshot)
-                    await page.getByRole("button", { name: "Later" }).click();
-
                     const header = page.locator(".mx_RoomHeader");
 
                     // There's two room info button - the header itself and the i button

playwright/e2e/room_options/marked_unread.spec.ts

@@ -7,13 +7,10 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { test, expect } from "../../element-web-test";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 const TEST_ROOM_NAME = "The mark unread test room";
 
 test.describe("Mark as Unread", () => {
-    test.skip(isDendrite, "due to Dendrite bug https://github.com/element-hq/dendrite/issues/2970");
-
     test.use({
         displayName: "Tom",
         botCreateOpts: {
@@ -51,6 +48,6 @@ test.describe("Mark as Unread", () => {
         await roomTile.getByRole("button", { name: "Room options" }).click();
         await page.getByRole("menuitem", { name: "Mark as unread" }).click();
 
-        await expect(page.getByLabel(TEST_ROOM_NAME + " Unread messages.")).toBeVisible();
+        expect(page.getByLabel(TEST_ROOM_NAME + " Unread messages.")).toBeVisible();
     });
 });

playwright/e2e/settings/account-user-settings-tab.spec.ts

@@ -34,14 +34,14 @@ test.describe("Account user settings tab", () => {
         await expect(profile.getByRole("textbox", { name: "Display Name" })).toHaveValue(USER_NAME);
 
         // Assert that a userId is rendered
-        await expect(uut.getByLabel("Username")).toHaveText(user.userId);
+        expect(uut.getByLabel("Username")).toHaveText(user.userId);
 
         // Wait until spinners disappear
         await expect(uut.getByTestId("accountSection").locator(".mx_Spinner")).not.toBeVisible();
         await expect(uut.getByTestId("discoverySection").locator(".mx_Spinner")).not.toBeVisible();
 
         const accountSection = uut.getByTestId("accountSection");
-        await accountSection.scrollIntoViewIfNeeded();
+        accountSection.scrollIntoViewIfNeeded();
         // Assert that input areas for changing a password exists
         await expect(accountSection.getByLabel("Current password")).toBeVisible();
         await expect(accountSection.getByLabel("New Password")).toBeVisible();

playwright/e2e/settings/encryption-user-tab/advanced.spec.ts

@@ -1,73 +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 "./index";
-import { checkDeviceIsCrossSigned } from "../../crypto/utils";
-import { bootstrapCrossSigningForClient } from "../../../pages/client";
-
-test.describe("Advanced section in Encryption tab", () => {
-    test.beforeEach(async ({ page, app, homeserver, credentials, util }) => {
-        const clientHandle = await app.client.prepareClient();
-        // Reset cross signing in order to have a verified session
-        await bootstrapCrossSigningForClient(clientHandle, credentials, true);
-    });
-
-    test("should show the encryption details", { tag: "@screenshot" }, async ({ page, app, util }) => {
-        await util.openEncryptionTab();
-        const section = util.getEncryptionDetailsSection();
-
-        const deviceId = await page.evaluate(() => window.mxMatrixClientPeg.get().getDeviceId());
-        await expect(section.getByText(deviceId)).toBeVisible();
-
-        await expect(section).toMatchScreenshot("encryption-details.png", {
-            mask: [section.getByTestId("deviceId"), section.getByTestId("sessionKey")],
-        });
-    });
-
-    test("should show the import room keys dialog", async ({ page, app, util }) => {
-        await util.openEncryptionTab();
-        const section = util.getEncryptionDetailsSection();
-
-        await section.getByRole("button", { name: "Import keys" }).click();
-        await expect(page.getByRole("heading", { name: "Import room keys" })).toBeVisible();
-    });
-
-    test("should show the export room keys dialog", async ({ page, app, util }) => {
-        await util.openEncryptionTab();
-        const section = util.getEncryptionDetailsSection();
-
-        await section.getByRole("button", { name: "Export keys" }).click();
-        await expect(page.getByRole("heading", { name: "Export room keys" })).toBeVisible();
-    });
-
-    test(
-        "should reset the cryptographic identity",
-        { tag: "@screenshot" },
-        async ({ page, app, credentials, util }) => {
-            const tab = await util.openEncryptionTab();
-            const section = util.getEncryptionDetailsSection();
-
-            await section.getByRole("button", { name: "Reset cryptographic identity" }).click();
-            await expect(util.getEncryptionTabContent()).toMatchScreenshot("reset-cryptographic-identity.png");
-            await tab.getByRole("button", { name: "Continue" }).click();
-
-            // Fill password dialog and validate
-            const dialog = page.locator(".mx_InteractiveAuthDialog");
-            await dialog.getByRole("textbox", { name: "Password" }).fill(credentials.password);
-            await dialog.getByRole("button", { name: "Continue" }).click();
-
-            await expect(section.getByRole("button", { name: "Reset cryptographic identity" })).toBeVisible();
-
-            // After resetting the identity, the user should set up a new recovery key
-            await expect(
-                util.getEncryptionRecoverySection().getByRole("button", { name: "Set up recovery" }),
-            ).toBeVisible();
-
-            await checkDeviceIsCrossSigned(app);
-        },
-    );
-});

playwright/e2e/settings/encryption-user-tab/encryption-tab.spec.ts

@@ -1,96 +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 { GeneratedSecretStorageKey } from "matrix-js-sdk/src/crypto-api";
-
-import { test, expect } from ".";
-import {
-    checkDeviceIsConnectedKeyBackup,
-    checkDeviceIsCrossSigned,
-    createBot,
-    deleteCachedSecrets,
-    verifySession,
-} from "../../crypto/utils";
-
-test.describe("Encryption tab", () => {
-    test.use({
-        displayName: "Alice",
-    });
-
-    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(
-        "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();
-
-            await util.verifyDevice(recoveryKey);
-
-            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 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, "new passphrase");
-            // 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);
-        },
-    );
-});

playwright/e2e/settings/encryption-user-tab/index.ts

@@ -1,113 +0,0 @@
-/*
- * Copyright 2024 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 { Page } from "@playwright/test";
-import { GeneratedSecretStorageKey } from "matrix-js-sdk/src/crypto-api";
-
-import { ElementAppPage } from "../../../pages/ElementAppPage";
-import { test as base, expect } from "../../../element-web-test";
-export { expect };
-
-/**
- * Set up for the encryption tab test
- */
-export const test = base.extend<{
-    util: Helpers;
-}>({
-    displayName: "Alice",
-
-    util: async ({ page, app, bot }, use) => {
-        await use(new Helpers(page, app));
-    },
-});
-
-class Helpers {
-    constructor(
-        private page: Page,
-        private app: ElementAppPage,
-    ) {}
-
-    /**
-     * Open the encryption tab
-     */
-    openEncryptionTab() {
-        return this.app.settings.openUserSettings("Encryption");
-    }
-
-    /**
-     * Go through the device verification flow using the recovery key.
-     */
-    async verifyDevice(recoveryKey: GeneratedSecretStorageKey) {
-        // Select the security phrase
-        await this.page.getByRole("button", { name: "Verify with Security Key or Phrase" }).click();
-        await this.enterRecoveryKey(recoveryKey);
-        await this.page.getByRole("button", { name: "Done" }).click();
-    }
-
-    /**
-     * Fill the recovery key in the dialog
-     * @param recoveryKey
-     */
-    async enterRecoveryKey(recoveryKey: GeneratedSecretStorageKey) {
-        // Select to use recovery key
-        await this.page.getByRole("button", { name: "use your Security Key" }).click();
-
-        // Fill the recovery key
-        const dialog = this.page.locator(".mx_Dialog");
-        await dialog.getByRole("textbox").fill(recoveryKey.encodedPrivateKey);
-        await dialog.getByRole("button", { name: "Continue" }).click();
-    }
-
-    /**
-     * Get the encryption tab content
-     */
-    getEncryptionTabContent() {
-        return this.page.getByTestId("encryptionTab");
-    }
-
-    /**
-     * Get the recovery section
-     */
-    getEncryptionRecoverySection() {
-        return this.page.getByTestId("recoveryPanel");
-    }
-
-    /**
-     * Get the encryption details section
-     */
-    getEncryptionDetailsSection() {
-        return this.page.getByTestId("encryptionDetails");
-    }
-
-    /**
-     * Set the default key id of the secret storage to `null`
-     */
-    async removeSecretStorageDefaultKeyId() {
-        const client = await this.app.client.prepareClient();
-        await client.evaluate(async (client) => {
-            await client.secretStorage.setDefaultKeyId(null);
-        });
-    }
-
-    /**
-     * Get the security key from the clipboard and fill in the input field
-     * Then click on the finish button
-     * @param title - The title of the dialog
-     * @param confirmButtonLabel - The label of the confirm button
-     * @param screenshot
-     */
-    async confirmRecoveryKey(title: string, confirmButtonLabel: string, screenshot: `${string}.png`) {
-        const dialog = this.getEncryptionTabContent();
-        await expect(dialog.getByText(title, { exact: true })).toBeVisible();
-        await expect(dialog).toMatchScreenshot(screenshot);
-
-        const clipboardContent = await this.app.getClipboard();
-        await dialog.getByRole("textbox").fill(clipboardContent);
-        await dialog.getByRole("button", { name: confirmButtonLabel }).click();
-        await expect(this.getEncryptionRecoverySection()).toMatchScreenshot("default-recovery.png");
-    }
-}

playwright/e2e/settings/encryption-user-tab/recovery.spec.ts

@@ -1,88 +0,0 @@
-/*
- * Copyright 2024 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 ".";
-import { checkDeviceIsConnectedKeyBackup, createBot, verifySession } from "../../crypto/utils";
-
-test.describe("Recovery section in Encryption tab", () => {
-    test.use({
-        displayName: "Alice",
-    });
-
-    test.beforeEach(async ({ page, homeserver, credentials }) => {
-        // The bot bootstraps cross-signing, creates a key backup and sets up a recovery key
-        await createBot(page, homeserver, credentials);
-    });
-
-    test(
-        "should change the recovery key",
-        { tag: ["@screenshot", "@no-webkit"] },
-        async ({ page, app, homeserver, credentials, util, context }) => {
-            await verifySession(app, "new passphrase");
-            const dialog = await util.openEncryptionTab();
-
-            // The user can only change the recovery key
-            const changeButton = dialog.getByRole("button", { name: "Change recovery key" });
-            await expect(changeButton).toBeVisible();
-            await expect(util.getEncryptionRecoverySection()).toMatchScreenshot("default-recovery.png");
-            await changeButton.click();
-
-            // Display the new recovery key and click on the copy button
-            await expect(dialog.getByText("Change recovery key?")).toBeVisible();
-            await expect(util.getEncryptionTabContent()).toMatchScreenshot("change-key-1-encryption-tab.png", {
-                mask: [dialog.getByTestId("recoveryKey")],
-            });
-            await dialog.getByRole("button", { name: "Copy" }).click();
-            await dialog.getByRole("button", { name: "Continue" }).click();
-
-            // Confirm the recovery key
-            await util.confirmRecoveryKey(
-                "Enter your new recovery key",
-                "Confirm new recovery key",
-                "change-key-2-encryption-tab.png",
-            );
-        },
-    );
-
-    test("should setup the recovery key", { tag: ["@screenshot", "@no-webkit"] }, async ({ page, app, util }) => {
-        await verifySession(app, "new passphrase");
-        await util.removeSecretStorageDefaultKeyId();
-
-        // The key backup is deleted and the user needs to set it up
-        const dialog = await util.openEncryptionTab();
-        const setupButton = dialog.getByRole("button", { name: "Set up recovery" });
-        await expect(setupButton).toBeVisible();
-        await expect(util.getEncryptionRecoverySection()).toMatchScreenshot("set-up-recovery.png");
-        await setupButton.click();
-
-        // Display an informative panel about the recovery key
-        await expect(dialog.getByRole("heading", { name: "Set up recovery" })).toBeVisible();
-        await expect(util.getEncryptionTabContent()).toMatchScreenshot("set-up-key-1-encryption-tab.png");
-        await dialog.getByRole("button", { name: "Continue" }).click();
-
-        // Display the new recovery key and click on the copy button
-        await expect(dialog.getByText("Save your recovery key somewhere safe")).toBeVisible();
-        await expect(util.getEncryptionTabContent()).toMatchScreenshot("set-up-key-2-encryption-tab.png", {
-            mask: [dialog.getByTestId("recoveryKey")],
-        });
-        await dialog.getByRole("button", { name: "Copy" }).click();
-        await dialog.getByRole("button", { name: "Continue" }).click();
-
-        // Confirm the recovery key
-        await util.confirmRecoveryKey(
-            "Enter your recovery key to confirm",
-            "Finish set up",
-            "set-up-key-3-encryption-tab.png",
-        );
-
-        // The recovery key is now set up and the user can change it
-        await expect(dialog.getByRole("button", { name: "Change recovery key" })).toBeVisible();
-
-        // Check that the current device is connected to key backup and the backup version is the expected one
-        await checkDeviceIsConnectedKeyBackup(app, "1", true);
-    });
-});

playwright/e2e/settings/general-room-settings-tab.spec.ts

@@ -36,16 +36,15 @@ test.describe("General room settings tab", () => {
         await expect(settings.getByText("Show more")).toBeVisible();
     });
 
-    test("long address should not cause dialog to overflow", { tag: "@no-webkit" }, async ({ page, app, user }) => {
+    test("long address should not cause dialog to overflow", { tag: "@no-webkit" }, async ({ page, app }) => {
         const settings = await app.settings.openRoomSettings("General");
         // 1. Set the room-address to be a really long string
         const longString = "abcasdhjasjhdaj1jh1asdhasjdhajsdhjavhjksd".repeat(4);
         await settings.locator("#roomAliases input[label='Room address']").fill(longString);
-        await expect(page.getByText("This address is available to use")).toBeVisible();
         await settings.locator("#roomAliases").getByText("Add", { exact: true }).click();
 
         // 2. wait for the new setting to apply ...
-        await expect(settings.locator("#canonicalAlias")).toHaveValue(`#${longString}:${user.homeServer}`);
+        await expect(settings.locator("#canonicalAlias")).toHaveValue(`#${longString}:localhost`);
 
         // 3. Check if the dialog overflows
         const dialogBoundingBox = await page.locator(".mx_Dialog").boundingBox();

playwright/e2e/settings/preferences-user-settings-tab.spec.ts

@@ -24,7 +24,7 @@ test.describe("Preferences user settings tab", () => {
     });
 
     test("should be rendered properly", { tag: "@screenshot" }, async ({ app, page, user }) => {
-        await page.setViewportSize({ width: 1024, height: 3300 });
+        page.setViewportSize({ width: 1024, height: 3300 });
         const tab = await app.settings.openUserSettings("Preferences");
         // Assert that the top heading is rendered
         await expect(tab.getByRole("heading", { name: "Preferences" })).toBeVisible();
@@ -61,7 +61,7 @@ test.describe("Preferences user settings tab", () => {
         // Click the button to display the dropdown menu
         await timezoneInput.getByRole("button", { name: "Set timezone" }).click();
         // Select a different value
-        await timezoneInput.getByRole("option", { name: /Africa\/Abidjan/ }).click();
+        timezoneInput.getByRole("option", { name: /Africa\/Abidjan/ }).click();
         // Check the new value
         await expect(timezoneValue.getByText("Africa/Abidjan")).toBeVisible();
     });

playwright/e2e/share-dialog/share-dialog.spec.ts

@@ -23,7 +23,7 @@ test.describe("Share dialog", () => {
 
         const dialog = page.getByRole("dialog", { name: "Share room" });
         await expect(dialog.getByText(`https://matrix.to/#/${room.roomId}`)).toBeVisible();
-        await expect(dialog).toMatchScreenshot("share-dialog-room.png", {
+        expect(dialog).toMatchScreenshot("share-dialog-room.png", {
             // QRCode and url changes at every run
             mask: [page.locator(".mx_QRCode"), page.locator(".mx_ShareDialog_top > span")],
         });
@@ -40,7 +40,7 @@ test.describe("Share dialog", () => {
 
         const dialog = page.getByRole("dialog", { name: "Share User" });
         await expect(dialog.getByText(`https://matrix.to/#/${user.userId}`)).toBeVisible();
-        await expect(dialog).toMatchScreenshot("share-dialog-user.png", {
+        expect(dialog).toMatchScreenshot("share-dialog-user.png", {
             // QRCode changes at every run
             mask: [page.locator(".mx_QRCode")],
         });
@@ -57,7 +57,7 @@ test.describe("Share dialog", () => {
 
         const dialog = page.getByRole("dialog", { name: "Share Room Message" });
         await expect(dialog.getByRole("checkbox", { name: "Link to selected message" })).toBeChecked();
-        await expect(dialog).toMatchScreenshot("share-dialog-event.png", {
+        expect(dialog).toMatchScreenshot("share-dialog-event.png", {
             // QRCode and url changes at every run
             mask: [page.locator(".mx_QRCode"), page.locator(".mx_ShareDialog_top > span")],
         });

playwright/e2e/sliding-sync/sliding-sync.spec.ts

@@ -108,6 +108,7 @@ test.describe("Sliding Sync", () => {
         await page.getByRole("menuitemradio", { name: "A-Z" }).dispatchEvent("click");
         await expect(page.locator(".mx_StyledRadioButton_checked").getByText("A-Z")).toBeVisible();
 
+        await page.pause();
         await checkOrder(["Apple", "Orange", "Pineapple", "Test Room"], page);
     });
 
@@ -275,7 +276,7 @@ test.describe("Sliding Sync", () => {
         // now rescind the invite
         await bot.evaluate(
             async (client, { roomRescind, clientUserId }) => {
-                await client.kick(roomRescind, clientUserId);
+                client.kick(roomRescind, clientUserId);
             },
             { roomRescind, clientUserId },
         );
@@ -294,7 +295,7 @@ test.describe("Sliding Sync", () => {
             is_direct: true,
         });
         await app.client.evaluate(async (client, roomId) => {
-            await client.setRoomTag(roomId, "m.favourite", { order: 0.5 });
+            client.setRoomTag(roomId, "m.favourite", { order: 0.5 });
         }, roomId);
         await expect(page.getByRole("group", { name: "Favourites" }).getByText("Favourite DM")).toBeVisible();
         await expect(page.getByRole("group", { name: "People" }).getByText("Favourite DM")).not.toBeAttached();

playwright/e2e/spaces/spaces.spec.ts

@@ -10,7 +10,6 @@ import type { Locator, Page } from "@playwright/test";
 import { test, expect } from "../../element-web-test";
 import type { Preset, ICreateRoomOpts } from "matrix-js-sdk/src/matrix";
 import { ElementAppPage } from "../../pages/ElementAppPage";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 async function openSpaceCreateMenu(page: Page): Promise<Locator> {
     await page.getByRole("button", { name: "Create a space" }).click();
@@ -51,7 +50,6 @@ function spaceChildInitialState(roomId: string): ICreateRoomOpts["initial_state"
 }
 
 test.describe("Spaces", () => {
-    test.skip(isDendrite, "due to a Dendrite bug https://github.com/element-hq/dendrite/issues/3488");
     test.use({
         displayName: "Sue",
         botCreateOpts: { displayName: "BotBob" },
@@ -84,7 +82,7 @@ test.describe("Spaces", () => {
 
             // Copy matrix.to link
             await page.getByRole("button", { name: "Share invite link" }).click();
-            expect(await app.getClipboard()).toEqual(`https://matrix.to/#/#lets-have-a-riot:${user.homeServer}`);
+            expect(await app.getClipboardText()).toEqual("https://matrix.to/#/#lets-have-a-riot:localhost");
 
             // Go to space home
             await page.getByRole("button", { name: "Go to my first room" }).click();
@@ -171,13 +169,13 @@ test.describe("Spaces", () => {
             room_alias_name: "space",
         });
 
-        const menu = await openSpaceContextMenu(page, app, `#space:${user.homeServer}`);
+        const menu = await openSpaceContextMenu(page, app, "#space:localhost");
         await menu.getByRole("menuitem", { name: "Invite" }).click();
 
         const shareDialog = page.locator(".mx_SpacePublicShare");
         // Copy link first
         await shareDialog.getByRole("button", { name: "Share invite link" }).click();
-        expect(await app.getClipboard()).toEqual(`https://matrix.to/#/#space:${user.homeServer}`);
+        expect(await app.getClipboardText()).toEqual("https://matrix.to/#/#space:localhost");
         // Start Matrix invite flow
         await shareDialog.getByRole("button", { name: "Invite people" }).click();
 

playwright/e2e/spaces/threads-activity-centre/index.ts

@@ -38,13 +38,11 @@ export const test = base.extend<{
     room1Name: "Room 1",
     room1: async ({ room1Name: name, app, user, bot }, use) => {
         const roomId = await app.client.createRoom({ name, invite: [bot.credentials.userId] });
-        await bot.awaitRoomMembership(roomId);
         await use({ name, roomId });
     },
     room2Name: "Room 2",
     room2: async ({ room2Name: name, app, user, bot }, use) => {
         const roomId = await app.client.createRoom({ name, invite: [bot.credentials.userId] });
-        await bot.awaitRoomMembership(roomId);
         await use({ name, roomId });
     },
     msg: async ({ page, app, util }, use) => {

playwright/e2e/spaces/threads-activity-centre/threadsActivityCentre.spec.ts

@@ -8,14 +8,8 @@
 
 import { expect, test } from ".";
 import { CommandOrControl } from "../../utils";
-import { isDendrite } from "../../../plugins/homeserver/dendrite";
 
 test.describe("Threads Activity Centre", { tag: "@no-firefox" }, () => {
-    test.skip(
-        isDendrite,
-        "due to Dendrite lacking full threads support https://github.com/element-hq/dendrite/issues/3283",
-    );
-
     test.use({
         displayName: "Alice",
         botCreateOpts: { displayName: "Other User" },

playwright/e2e/spotlight/spotlight.spec.ts

@@ -6,13 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import type { AccountDataEvents, Visibility } from "matrix-js-sdk/src/matrix";
-import { test as base, expect } from "../../element-web-test";
+import type { AccountDataEvents } from "matrix-js-sdk/src/matrix";
+import { test, expect } from "../../element-web-test";
 import { Filter } from "../../pages/Spotlight";
 import { Bot } from "../../pages/bot";
 import type { Locator, Page } from "@playwright/test";
 import type { ElementAppPage } from "../../pages/ElementAppPage";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 function roomHeaderName(page: Page): Locator {
     return page.locator(".mx_RoomHeader_heading");
@@ -39,37 +38,41 @@ async function startDM(app: ElementAppPage, page: Page, name: string): Promise<v
     await expect(page.getByRole("group", { name: "People" }).getByText(name)).toBeAttached();
 }
 
-type RoomRef = { name: string; roomId: string };
-const test = base.extend<{
-    bot1: Bot;
-    bot2: Bot;
-    room1: RoomRef;
-    room2: RoomRef;
-    room3: RoomRef;
-}>({
-    bot1: async ({ page, homeserver }, use, testInfo) => {
-        const bot = new Bot(page, homeserver, { displayName: `BotBob_${testInfo.testId}`, autoAcceptInvites: true });
-        await use(bot);
-    },
-    bot2: async ({ page, homeserver }, use, testInfo) => {
-        const bot = new Bot(page, homeserver, { displayName: `ByteBot_${testInfo.testId}`, autoAcceptInvites: true });
-        await use(bot);
-    },
-    room1: async ({ app }, use) => {
-        const name = "247";
-        const roomId = await app.client.createRoom({ name, visibility: "public" as Visibility });
-        await use({ name, roomId });
-    },
-    room2: async ({ bot2 }, use) => {
-        const name = "Lounge";
-        const roomId = await bot2.createRoom({ name, visibility: "public" as Visibility });
-        await use({ name, roomId });
-    },
-    room3: async ({ bot2 }, use) => {
-        const name = "Public";
-        const roomId = await bot2.createRoom({
-            name,
-            visibility: "public" as Visibility,
+test.describe("Spotlight", () => {
+    const bot1Name = "BotBob";
+    let bot1: Bot;
+
+    const bot2Name = "ByteBot";
+    let bot2: Bot;
+
+    const room1Name = "247";
+    let room1Id: string;
+
+    const room2Name = "Lounge";
+    let room2Id: string;
+
+    const room3Name = "Public";
+    let room3Id: string;
+
+    test.use({
+        displayName: "Jim",
+    });
+
+    test.beforeEach(async ({ page, homeserver, app, user }) => {
+        bot1 = new Bot(page, homeserver, { displayName: bot1Name, autoAcceptInvites: true });
+        bot2 = new Bot(page, homeserver, { displayName: bot2Name, autoAcceptInvites: true });
+        const Visibility = await page.evaluate(() => (window as any).matrixcs.Visibility);
+
+        room1Id = await app.client.createRoom({ name: room1Name, visibility: Visibility.Public });
+
+        await bot1.joinRoom(room1Id);
+        const bot1UserId = await bot1.evaluate((client) => client.getUserId());
+        room2Id = await bot2.createRoom({ name: room2Name, visibility: Visibility.Public });
+        await bot2.inviteUser(room2Id, bot1UserId);
+
+        room3Id = await bot2.createRoom({
+            name: room3Name,
+            visibility: Visibility.Public,
             initial_state: [
                 {
                     type: "m.room.history_visibility",
@@ -80,27 +83,9 @@ const test = base.extend<{
                 },
             ],
         });
-        await use({ name, roomId });
-    },
-    context: async ({ context, homeserver }, use) => {
-        // Restart the homeserver to wipe its in-memory db so we can reuse the same user ID without cross-signing prompts
-        await homeserver.restart();
-        await use(context);
-    },
-});
+        await bot2.inviteUser(room3Id, bot1UserId);
 
-test.describe("Spotlight", () => {
-    test.skip(isDendrite, "due to a Dendrite bug https://github.com/element-hq/dendrite/issues/3488");
-    test.use({
-        displayName: "Jim",
-    });
-
-    test.beforeEach(async ({ page, user, bot1, bot2, room1, room2, room3 }) => {
-        await bot1.joinRoom(room1.roomId);
-        await bot2.inviteUser(room2.roomId, bot1.credentials.userId);
-        await bot2.inviteUser(room3.roomId, bot1.credentials.userId);
-
-        await page.goto(`/#/room/${room1.roomId}`);
+        await page.goto("/#/room/" + room1Id);
         await expect(page.locator(".mx_RoomSublist_skeletonUI")).not.toBeAttached();
     });
 
@@ -132,69 +117,69 @@ test.describe("Spotlight", () => {
         await expect(spotlight.dialog.locator(".mx_SpotlightDialog_filter")).not.toBeAttached();
     });
 
-    test("should find joined rooms", async ({ page, app, room1 }) => {
+    test("should find joined rooms", async ({ page, app }) => {
         const spotlight = await app.openSpotlight();
         await page.waitForTimeout(500); // wait for the dialog to settle
-        await spotlight.search(room1.name);
+        await spotlight.search(room1Name);
         const resultLocator = spotlight.results;
         await expect(resultLocator).toHaveCount(1);
-        await expect(resultLocator.first()).toContainText(room1.name);
+        await expect(resultLocator.first()).toContainText(room1Name);
         await resultLocator.first().click();
-        await expect(page).toHaveURL(new RegExp(`#/room/${room1.roomId}`));
-        await expect(roomHeaderName(page)).toContainText(room1.name);
+        await expect(page).toHaveURL(new RegExp(`#/room/${room1Id}`));
+        await expect(roomHeaderName(page)).toContainText(room1Name);
     });
 
-    test("should find known public rooms", async ({ page, app, room1 }) => {
+    test("should find known public rooms", async ({ page, app }) => {
         const spotlight = await app.openSpotlight();
         await page.waitForTimeout(500); // wait for the dialog to settle
         await spotlight.filter(Filter.PublicRooms);
-        await spotlight.search(room1.name);
+        await spotlight.search(room1Name);
         const resultLocator = spotlight.results;
         await expect(resultLocator).toHaveCount(1);
-        await expect(resultLocator.first()).toContainText(room1.name);
+        await expect(resultLocator.first()).toContainText(room1Name);
         await expect(resultLocator.first()).toContainText("View");
         await resultLocator.first().click();
-        await expect(page).toHaveURL(new RegExp(`#/room/${room1.roomId}`));
-        await expect(roomHeaderName(page)).toContainText(room1.name);
+        await expect(page).toHaveURL(new RegExp(`#/room/${room1Id}`));
+        await expect(roomHeaderName(page)).toContainText(room1Name);
     });
 
-    test("should find unknown public rooms", async ({ page, app, room2 }) => {
+    test("should find unknown public rooms", async ({ page, app }) => {
         const spotlight = await app.openSpotlight();
         await page.waitForTimeout(500); // wait for the dialog to settle
         await spotlight.filter(Filter.PublicRooms);
-        await spotlight.search(room2.name);
+        await spotlight.search(room2Name);
         const resultLocator = spotlight.results;
         await expect(resultLocator).toHaveCount(1);
-        await expect(resultLocator.first()).toContainText(room2.name);
+        await expect(resultLocator.first()).toContainText(room2Name);
         await expect(resultLocator.first()).toContainText("Join");
         await resultLocator.first().click();
-        await expect(page).toHaveURL(new RegExp(`#/room/${room2.roomId}`));
+        await expect(page).toHaveURL(new RegExp(`#/room/${room2Id}`));
         await expect(page.locator(".mx_RoomView_MessageList")).toHaveCount(1);
-        await expect(roomHeaderName(page)).toContainText(room2.name);
+        await expect(roomHeaderName(page)).toContainText(room2Name);
     });
 
-    test("should find unknown public world readable rooms", async ({ page, app, room3 }) => {
+    test("should find unknown public world readable rooms", async ({ page, app }) => {
         const spotlight = await app.openSpotlight();
         await page.waitForTimeout(500); // wait for the dialog to settle
         await spotlight.filter(Filter.PublicRooms);
-        await spotlight.search(room3.name);
+        await spotlight.search(room3Name);
         const resultLocator = spotlight.results;
         await expect(resultLocator).toHaveCount(1);
-        await expect(resultLocator.first()).toContainText(room3.name);
+        await expect(resultLocator.first()).toContainText(room3Name);
         await expect(resultLocator.first()).toContainText("View");
         await resultLocator.first().click();
-        await expect(page).toHaveURL(new RegExp(`#/room/${room3.roomId}`));
+        await expect(page).toHaveURL(new RegExp(`#/room/${room3Id}`));
         await page.getByRole("button", { name: "Join the discussion" }).click();
-        await expect(roomHeaderName(page)).toHaveText(room3.name);
+        await expect(roomHeaderName(page)).toHaveText(room3Name);
     });
 
     // TODO: We currently can’t test finding rooms on other homeservers/other protocols
     // We obviously don’t have federation or bridges in local e2e tests
-    test.skip("should find unknown public rooms on other homeservers", async ({ page, app, room3 }) => {
+    test.skip("should find unknown public rooms on other homeservers", async ({ page, app }) => {
         const spotlight = await app.openSpotlight();
         await page.waitForTimeout(500); // wait for the dialog to settle
         await spotlight.filter(Filter.PublicRooms);
-        await spotlight.search(room3.name);
+        await spotlight.search(room3Name);
         await page.locator("[aria-haspopup=true][role=button]").click();
 
         await page
@@ -209,20 +194,20 @@ test.describe("Spotlight", () => {
 
         const resultLocator = spotlight.results;
         await expect(resultLocator).toHaveCount(1);
-        await expect(resultLocator.first()).toContainText(room3.name);
-        await expect(resultLocator.first()).toContainText(room3.roomId);
+        await expect(resultLocator.first()).toContainText(room3Name);
+        await expect(resultLocator.first()).toContainText(room3Id);
     });
 
-    test("should find known people", async ({ page, app, bot1 }) => {
+    test("should find known people", async ({ page, app }) => {
         const spotlight = await app.openSpotlight();
         await page.waitForTimeout(500); // wait for the dialog to settle
         await spotlight.filter(Filter.People);
-        await spotlight.search(bot1.credentials.displayName);
+        await spotlight.search(bot1Name);
         const resultLocator = spotlight.results;
         await expect(resultLocator).toHaveCount(1);
-        await expect(resultLocator.first()).toContainText(bot1.credentials.displayName);
+        await expect(resultLocator.first()).toContainText(bot1Name);
         await resultLocator.first().click();
-        await expect(roomHeaderName(page)).toHaveText(bot1.credentials.displayName);
+        await expect(roomHeaderName(page)).toHaveText(bot1Name);
     });
 
     /**
@@ -232,41 +217,42 @@ test.describe("Spotlight", () => {
      *
      * https://github.com/matrix-org/synapse/issues/16472
      */
-    test("should find unknown people", async ({ page, app, bot2 }) => {
+    test("should find unknown people", async ({ page, app }) => {
         const spotlight = await app.openSpotlight();
         await page.waitForTimeout(500); // wait for the dialog to settle
         await spotlight.filter(Filter.People);
-        await spotlight.search(bot2.credentials.displayName);
+        await spotlight.search(bot2Name);
         const resultLocator = spotlight.results;
         await expect(resultLocator).toHaveCount(1);
-        await expect(resultLocator.first()).toContainText(bot2.credentials.displayName);
+        await expect(resultLocator.first()).toContainText(bot2Name);
         await resultLocator.first().click();
-        await expect(roomHeaderName(page)).toHaveText(bot2.credentials.displayName);
+        await expect(roomHeaderName(page)).toHaveText(bot2Name);
     });
 
-    test("should find group DMs by usernames or user ids", async ({ page, app, bot1, bot2, room1 }) => {
+    test("should find group DMs by usernames or user ids", async ({ page, app }) => {
         // First we want to share a room with both bots to ensure we’ve got their usernames cached
-        await app.client.inviteUser(room1.roomId, bot2.credentials.userId);
+        const bot2UserId = await bot2.evaluate((client) => client.getUserId());
+        await app.client.inviteUser(room1Id, bot2UserId);
 
         // Starting a DM with ByteBot (will be turned into a group dm later)
         let spotlight = await app.openSpotlight();
         await page.waitForTimeout(500); // wait for the dialog to settle
         await spotlight.filter(Filter.People);
-        await spotlight.search(bot2.credentials.displayName);
+        await spotlight.search(bot2Name);
         let resultLocator = spotlight.results;
         await expect(resultLocator).toHaveCount(1);
-        await expect(resultLocator.first()).toContainText(bot2.credentials.displayName);
+        await expect(resultLocator.first()).toContainText(bot2Name);
         await resultLocator.first().click();
 
         // Send first message to actually start DM
-        await expect(roomHeaderName(page)).toHaveText(bot2.credentials.displayName);
+        await expect(roomHeaderName(page)).toHaveText(bot2Name);
         const locator = page.getByRole("textbox", { name: "Send a message…" });
         await locator.fill("Hey!");
         await locator.press("Enter");
 
         // Assert DM exists by checking for the first message and the room being in the room list
         await expect(page.locator(".mx_EventTile_body").filter({ hasText: "Hey!" })).toBeAttached({ timeout: 3000 });
-        await expect(page.getByRole("group", { name: "People" })).toContainText(bot2.credentials.displayName);
+        await expect(page.getByRole("group", { name: "People" })).toContainText(bot2Name);
 
         // Invite BotBob into existing DM with ByteBot
         const dmRooms = await app.client.evaluate((client, userId) => {
@@ -274,17 +260,18 @@ test.describe("Spotlight", () => {
                 .getAccountData("m.direct" as keyof AccountDataEvents)
                 ?.getContent<Record<string, string[]>>();
             return map[userId] ?? [];
-        }, bot2.credentials.userId);
+        }, bot2UserId);
         expect(dmRooms).toHaveLength(1);
         const groupDmName = await app.client.evaluate((client, id) => client.getRoom(id).name, dmRooms[0]);
-        await app.client.inviteUser(dmRooms[0], bot1.credentials.userId);
+        const bot1UserId = await bot1.evaluate((client) => client.getUserId());
+        await app.client.inviteUser(dmRooms[0], bot1UserId);
         await expect(roomHeaderName(page).first()).toContainText(groupDmName);
         await expect(page.getByRole("group", { name: "People" }).first()).toContainText(groupDmName);
 
         // Search for BotBob by id, should return group DM and user
         spotlight = await app.openSpotlight();
         await spotlight.filter(Filter.People);
-        await spotlight.search(bot1.credentials.userId);
+        await spotlight.search(bot1UserId);
         await page.waitForTimeout(1000); // wait for the dialog to settle
         resultLocator = spotlight.results;
         await expect(resultLocator).toHaveCount(2);
@@ -297,7 +284,7 @@ test.describe("Spotlight", () => {
         // Search for ByteBot by id, should return group DM and user
         spotlight = await app.openSpotlight();
         await spotlight.filter(Filter.People);
-        await spotlight.search(bot2.credentials.userId);
+        await spotlight.search(bot2UserId);
         await page.waitForTimeout(1000); // wait for the dialog to settle
         resultLocator = spotlight.results;
         await expect(resultLocator).toHaveCount(2);
@@ -310,10 +297,11 @@ test.describe("Spotlight", () => {
     });
 
     // Test against https://github.com/vector-im/element-web/issues/22851
-    test("should show each person result only once", async ({ page, app, bot1 }) => {
+    test("should show each person result only once", async ({ page, app }) => {
         const spotlight = await app.openSpotlight();
         await page.waitForTimeout(500); // wait for the dialog to settle
         await spotlight.filter(Filter.People);
+        const bot1UserId = await bot1.evaluate((client) => client.getUserId());
 
         // 2 rounds of search to simulate the bug conditions. Specifically, the first search
         // should have 1 result (not 2) and the second search should also have 1 result (instead
@@ -322,24 +310,24 @@ test.describe("Spotlight", () => {
         // We search for user ID to trigger the profile lookup within the dialog.
         for (let i = 0; i < 2; i++) {
             console.log("Iteration: " + i);
-            await spotlight.search(bot1.credentials.userId);
+            await spotlight.search(bot1UserId);
             await page.waitForTimeout(1000); // wait for the dialog to settle
             const resultLocator = spotlight.results;
             await expect(resultLocator).toHaveCount(1);
-            await expect(resultLocator.first()).toContainText(bot1.credentials.userId);
+            await expect(resultLocator.first()).toContainText(bot1UserId);
         }
     });
 
-    test("should allow opening group chat dialog", async ({ page, app, bot2 }) => {
+    test("should allow opening group chat dialog", async ({ page, app }) => {
         const spotlight = await app.openSpotlight();
         await page.waitForTimeout(500); // wait for the dialog to settle
         await spotlight.filter(Filter.People);
-        await spotlight.search(bot2.credentials.displayName);
+        await spotlight.search(bot2Name);
         await page.waitForTimeout(3000); // wait for the dialog to settle
 
         const resultLocator = spotlight.results;
         await expect(resultLocator).toHaveCount(1);
-        await expect(resultLocator.first()).toContainText(bot2.credentials.displayName);
+        await expect(resultLocator.first()).toContainText(bot2Name);
 
         await expect(spotlight.dialog.locator(".mx_SpotlightDialog_startGroupChat")).toContainText(
             "Start a group chat",
@@ -348,18 +336,18 @@ test.describe("Spotlight", () => {
         await expect(page.getByRole("dialog")).toContainText("Direct Messages");
     });
 
-    test("should close spotlight after starting a DM", async ({ page, app, bot1 }) => {
-        await startDM(app, page, bot1.credentials.displayName);
+    test("should close spotlight after starting a DM", async ({ page, app }) => {
+        await startDM(app, page, bot1Name);
         await expect(page.locator(".mx_SpotlightDialog")).toHaveCount(0);
     });
 
-    test("should show the same user only once", async ({ page, app, bot1 }) => {
-        await startDM(app, page, bot1.credentials.displayName);
+    test("should show the same user only once", async ({ page, app }) => {
+        await startDM(app, page, bot1Name);
         await page.goto("/#/home");
         const spotlight = await app.openSpotlight();
         await page.waitForTimeout(500); // wait for the dialog to settle
         await spotlight.filter(Filter.People);
-        await spotlight.search(bot1.credentials.displayName);
+        await spotlight.search(bot1Name);
         await page.waitForTimeout(3000); // wait for the dialog to settle
         await expect(spotlight.dialog.locator(".mx_Spinner")).not.toBeAttached();
         const resultLocator = spotlight.results;

playwright/e2e/threads/threads.spec.ts

@@ -8,10 +8,8 @@ Please see LICENSE files in the repository root for full details.
 import { SettingLevel } from "../../../src/settings/SettingLevel";
 import { Layout } from "../../../src/settings/enums/Layout";
 import { test, expect } from "../../element-web-test";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
 
 test.describe("Threads", () => {
-    test.skip(isDendrite, "due to a Dendrite bug https://github.com/element-hq/dendrite/issues/3489");
     test.use({
         displayName: "Tom",
         botCreateOpts: {
@@ -26,7 +24,8 @@ test.describe("Threads", () => {
         });
     });
 
-    test("should be usable for a conversation", { tag: "@screenshot" }, async ({ page, app, bot }) => {
+    // Flaky: https://github.com/vector-im/element-web/issues/26452
+    test.skip("should be usable for a conversation", { tag: "@screenshot" }, async ({ page, app, bot }) => {
         const roomId = await app.client.createRoom({});
         await app.client.inviteUser(roomId, bot.credentials.userId);
         await bot.joinRoom(roomId);
@@ -77,7 +76,7 @@ test.describe("Threads", () => {
             mask: mask,
         });
         await app.settings.setValue("layout", null, SettingLevel.DEVICE, Layout.Bubble);
-        await expect(page.locator(".mx_ThreadView .mx_EventTile[data-layout='bubble']")).toHaveCount(2);
+        await expect(page.locator(".mx_ThreadView .mx_EventTile[data-layout='bubble']")).toBeVisible();
 
         await expect(page.locator(".mx_ThreadView")).toMatchScreenshot("Initial_ThreadView_on_bubble_layout.png", {
             mask: mask,
@@ -137,8 +136,8 @@ test.describe("Threads", () => {
         await page.getByRole("gridcell", { name: "👋" }).click();
 
         locator = page.locator(".mx_ThreadView");
-        // Make sure the CSS style for spacing is applied to mx_EventTile_footer on group/modern layout
-        await expect(locator.locator(".mx_EventTile[data-layout=group] .mx_EventTile_footer")).toHaveCSS(
+        // Make sure the CSS style for spacing is applied to mx_ReactionsRow on group/modern layout
+        await expect(locator.locator(".mx_EventTile[data-layout=group] .mx_ReactionsRow")).toHaveCSS(
             "margin-inline-start",
             ThreadViewGroupSpacingStart,
         );
@@ -165,7 +164,7 @@ test.describe("Threads", () => {
         locator = page.locator(
             ".mx_ThreadView .mx_GenericEventListSummary[data-layout=bubble] .mx_EventTile_info.mx_EventTile_last",
         );
-        await expect(locator.locator(".mx_EventTile_line .mx_EventTile_content"))
+        expect(locator.locator(".mx_EventTile_line .mx_EventTile_content"))
             // 76px: ThreadViewGroupSpacingStart + 14px + 6px
             // 14px: avatar width
             // See: _EventTile.pcss
@@ -203,14 +202,12 @@ test.describe("Threads", () => {
         await locator.click();
 
         // Wait until the response is redacted
-        // XXX: one would expect this redaction to be shown in the thread the message was in, but due to redactions
-        // stripping the thread_id, it is instead shown in the main timeline
-        await expect(page.locator(".mx_MainSplit_timeline").locator(".mx_EventTile_last")).toContainText(
-            "Message deleted",
-        );
+        await expect(
+            page.locator(".mx_ThreadView").locator(".mx_EventTile_last .mx_EventTile_receiptSent"),
+        ).toBeVisible();
 
         // Take snapshots in group layout and bubble layout (IRC layout is not available on ThreadView)
-        await expect(page.locator(".mx_ThreadView .mx_EventTile[data-layout='group']")).toHaveCount(2);
+        await expect(page.locator(".mx_ThreadView .mx_EventTile[data-layout='group']")).toBeVisible();
         await expect(page.locator(".mx_ThreadView")).toMatchScreenshot(
             "ThreadView_with_redacted_messages_on_group_layout.png",
             {
@@ -218,7 +215,7 @@ test.describe("Threads", () => {
             },
         );
         await app.settings.setValue("layout", null, SettingLevel.DEVICE, Layout.Bubble);
-        await expect(page.locator(".mx_ThreadView .mx_EventTile[data-layout='bubble']")).toHaveCount(2);
+        await expect(page.locator(".mx_ThreadView .mx_EventTile[data-layout='bubble']")).toBeVisible();
         await expect(page.locator(".mx_ThreadView")).toMatchScreenshot(
             "ThreadView_with_redacted_messages_on_bubble_layout.png",
             {
@@ -236,8 +233,8 @@ test.describe("Threads", () => {
 
         // User closes right panel after clicking back to thread list
         locator = page.locator(".mx_ThreadPanel");
-        await locator.getByRole("button", { name: "Threads" }).click();
-        await locator.getByRole("button", { name: "Close" }).click();
+        locator.getByRole("button", { name: "Threads" }).click();
+        locator.getByRole("button", { name: "Close" }).click();
 
         // Bot responds to thread
         await bot.sendMessage(roomId, "How are things?", threadId);
@@ -246,8 +243,9 @@ test.describe("Threads", () => {
         await expect(locator.locator(".mx_ThreadSummary_sender").getByText("BotBob")).toBeAttached();
         await expect(locator.locator(".mx_ThreadSummary_content").getByText("How are things?")).toBeAttached();
 
-        locator = page.getByRole("banner").getByRole("button", { name: "Threads" });
-        await expect(locator).toHaveAttribute("data-indicator", "success"); // User asserts thread list unread indicator
+        locator = page.getByRole("button", { name: "Threads" });
+        await expect(locator).toHaveAttribute("data-indicator", "default"); // User asserts thread list unread indicator
+        // await expect(locator).toHaveClass(/mx_LegacyRoomHeader_button--unread/);
         await locator.click(); // User opens thread list
 
         // User asserts thread with correct root & latest events & unread dot
@@ -275,18 +273,20 @@ test.describe("Threads", () => {
         await expect(locator.getByText("Great!")).toBeAttached();
         await locator.locator(".mx_EventTile_line").hover();
         await locator.locator(".mx_EventTile_line").getByRole("button", { name: "Edit" }).click();
-        await locator.getByRole("textbox").pressSequentially(" How about yourself?"); // fill would overwrite the original text
+        await locator.getByRole("textbox").fill(" How about yourself?{enter}");
         await locator.getByRole("textbox").press("Enter");
 
         locator = page.locator(".mx_RoomView_body .mx_ThreadSummary");
         await expect(locator.locator(".mx_ThreadSummary_sender").getByText("Tom")).toBeAttached();
-        await expect(locator.locator(".mx_ThreadSummary_content")).toHaveText("Great! How about yourself?");
+        await expect(
+            locator.locator(".mx_ThreadSummary_content").getByText("Great! How about yourself?"),
+        ).toBeAttached();
 
         // User closes right panel
         await page.locator(".mx_ThreadPanel").getByRole("button", { name: "Close" }).click();
 
         // Bot responds to thread and saves the id of their message to @eventId
-        const { event_id: eventId } = await bot.sendMessage(roomId, "I'm very good thanks", threadId);
+        const { event_id: eventId } = await bot.sendMessage(roomId, threadId, "I'm very good thanks");
 
         // User asserts
         locator = page.locator(".mx_RoomView_body .mx_ThreadSummary");
@@ -344,7 +344,7 @@ test.describe("Threads", () => {
 
             await expect(page.locator(".mx_ThreadView_timelinePanelWrapper")).toHaveCount(1);
 
-            await (await app.openMessageComposerOptions(true)).getByRole("menuitem", { name: "Voice Message" }).click();
+            (await app.openMessageComposerOptions(true)).getByRole("menuitem", { name: "Voice Message" }).click();
             await page.waitForTimeout(3000);
             await app.getComposer(true).getByRole("button", { name: "Send voice message" }).click();
             await expect(page.locator(".mx_ThreadView .mx_MVoiceMessageBody")).toHaveCount(1);

playwright/e2e/timeline/timeline.spec.ts

@@ -590,6 +590,10 @@ test.describe("Timeline", () => {
             "should set inline start padding to a hidden event line",
             { tag: "@screenshot" },
             async ({ page, app, room }) => {
+                test.skip(
+                    true,
+                    "Disabled due to screenshot test being flaky - https://github.com/element-hq/element-web/issues/26890",
+                );
                 await sendEvent(app.client, room.roomId);
                 await page.goto(`/#/room/${room.roomId}`);
                 await app.settings.setValue("showHiddenEventsInTimeline", null, SettingLevel.DEVICE, true);
@@ -603,12 +607,7 @@ test.describe("Timeline", () => {
                 await messageEdit(page);
 
                 // Click timestamp to highlight hidden event line
-                const timestamp = page.locator(".mx_RoomView_body .mx_EventTile_info a", {
-                    has: page.locator(".mx_MessageTimestamp"),
-                });
-                // wait for the remote echo otherwise we get an error modal due to a 404 on the /event/ API
-                await expect(timestamp).not.toHaveAttribute("href", /~!/);
-                await timestamp.locator(".mx_MessageTimestamp").click();
+                await page.locator(".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp").click();
 
                 // should not add inline start padding to a hidden event line on IRC layout
                 await app.settings.setValue("layout", null, SettingLevel.DEVICE, Layout.IRC);
@@ -1195,7 +1194,6 @@ test.describe("Timeline", () => {
             });
 
             await sendImage(app.client, room.roomId, NEW_AVATAR);
-            await app.timeline.scrollToBottom();
             await expect(page.locator(".mx_MImageBody").first()).toBeVisible();
 
             // Exclude timestamp and read marker from snapshot