Update shell script

.dockerignore

@@ -7,6 +7,3 @@ karma-reports/
 .idea/
 .tmp/
 config.json*
-# Exclude the playwright directory as much as we can as the snapshots are huge and we bind mount it in
-playwright/
-!playwright/docker-entrypoint.sh

.editorconfig

@@ -1,8 +1,16 @@
-#   Copyright 2024 New Vector Ltd.
 #   Copyright 2017 Aviral Dasgupta
 #
-#   SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
-#   Please see LICENSE files in the repository root for full details.
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
 
 root = true
 
@@ -18,7 +26,4 @@ trim_trailing_whitespace = true
 indent_size = 4
 
 [package.json]
-indent_size = 4
-
-[*.tsx.snap]
-trim_trailing_whitespace = false
+indent_size = 2

.env.example

@@ -0,0 +1,16 @@
+# To enable CSS hot-reload, set the following variable to 1.
+CSS_HOT_RELOAD=1
+# To use the full page error dialog, set this to 1. Please report false positives to
+# the issue tracker for handling.
+FULL_PAGE_ERRORS=0
+# To use a single theme, uncomment the line with the theme you want to hot-reload.
+MATRIX_THEMES='light'
+#MATRIX_THEMES='dark'
+#MATRIX_THEMES='legacy-light'
+#MATRIX_THEMES='legacy-dark'
+#MATRIX_THEMES='light-custom'
+#MATRIX_THEMES='dark-custom'
+# You can also enable multiple themes by using a comma-separated list.
+# When multiple themes are enabled, switching between them may require a full page reload.
+# Note that compilation times are proportional to the number of enabled themes.
+#MATRIX_THEMES='light,dark'

.eslintignore

@@ -1,10 +1,5 @@
 src/vector/modernizr.js
-test/end-to-end-tests/node_modules/
-test/end-to-end-tests/element/
-test/end-to-end-tests/synapse/
-test/end-to-end-tests/lib/
 # Legacy skinning file that some people might still have
 src/component-index.js
 # Auto-generated file
 src/modules.ts
-src/modules.js

.eslintrc-module_system.js

@@ -0,0 +1,72 @@
+module.exports = {
+    plugins: ["matrix-org"],
+    extends: ["./.eslintrc.js"],
+    parserOptions: {
+        project: ["./tsconfig.module_system.json"],
+    },
+    overrides: [
+        {
+            files: ["module_system/**/*.{ts,tsx}"],
+            extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
+            // NOTE: These rules are frozen and new rules should not be added here.
+            // New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/
+            rules: {
+                // Things we do that break the ideal style
+                "prefer-promise-reject-errors": "off",
+                "quotes": "off",
+
+                // We disable this while we're transitioning
+                "@typescript-eslint/no-explicit-any": "off",
+                // We're okay with assertion errors when we ask for them
+                "@typescript-eslint/no-non-null-assertion": "off",
+
+                // Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
+                "no-restricted-imports": [
+                    "error",
+                    {
+                        paths: [
+                            {
+                                name: "matrix-js-sdk",
+                                message: "Please use matrix-js-sdk/src/matrix instead",
+                            },
+                            {
+                                name: "matrix-js-sdk/",
+                                message: "Please use matrix-js-sdk/src/matrix instead",
+                            },
+                            {
+                                name: "matrix-js-sdk/src",
+                                message: "Please use matrix-js-sdk/src/matrix instead",
+                            },
+                            {
+                                name: "matrix-js-sdk/src/",
+                                message: "Please use matrix-js-sdk/src/matrix instead",
+                            },
+                            {
+                                name: "matrix-js-sdk/src/index",
+                                message: "Please use matrix-js-sdk/src/matrix instead",
+                            },
+                            {
+                                name: "matrix-react-sdk",
+                                message: "Please use matrix-react-sdk/src/index instead",
+                            },
+                            {
+                                name: "matrix-react-sdk/",
+                                message: "Please use matrix-react-sdk/src/index instead",
+                            },
+                        ],
+                        patterns: [
+                            {
+                                group: ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
+                                message: "Please use matrix-js-sdk/src/* instead",
+                            },
+                            {
+                                group: ["matrix-react-sdk/lib", "matrix-react-sdk/lib/", "matrix-react-sdk/lib/**"],
+                                message: "Please use matrix-react-sdk/src/* instead",
+                            },
+                        ],
+                    },
+                ],
+            },
+        },
+    ],
+};

.eslintrc.js

@@ -1,6 +1,6 @@
 module.exports = {
-    plugins: ["matrix-org", "eslint-plugin-react-compiler"],
-    extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react", "plugin:matrix-org/a11y"],
+    plugins: ["matrix-org"],
+    extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react"],
     parserOptions: {
         project: ["./tsconfig.json"],
     },
@@ -8,286 +8,18 @@ module.exports = {
         browser: true,
         node: true,
     },
-    globals: {
-        LANGUAGES_FILE: "readonly",
-    },
     rules: {
         // Things we do that break the ideal style
-        "no-constant-condition": "off",
-        "prefer-promise-reject-errors": "off",
-        "no-async-promise-executor": "off",
-        "no-extra-boolean-cast": "off",
-
-        // Bind or arrow functions in props causes performance issues (but we
-        // currently use them in some places).
-        // It's disabled here, but we should using it sparingly.
-        "react/jsx-no-bind": "off",
-        "react/jsx-key": ["error"],
-
-        "no-restricted-properties": [
-            "error",
-            ...buildRestrictedPropertiesOptions(
-                ["window.innerHeight", "window.innerWidth", "window.visualViewport"],
-                "Use UIStore to access window dimensions instead.",
-            ),
-            ...buildRestrictedPropertiesOptions(
-                ["*.mxcUrlToHttp", "*.getHttpUriForMxc"],
-                "Use Media helper instead to centralise access for customisation.",
-            ),
-            ...buildRestrictedPropertiesOptions(["window.setImmediate"], "Use setTimeout instead."),
-        ],
-        "no-restricted-globals": [
-            "error",
-            {
-                name: "setImmediate",
-                message: "Use setTimeout instead.",
-            },
-            {
-                name: "Buffer",
-                message: "Buffer is not available in the web.",
-            },
-        ],
-
-        "import/no-duplicates": ["error"],
-        // Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
-        // Ban compound-design-tokens raw svg imports in favour of their React component counterparts
-        "no-restricted-imports": [
-            "error",
-            {
-                paths: [
-                    {
-                        name: "@testing-library/react",
-                        message: "Please use jest-matrix-react instead",
-                    },
-                    {
-                        name: "matrix-js-sdk",
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        name: "matrix-js-sdk/",
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        name: "matrix-js-sdk/src",
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        name: "matrix-js-sdk/src/",
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        name: "matrix-js-sdk/src/index",
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        name: "emojibase-regex",
-                        message:
-                            "This regex doesn't actually test for emoji. See the docs at https://emojibase.dev/docs/regex/ and prefer our own EMOJI_REGEX from HtmlUtils.",
-                    },
-                ],
-                patterns: [
-                    {
-                        group: [
-                            "matrix-js-sdk/src/**",
-                            "!matrix-js-sdk/src/matrix",
-                            "!matrix-js-sdk/src/crypto-api",
-                            "!matrix-js-sdk/src/types",
-                            "!matrix-js-sdk/src/testing",
-                            "!matrix-js-sdk/src/utils/**",
-                            "matrix-js-sdk/src/utils/internal/**",
-                            "matrix-js-sdk/lib",
-                            "matrix-js-sdk/lib/",
-                            "matrix-js-sdk/lib/**",
-                            // XXX: Temporarily allow these as they are not available via the main export
-                            "!matrix-js-sdk/src/logger",
-                            "!matrix-js-sdk/src/errors",
-                            "!matrix-js-sdk/src/utils",
-                            "!matrix-js-sdk/src/version-support",
-                            "!matrix-js-sdk/src/randomstring",
-                            "!matrix-js-sdk/src/sliding-sync",
-                            "!matrix-js-sdk/src/browser-index",
-                            "!matrix-js-sdk/src/feature",
-                            "!matrix-js-sdk/src/NamespacedValue",
-                            "!matrix-js-sdk/src/ReEmitter",
-                            "!matrix-js-sdk/src/event-mapper",
-                            "!matrix-js-sdk/src/interactive-auth",
-                            "!matrix-js-sdk/src/secret-storage",
-                            "!matrix-js-sdk/src/room-hierarchy",
-                            "!matrix-js-sdk/src/rendezvous",
-                            "!matrix-js-sdk/src/indexeddb-worker",
-                            "!matrix-js-sdk/src/pushprocessor",
-                            "!matrix-js-sdk/src/extensible_events_v1",
-                            "!matrix-js-sdk/src/extensible_events_v1/PollStartEvent",
-                            "!matrix-js-sdk/src/extensible_events_v1/PollResponseEvent",
-                            "!matrix-js-sdk/src/extensible_events_v1/PollEndEvent",
-                            "!matrix-js-sdk/src/extensible_events_v1/InvalidEventError",
-                            "!matrix-js-sdk/src/oidc",
-                            "!matrix-js-sdk/src/oidc/discovery",
-                            "!matrix-js-sdk/src/oidc/authorize",
-                            "!matrix-js-sdk/src/oidc/validate",
-                            "!matrix-js-sdk/src/oidc/error",
-                            "!matrix-js-sdk/src/oidc/register",
-                            "!matrix-js-sdk/src/webrtc",
-                            "!matrix-js-sdk/src/webrtc/call",
-                            "!matrix-js-sdk/src/webrtc/callFeed",
-                            "!matrix-js-sdk/src/webrtc/mediaHandler",
-                            "!matrix-js-sdk/src/webrtc/callEventTypes",
-                            "!matrix-js-sdk/src/webrtc/callEventHandler",
-                            "!matrix-js-sdk/src/webrtc/groupCallEventHandler",
-                            "!matrix-js-sdk/src/models",
-                            "!matrix-js-sdk/src/models/read-receipt",
-                            "!matrix-js-sdk/src/models/relations-container",
-                            "!matrix-js-sdk/src/models/related-relations",
-                            "!matrix-js-sdk/src/matrixrtc",
-                        ],
-                        message: "Please use matrix-js-sdk/src/matrix instead",
-                    },
-                    {
-                        group: ["emojibase-regex/emoji*"],
-                        message:
-                            "This regex doesn't actually test for emoji. See the docs at https://emojibase.dev/docs/regex/ and prefer our own EMOJI_REGEX from HtmlUtils.",
-                    },
-                    {
-                        group: ["@vector-im/compound-design-tokens/icons/*"],
-                        message: "Please use @vector-im/compound-design-tokens/assets/web/icons/* instead",
-                    },
-                ],
-            },
-        ],
-
-        // There are too many a11y violations to fix at once
-        // Turn violated rules off until they are fixed
-        "jsx-a11y/aria-activedescendant-has-tabindex": "off",
-        "jsx-a11y/click-events-have-key-events": "off",
-        "jsx-a11y/interactive-supports-focus": "off",
-        "jsx-a11y/media-has-caption": "off",
-        "jsx-a11y/mouse-events-have-key-events": "off",
-        "jsx-a11y/no-autofocus": "off",
-        "jsx-a11y/no-noninteractive-element-interactions": "off",
-        "jsx-a11y/no-noninteractive-element-to-interactive-role": "off",
-        "jsx-a11y/no-noninteractive-tabindex": "off",
-        "jsx-a11y/no-static-element-interactions": "off",
-        "jsx-a11y/role-supports-aria-props": "off",
-
-        "matrix-org/require-copyright-header": "error",
-
-        "react-compiler/react-compiler": "error",
+        quotes: "off",
+    },
+    settings: {
+        react: {
+            version: "detect",
+        },
     },
     overrides: [
         {
-            files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "playwright/**/*.ts"],
-            extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
-            rules: {
-                "@typescript-eslint/explicit-function-return-type": [
-                    "error",
-                    {
-                        allowExpressions: true,
-                    },
-                ],
-
-                // Things we do that break the ideal style
-                "prefer-promise-reject-errors": "off",
-                "no-extra-boolean-cast": "off",
-
-                // Remove Babel things manually due to override limitations
-                "@babel/no-invalid-this": ["off"],
-
-                // We're okay being explicit at the moment
-                "@typescript-eslint/no-empty-interface": "off",
-                // We disable this while we're transitioning
-                "@typescript-eslint/no-explicit-any": "off",
-                // We'd rather not do this but we do
-                "@typescript-eslint/ban-ts-comment": "off",
-                // We're okay with assertion errors when we ask for them
-                "@typescript-eslint/no-non-null-assertion": "off",
-                "@typescript-eslint/no-empty-object-type": [
-                    "error",
-                    {
-                        // We do this sometimes to brand interfaces
-                        allowInterfaces: "with-single-extends",
-                    },
-                ],
-            },
-        },
-        // temporary override for offending icon require files
-        {
-            files: [
-                "src/SdkConfig.ts",
-                "src/components/structures/FileDropTarget.tsx",
-                "src/components/structures/RoomStatusBar.tsx",
-                "src/components/structures/UserMenu.tsx",
-                "src/components/views/avatars/WidgetAvatar.tsx",
-                "src/components/views/dialogs/AddExistingToSpaceDialog.tsx",
-                "src/components/views/dialogs/ForwardDialog.tsx",
-                "src/components/views/dialogs/InviteDialog.tsx",
-                "src/components/views/dialogs/ModalWidgetDialog.tsx",
-                "src/components/views/dialogs/UploadConfirmDialog.tsx",
-                "src/components/views/dialogs/security/SetupEncryptionDialog.tsx",
-                "src/components/views/elements/AddressTile.tsx",
-                "src/components/views/elements/AppWarning.tsx",
-                "src/components/views/elements/SSOButtons.tsx",
-                "src/components/views/messages/MAudioBody.tsx",
-                "src/components/views/messages/MImageBody.tsx",
-                "src/components/views/messages/MFileBody.tsx",
-                "src/components/views/messages/MStickerBody.tsx",
-                "src/components/views/messages/MVideoBody.tsx",
-                "src/components/views/messages/MVoiceMessageBody.tsx",
-                "src/components/views/right_panel/EncryptionPanel.tsx",
-                "src/components/views/rooms/EntityTile.tsx",
-                "src/components/views/rooms/LinkPreviewGroup.tsx",
-                "src/components/views/rooms/MemberList.tsx",
-                "src/components/views/rooms/MessageComposer.tsx",
-                "src/components/views/rooms/ReplyPreview.tsx",
-                "src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx",
-                "src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx",
-            ],
-            rules: {
-                "@typescript-eslint/no-var-requires": "off",
-            },
-        },
-        {
-            files: ["test/**/*.{ts,tsx}", "playwright/**/*.ts"],
-            extends: ["plugin:matrix-org/jest"],
-            rules: {
-                // We don't need super strict typing in test utilities
-                "@typescript-eslint/explicit-function-return-type": "off",
-                "@typescript-eslint/explicit-member-accessibility": "off",
-                "@typescript-eslint/no-empty-object-type": "off",
-
-                // Jest/Playwright specific
-
-                // Disabled tests are a reality for now but as soon as all of the xits are
-                // eliminated, we should enforce this.
-                "jest/no-disabled-tests": "off",
-                // Also treat "oldBackendOnly" as a test function.
-                // Used in some crypto tests.
-                "jest/no-standalone-expect": [
-                    "error",
-                    {
-                        additionalTestBlockFunctions: ["beforeAll", "beforeEach", "oldBackendOnly"],
-                    },
-                ],
-
-                // These are fine in tests
-                "no-restricted-globals": "off",
-                "react-compiler/react-compiler": "off",
-            },
-        },
-        {
-            files: ["playwright/**/*.ts"],
-            parserOptions: {
-                project: ["./playwright/tsconfig.json"],
-            },
-            rules: {
-                "react-hooks/rules-of-hooks": ["off"],
-                "@typescript-eslint/no-floating-promises": ["error"],
-            },
-        },
-        {
-            files: ["module_system/**/*.{ts,tsx}"],
-            parserOptions: {
-                project: ["./tsconfig.module_system.json"],
-            },
+            files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "scripts/*.ts"],
             extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
             // NOTE: These rules are frozen and new rules should not be added here.
             // New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/
@@ -326,35 +58,38 @@ module.exports = {
                                 name: "matrix-js-sdk/src/index",
                                 message: "Please use matrix-js-sdk/src/matrix instead",
                             },
+                            {
+                                name: "matrix-react-sdk",
+                                message: "Please use matrix-react-sdk/src/index instead",
+                            },
+                            {
+                                name: "matrix-react-sdk/",
+                                message: "Please use matrix-react-sdk/src/index instead",
+                            },
                         ],
                         patterns: [
                             {
                                 group: ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
                                 message: "Please use matrix-js-sdk/src/* instead",
                             },
+                            {
+                                group: ["matrix-react-sdk/lib", "matrix-react-sdk/lib/", "matrix-react-sdk/lib/**"],
+                                message: "Please use matrix-react-sdk/src/* instead",
+                            },
                         ],
                     },
                 ],
             },
         },
-    ],
-    settings: {
-        react: {
-            version: "detect",
+        {
+            files: ["test/**/*.{ts,tsx}"],
+            rules: {
+                // We don't need super strict typing in test utilities
+                "@typescript-eslint/explicit-function-return-type": "off",
+                "@typescript-eslint/explicit-member-accessibility": "off",
+                "@typescript-eslint/ban-ts-comment": "off",
+                "@typescript-eslint/no-floating-promises": "off",
+            },
         },
-    },
+    ],
 };
-
-function buildRestrictedPropertiesOptions(properties, message) {
-    return properties.map((prop) => {
-        let [object, property] = prop.split(".");
-        if (object === "*") {
-            object = undefined;
-        }
-        return {
-            object,
-            property,
-            message,
-        };
-    });
-}

.git-blame-ignore-revs

@@ -1,3 +1,2 @@
 # prettier
-526645c79160ab1ad4b4c3845de27d51263a405e
 7921a6cbf86b035d2b0c1daecb4c24beaf5a5abc

.github/CODEOWNERS

@@ -2,24 +2,4 @@
 /.github/workflows/**     @element-hq/element-web-team
 /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/components/views/settings/encryption/                              @element-hq/element-crypto-web-reviewers
-/test/unit-tests/components/views/settings/encryption/                  @element-hq/element-crypto-web-reviewers
-/src/components/views/dialogs/devtools/Crypto.tsx                       @element-hq/element-crypto-web-reviewers
-/playwright/e2e/crypto/                                                 @element-hq/element-crypto-web-reviewers
-/playwright/e2e/settings/encryption-user-tab/                           @element-hq/element-crypto-web-reviewers
-
-# Ignore translations as those will be updated by GHA for Localazy download
 /src/i18n/strings
-/src/i18n/strings/en_EN.json  @element-hq/element-web-reviewers
-# Ignore the synapse plugin as this is updated by GHA for docker image updating
-/playwright/testcontainers/synapse.ts
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 
 ## Checklist
 
-- [ ] Tests written for new code (and old code if feasible).
-- [ ] New or updated `public`/`exported` symbols have accurate [TSDoc](https://tsdoc.org/) documentation.
-- [ ] Linter and other CI checks pass.
-- [ ] I have licensed the changes to Element by completing the [Contributor License Agreement (CLA)](https://cla-assistant.io/element-hq/element-web)
+-   [ ] Tests written for new code (and old code if feasible).
+-   [ ] New or updated `public`/`exported` symbols have accurate [TSDoc](https://tsdoc.org/) documentation.
+-   [ ] Linter and other CI checks pass.
+-   [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/element-hq/element-web/blob/develop/CONTRIBUTING.md)).

.github/actions/download-verify-element-tarball/action.yml

@@ -1,38 +0,0 @@
-name: Upload release assets
-description: Uploads assets to an existing release and optionally signs them
-inputs:
-    tag:
-        description: GitHub release tag to fetch assets from.
-        required: true
-    out-file-path:
-        description: Path to where the webapp should be extracted to.
-        required: true
-runs:
-    using: composite
-    steps:
-        - name: Download release tarball
-          uses: robinraju/release-downloader@a96f54c1b5f5e09e47d9504526e96febd949d4c2 # v1
-          with:
-              tag: ${{ inputs.tag }}
-              fileName: element-*.tar.gz*
-              out-file-path: ${{ runner.temp }}/download-verify-element-tarball
-
-        - name: Verify tarball
-          shell: bash
-          run: gpg --verify element-*.tar.gz.asc element-*.tar.gz
-          working-directory: ${{ runner.temp }}/download-verify-element-tarball
-
-        - name: Extract tarball
-          shell: bash
-          run: |
-              mkdir webapp
-              tar xvzf element-*.tar.gz -C webapp --strip-components=1
-          working-directory: ${{ runner.temp }}/download-verify-element-tarball
-
-        - name: Move webapp to out-file-path
-          shell: bash
-          run: mv ${{ runner.temp }}/download-verify-element-tarball/webapp ${{ inputs.out-file-path }}
-
-        - name: Clean up temp directory
-          shell: bash
-          run: rm -R ${{ runner.temp }}/download-verify-element-tarball

.github/labels.yml

@@ -210,9 +210,6 @@
 - name: "X-Upcoming-Release-Blocker"
   description: "This does not affect the current release cycle but will affect the next one"
   color: "e99695"
-- name: "X-Run-All-Tests"
-  description: "When applied to PRs, it'll run the full gamut of end-to-end tests on the PR"
-  color: "ff7979"
 - name: "Z-Actions"
   color: "ededed"
 - name: "Z-Cache-Confusion"
@@ -235,18 +232,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"
 - name: "Z-FOSDEM"
   description: "Issues in chat.fosdem.org"
   color: "ededed"

.github/release-drafter.yml

@@ -1,3 +1,3 @@
-_extends: matrix-org/matrix-js-sdk
+_extends: matrix-org/matrix-react-sdk
 version-resolver:
     default: patch

.github/workflows/backport.yml

@@ -7,12 +7,10 @@ on:
         branches:
             - develop
 
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
 jobs:
     backport:
         name: Backport
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         # Only react to merged PRs for security reasons.
         # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
         if: >

.github/workflows/build.yml

@@ -5,15 +5,11 @@ on:
         branches: [develop, master]
     merge_group:
         types: [checks_requested]
-concurrency:
-    group: ${{ github.workflow }}-${{ github.head_ref || github.sha }}
-    cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 # develop pushes and repository_dispatch handled in build_develop.yaml
 env:
     # These must be set for fetchdep.sh to get the right branch
     REPOSITORY: ${{ github.repository }}
     PR_NUMBER: ${{ github.event.pull_request.number }}
-permissions: {} # No permissions required
 jobs:
     build:
         name: "Build on ${{ matrix.image }}"
@@ -22,22 +18,15 @@ jobs:
             fail-fast: false
             matrix:
                 image:
-                    - ubuntu-24.04
-                    - windows-2022
-                    - macos-14
+                    - ubuntu-latest
+                    - windows-latest
+                    - macos-latest
                 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
+                # Skip the ubuntu-latest build for the develop branch as the dedicated CD build_develop workflow handles that
                 exclude:
                     - isDevelop: true
-                      image: ubuntu-24.04
-                    - isPullRequest: true
-                      image: windows-2022
-                    - isPullRequest: true
-                      image: macos-14
+                      image: ubuntu-latest
         runs-on: ${{ matrix.image }}
         defaults:
             run:
@@ -47,38 +36,14 @@ jobs:
 
             - uses: actions/setup-node@v4
               with:
-                  # Disable cache on Windows as it is slower than not caching
-                  # https://github.com/actions/setup-node/issues/975
-                  cache: ${{ runner.os != 'Windows' && 'yarn' || '' }}
+                  cache: "yarn"
                   node-version: "lts/*"
 
             # Workaround for yarn install timeouts, especially on Windows
             - run: yarn config set network-timeout 300000
 
-            - name: Fetch layered build
-              id: layered_build
-              env:
-                  # tell layered.sh to check out the right sha of the JS-SDK & EW, if they were given one
-                  JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
-              run: |
-                  scripts/layered.sh
-                  JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
-                  VECTOR_SHA=$(git rev-parse --short=12 HEAD)
-                  echo "VERSION=$VECTOR_SHA--js-$JSSDK_SHA" >> $GITHUB_OUTPUT
-
-            - name: Copy config
-              run: cp element.io/develop/config.json config.json
+            - name: Install Dependencies
+              run: "./scripts/layered.sh"
 
             - name: Build
-              env:
-                  CI_PACKAGE: true
-                  VERSION: "${{ steps.layered_build.outputs.VERSION }}"
-              run: |
-                  yarn build
-
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v4
-              with:
-                  name: webapp-${{ matrix.image }}
-                  path: webapp
-                  retention-days: 1
+              run: "yarn build"

.github/workflows/build_debian.yaml

@@ -3,12 +3,11 @@ on:
     release:
         types: [published]
 concurrency: ${{ github.workflow }}
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
 jobs:
     build:
         name: Build package
         environment: packages.element.io
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         env:
             R2_INCOMING_BUCKET: ${{ vars.R2_INCOMING_BUCKET }}
             R2_URL: ${{ vars.CF_R2_S3_API }}

.github/workflows/build_develop.yml

@@ -9,29 +9,18 @@ on:
 concurrency:
     group: ${{ github.repository_owner }}-${{ github.workflow }}-${{ github.ref_name }}
     cancel-in-progress: true
-permissions: {}
 jobs:
     build:
         name: "Build & Deploy develop.element.io"
         # Only respect triggers from our develop branch, ignore that of forks
         if: github.repository == 'element-hq/element-web'
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         environment: develop
-        permissions:
-            checks: read
-            pages: write
-            deployments: write
         env:
             R2_BUCKET: "element-web-develop"
             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

@@ -1,99 +0,0 @@
-# Manual deploy workflow for deploying to app.element.io & staging.element.io
-# Runs automatically for staging.element.io when an RC or Release is published
-# Note: Does *NOT* run automatically for app.element.io so that it gets tested on staging.element.io beforehand
-name: Deploy release
-run-name: Deploy ${{ github.ref_name }} to ${{ inputs.site || 'staging.element.io' }}
-on:
-    release:
-        types: [published]
-    workflow_dispatch:
-        inputs:
-            site:
-                description: Which site to deploy to
-                required: true
-                default: staging.element.io
-                type: choice
-                options:
-                    - staging.element.io
-                    - app.element.io
-            skip-checks:
-                description: Skip CI on the tagged commit
-                required: true
-                default: false
-                type: boolean
-concurrency: ${{ inputs.site || 'staging.element.io' }}
-permissions: {}
-jobs:
-    deploy:
-        name: "Deploy to Cloudflare Pages"
-        runs-on: ubuntu-24.04
-        environment: ${{ inputs.site || 'staging.element.io' }}
-        permissions:
-            checks: read
-            deployments: write
-        env:
-            SITE: ${{ inputs.site || 'staging.element.io' }}
-        steps:
-            - uses: actions/checkout@v4
-
-            - name: Load GPG key
-              run: |
-                  curl https://packages.element.io/element-release-key.gpg | gpg --import
-                  gpg -k "$GPG_FINGERPRINT"
-              env:
-                  GPG_FINGERPRINT: ${{ vars.GPG_FINGERPRINT }}
-
-            - name: Check current version on deployment
-              id: current_version
-              run: |
-                  version=$(curl -s https://$SITE/version)
-                  echo "version=${version#v}" >> $GITHUB_OUTPUT
-
-            # The current version bundle melding dance is skipped if the version we're deploying is the same
-            # as then we're just doing a re-deploy of the same version with potentially different configs.
-            - name: Download current version for its old bundles
-              id: current_download
-              if: steps.current_version.outputs.version != github.ref_name
-              uses: ./.github/actions/download-verify-element-tarball
-              with:
-                  tag: v${{ steps.current_version.outputs.version }}
-                  out-file-path: _current_version
-
-            - name: Download target version
-              uses: ./.github/actions/download-verify-element-tarball
-              with:
-                  tag: ${{ github.ref_name }}
-                  out-file-path: _deploy
-
-            - name: Merge current bundles into target
-              if: steps.current_download.outcome == 'success'
-              run: cp -vnpr _current_version/bundles/* _deploy/bundles/
-
-            - name: Copy config
-              run: cp element.io/app/config.json _deploy/config.json
-
-            - name: Populate 404.html
-              run: echo "404 Not Found" > _deploy/404.html
-
-            - name: Populate _headers
-              run: cp .github/cfp_headers _deploy/_headers
-
-            - name: Wait for other steps to succeed
-              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
-              if: inputs.skip-checks != true
-              with:
-                  ref: ${{ github.sha }}
-                  running-workflow-name: "Deploy to Cloudflare Pages"
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  wait-interval: 10
-                  check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label|Release|prepare|GitHub Pages).)*$
-
-            - name: Deploy to Cloudflare Pages
-              uses: cloudflare/pages-action@f0a1cd58cd66095dee69bfa18fa5efd1dde93bca # v1
-              with:
-                  apiToken: ${{ secrets.CF_PAGES_TOKEN }}
-                  accountId: ${{ secrets.CF_PAGES_ACCOUNT_ID }}
-                  projectName: ${{ env.SITE == 'staging.element.io' && 'element-web-staging' || 'element-web' }}
-                  directory: _deploy
-                  gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-                  branch: main

.github/workflows/docker.yaml

@@ -1,123 +0,0 @@
-name: Docker
-on:
-    workflow_dispatch: {}
-    push:
-        tags: [v*]
-    pull_request: {}
-    schedule:
-        # This job can take a while, and we have usage limits, so just publish develop only twice a day
-        - cron: "0 7/12 * * *"
-concurrency: ${{ github.workflow }}-${{ github.ref_name }}
-permissions: {}
-jobs:
-    buildx:
-        name: Docker Buildx
-        runs-on: ubuntu-24.04
-        environment: ${{ github.event_name != 'pull_request' && 'dockerhub' || '' }}
-        permissions:
-            id-token: write # needed for signing the images with GitHub OIDC Token
-            packages: write # needed for publishing packages to GHCR
-        env:
-            TEST_TAG: vectorim/element-web:test
-        steps:
-            - uses: actions/checkout@v4
-              with:
-                  fetch-depth: 0 # needed for docker-package to be able to calculate the version
-
-            - name: Install Cosign
-              uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3
-              if: github.event_name != 'pull_request'
-
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3
-
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3
-              with:
-                  install: true
-
-            - name: Login to Docker Hub
-              uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
-              if: github.event_name != 'pull_request'
-              with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-            - name: Login to GitHub Container Registry
-              uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
-              if: github.event_name != 'pull_request'
-              with:
-                  registry: ghcr.io
-                  username: ${{ github.repository_owner }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
-
-            - name: Build and load
-              uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
-              with:
-                  context: .
-                  load: true
-                  tags: ${{ env.TEST_TAG }}
-
-            - name: Test the image
-              run: |
-                  # Make a fake module to test the image
-                  MODULE_PATH="modules/module_name/index.js"
-                  mkdir -p $(dirname $MODULE_PATH)
-                  echo 'alert("Testing");' > $MODULE_PATH
-
-                  # Spin up a container of the image
-                  CONTAINER_ID=$(docker run --rm -dp 80:80 -v $(pwd)/modules:/tmp/element-web-modules ${{ env.TEST_TAG }})
-
-                  # Run some smoke tests
-                  wget --retry-connrefused --tries=5 -q --wait=3 --spider http://localhost:80/modules/module_name/index.js
-                  MODULE_1=$(curl http://localhost:80/config.json | jq -r .modules[0])
-                  test "$MODULE_1" = "/${MODULE_PATH}"
-
-                  # Clean up
-                  docker stop "$CONTAINER_ID"
-
-            - name: Docker meta
-              id: meta
-              uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5
-              if: github.event_name != 'pull_request'
-              with:
-                  images: |
-                      vectorim/element-web
-                      ghcr.io/element-hq/element-web
-                  tags: |
-                      type=ref,event=branch
-                      type=ref,event=tag
-                  flavor: |
-                      latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
-
-            - name: Build and push
-              id: build-and-push
-              uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
-              if: github.event_name != 'pull_request'
-              with:
-                  context: .
-                  push: true
-                  platforms: linux/amd64,linux/arm64
-                  tags: ${{ steps.meta.outputs.tags }}
-                  labels: ${{ steps.meta.outputs.labels }}
-
-            - name: Sign the images with GitHub OIDC Token
-              env:
-                  DIGEST: ${{ steps.build-and-push.outputs.digest }}
-                  TAGS: ${{ steps.meta.outputs.tags }}
-              if: github.event_name != 'pull_request'
-              run: |
-                  images=""
-                  for tag in ${TAGS}; do
-                      images+="${tag}@${DIGEST} "
-                  done
-                  cosign sign --yes ${images}
-
-            - name: Update repo description
-              uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4
-              if: github.event_name != 'pull_request'
-              continue-on-error: true
-              with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
-                  repository: vectorim/element-web

.github/workflows/dockerhub.yaml

@@ -0,0 +1,94 @@
+name: Dockerhub
+on:
+    workflow_dispatch: {}
+    push:
+        tags: [v*]
+    schedule:
+        # This job can take a while, and we have usage limits, so just publish develop only twice a day
+        - cron: "0 7/12 * * *"
+concurrency: ${{ github.workflow }}-${{ github.ref_name }}
+
+permissions:
+    id-token: write # needed for signing the images with GitHub OIDC Token
+jobs:
+    buildx:
+        name: Docker Buildx
+        runs-on: ubuntu-latest
+        environment: dockerhub
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - variant: vanilla
+                    # Variant we ship to aid ESS in providing a build on the OpenCoDE platform including specific modules
+                    - variant: opendesk
+                      flavor: suffix=-opendesk,onlatest=true
+                      prepare: mv variants/openDesk/* .
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0 # needed for docker-package to be able to calculate the version
+
+            - name: Install Cosign
+              uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3
+
+            - name: Prepare
+              if: matrix.prepare
+              run: ${{ matrix.prepare }}
+
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3
+
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3
+              with:
+                  install: true
+
+            - name: Login to Docker Hub
+              uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+            - name: Docker meta
+              id: meta
+              uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5
+              with:
+                  images: |
+                      vectorim/element-web
+                  tags: |
+                      type=ref,event=branch
+                      type=ref,event=tag
+                  flavor: |
+                      latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
+                      ${{ matrix.flavor }}
+
+            - name: Build and push
+              id: build-and-push
+              uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6
+              with:
+                  context: .
+                  push: true
+                  platforms: linux/amd64,linux/arm64
+                  tags: ${{ steps.meta.outputs.tags }}
+                  labels: ${{ steps.meta.outputs.labels }}
+
+            - name: Sign the images with GitHub OIDC Token
+              env:
+                  DIGEST: ${{ steps.build-and-push.outputs.digest }}
+                  TAGS: ${{ steps.meta.outputs.tags }}
+              run: |
+                  images=""
+                  for tag in ${TAGS}; do
+                      images+="${tag}@${DIGEST} "
+                  done
+                  cosign sign --yes ${images}
+
+            - name: Update repo description
+              if: matrix.variant == 'vanilla'
+              uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4
+              continue-on-error: true
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+                  repository: vectorim/element-web

.github/workflows/docs.yml

@@ -5,7 +5,10 @@ on:
         branches: [develop]
     workflow_dispatch: {}
 
-permissions: {}
+permissions:
+    contents: read
+    pages: write
+    id-token: write
 
 concurrency:
     group: "pages"
@@ -14,7 +17,7 @@ concurrency:
 jobs:
     build:
         name: GitHub Pages
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - name: Fetch element-desktop
               uses: actions/checkout@v4
@@ -27,6 +30,12 @@ jobs:
               with:
                   path: element-web
 
+            - name: Fetch matrix-react-sdk
+              uses: actions/checkout@v4
+              with:
+                  repository: matrix-org/matrix-react-sdk
+                  path: matrix-react-sdk
+
             - name: Fetch matrix-js-sdk
               uses: actions/checkout@v4
               with:
@@ -43,7 +52,7 @@ jobs:
               working-directory: element-web
               run: |
                   yarn install --frozen-lockfile
-                  yarn ts-node ./scripts/gen-workflow-mermaid.ts ../element-desktop ../element-web ../matrix-js-sdk > docs/automations.md
+                  yarn ts-node ./scripts/gen-workflow-mermaid.ts ../element-desktop ../element-web ../matrix-react-sdk ../matrix-js-sdk > docs/automations.md
                   echo "-   [Automations](automations.md)" >> docs/SUMMARY.md
 
             - name: Setup mdBook
@@ -65,6 +74,9 @@ jobs:
                   mv element-web/docs/lib docs/
                   mv element-web/docs "docs/Element Web"
 
+                  mv matrix-react-sdk/README.md matrix-react-sdk/docs/
+                  mv matrix-react-sdk/docs "docs/Matrix React SDK"
+
                   mv matrix-js-sdk/README.md matrix-js-sdk/docs/
                   mv matrix-js-sdk/docs "docs/Matrix JS SDK"
 
@@ -96,10 +108,7 @@ jobs:
         environment:
             name: github-pages
             url: ${{ steps.deployment.outputs.page_url }}
-        runs-on: ubuntu-24.04
-        permissions:
-            pages: write
-            id-token: write
+        runs-on: ubuntu-latest
         needs: build
         steps:
             - name: Deploy to GitHub Pages

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

@@ -1,46 +0,0 @@
-# Triggers after the playwright tests have finished,
-# taking the artifact and uploading it to Netlify for easier viewing
-name: Upload End to End Test report to Netlify
-on:
-    workflow_run:
-        workflows: ["End to End Tests"]
-        types:
-            - completed
-
-concurrency:
-    group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch || github.run_id }}
-    cancel-in-progress: ${{ github.event.workflow_run.event == 'pull_request' }}
-
-permissions: {}
-
-jobs:
-    report:
-        if: github.event.workflow_run.conclusion != 'cancelled'
-        name: Report results
-        runs-on: ubuntu-24.04
-        environment: Netlify
-        permissions:
-            statuses: write
-            deployments: write
-            actions: read
-        steps:
-            - name: Download HTML report
-              uses: actions/download-artifact@v4
-              with:
-                  github-token: ${{ secrets.GITHUB_TOKEN }}
-                  run-id: ${{ github.event.workflow_run.id }}
-                  name: html-report
-                  path: playwright-report
-
-            - name: 📤 Deploy to Netlify
-              uses: matrix-org/netlify-pr-preview@v3
-              with:
-                  path: playwright-report
-                  owner: ${{ github.event.workflow_run.head_repository.owner.login }}
-                  branch: ${{ github.event.workflow_run.head_branch }}
-                  revision: ${{ github.event.workflow_run.head_sha }}
-                  token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-                  site_id: ${{ vars.NETLIFY_SITE_ID }}
-                  desc: Playwright Report
-                  deployment_env: EndToEndTests
-                  prefix: "e2e-"

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

@@ -1,236 +1,29 @@
-# Produce a build of element-web with this version of react-sdk
-# and any matching branches of element-web and js-sdk, output it
-# as an artifact and run end-to-end tests.
-name: End to End Tests
+# Triggers after the "Downstream artifacts" build has finished, to run the
+# matrix-react-sdk playwright tests (with access to repo secrets)
+
+name: matrix-react-sdk End to End Tests
 on:
-    # CRON to run all Projects at 6am UTC
-    schedule:
-        - cron: "0 6 * * *"
-    pull_request: {}
     merge_group:
         types: [checks_requested]
+    pull_request: {}
     push:
         branches: [develop, master]
-    repository_dispatch:
-        types: [element-web-notify]
-
-    # support triggering from other workflows
-    workflow_call:
-        inputs:
-            skip:
-                type: boolean
-                required: false
-                default: false
-                description: "A boolean to skip the playwright check itself while still creating the passing check. Useful when only running in Merge Queues."
-
-            matrix-js-sdk-sha:
-                type: string
-                required: false
-                description: "The Git SHA of matrix-js-sdk to build against. By default, will use a matching branch name if it exists, or develop."
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
-    cancel-in-progress: true
-
-env:
-    # fetchdep.sh needs to know our PR number
-    PR_NUMBER: ${{ github.event.pull_request.number }}
-    # Use 6 runners in the default case, but 4 when running on a schedule where we run all 5 projects (20 runners total)
-    NUM_RUNNERS: ${{ github.event_name == 'schedule' && 4 || 6 }}
-
-permissions: {} # No permissions required
+    group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch || github.run_id }}
+    cancel-in-progress: ${{ github.event.workflow_run.event == 'pull_request' }}
 
 jobs:
-    build:
-        name: "Build Element-Web"
-        runs-on: ubuntu-24.04
-        if: inputs.skip != true
-        outputs:
-            num-runners: ${{ env.NUM_RUNNERS }}
-            runners-matrix: ${{ steps.runner-vars.outputs.matrix }}
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  repository: element-hq/element-web
-
-            - uses: actions/setup-node@v4
-              with:
-                  cache: "yarn"
-                  node-version: "lts/*"
-
-            - name: Fetch layered build
-              id: layered_build
-              env:
-                  # tell layered.sh to check out the right sha of the JS-SDK & EW, if they were given one
-                  JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
-              run: |
-                  scripts/layered.sh
-                  JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
-                  VECTOR_SHA=$(git rev-parse --short=12 HEAD)
-                  echo "VERSION=$VECTOR_SHA--js-$JSSDK_SHA" >> $GITHUB_OUTPUT
-
-            - name: Copy config
-              run: cp element.io/develop/config.json config.json
-
-            - name: Build
-              env:
-                  CI_PACKAGE: true
-                  VERSION: "${{ steps.layered_build.outputs.VERSION }}"
-              run: |
-                  yarn build
-
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v4
-              with:
-                  name: webapp
-                  path: webapp
-                  retention-days: 1
-
-            - name: Calculate runner variables
-              id: runner-vars
-              uses: actions/github-script@v7
-              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));
-
     playwright:
-        name: "Run Tests [${{ matrix.project }}] ${{ matrix.runner }}/${{ needs.build.outputs.num-runners }}"
-        needs: build
-        if: inputs.skip != true
-        runs-on: ubuntu-24.04
+        name: Playwright
+        uses: matrix-org/matrix-react-sdk/.github/workflows/end-to-end-tests.yaml@develop
         permissions:
             actions: read
             issues: read
             pull-requests: read
-        strategy:
-            fail-fast: false
-            matrix:
-                # Run multiple instances in parallel to speed up the tests
-                runner: ${{ fromJSON(needs.build.outputs.runners-matrix) }}
-                project:
-                    - 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
-                exclude:
-                    - runAllTests: false
-                      project: Firefox
-                    - runAllTests: false
-                      project: WebKit
-                    - runAllTests: false
-                      project: Dendrite
-                    - runAllTests: false
-                      project: Pinecone
-        steps:
-            - uses: actions/checkout@v4
-              with:
-                  persist-credentials: false
-                  repository: element-hq/element-web
-
-            - name: 📥 Download artifact
-              uses: actions/download-artifact@v4
-              with:
-                  name: webapp
-                  path: webapp
-
-            - uses: actions/setup-node@v4
-              with:
-                  cache: "yarn"
-                  cache-dependency-path: yarn.lock
-                  node-version: "lts/*"
-
-            - name: Install dependencies
-              run: yarn install --frozen-lockfile
-
-            - name: Get installed Playwright version
-              id: playwright
-              run: echo "version=$(yarn list --pattern @playwright/test --depth=0 --json --non-interactive --no-progress | jq -r '.data.trees[].name')" >> $GITHUB_OUTPUT
-
-            - name: Cache playwright binaries
-              uses: actions/cache@v4
-              id: playwright-cache
-              with:
-                  path: |
-                      ~/.cache/ms-playwright
-                  key: ${{ runner.os }}-playwright-${{ steps.playwright.outputs.version }}
-
-            - name: Install Playwright browsers
-              if: steps.playwright-cache.outputs.cache-hit != 'true'
-              run: yarn playwright install --with-deps --no-shell
-
-            - name: Install system dependencies for WebKit
-              # Some WebKit dependencies seem to lay outside the cache and will need to be installed separately
-              if: matrix.project == 'WebKit' && steps.playwright-cache.outputs.cache-hit == 'true'
-              run: yarn playwright install-deps webkit
-
-            # We skip tests tagged with @mergequeue when running on PRs, but run them in MQ and everywhere else
-            - name: Run Playwright tests
-              run: |
-                  yarn playwright test \
-                      --shard "${{ matrix.runner }}/${{ needs.build.outputs.num-runners }}" \
-                      --project="${{ matrix.project }}" \
-                      ${{ (github.event_name == 'pull_request' && matrix.runAllTests == false ) && '--grep-invert @mergequeue' || '' }}
-
-            - name: Upload blob report to GitHub Actions Artifacts
-              if: always()
-              uses: actions/upload-artifact@v4
-              with:
-                  name: all-blob-reports-${{ matrix.project }}-${{ matrix.runner }}
-                  path: blob-report
-                  retention-days: 1
-
-    complete:
-        name: end-to-end-tests
-        needs: playwright
-        if: always()
-        runs-on: ubuntu-24.04
-        steps:
-            - uses: actions/checkout@v4
-              if: inputs.skip != true
-              with:
-                  persist-credentials: false
-                  repository: element-hq/element-web
-
-            - uses: actions/setup-node@v4
-              if: inputs.skip != true
-              with:
-                  cache: "yarn"
-                  node-version: "lts/*"
-
-            - name: Install dependencies
-              if: inputs.skip != true
-              run: yarn install --frozen-lockfile
-
-            - name: Download blob reports from GitHub Actions Artifacts
-              if: inputs.skip != true
-              uses: actions/download-artifact@v4
-              with:
-                  pattern: all-blob-reports-*
-                  path: all-blob-reports
-                  merge-multiple: true
-
-            - name: Merge into HTML Report
-              if: inputs.skip != true
-              run: yarn playwright merge-reports --reporter=html,./playwright/flaky-reporter.ts,./playwright/stale-screenshot-reporter.ts ./all-blob-reports
-              env:
-                  # Only pass creds to the flaky-reporter on main branch runs
-                  GITHUB_TOKEN: ${{ github.ref_name == 'develop' && secrets.ELEMENT_BOT_TOKEN || '' }}
-
-            # Upload the HTML report even if one of our reporters fails, this can happen when stale screenshots are detected
-            - name: Upload HTML report
-              if: always() && inputs.skip != true
-              uses: actions/upload-artifact@v4
-              with:
-                  name: html-report
-                  path: playwright-report
-                  retention-days: 14
-
-            - if: needs.playwright.result != 'skipped' && needs.playwright.result != 'success'
-              run: exit 1
+        with:
+            element-web-sha: ${{ github.sha }}
+            react-sdk-repository: matrix-org/matrix-react-sdk
+            # We only want to run the playwright tests on merge queue to prevent regressions
+            # from creeping in. They take a long time to run and consume multiple concurrent runners.
+            skip: ${{ github.event_name != 'merge_group' }}

.github/workflows/issue_closed.yml

@@ -4,11 +4,10 @@
 on:
     issues:
         types: [closed]
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
 jobs:
     tidy:
         name: Tidy closed issues
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/github-script@v7
               id: main

.github/workflows/localazy_download.yaml

@@ -3,8 +3,6 @@ on:
     workflow_dispatch: {}
     schedule:
         - cron: "0 6 * * 1,3,5" # Every Monday, Wednesday and Friday at 6am UTC
-permissions:
-    pull-requests: write # needed to auto-approve PRs
 jobs:
     download:
         uses: matrix-org/matrix-web-i18n/.github/workflows/localazy_download.yaml@main

.github/workflows/localazy_upload.yaml

@@ -4,7 +4,6 @@ on:
         branches: [develop]
         paths:
             - "src/i18n/strings/en_EN.json"
-permissions: {} # No permissions needed
 jobs:
     upload:
         uses: matrix-org/matrix-web-i18n/.github/workflows/localazy_upload.yaml@main

.github/workflows/netlify.yaml

@@ -1,51 +0,0 @@
-# Triggers after the layered build has finished, taking the artifact
-# and uploading it to netlify
-name: Upload Preview Build to Netlify
-on:
-    workflow_run:
-        workflows: ["Build"]
-        types:
-            - completed
-jobs:
-    deploy:
-        if: github.event.workflow_run.conclusion != 'cancelled' && github.event.workflow_run.event == 'pull_request'
-        runs-on: ubuntu-24.04
-        environment: Netlify
-        permissions:
-            actions: read
-            deployments: write
-        steps:
-            - name: 📝 Create Deployment
-              uses: bobheadxi/deployments@648679e8e4915b27893bd7dbc35cb504dc915bc8 # v1
-              id: deployment
-              with:
-                  step: start
-                  token: ${{ secrets.GITHUB_TOKEN }}
-                  env: Netlify
-                  ref: ${{ github.event.workflow_run.head_sha }}
-                  desc: |
-                      Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
-                      Exercise caution. Use test accounts.
-
-            - name: 📥 Download artifact
-              uses: actions/download-artifact@v4
-              with:
-                  github-token: ${{ secrets.GITHUB_TOKEN }}
-                  run-id: ${{ github.event.workflow_run.id }}
-                  name: webapp-ubuntu-24.04
-                  path: webapp
-
-            - name: 📤 Deploy to Netlify
-              uses: matrix-org/netlify-pr-preview@v3
-              with:
-                  path: webapp
-                  owner: ${{ github.event.workflow_run.head_repository.owner.login }}
-                  branch: ${{ github.event.workflow_run.head_branch }}
-                  revision: ${{ github.event.workflow_run.head_sha }}
-                  token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-                  site_id: ${{ vars.NETLIFY_SITE_ID }}
-                  deployment_env: ${{ steps.deployment.outputs.env }}
-                  deployment_id: ${{ steps.deployment.outputs.deployment_id }}
-                  desc: |
-                      Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
-                      Exercise caution. Use test accounts.

.github/workflows/pending-reviews.yaml

@@ -1,16 +1,13 @@
 name: Pending reviews automation
 on:
-    # The bot exceeded its API rate limit. Disabling for now (adding workflow dispatch so the workflow file stays valid & we can test to see if it starts working again)
-    workflow_dispatch: {}
     # We run it on a schedule instead of on pull_request_* events to not create confusing messaging in the PR
-    #schedule:
-    #    - cron: "*/10 * * * *"
+    schedule:
+        - cron: "*/10 * * * *"
 concurrency: ${{ github.workflow }}
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
 jobs:
     bot:
         name: Pending reviews bot
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         environment: Matrix
         env:
             URL: "https://github.com/pulls?q=is%3Apr+is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Aelement-hq%2Felement-web+repo%3Aelement-hq%2Felement-desktop+review-requested%3A%40me+sort%3Aupdated-desc+"
@@ -65,6 +62,7 @@ jobs:
                       const repos = [
                           "element-hq/element-desktop",
                           "element-hq/element-web",
+                          "matrix-org/matrix-react-sdk",
                           "matrix-org/matrix-js-sdk",
                       ];
                       const teams = [

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

@@ -1,48 +0,0 @@
-name: Update Playwright docker images
-on:
-    workflow_dispatch: {}
-    schedule:
-        - cron: "0 6 * * *" # Every day at 6am UTC
-permissions: {}
-jobs:
-    update:
-        runs-on: ubuntu-24.04
-        permissions:
-            pull-requests: write
-        steps:
-            - uses: actions/checkout@v4
-
-            - name: Update synapse image
-              run: |
-                  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
-              env:
-                  IMAGE: ghcr.io/element-hq/synapse:develop
-
-            - name: Create Pull Request
-              id: cpr
-              uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7
-              with:
-                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  branch: actions/playwright-image-updates
-                  delete-branch: true
-                  title: Playwright Docker image updates
-                  labels: |
-                      T-Task
-
-            - name: Enable automerge
-              run: gh pr merge --merge --auto "$PR_NUMBER"
-              if: steps.cpr.outputs.pull-request-operation == 'created'
-              env:
-                  GH_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  PR_NUMBER: ${{ steps.cpr.outputs.pull-request-number }}
-
-            - name: Enable autoapprove
-              run: |
-                  gh pr review --approve "$PR_NUMBER"
-              if: steps.cpr.outputs.pull-request-operation == 'created'
-              env:
-                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  PR_NUMBER: ${{ steps.cpr.outputs.pull-request-number }}

.github/workflows/pull_request.yaml

@@ -4,11 +4,8 @@ on:
         types: [opened, edited, labeled, unlabeled, synchronize]
     merge_group:
         types: [checks_requested]
-permissions: {}
 jobs:
     action:
         uses: matrix-org/matrix-js-sdk/.github/workflows/pull_request.yaml@develop
-        permissions:
-            pull-requests: write
         secrets:
             ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/pull_request_base_branch.yaml

@@ -1,17 +0,0 @@
-name: Pull Request Base Branch
-on:
-    pull_request:
-        types: [opened, edited, synchronize]
-permissions: {} # No permissions required
-jobs:
-    check_base_branch:
-        name: Check PR base branch
-        runs-on: ubuntu-24.04
-        steps:
-            - uses: actions/github-script@v7
-              with:
-                  script: |
-                      const baseBranch = context.payload.pull_request.base.ref;
-                      if (!['develop', 'staging'].includes(baseBranch) && !baseBranch.startsWith('feat/')) {
-                          core.setFailed(`Invalid base branch: ${baseBranch}`);
-                      }

.github/workflows/release-drafter.yml

@@ -4,9 +4,8 @@ on:
         branches: [staging]
     workflow_dispatch: {}
 concurrency: ${{ github.workflow }}
-permissions: {}
 jobs:
     draft:
-        permissions:
-            contents: write
         uses: matrix-org/matrix-js-sdk/.github/workflows/release-drafter-workflow.yml@develop
+        with:
+            include-changes: matrix-react-sdk

.github/workflows/release-gitflow.yml

@@ -4,7 +4,6 @@ on:
     push:
         branches: [master]
 concurrency: ${{ github.repository }}-${{ github.workflow }}
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
 jobs:
     merge:
         uses: matrix-org/matrix-js-sdk/.github/workflows/release-gitflow.yml@develop
@@ -12,4 +11,5 @@ jobs:
             ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
         with:
             dependencies: |
+                matrix-react-sdk
                 matrix-js-sdk

.github/workflows/release.yml

@@ -11,14 +11,9 @@ on:
                     - rc
                     - final
 concurrency: ${{ github.workflow }}
-permissions: {}
 jobs:
     release:
         uses: matrix-org/matrix-js-sdk/.github/workflows/release-make.yml@develop
-        permissions:
-            contents: write
-            issues: write
-            pull-requests: read
         secrets:
             ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
             GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
@@ -32,7 +27,7 @@ jobs:
     notify-downstream:
         name: Trigger release drafter downstream
         needs: release
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - name: Notify element-desktop repo that element-web release has completed to re-trigger release-drafter
               uses: benc-uk/workflow-dispatch@e2e5e9a103e331dad343f381a29e654aea3cf8fc # v1
@@ -46,17 +41,15 @@ jobs:
     check:
         name: Post release checks
         needs: release
-        runs-on: ubuntu-24.04
-        permissions:
-            checks: read
+        runs-on: ubuntu-latest
         steps:
-            - name: Wait for docker build
+            - name: Wait for dockerhub
               uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
               with:
                   ref: master
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
                   wait-interval: 10
-                  check-name: "Docker Buildx"
+                  check-name: "Docker Buildx (vanilla)"
                   allowed-conclusions: success
 
             - name: Wait for debian package

.github/workflows/release_prepare.yml

@@ -12,33 +12,22 @@ on:
                 required: true
                 type: boolean
                 default: true
+            matrix-react-sdk:
+                description: Prepare matrix-react-sdk
+                required: true
+                type: boolean
+                default: true
             matrix-js-sdk:
                 description: Prepare matrix-js-sdk
                 required: true
                 type: boolean
                 default: true
-permissions: {} # Uses ELEMENT_BOT_TOKEN instead
 jobs:
-    checks:
-        name: Sanity checks
-        strategy:
-            matrix:
-                repo:
-                    - matrix-org/matrix-js-sdk
-                    - element-hq/element-web
-                    - element-hq/element-desktop
-        uses: matrix-org/matrix-js-sdk/.github/workflows/release-checks.yml@develop
-        secrets:
-            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-        with:
-            repository: ${{ matrix.repo }}
-
     prepare:
-        runs-on: ubuntu-24.04
-        needs: checks
+        runs-on: ubuntu-latest
         env:
             # The order is specified bottom-up to avoid any races for allchange
-            REPOS: matrix-js-sdk element-web element-desktop
+            REPOS: matrix-js-sdk matrix-react-sdk element-web element-desktop
         steps:
             - name: Checkout Element Desktop
               uses: actions/checkout@v4
@@ -60,6 +49,16 @@ jobs:
                   fetch-depth: 0
                   fetch-tags: true
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+            - name: Checkout Matrix React SDK
+              uses: actions/checkout@v4
+              if: inputs.matrix-react-sdk
+              with:
+                  repository: matrix-org/matrix-react-sdk
+                  path: matrix-react-sdk
+                  ref: staging
+                  fetch-depth: 0
+                  fetch-tags: true
+                  token: ${{ secrets.ELEMENT_BOT_TOKEN }}
             - name: Checkout Matrix JS SDK
               uses: actions/checkout@v4
               if: inputs.matrix-js-sdk
@@ -71,23 +70,11 @@ jobs:
                   fetch-tags: true
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-            - name: Prepare Git
+            - name: Merge develop
               run: |
                   git config --global user.email "releases@riot.im"
                   git config --global user.name "RiotRobot"
-
-            - name: Merge Element Desktop
-              if: inputs.element-desktop
-              run: |
-                  git -C "element-desktop" merge origin/develop
-            - name: Merge Element Web
-              if: inputs.element-web
-              run: |
-                  git -C "element-web" merge origin/develop
-            - name: Merge JS SDK
-              if: inputs.matrix-js-sdk
-              run: |
-                  git -C "matrix-js-sdk" merge origin/develop
+                  for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" merge origin/develop; done
 
             - name: Push staging
               run: for REPO in $REPOS; do [ -d "$REPO" ] && git -C "$REPO" push origin staging; done
@@ -103,6 +90,17 @@ jobs:
                   check-name: draft
                   allowed-conclusions: success
 
+            - name: Wait for matrix-react-sdk draft
+              if: inputs.matrix-react-sdk
+              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
+              with:
+                  ref: staging
+                  repo: matrix-org/matrix-react-sdk
+                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  wait-interval: 10
+                  check-name: draft
+                  allowed-conclusions: success
+
             - name: Wait for element-web draft
               if: inputs.element-web
               uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork

.github/workflows/sonarqube.yml

@@ -7,18 +7,10 @@ on:
 concurrency:
     group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
     cancel-in-progress: true
-permissions: {}
 jobs:
     sonarqube:
         name: 🩻 SonarQube
-        if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event != 'merge_group'
         uses: matrix-org/matrix-js-sdk/.github/workflows/sonarcloud.yml@develop
-        permissions:
-            actions: read
-            statuses: write
-            id-token: write # sonar
         secrets:
             SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
             ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-        with:
-            sharded: true

.github/workflows/static_analysis.yaml

@@ -7,21 +7,14 @@ on:
         types: [checks_requested]
     repository_dispatch:
         types: [element-web-notify]
-concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
-    cancel-in-progress: true
-
 env:
     # These must be set for fetchdep.sh to get the right branch
     REPOSITORY: ${{ github.repository }}
     PR_NUMBER: ${{ github.event.pull_request.number }}
-
-permissions: {} # No permissions required
-
 jobs:
     ts_lint:
         name: "Typescript Syntax Check"
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
@@ -39,32 +32,12 @@ jobs:
     i18n_lint:
         name: "i18n Check"
         uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
-        permissions:
-            pull-requests: read
         with:
             hardcoded-words: "Element"
-            allowed-hardcoded-keys: |
-                console_dev_note
-                labs|element_call_video_rooms
-                labs|feature_disable_call_per_sender_encryption
-                voip|element_call
-                error|invalid_json
-                error|misconfigured
-                welcome_to_element
-
-    rethemendex_lint:
-        name: "Rethemendex Check"
-        runs-on: ubuntu-24.04
-        steps:
-            - uses: actions/checkout@v4
-
-            - run: ./res/css/rethemendex.sh
-
-            - run: git diff --exit-code
 
     js_lint:
         name: "ESLint"
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
@@ -82,7 +55,7 @@ jobs:
 
     style_lint:
         name: "Style Lint"
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
@@ -91,16 +64,16 @@ jobs:
                   cache: "yarn"
                   node-version: "lts/*"
 
-            # Does not need branch matching as only analyses this layer
-            - name: Install Deps
-              run: "yarn install"
+            # Needs branch matching as it inherits .stylelintrc.js from matrix-react-sdk
+            - name: Install Dependencies
+              run: "./scripts/layered.sh"
 
             - name: Run Linter
               run: "yarn run lint:style"
 
     workflow_lint:
         name: "Workflow Lint"
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
@@ -118,7 +91,7 @@ jobs:
 
     analyse_dead_code:
         name: "Analyse Dead Code"
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
@@ -128,7 +101,7 @@ jobs:
                   node-version: "lts/*"
 
             - name: Install Deps
-              run: "yarn install --frozen-lockfile"
+              run: "scripts/layered.sh"
 
-            - name: Run linter
-              run: "yarn run lint:knip"
+            - name: Dead Code Analysis
+              run: "yarn run analyse:unused-exports"

.github/workflows/sync-labels.yml

@@ -8,9 +8,6 @@ on:
             - develop
         paths:
             - .github/labels.yml
-
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
 jobs:
     sync-labels:
         uses: element-hq/element-meta/.github/workflows/sync-labels.yml@develop

.github/workflows/tests.yaml

@@ -0,0 +1,60 @@
+name: Tests
+on:
+    pull_request: {}
+    push:
+        branches: [develop, master]
+    merge_group:
+        types: [checks_requested]
+    repository_dispatch:
+        types: [element-web-notify]
+env:
+    # These must be set for fetchdep.sh to get the right branch
+    REPOSITORY: ${{ github.repository }}
+    PR_NUMBER: ${{ github.event.pull_request.number }}
+jobs:
+    jest:
+        name: Jest
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Yarn cache
+              uses: actions/setup-node@v4
+              with:
+                  cache: "yarn"
+                  node-version: "lts/*"
+
+            - name: Install Dependencies
+              run: "./scripts/layered.sh"
+
+            - name: Get number of CPU cores
+              id: cpu-cores
+              uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2
+
+            - name: Run tests with coverage
+              run: "yarn coverage --ci --max-workers ${{ steps.cpu-cores.outputs.count }}"
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: coverage
+                  path: |
+                      coverage
+                      !coverage/lcov-report
+
+    skip_sonar:
+        name: Skip SonarCloud in merge queue
+        if: github.event_name == 'merge_group'
+        runs-on: ubuntu-latest
+        needs: jest
+        steps:
+            - name: Skip SonarCloud
+              uses: Sibz/github-status-action@faaa4d96fecf273bd762985e0e7f9f933c774918 # v1
+              with:
+                  authToken: ${{ secrets.GITHUB_TOKEN }}
+                  state: success
+                  description: SonarCloud skipped
+                  context: SonarCloud Code Analysis
+                  sha: ${{ github.sha }}
+                  target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/tests.yml

@@ -1,114 +0,0 @@
-name: Tests
-on:
-    pull_request: {}
-    merge_group:
-        types: [checks_requested]
-    push:
-        branches: [develop, master]
-    repository_dispatch:
-        types: [element-web-notify]
-    workflow_call:
-        inputs:
-            disable_coverage:
-                type: boolean
-                required: false
-                description: "Specify true to skip generating and uploading coverage for tests"
-            matrix-js-sdk-sha:
-                type: string
-                required: false
-                description: "The matrix-js-sdk SHA to use"
-concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
-    cancel-in-progress: true
-
-env:
-    ENABLE_COVERAGE: ${{ github.event_name != 'merge_group' && inputs.disable_coverage != 'true' }}
-    # fetchdep.sh needs to know our PR number
-    PR_NUMBER: ${{ github.event.pull_request.number }}
-
-permissions: {}
-
-jobs:
-    jest:
-        name: Jest
-        runs-on: ubuntu-24.04
-        strategy:
-            fail-fast: false
-            matrix:
-                # Run multiple instances in parallel to speed up the tests
-                runner: [1, 2]
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  repository: ${{ inputs.matrix-js-sdk-sha && 'element-hq/element-web' || github.repository }}
-
-            - name: Yarn cache
-              uses: actions/setup-node@v4
-              with:
-                  node-version: "lts/*"
-                  cache: "yarn"
-
-            - name: Install Deps
-              run: "./scripts/layered.sh"
-              env:
-                  JS_SDK_GITHUB_BASE_REF: ${{ inputs.matrix-js-sdk-sha }}
-
-            - name: Jest Cache
-              uses: actions/cache@v4
-              with:
-                  path: /tmp/jest_cache
-                  key: ${{ hashFiles('**/yarn.lock') }}
-
-            - name: Get number of CPU cores
-              id: cpu-cores
-              uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2
-
-            - name: Run tests
-              run: |
-                  yarn test \
-                      --coverage=${{ env.ENABLE_COVERAGE }} \
-                      --ci \
-                      --max-workers ${{ steps.cpu-cores.outputs.count }} \
-                      --shard ${{ matrix.runner }}/${{ strategy.job-total }} \
-                      --cacheDirectory /tmp/jest_cache
-              env:
-                  JEST_SONAR_UNIQUE_OUTPUT_NAME: true
-
-                  # tell jest to use coloured output
-                  FORCE_COLOR: true
-
-            - name: Move coverage files into place
-              if: env.ENABLE_COVERAGE == 'true'
-              run: mv coverage/lcov.info coverage/${{ steps.setupNode.outputs.node-version }}-${{ matrix.runner }}.lcov.info
-
-            - name: Upload Artifact
-              if: env.ENABLE_COVERAGE == 'true'
-              uses: actions/upload-artifact@v4
-              with:
-                  name: coverage-${{ matrix.runner }}
-                  path: |
-                      coverage
-                      !coverage/lcov-report
-
-    complete:
-        name: jest-tests
-        needs: jest
-        if: always()
-        runs-on: ubuntu-24.04
-        permissions:
-            statuses: write
-        steps:
-            - if: needs.jest.result != 'skipped' && needs.jest.result != 'success'
-              run: exit 1
-
-            - name: Skip SonarCloud in merge queue
-              if: github.event_name == 'merge_group' || inputs.disable_coverage == 'true'
-              uses: guibranco/github-status-action-v2@119b3320db3f04d89e91df840844b92d57ce3468
-              with:
-                  authToken: ${{ secrets.GITHUB_TOKEN }}
-                  state: success
-                  description: SonarCloud skipped
-                  context: SonarCloud Code Analysis
-                  sha: ${{ github.sha }}
-                  target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/triage-assigned.yml

@@ -4,11 +4,9 @@ on:
     issues:
         types: [assigned]
 
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
 jobs:
     web-app-team:
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: |
             contains(github.event.issue.assignees.*.login, 't3chguy') ||
             contains(github.event.issue.assignees.*.login, 'andybalaam') ||

.github/workflows/triage-incoming.yml

@@ -4,11 +4,9 @@ on:
     issues:
         types: [opened]
 
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
 jobs:
     automate-project-columns:
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/add-to-project@main
               with:

.github/workflows/triage-labelled.yml

@@ -8,14 +8,13 @@ on:
             ELEMENT_BOT_TOKEN:
                 required: true
 
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
-
 jobs:
     apply_Z-Labs_label:
         name: Add Z-Labs label for features behind labs flags
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'A-Maths') ||
+            contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
             contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
             contains(github.event.issue.labels.*.name, 'Z-IA') ||
             contains(github.event.issue.labels.*.name, 'A-Jump-To-Date ') ||
@@ -39,7 +38,7 @@ jobs:
 
     apply_Help-Wanted_label:
         name: Add "Help Wanted" label to all "good first issue" and Hacktoberfest
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'good first issue') ||
             contains(github.event.issue.labels.*.name, 'Hacktoberfest')
@@ -56,7 +55,7 @@ jobs:
 
     move_needs_info_issues:
         name: X-Needs-Info issues to Need info column on triage board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'X-Needs-Info')
         steps:
@@ -79,7 +78,7 @@ jobs:
 
     move_flakey_test_issues:
         name: Z-Flaky-Test issues to Sized for maintainer column on triage board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'Z-Flaky-Test')
         steps:
@@ -102,7 +101,7 @@ jobs:
 
     add_priority_design_issues_to_project:
         name: P1 X-Needs-Design to Design project board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
             (contains(github.event.issue.labels.*.name, 'S-Critical') &&
@@ -119,7 +118,7 @@ jobs:
 
     add_product_issues:
         name: X-Needs-Product to product project board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'X-Needs-Product')
         steps:
@@ -130,7 +129,7 @@ jobs:
 
     Search_issues_to_board:
         name: Search issues to project board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'A-New-Search-Experience')
         steps:
@@ -141,7 +140,7 @@ jobs:
 
     voip:
         name: Add labelled issues to VoIP project board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'Team: VoIP')
         steps:
@@ -152,7 +151,7 @@ jobs:
 
     verticals_feature:
         name: Add labelled issues to Verticals Feature project
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'Team: Verticals Feature')
         steps:
@@ -163,7 +162,7 @@ jobs:
 
     tech_debt:
         name: Add labelled issues to tech debt project
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             contains(github.event.issue.labels.*.name, 'A-Developer-Experience') ||
             contains(github.event.issue.labels.*.name, 'A-Documentation') ||
@@ -176,3 +175,26 @@ jobs:
               with:
                   project-url: https://github.com/orgs/element-hq/projects/101
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+    element_r:
+        name: Add Element R issues to Crypto Team board
+        runs-on: ubuntu-latest
+        if: >
+            contains(github.event.issue.labels.*.name, 'A-Element-R')
+        steps:
+            - id: add_to_project
+              uses: actions/add-to-project@v1.0.2
+              with:
+                  project-url: ${{ env.PROJECT_URL }}
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+            - id: set_fields
+              uses: titoportas/update-project-fields@421a54430b3cdc9eefd8f14f9ce0142ab7678751 # v0.1.0
+              with:
+                  project-url: ${{ env.PROJECT_URL }}
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  item-id: ${{ steps.add_to_project.outputs.itemId }} # Use the item-id output of the previous step
+                  field-keys: Workstream,module
+                  field-values: Element-R,web
+        env:
+            PROJECT_URL: https://github.com/orgs/element-hq/projects/76

.github/workflows/triage-move-review-requests.yml

@@ -3,11 +3,10 @@ on:
     pull_request_target:
         types: [review_requested]
 
-permissions: {} # Uses ELEMENT_BOT_TOKEN instead
 jobs:
     add_design_pr_to_project:
         name: Move PRs asking for design review to the design board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: octokit/graphql-action@v2.x
               id: find_team_members
@@ -74,7 +73,7 @@ jobs:
 
     add_product_pr_to_project:
         name: Move PRs asking for design review to the design board
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: octokit/graphql-action@v2.x
               id: find_team_members

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

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

.github/workflows/triage-stale.yml

@@ -1,27 +0,0 @@
-name: Close stale issues & PRs
-on:
-    workflow_dispatch: {}
-    schedule:
-        - cron: "30 1 * * *"
-permissions: {}
-jobs:
-    close:
-        runs-on: ubuntu-24.04
-        permissions:
-            actions: write
-            issues: write
-            pull-requests: write
-        steps:
-            - uses: actions/stale@v9
-              with:
-                  operations-per-run: 100
-                  # Flaky test issue closing
-                  only-issue-labels: "Z-Flaky-Test"
-                  days-before-issue-stale: 14
-                  days-before-issue-close: 0
-                  close-issue-message: "This flaky test issue has not been updated in 14 days. It is being closed as presumed resolved."
-                  exempt-issue-labels: "Z-Flaky-Test-Disabled"
-                  # Stale PR closing
-                  days-before-pr-stale: 180
-                  days-before-pr-close: 0
-                  close-pr-message: "This PR has been automatically closed because it has been stale for 180 days. If you wish to continue working on this PR, please ping a maintainer to reopen it."

.github/workflows/triage-unlabelled.yml

@@ -3,13 +3,11 @@ name: Move unlabelled from needs info columns to triaged
 on:
     issues:
         types: [unlabeled]
-permissions: {}
+
 jobs:
     Move_Unabeled_Issue_On_Project_Board:
         name: Move no longer X-Needs-Info issues to Triaged
-        runs-on: ubuntu-24.04
-        permissions:
-            repository-projects: read
+        runs-on: ubuntu-latest
         if: >
             ${{
             !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
@@ -46,7 +44,7 @@ jobs:
 
     remove_Z-Labs_label:
         name: Remove Z-Labs label when features behind labs flags are removed
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         if: >
             !(contains(github.event.issue.labels.*.name, 'A-Maths') ||
             contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||

.github/workflows/update-jitsi.yml

@@ -4,10 +4,9 @@ on:
     workflow_dispatch: {}
     schedule:
         - cron: "0 3 * * 0" # 3am every Sunday
-permissions: {} # We use ELEMENT_BOT_TOKEN instead
 jobs:
     update:
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
 
@@ -23,7 +22,7 @@ jobs:
               run: "yarn update:jitsi"
 
             - name: Create Pull Request
-              uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7
+              uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 # v7
               with:
                   token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   branch: actions/jitsi-update

.github/workflows/update-topics.yaml

@@ -15,11 +15,10 @@ on:
                 required: true
                 type: string
 concurrency: ${{ github.workflow }}
-permissions: {} # No permissions required
 jobs:
     bot:
         name: Release topic update
-        runs-on: ubuntu-24.04
+        runs-on: ubuntu-latest
         environment: Matrix
         steps:
             - uses: actions/github-script@v7
@@ -57,7 +56,7 @@ jobs:
                               headers,
                               body: "{}",
                           });
-
+                          
                           let res = await fetch(apiUrl, {
                               method: "GET",
                               headers,
@@ -70,7 +69,7 @@ jobs:
 
                           const data = await res.json();
                           console.log(roomId, "got event", data);
-
+                          
                           const topic = data.topic.replace(regex, releaseTopic);
                           if (topic === data.topic) {
                               console.log(roomId, "nothing to do");
@@ -90,7 +89,7 @@ jobs:
                               }),
                               headers,
                           });
-
+                          
                           if (res.ok) {
                               console.log(roomId, "topic updated:", topic);
                           } else {

.gitignore

@@ -26,9 +26,6 @@ electron/pub
 /coverage
 # Auto-generated file
 /src/modules.ts
-/src/modules.js
 /build_config.yaml
 /book
 /index.html
-# version file and tarball created by `npm pack` / `yarn pack`
-/git-revision.txt

.lintstagedrc

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

.node-version

@@ -1 +0,0 @@
-22

.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
@@ -26,22 +25,10 @@ src/vector/modernizr.js
 /docs/lib
 /book
 /debian/tmp
-/.npmrc
-package-lock.json
 
 # This file is owned, parsed, and generated by allchange, which doesn't comply with prettier
 /CHANGELOG.md
 /docs/changelogs
 
-# Legacy skinning file that some people might still have
-/src/component-index.js
-
 # Downloaded and already minified
 res/jitsi_external_api.min.js
-
-# This file is also machine-generated
-/playwright/e2e/crypto/test_indexeddb_cryptostore_dump/dump.json
-/playwright/test-results/
-/playwright/html-report/
-/playwright/logs/
-/playwright/snapshots/

.prettierrc.cjs

@@ -1 +0,0 @@
-module.exports = require("eslint-plugin-matrix-org/.prettierrc.js");

.stylelintrc.js

@@ -1,74 +1,4 @@
 module.exports = {
+    ...require("matrix-react-sdk/.stylelintrc.js"),
     extends: ["stylelint-config-standard"],
-    customSyntax: "postcss-scss",
-    plugins: ["stylelint-scss", "stylelint-value-no-unknown-custom-properties"],
-    rules: {
-        "comment-empty-line-before": null,
-        "declaration-empty-line-before": null,
-        "length-zero-no-unit": null,
-        "rule-empty-line-before": null,
-        "color-hex-length": null,
-        "at-rule-no-unknown": null,
-        "no-descending-specificity": null,
-        "scss/at-rule-no-unknown": [
-            true,
-            {
-                // https://github.com/vector-im/element-web/issues/10544
-                ignoreAtRules: ["define-mixin"],
-            },
-        ],
-        // Disable `&_kind`-style selectors while our unused CSS approach is "Find & Replace All"
-        // rather than a CI thing. Shorthand selectors are harder to detect when searching for a
-        // class name. This regex is trying to *allow* anything except `&words`, such as `&::before`,
-        // `&.mx_Class`, etc.
-        "selector-nested-pattern": "^((&[ :.\\[,])|([^&]))",
-        // Disable some defaults
-        "selector-class-pattern": null,
-        "custom-property-pattern": null,
-        "selector-id-pattern": null,
-        "keyframes-name-pattern": null,
-        "alpha-value-notation": null,
-        "color-function-notation": null,
-        "selector-not-notation": null,
-        "import-notation": null,
-        "value-keyword-case": null,
-        "declaration-block-no-redundant-longhand-properties": null,
-        "shorthand-property-no-redundant-values": null,
-        "property-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,
-            {
-                importFrom: [
-                    { from: "res/css/_common.pcss", type: "css" },
-                    { from: "res/themes/light/css/_light.pcss", type: "css" },
-                    // Right now our styles share vars all over the place, this is not ideal but acceptable for now
-                    { from: "res/css/views/rooms/_EventTile.pcss", type: "css" },
-                    { from: "res/css/views/rooms/_IRCLayout.pcss", type: "css" },
-                    { from: "res/css/views/rooms/_EventBubbleTile.pcss", type: "css" },
-                    { from: "res/css/views/rooms/_ReadReceiptGroup.pcss", type: "css" },
-                    { from: "res/css/views/rooms/_EditMessageComposer.pcss", type: "css" },
-                    { from: "res/css/views/right_panel/_BaseCard.pcss", type: "css" },
-                    { from: "res/css/views/messages/_MessageTimestamp.pcss", type: "css" },
-                    { from: "res/css/views/messages/_EventTileBubble.pcss", type: "css" },
-                    { from: "res/css/views/messages/_MessageActionBar.pcss", type: "css" },
-                    { from: "res/css/views/voip/LegacyCallView/_LegacyCallViewButtons.pcss", type: "css" },
-                    { from: "res/css/views/elements/_ToggleSwitch.pcss", type: "css" },
-                    { from: "res/css/views/settings/tabs/_SettingsTab.pcss", type: "css" },
-                    { from: "res/css/structures/_RoomView.pcss", type: "css" },
-                    // Compound vars
-                    "node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-common-base.css",
-                    "node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-common-semantic.css",
-                    "node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-theme-light-base-mq.css",
-                    "node_modules/@vector-im/compound-design-tokens/assets/web/css/cpd-theme-light-semantic-mq.css",
-                ],
-            },
-        ],
-    },
 };

CHANGELOG.md

@@ -1,357 +1,3 @@
-Changes in [1.11.94](https://github.com/element-hq/element-web/releases/tag/v1.11.94) (2025-02-27)
-==================================================================================================
-## 🐛 Bug Fixes
-
-* [Backport staging] fix: /tmp/element-web-config may already exist preventing the container from booting up ([#29377](https://github.com/element-hq/element-web/pull/29377)). Contributed by @RiotRobot.
-
-
-Changes in [1.11.93](https://github.com/element-hq/element-web/releases/tag/v1.11.93) (2025-02-25)
-==================================================================================================
-## ✨ Features
-
-* [backport] Dynamically load Element Web modules in Docker entrypoint ([#29358](https://github.com/element-hq/element-web/pull/29358)). Contributed by @t3chguy.
-* ChangeRecoveryKey: error handling ([#29262](https://github.com/element-hq/element-web/pull/29262)). Contributed by @richvdh.
-* Dehydration: enable dehydrated device on "Set up recovery" ([#29265](https://github.com/element-hq/element-web/pull/29265)). Contributed by @richvdh.
-* Render reason for invite rejection. ([#29257](https://github.com/element-hq/element-web/pull/29257)). Contributed by @Half-Shot.
-* New room list: add search section ([#29251](https://github.com/element-hq/element-web/pull/29251)). Contributed by @florianduros.
-* New room list: hide favourites and people meta spaces ([#29241](https://github.com/element-hq/element-web/pull/29241)). Contributed by @florianduros.
-* New Room List: Create new labs flag ([#29239](https://github.com/element-hq/element-web/pull/29239)). Contributed by @MidhunSureshR.
-* Stop URl preview from covering message box ([#29215](https://github.com/element-hq/element-web/pull/29215)). Contributed by @edent.
-* Rename "security key" into "recovery key" ([#29217](https://github.com/element-hq/element-web/pull/29217)). Contributed by @florianduros.
-* Add new verification section to user profile ([#29200](https://github.com/element-hq/element-web/pull/29200)). Contributed by @MidhunSureshR.
-* Initial support for runtime modules ([#29104](https://github.com/element-hq/element-web/pull/29104)). Contributed by @t3chguy.
-* Add `Forgot recovery key?` button to encryption tab ([#29202](https://github.com/element-hq/element-web/pull/29202)). Contributed by @florianduros.
-* Add KeyIcon to key storage out of sync toast ([#29201](https://github.com/element-hq/element-web/pull/29201)). Contributed by @florianduros.
-* Improve rendering of empty topics in the timeline  ([#29152](https://github.com/element-hq/element-web/pull/29152)). Contributed by @Half-Shot.
-
-## 🐛 Bug Fixes
-
-* Fix font scaling in member list ([#29285](https://github.com/element-hq/element-web/pull/29285)). Contributed by @florianduros.
-* Grow member list search field when resizing the right panel ([#29267](https://github.com/element-hq/element-web/pull/29267)). Contributed by @langleyd.
-* Don't reload roomview on offline connectivity check ([#29243](https://github.com/element-hq/element-web/pull/29243)). Contributed by @dbkr.
-* Respect user's 12/24 hour preference consistently ([#29237](https://github.com/element-hq/element-web/pull/29237)). Contributed by @t3chguy.
-* Restore the accessibility role on call views ([#29225](https://github.com/element-hq/element-web/pull/29225)). Contributed by @robintown.
-* Revert `GoToHome` keyboard shortcut to `Ctrl`–`Shift`–`H` on macOS ([#28577](https://github.com/element-hq/element-web/pull/28577)). Contributed by @gy-mate.
-* Encryption tab: display correct encryption panel when user cancels the reset identity flow ([#29216](https://github.com/element-hq/element-web/pull/29216)). Contributed by @florianduros.
-
-
-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.
-
-## 🐛 Bug Fixes
-
-* Upgrade matrix-sdk-crypto-wasm to 1.11.0 (https://github.com/matrix-org/matrix-js-sdk/pull/4593)
-* Fix url preview display ([#28766](https://github.com/element-hq/element-web/pull/28766)).
-
-
-Changes in [1.11.88](https://github.com/element-hq/element-web/releases/tag/v1.11.88) (2024-12-17)
-==================================================================================================
-## ✨ Features
-
-* Allow trusted Element Call widget to send and receive media encryption key to-device messages ([#28316](https://github.com/element-hq/element-web/pull/28316)). Contributed by @hughns.
-* increase ringing timeout from 10 seconds to 90 seconds ([#28630](https://github.com/element-hq/element-web/pull/28630)). Contributed by @fkwp.
-* Add `Close` tooltip to dialog ([#28617](https://github.com/element-hq/element-web/pull/28617)). Contributed by @florianduros.
-* New UX for Share dialog ([#28598](https://github.com/element-hq/element-web/pull/28598)). Contributed by @florianduros.
-* Improve performance of RoomContext in RoomHeader ([#28574](https://github.com/element-hq/element-web/pull/28574)). Contributed by @t3chguy.
-* Remove `Features.RustCrypto` flag ([#28582](https://github.com/element-hq/element-web/pull/28582)). Contributed by @florianduros.
-* Add Modernizr warning when running in non-secure context ([#28581](https://github.com/element-hq/element-web/pull/28581)). Contributed by @t3chguy.
-
-## 🐛 Bug Fixes
-
-* Fix jumpy timeline when the pinned message banner is displayed ([#28654](https://github.com/element-hq/element-web/pull/28654)). Contributed by @florianduros.
-* Fix font \& spaces in settings subsection ([#28631](https://github.com/element-hq/element-web/pull/28631)). Contributed by @florianduros.
-* Remove manual device verification which is not supported by the new cryptography stack ([#28588](https://github.com/element-hq/element-web/pull/28588)). Contributed by @florianduros.
-* Fix code block highlighting not working reliably with many code blocks ([#28613](https://github.com/element-hq/element-web/pull/28613)). Contributed by @t3chguy.
-* Remove remaining reply fallbacks code ([#28610](https://github.com/element-hq/element-web/pull/28610)). Contributed by @t3chguy.
-* Provide a way to activate GIFs via the keyboard for a11y ([#28611](https://github.com/element-hq/element-web/pull/28611)). Contributed by @t3chguy.
-* Fix format bar position ([#28591](https://github.com/element-hq/element-web/pull/28591)). Contributed by @florianduros.
-* Fix room taking long time to load ([#28579](https://github.com/element-hq/element-web/pull/28579)). Contributed by @florianduros.
-* Show the correct shield status in tooltip for more conditions ([#28476](https://github.com/element-hq/element-web/pull/28476)). Contributed by @uhoreg.
-
-
-Changes in [1.11.87](https://github.com/element-hq/element-web/releases/tag/v1.11.87) (2024-12-03)
-==================================================================================================
-## ✨ Features
-
-* Send and respect MSC4230 is\_animated flag ([#28513](https://github.com/element-hq/element-web/pull/28513)). Contributed by @t3chguy.
-* Display a warning when an unverified user's identity changes ([#28211](https://github.com/element-hq/element-web/pull/28211)). Contributed by @uhoreg.
-* Swap out Twitter link for Mastodon on auth footer ([#28508](https://github.com/element-hq/element-web/pull/28508)). Contributed by @t3chguy.
-* Consider `org.matrix.msc3417.call` as video room in create room dialog ([#28497](https://github.com/element-hq/element-web/pull/28497)). Contributed by @t3chguy.
-* Standardise icons using Compound Design Tokens ([#28217](https://github.com/element-hq/element-web/pull/28217)). Contributed by @t3chguy.
-* Start sending stable `m.marked_unread` events ([#28478](https://github.com/element-hq/element-web/pull/28478)). Contributed by @tulir.
-* Upgrade to compound-design-tokens v2 ([#28471](https://github.com/element-hq/element-web/pull/28471)). Contributed by @t3chguy.
-* Standardise icons using Compound Design Tokens ([#28286](https://github.com/element-hq/element-web/pull/28286)). Contributed by @t3chguy.
-* Remove reply fallbacks as per merged MSC2781 ([#28406](https://github.com/element-hq/element-web/pull/28406)). Contributed by @t3chguy.
-* Use React Suspense when rendering async modals ([#28386](https://github.com/element-hq/element-web/pull/28386)). Contributed by @t3chguy.
-
-## 🐛 Bug Fixes
-
-* Add spinner when room encryption is loading in room settings ([#28535](https://github.com/element-hq/element-web/pull/28535)). Contributed by @florianduros.
-* Fix getOidcCallbackUrl for Element Desktop ([#28521](https://github.com/element-hq/element-web/pull/28521)). Contributed by @t3chguy.
-* Filter out redacted poll votes to avoid crashing the Poll widget ([#28498](https://github.com/element-hq/element-web/pull/28498)). Contributed by @t3chguy.
-* Fix force tab complete not working since switching to React 18 createRoot API ([#28505](https://github.com/element-hq/element-web/pull/28505)). Contributed by @t3chguy.
-* Fix media captions in bubble layout ([#28480](https://github.com/element-hq/element-web/pull/28480)). Contributed by @tulir.
-* Reset cross-signing before backup when resetting both ([#28402](https://github.com/element-hq/element-web/pull/28402)). Contributed by @uhoreg.
-* Listen to events so that encryption icon updates when status changes ([#28407](https://github.com/element-hq/element-web/pull/28407)). Contributed by @uhoreg.
-* Check that the file the user chose has a MIME type of `image/*` ([#28467](https://github.com/element-hq/element-web/pull/28467)). Contributed by @t3chguy.
-* Fix download button size in message action bar ([#28472](https://github.com/element-hq/element-web/pull/28472)). Contributed by @t3chguy.
-* Allow tab completing users in brackets ([#28460](https://github.com/element-hq/element-web/pull/28460)). Contributed by @t3chguy.
-* Fix React 18 strict mode breaking spotlight dialog ([#28452](https://github.com/element-hq/element-web/pull/28452)). Contributed by @MidhunSureshR.
-
-
-Changes in [1.11.86](https://github.com/element-hq/element-web/releases/tag/v1.11.86) (2024-11-19)
-==================================================================================================
-## ✨ Features
-
-* Deduplicate icons using Compound Design Tokens ([#28419](https://github.com/element-hq/element-web/pull/28419)). Contributed by @t3chguy.
-* Let widget driver send error details ([#28357](https://github.com/element-hq/element-web/pull/28357)). Contributed by @AndrewFerr.
-* Deduplicate icons using Compound Design Tokens ([#28381](https://github.com/element-hq/element-web/pull/28381)). Contributed by @t3chguy.
-* Auto approvoce `io.element.call.reaction` capability for element call widgets ([#28401](https://github.com/element-hq/element-web/pull/28401)). Contributed by @toger5.
-* Show message type prefix in thread root \& reply previews ([#28361](https://github.com/element-hq/element-web/pull/28361)). Contributed by @t3chguy.
-* Support sending encrypted to device messages from widgets ([#28315](https://github.com/element-hq/element-web/pull/28315)). Contributed by @hughns.
-
-## 🐛 Bug Fixes
-
-* Feed events to widgets as they are decrypted (even if out of order) ([#28376](https://github.com/element-hq/element-web/pull/28376)). Contributed by @robintown.
-* Handle authenticated media when downloading from ImageView ([#28379](https://github.com/element-hq/element-web/pull/28379)). Contributed by @t3chguy.
-* Ignore `m.3pid_changes` for Identity service 3PID changes ([#28375](https://github.com/element-hq/element-web/pull/28375)). Contributed by @t3chguy.
-* Fix markdown escaping wrongly passing html through ([#28363](https://github.com/element-hq/element-web/pull/28363)). Contributed by @t3chguy.
-* Remove "Upgrade your encryption" flow in `CreateSecretStorageDialog` ([#28290](https://github.com/element-hq/element-web/pull/28290)). Contributed by @florianduros.
-
-
-Changes in [1.11.85](https://github.com/element-hq/element-web/releases/tag/v1.11.85) (2024-11-12)
-==================================================================================================
-# Security
-- Fixes for [CVE-2024-51750](https://www.cve.org/CVERecord?id=CVE-2024-51750) / [GHSA-w36j-v56h-q9pc](https://github.com/element-hq/element-web/security/advisories/GHSA-w36j-v56h-q9pc)
-- Fixes for [CVE-2024-51749](https://www.cve.org/CVERecord?id=CVE-2024-51749) / [GHSA-5486-384g-mcx2](https://github.com/element-hq/element-web/security/advisories/GHSA-5486-384g-mcx2)
-- Update JS SDK with the fixes for [CVE-2024-50336](https://www.cve.org/CVERecord?id=CVE-2024-50336) / [GHSA-xvg8-m4x3-w6xr](https://github.com/matrix-org/matrix-js-sdk/security/advisories/GHSA-xvg8-m4x3-w6xr)
-
-
-Changes in [1.11.84](https://github.com/element-hq/element-web/releases/tag/v1.11.84) (2024-11-05)
-==================================================================================================
-## ✨ Features
-
-* Remove abandoned MSC3886, MSC3903, MSC3906 implementations ([#28274](https://github.com/element-hq/element-web/pull/28274)). Contributed by @t3chguy.
-* Update to React 18 ([#24763](https://github.com/element-hq/element-web/pull/24763)). Contributed by @t3chguy.
-* Deduplicate icons using Compound ([#28239](https://github.com/element-hq/element-web/pull/28239)). Contributed by @t3chguy.
-* Replace legacy Tooltips with Compound tooltips ([#28231](https://github.com/element-hq/element-web/pull/28231)). Contributed by @t3chguy.
-* Deduplicate icons using Compound Design Tokens ([#28219](https://github.com/element-hq/element-web/pull/28219)). Contributed by @t3chguy.
-* Add reactions to html export ([#28210](https://github.com/element-hq/element-web/pull/28210)). Contributed by @langleyd.
-* Remove feature\_dehydration ([#28173](https://github.com/element-hq/element-web/pull/28173)). Contributed by @florianduros.
-
-## 🐛 Bug Fixes
-
-* Remove upgrade encryption in `DeviceListener` and `SetupEncryptionToast` ([#28299](https://github.com/element-hq/element-web/pull/28299)). Contributed by @florianduros.
-* Fix 'remove alias' button in room settings ([#28269](https://github.com/element-hq/element-web/pull/28269)). Contributed by @Dev-Gurjar.
-* Add back unencrypted path in `StopGapWidgetDriver.sendToDevice` ([#28295](https://github.com/element-hq/element-web/pull/28295)). Contributed by @florianduros.
-* Fix other devices not being decorated as such ([#28279](https://github.com/element-hq/element-web/pull/28279)). Contributed by @t3chguy.
-* Fix pill contrast in invitation dialog ([#28250](https://github.com/element-hq/element-web/pull/28250)). Contributed by @florianduros.
-* Close right panel chat when minimising maximised voip widget ([#28241](https://github.com/element-hq/element-web/pull/28241)). Contributed by @t3chguy.
-* Fix develop changelog parsing ([#28232](https://github.com/element-hq/element-web/pull/28232)). Contributed by @t3chguy.
-* Fix Ctrl+F shortcut not working with minimised room summary card ([#28223](https://github.com/element-hq/element-web/pull/28223)). Contributed by @t3chguy.
-* Fix network dropdown missing checkbox \& aria-checked ([#28220](https://github.com/element-hq/element-web/pull/28220)). Contributed by @t3chguy.
-
-
-Changes in [1.11.83](https://github.com/element-hq/element-web/releases/tag/v1.11.83) (2024-10-29)
-==================================================================================================
-## ✨ Features
-
-* Enable Element Call by default on release instances ([#28314](https://github.com/element-hq/element-web/pull/28314)). Contributed by @t3chguy.
-
-
-
-Changes in [1.11.82](https://github.com/element-hq/element-web/releases/tag/v1.11.82) (2024-10-22)
-==================================================================================================
-## ✨ Features
-
-* Deduplicate more icons using Compound Design Tokens ([#132](https://github.com/element-hq/matrix-react-sdk/pull/132)). Contributed by @t3chguy.
-* Always show link new device flow even if unsupported ([#147](https://github.com/element-hq/matrix-react-sdk/pull/147)). Contributed by @t3chguy.
-* Update design of files list in right panel ([#144](https://github.com/element-hq/matrix-react-sdk/pull/144)). Contributed by @t3chguy.
-* Remove feature\_dehydration ([#138](https://github.com/element-hq/matrix-react-sdk/pull/138)). Contributed by @florianduros.
-* Upgrade emojibase-bindings and remove local handling of emoticon variations ([#127](https://github.com/element-hq/matrix-react-sdk/pull/127)). Contributed by @langleyd.
-* Add support for rendering media captions ([#43](https://github.com/element-hq/matrix-react-sdk/pull/43)). Contributed by @tulir.
-* Replace composer icons with Compound variants ([#123](https://github.com/element-hq/matrix-react-sdk/pull/123)). Contributed by @t3chguy.
-* Tweak default right panel size to be 320px except for maximised widgets at 420px ([#110](https://github.com/element-hq/matrix-react-sdk/pull/110)). Contributed by @t3chguy.
-* Add a pinned message badge under a pinned message ([#118](https://github.com/element-hq/matrix-react-sdk/pull/118)). Contributed by @florianduros.
-* Ditch right panel tabs and re-add close button ([#99](https://github.com/element-hq/matrix-react-sdk/pull/99)). Contributed by @t3chguy.
-* Force verification even for refreshed clients ([#44](https://github.com/element-hq/matrix-react-sdk/pull/44)). Contributed by @dbkr.
-* Update emoji text, border and background colour in timeline ([#119](https://github.com/element-hq/matrix-react-sdk/pull/119)). Contributed by @florianduros.
-* Disable ICE fallback based on well-known configuration ([#111](https://github.com/element-hq/matrix-react-sdk/pull/111)). Contributed by @t3chguy.
-* Remove legacy room header and promote beta room header ([#105](https://github.com/element-hq/matrix-react-sdk/pull/105)). Contributed by @t3chguy.
-* Respect `io.element.jitsi` `useFor1To1Calls` in well-known ([#112](https://github.com/element-hq/matrix-react-sdk/pull/112)). Contributed by @t3chguy.
-* Use Compound close icon in favour of mishmash of x/close icons ([#108](https://github.com/element-hq/matrix-react-sdk/pull/108)). Contributed by @t3chguy.
-
-## 🐛 Bug Fixes
-
-* Correct typo in option documentation ([#28148](https://github.com/element-hq/element-web/pull/28148)). Contributed by @AndrewKvalheim.
-* Revert #124 and #135 ([#139](https://github.com/element-hq/matrix-react-sdk/pull/139)). Contributed by @dbkr.
-* Add aria-label to e2e icon ([#136](https://github.com/element-hq/matrix-react-sdk/pull/136)). Contributed by @florianduros.
-* Fix bell icons on room list hover being black squares ([#135](https://github.com/element-hq/matrix-react-sdk/pull/135)). Contributed by @dbkr.
-* Fix vertical overflow on the mobile register screen ([#137](https://github.com/element-hq/matrix-react-sdk/pull/137)). Contributed by @langleyd.
-* Allow to unpin redacted event ([#98](https://github.com/element-hq/matrix-react-sdk/pull/98)). Contributed by @florianduros.
-
-
-
-Changes in [1.11.81](https://github.com/element-hq/element-web/releases/tag/v1.11.81) (2024-10-15)
-==================================================================================================
-This release fixes High severity vulnerability CVE-2024-47771 / GHSA-963w-49j9-gxj6
-
-Changes in [1.11.80](https://github.com/element-hq/element-web/releases/tag/v1.11.80) (2024-10-08)
-==================================================================================================
-## ✨ Features
-
-* Add doc for 'force\_verification config option ([#28035](https://github.com/element-hq/element-web/pull/28035)). Contributed by @dbkr.
-* Roll back change to device isolation mode ([#104](https://github.com/element-hq/matrix-react-sdk/pull/104)). Contributed by @richvdh.
-* Remove right panel toggling behaviour on room header buttons ([#100](https://github.com/element-hq/matrix-react-sdk/pull/100)). Contributed by @t3chguy.
-* Improve error display for messages sent from insecure devices ([#93](https://github.com/element-hq/matrix-react-sdk/pull/93)). Contributed by @richvdh.
-* Add labs option to exclude unverified devices ([#92](https://github.com/element-hq/matrix-react-sdk/pull/92)). Contributed by @richvdh.
-* Improve contrast for timestamps, date separators \& spotlight trigger ([#91](https://github.com/element-hq/matrix-react-sdk/pull/91)). Contributed by @t3chguy.
-* Open room settings on room header avatar click ([#88](https://github.com/element-hq/matrix-react-sdk/pull/88)). Contributed by @t3chguy.
-* Use `strong` over `b` for improved a11y semantics ([#41](https://github.com/element-hq/matrix-react-sdk/pull/41)). Contributed by @t3chguy.
-* Grant Element Call widget capabilities for "raise hand" feature ([#82](https://github.com/element-hq/matrix-react-sdk/pull/82)). Contributed by @AndrewFerr.
-* Mobile registration optimizations and tests ([#62](https://github.com/element-hq/matrix-react-sdk/pull/62)). Contributed by @langleyd.
-* Ignore chat effect when older than 48h ([#48](https://github.com/element-hq/matrix-react-sdk/pull/48)). Contributed by @florianduros.
-
-## 🐛 Bug Fixes
-
-* Update native OIDC callback url to be RFC8252 compliant ([#28096](https://github.com/element-hq/element-web/pull/28096)). Contributed by @t3chguy.
-* Update icons to include transparency ([#28040](https://github.com/element-hq/element-web/pull/28040)). Contributed by @t3chguy.
-* Fix default\_widget\_container\_height in sample config ([#28034](https://github.com/element-hq/element-web/pull/28034)). Contributed by @dbkr.
-* Fix untranslated keys being rendered in `/help` dialog ([#90](https://github.com/element-hq/matrix-react-sdk/pull/90)). Contributed by @t3chguy.
-* Ensure timeline search results are visible even in video rooms ([#96](https://github.com/element-hq/matrix-react-sdk/pull/96)). Contributed by @t3chguy.
-* Pop right panel timeline when unmaximising widget to avoid double timeline ([#94](https://github.com/element-hq/matrix-react-sdk/pull/94)). Contributed by @t3chguy.
-* Fix accessible label on left panel spotlight trigger ([#87](https://github.com/element-hq/matrix-react-sdk/pull/87)). Contributed by @t3chguy.
-* Crypto: fix display of device key ([#86](https://github.com/element-hq/matrix-react-sdk/pull/86)). Contributed by @richvdh.
-
-
-
-Changes in [1.11.79](https://github.com/element-hq/element-web/releases/tag/v1.11.79) (2024-10-01)
-==================================================================================================
-* No changes
-
-## ✨ Features
-
-* [Backport staging] Allow joining calls and video rooms without enabling the labs flags ([#106](https://github.com/element-hq/matrix-react-sdk/pull/106)). Contributed by @RiotRobot.
-
-
-
-Changes in [1.11.78](https://github.com/element-hq/element-web/releases/tag/v1.11.78) (2024-09-24)
-==================================================================================================
-## ✨ Features
-
-* Add Release announcement for the pinning message list ([#46](https://github.com/element-hq/matrix-react-sdk/pull/46)). Contributed by @florianduros.
-* Unlabs feature pinning ([#22](https://github.com/element-hq/matrix-react-sdk/pull/22)). Contributed by @florianduros.
-* Add mobile registration ([#42](https://github.com/element-hq/matrix-react-sdk/pull/42)). Contributed by @langleyd.
-* Add support for `org.matrix.cross_signing_reset` UIA stage flow ([#34](https://github.com/element-hq/matrix-react-sdk/pull/34)). Contributed by @t3chguy.
-* Add timezone to user profile ([#20](https://github.com/element-hq/matrix-react-sdk/pull/20)). Contributed by @Half-Shot.
-* Add config option to force verification ([#29](https://github.com/element-hq/matrix-react-sdk/pull/29)). Contributed by @dbkr.
-* Reduce pinned message banner size ([#28](https://github.com/element-hq/matrix-react-sdk/pull/28)). Contributed by @florianduros.
-* Enable message pinning labs by default ([#25](https://github.com/element-hq/matrix-react-sdk/pull/25)). Contributed by @florianduros.
-* Remove release announcement of the new header ([#23](https://github.com/element-hq/matrix-react-sdk/pull/23)). Contributed by @florianduros.
-
-## 🐛 Bug Fixes
-
-* Fix timeout type ([#40](https://github.com/element-hq/matrix-react-sdk/pull/40)). Contributed by @dbkr.
-* Fix huge usage bandwidth and performance issue of pinned message banner. ([#37](https://github.com/element-hq/matrix-react-sdk/pull/37)). Contributed by @florianduros.
-* Reverse order of pinned message list ([#19](https://github.com/element-hq/matrix-react-sdk/pull/19)). Contributed by @florianduros.
-
-
-Changes in [1.11.77](https://github.com/element-hq/element-web/releases/tag/v1.11.77) (2024-09-10)
-==================================================================================================
-## ✨ Features
-
-* Add docs for widget container height option ([#27922](https://github.com/element-hq/element-web/pull/27922)). Contributed by @dbkr.
-* Allow user to set timezone ([#12775](https://github.com/matrix-org/matrix-react-sdk/pull/12775)). Contributed by @Timshel.
-* Implement download\_file in widget driver ([#12931](https://github.com/matrix-org/matrix-react-sdk/pull/12931)). Contributed by @weeman1337.
-* Sort the pinning message list in the same order than the banner. By timeline order. ([#12937](https://github.com/matrix-org/matrix-react-sdk/pull/12937)). Contributed by @florianduros.
-* Display pinned messages on a banner at the top of a room ([#12917](https://github.com/matrix-org/matrix-react-sdk/pull/12917)). Contributed by @florianduros.
-* Add a config option to control the default widget container height ([#12893](https://github.com/matrix-org/matrix-react-sdk/pull/12893)). Contributed by @dbkr.
-* RTE drafts ([#12674](https://github.com/matrix-org/matrix-react-sdk/pull/12674)). Contributed by @langleyd.
-* Add thread information in pinned message list ([#12902](https://github.com/matrix-org/matrix-react-sdk/pull/12902)). Contributed by @florianduros.
-* Add Pin/Unpin action in quick access of the message action bar ([#12897](https://github.com/matrix-org/matrix-react-sdk/pull/12897)). Contributed by @florianduros.
-
-## 🐛 Bug Fixes
-
-* Fix read receipt animation ([#12923](https://github.com/matrix-org/matrix-react-sdk/pull/12923)). Contributed by @dbkr.
-* Display the indicator even with one message in pinned message banner ([#12946](https://github.com/matrix-org/matrix-react-sdk/pull/12946)). Contributed by @florianduros.
-* Always display last pinned message on the banner ([#12945](https://github.com/matrix-org/matrix-react-sdk/pull/12945)). Contributed by @florianduros.
-* The pinned message banner or list are triggering  🎉 effect. ([#12944](https://github.com/matrix-org/matrix-react-sdk/pull/12944)). Contributed by @florianduros.
-* Fix reply message truncation on 2 lines ([#12929](https://github.com/matrix-org/matrix-react-sdk/pull/12929)). Contributed by @florianduros.
-* Fix pin/unpin slowness and non refresh from the message action bar ([#12934](https://github.com/matrix-org/matrix-react-sdk/pull/12934)). Contributed by @florianduros.
-* Ignore desktop for minimum browser support. ([#12928](https://github.com/matrix-org/matrix-react-sdk/pull/12928)). Contributed by @florianduros.
-
-
-
 Changes in [1.11.76](https://github.com/element-hq/element-web/releases/tag/v1.11.76) (2024-08-27)
 ==================================================================================================
 ## ✨ Features

CONTRIBUTING.md

@@ -20,26 +20,26 @@ Definitely don't use the GitHub default of "Update file.ts".
 
 As for your PR description, it should include these things:
 
-- References to any bugs fixed by the change (in GitHub's `Fixes` notation)
-- Describe the why and what is changing in the PR description so it's easy for
-  onlookers and reviewers to onboard and context switch. This information is
-  also helpful when we come back to look at this in 6 months and ask "why did
-  we do it like that?" we have a chance of finding out.
-    - Why didn't it work before? Why does it work now? What use cases does it
-      unlock?
-    - If you find yourself adding information on how the code works or why you
-      chose to do it the way you did, make sure this information is instead
-      written as comments in the code itself.
-    - Sometimes a PR can change considerably as it is developed. In this case,
-      the description should be updated to reflect the most recent state of
-      the PR. (It can be helpful to retain the old content under a suitable
-      heading, for additional context.)
-- Include both **before** and **after** screenshots to easily compare and discuss
-  what's changing.
-- Include a step-by-step testing strategy so that a reviewer can check out the
-  code locally and easily get to the point of testing your change.
-- Add comments to the diff for the reviewer that might help them to understand
-  why the change is necessary or how they might better understand and review it.
+-   References to any bugs fixed by the change (in GitHub's `Fixes` notation)
+-   Describe the why and what is changing in the PR description so it's easy for
+    onlookers and reviewers to onboard and context switch. This information is
+    also helpful when we come back to look at this in 6 months and ask "why did
+    we do it like that?" we have a chance of finding out.
+    -   Why didn't it work before? Why does it work now? What use cases does it
+        unlock?
+    -   If you find yourself adding information on how the code works or why you
+        chose to do it the way you did, make sure this information is instead
+        written as comments in the code itself.
+    -   Sometimes a PR can change considerably as it is developed. In this case,
+        the description should be updated to reflect the most recent state of
+        the PR. (It can be helpful to retain the old content under a suitable
+        heading, for additional context.)
+-   Include both **before** and **after** screenshots to easily compare and discuss
+    what's changing.
+-   Include a step-by-step testing strategy so that a reviewer can check out the
+    code locally and easily get to the point of testing your change.
+-   Add comments to the diff for the reviewer that might help them to understand
+    why the change is necessary or how they might better understand and review it.
 
 ### Changelogs
 
@@ -79,8 +79,9 @@ element-web notes: Fix a bug where the 'Herd' button only worked on Tuesdays
 
 This example is for Element Web. You can specify:
 
-- element-web
-- element-desktop
+-   matrix-react-sdk
+-   element-web
+-   element-desktop
 
 If your PR introduces a breaking change, use the `Notes` section in the same
 way, additionally adding the `X-Breaking-Change` label (see below). There's no need
@@ -96,10 +97,10 @@ Notes: Remove legacy `Camelopard` class. `Giraffe` should be used instead.
 
 Other metadata can be added using labels.
 
-- `X-Breaking-Change`: A breaking change - adding this label will mean the change causes a _major_ version bump.
-- `T-Enhancement`: A new feature - adding this label will mean the change causes a _minor_ version bump.
-- `T-Defect`: A bug fix (in either code or docs).
-- `T-Task`: No user-facing changes, eg. code comments, CI fixes, refactors or tests. Won't have a changelog entry unless you specify one.
+-   `X-Breaking-Change`: A breaking change - adding this label will mean the change causes a _major_ version bump.
+-   `T-Enhancement`: A new feature - adding this label will mean the change causes a _minor_ version bump.
+-   `T-Defect`: A bug fix (in either code or docs).
+-   `T-Task`: No user-facing changes, eg. code comments, CI fixes, refactors or tests. Won't have a changelog entry unless you specify one.
 
 If you don't have permission to add labels, your PR reviewer(s) can work with you
 to add them: ask in the PR description or comments.
@@ -112,12 +113,14 @@ checks, so please check back after a few minutes.
 
 Your PR should include tests.
 
-For new user facing features in `matrix-js-sdk` or `element-web`, you must include:
+For new user facing features in `matrix-js-sdk`, `matrix-react-sdk` or `element-web`, you
+must include:
 
 1. Comprehensive unit tests written in Jest. These are located in `/test`.
 2. "happy path" end-to-end tests.
-   These are located in `/playwright/e2e`, and are run using `element-web`.
-   Ideally, you would also include tests for edge and error cases.
+   These are located in `/playwright/e2e` in `matrix-react-sdk`, and
+   are run using `element-web`. Ideally, you would also include tests for edge
+   and error cases.
 
 Unit tests are expected even when the feature is in labs. It's good practice
 to write tests alongside the code as it ensures the code is testable from
@@ -131,7 +134,8 @@ end-to-end test; which is best depends on what sort of test most concisely
 exercises the area.
 
 Changes to must be accompanied by unit tests written in Jest.
-These are located in `/spec/` in `matrix-js-sdk` or `/test/` in `element-web`.
+These are located in `/spec/` in `matrix-js-sdk` or `/test/` in `element-web`
+and `matrix-react-sdk`.
 
 When writing unit tests, please aim for a high level of test coverage
 for new code - 80% or greater. If you cannot achieve that, please document
@@ -189,6 +193,89 @@ give away to contributors - if you feel that Matrix-branded apparel is missing
 from your life, please mail us your shipping address to matrix at matrix.org
 and we'll try to fix it :)
 
+## Sign off
+
+In order to have a concrete record that your contribution is intentional
+and you agree to license it under the same terms as the project's license, we've
+adopted the same lightweight approach that the Linux Kernel
+(https://www.kernel.org/doc/html/latest/process/submitting-patches.html), Docker
+(https://github.com/docker/docker/blob/master/CONTRIBUTING.md), and many other
+projects use: the DCO (Developer Certificate of Origin:
+http://developercertificate.org/). This is a simple declaration that you wrote
+the contribution or otherwise have the right to contribute it to Matrix:
+
+```
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+```
+
+If you agree to this for your contribution, then all that's needed is to
+include the line in your commit or pull request comment:
+
+```
+Signed-off-by: Your Name <your@email.example.org>
+```
+
+We accept contributions under a legally identifiable name, such as your name on
+government documentation or common-law names (names claimed by legitimate usage
+or repute). Unfortunately, we cannot accept anonymous contributions at this
+time.
+
+Git allows you to add this signoff automatically when using the `-s` flag to
+`git commit`, which uses the name and email set in your `user.name` and
+`user.email` git configs.
+
+If you forgot to sign off your commits before making your pull request and are
+on Git 2.17+ you can mass signoff using rebase:
+
+```
+git rebase --signoff origin/develop
+```
+
+## Private sign off
+
+If you would like to provide your legal name privately to the Matrix.org
+Foundation (instead of in a public commit or comment), you can do so by emailing
+your legal name and a link to the pull request to dco@matrix.org. It helps to
+include "sign off" or similar in the subject line. You will then be instructed
+further.
+
+Once private sign off is complete, doing so for future contributions will not
+be required.
+
 # Review expectations
 
 See https://github.com/element-hq/element-meta/wiki/Review-process

Dockerfile

@@ -1,19 +1,23 @@
-# syntax=docker.io/docker/dockerfile:1.7-labs
-
 # Builder
-FROM --platform=$BUILDPLATFORM node:22-bullseye AS builder
+FROM --platform=$BUILDPLATFORM node:20-bullseye as builder
 
-# Support custom branch of the js-sdk. This also helps us build images of element-web develop.
+# Support custom branches of the react-sdk and js-sdk. This also helps us build
+# images of element-web develop.
 ARG USE_CUSTOM_SDKS=false
+ARG REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git"
+ARG REACT_SDK_BRANCH="master"
 ARG JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git"
 ARG JS_SDK_BRANCH="master"
 
+RUN apt-get update && apt-get install -y git dos2unix
+
 WORKDIR /src
 
-COPY --exclude=docker . /src
-RUN /src/scripts/docker-link-repos.sh
+COPY . /src
+RUN dos2unix /src/scripts/docker-link-repos.sh && bash /src/scripts/docker-link-repos.sh
 RUN yarn --network-timeout=200000 install
-RUN /src/scripts/docker-package.sh
+
+RUN dos2unix /src/scripts/docker-package.sh /src/scripts/get-version-from-git.sh /src/scripts/normalize-version.sh && bash /src/scripts/docker-package.sh
 
 # Copy the config now so that we don't create another layer in the app image
 RUN cp /src/config.sample.json /src/webapp/config.json
@@ -21,28 +25,10 @@ RUN cp /src/config.sample.json /src/webapp/config.json
 # App
 FROM nginx:alpine-slim
 
-# Install jq and moreutils for sponge, both used by our entrypoints
-RUN apk add jq moreutils
-
 COPY --from=builder /src/webapp /app
 
-# Override default nginx config. Templates in `/etc/nginx/templates` are passed
-# through `envsubst` by the nginx docker image entry point.
-COPY /docker/nginx-templates/* /etc/nginx/templates/
-COPY /docker/docker-entrypoint.d/* /docker-entrypoint.d/
-
-# Tell nginx to put its pidfile elsewhere, so it can run as non-root
-RUN sed -i -e 's,/var/run/nginx.pid,/tmp/nginx.pid,' /etc/nginx/nginx.conf
-
-# nginx user must own the cache and etc directory to write cache and tweak the nginx config
-RUN chown -R nginx:0 /var/cache/nginx /etc/nginx
-RUN chmod -R g+w /var/cache/nginx /etc/nginx
+# Override default nginx config
+COPY /nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 
 RUN rm -rf /usr/share/nginx/html \
   && ln -s /app /usr/share/nginx/html
-
-# Run as nginx user by default
-USER nginx
-
-# HTTP listen port
-ENV ELEMENT_WEB_PORT=80

LICENSE-COMMERCIAL

@@ -1,6 +0,0 @@
-Licensees holding a valid commercial license with Element may use this
-software in accordance with the terms contained in a written agreement
-between you and Element.
-
-To purchase a commercial license please contact our sales team at
-licensing@element.io

README.md

@@ -10,34 +10,34 @@
 # Element
 
 Element (formerly known as Vector and Riot) is a Matrix web client built using the [Matrix
-JS SDK](https://github.com/matrix-org/matrix-js-sdk).
+React SDK](https://github.com/matrix-org/matrix-react-sdk).
 
 # Supported Environments
 
 Element has several tiers of support for different environments:
 
-- Supported
-    - Definition:
-        - Issues **actively triaged**, regressions **block** the release
-    - Last 2 major versions of Chrome, Firefox, and Edge on desktop OSes
-    - Last 2 versions of Safari
-    - Latest release of official Element Desktop app on desktop OSes
-    - Desktop OSes means macOS, Windows, and Linux versions for desktop devices
-      that are actively supported by the OS vendor and receive security updates
-- Best effort
-    - Definition:
-        - Issues **accepted**, regressions **do not block** the release
-        - The wider Element Products(including Element Call and the Enterprise Server Suite) do still not officially support these browsers.
-        - The element web project and its contributors should keep the client functioning and gracefully degrade where other sibling features (E.g. Element Call) may not function.
-    - Last major release of Firefox ESR and Chrome/Edge Extended Stable
-- Community Supported
-    - Definition:
-        - Issues **accepted**, regressions **do not block** the release
-        - Community contributions are welcome to support these issues
-    - Mobile web for current stable version of Chrome, Firefox, and Safari on Android, iOS, and iPadOS
-- Not supported
-    - Definition: Issues only affecting unsupported environments are **closed**
-    - Everything else
+-   Supported
+    -   Definition:
+        -   Issues **actively triaged**, regressions **block** the release
+    -   Last 2 major versions of Chrome, Firefox, and Edge on desktop OSes
+    -   Last 2 versions of Safari
+    -   Latest release of official Element Desktop app on desktop OSes
+    -   Desktop OSes means macOS, Windows, and Linux versions for desktop devices
+        that are actively supported by the OS vendor and receive security updates
+-   Best effort
+    -   Definition:
+        -   Issues **accepted**, regressions **do not block** the release
+        -   The wider Element Products(including Element Call and the Enterprise Server Suite) do still not officially support these browsers.
+        -   The element web project and its contributors should keep the client functioning and gracefully degrade where other sibling features (E.g. Element Call) may not function.
+    -   Last major release of Firefox ESR and Chrome/Edge Extended Stable
+-   Community Supported
+    -   Definition:
+        -   Issues **accepted**, regressions **do not block** the release
+        -   Community contributions are welcome to support these issues
+    -   Mobile web for current stable version of Chrome, Firefox, and Safari on Android, iOS, and iPadOS
+-   Not supported
+    -   Definition: Issues only affecting unsupported environments are **closed**
+    -   Everything else
 
 The period of support for these tiers should last until the releases specified above, plus 1 app release cycle(2 weeks). In the case of Firefox ESR this is extended further to allow it land in Debian Stable.
 
@@ -74,16 +74,16 @@ situation, but it's still not good practice to do it in the first place. See
 Unless you have special requirements, you will want to add the following to
 your web server configuration when hosting Element Web:
 
-- The `X-Frame-Options: SAMEORIGIN` header, to prevent Element Web from being
-  framed and protect from [clickjacking][owasp-clickjacking].
-- The `frame-ancestors 'self'` directive to your `Content-Security-Policy`
-  header, as the modern replacement for `X-Frame-Options` (though both should be
-  included since not all browsers support it yet, see
-  [this][owasp-clickjacking-csp]).
-- The `X-Content-Type-Options: nosniff` header, to [disable MIME
-  sniffing][mime-sniffing].
-- The `X-XSS-Protection: 1; mode=block;` header, for basic XSS protection in
-  legacy browsers.
+-   The `X-Frame-Options: SAMEORIGIN` header, to prevent Element Web from being
+    framed and protect from [clickjacking][owasp-clickjacking].
+-   The `frame-ancestors 'self'` directive to your `Content-Security-Policy`
+    header, as the modern replacement for `X-Frame-Options` (though both should be
+    included since not all browsers support it yet, see
+    [this][owasp-clickjacking-csp]).
+-   The `X-Content-Type-Options: nosniff` header, to [disable MIME
+    sniffing][mime-sniffing].
+-   The `X-XSS-Protection: 1; mode=block;` header, for basic XSS protection in
+    legacy browsers.
 
 [mime-sniffing]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#mime_sniffing
 [owasp-clickjacking-csp]: https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html#content-security-policy-frame-ancestors-examples
@@ -182,11 +182,141 @@ Dockerfile.
 
 # Development
 
-Please read through the following:
+Before attempting to develop on Element you **must** read the [developer guide
+for `matrix-react-sdk`](https://github.com/matrix-org/matrix-react-sdk#developer-guide), which
+also defines the design, architecture and style for Element too.
 
-1. [Developer guide](./developer_guide.md)
-2. [Code style](./code_style.md)
-3. [Contribution guide](./CONTRIBUTING.md)
+Read the [Choosing an issue](docs/choosing-an-issue.md) page for some guidance
+about where to start. Before starting work on a feature, it's best to ensure
+your plan aligns well with our vision for Element. Please chat with the team in
+[#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org) before
+you start so we can ensure it's something we'd be willing to merge.
+
+You should also familiarise yourself with the ["Here be Dragons" guide
+](https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM)
+to the tame & not-so-tame dragons (gotchas) which exist in the codebase.
+
+The idea of Element is to be a relatively lightweight "skin" of customisations on
+top of the underlying `matrix-react-sdk`. `matrix-react-sdk` provides both the
+higher and lower level React components useful for building Matrix communication
+apps using React.
+
+Please note that Element is intended to run correctly without access to the public
+internet. So please don't depend on resources (JS libs, CSS, images, fonts)
+hosted by external CDNs or servers but instead please package all dependencies
+into Element itself.
+
+CSS hot-reload is available as an opt-in development feature. You can enable it
+by defining a `CSS_HOT_RELOAD` environment variable, in a `.env` file in the root
+of the repository. See `.env.example` for documentation and an example.
+
+# Setting up a dev environment
+
+Much of the functionality in Element is actually in the `matrix-react-sdk` and
+`matrix-js-sdk` modules. It is possible to set these up in a way that makes it
+easy to track the `develop` branches in git and to make local changes without
+having to manually rebuild each time.
+
+First clone and build `matrix-js-sdk`:
+
+```bash
+git clone https://github.com/matrix-org/matrix-js-sdk.git
+pushd matrix-js-sdk
+yarn link
+yarn install
+popd
+```
+
+Then similarly with `matrix-react-sdk`:
+
+```bash
+git clone https://github.com/matrix-org/matrix-react-sdk.git
+pushd matrix-react-sdk
+yarn link
+yarn link matrix-js-sdk
+yarn install
+popd
+```
+
+Clone the repo and switch to the `element-web` directory:
+
+```bash
+git clone https://github.com/element-hq/element-web.git
+cd element-web
+```
+
+Configure the app by copying `config.sample.json` to `config.json` and
+modifying it. See the [configuration docs](docs/config.md) for details.
+
+Finally, build and start Element itself:
+
+```bash
+yarn link matrix-js-sdk
+yarn link matrix-react-sdk
+yarn install
+yarn start
+```
+
+Wait a few seconds for the initial build to finish; you should see something like:
+
+```
+[element-js] <s> [webpack.Progress] 100%
+[element-js]
+[element-js] ℹ ｢wdm｣:    1840 modules
+[element-js] ℹ ｢wdm｣: Compiled successfully.
+```
+
+Remember, the command will not terminate since it runs the web server
+and rebuilds source files when they change. This development server also
+disables caching, so do NOT use it in production.
+
+Open <http://127.0.0.1:8080/> in your browser to see your newly built Element.
+
+**Note**: The build script uses inotify by default on Linux to monitor directories
+for changes. If the inotify limits are too low your build will fail silently or with
+`Error: EMFILE: too many open files`. To avoid these issues, we recommend a watch limit
+of at least `128M` and instance limit around `512`.
+
+You may be interested in issues [#15750](https://github.com/element-hq/element-web/issues/15750) and
+[#15774](https://github.com/element-hq/element-web/issues/15774) for further details.
+
+To set a new inotify watch and instance limit, execute:
+
+```
+sudo sysctl fs.inotify.max_user_watches=131072
+sudo sysctl fs.inotify.max_user_instances=512
+sudo sysctl -p
+```
+
+If you wish, you can make the new limits permanent, by executing:
+
+```
+echo fs.inotify.max_user_watches=131072 | sudo tee -a /etc/sysctl.conf
+echo fs.inotify.max_user_instances=512 | sudo tee -a /etc/sysctl.conf
+sudo sysctl -p
+```
+
+---
+
+When you make changes to `matrix-react-sdk` or `matrix-js-sdk` they should be
+automatically picked up by webpack and built.
+
+If any of these steps error with, `file table overflow`, you are probably on a mac
+which has a very low limit on max open files. Run `ulimit -Sn 1024` and try again.
+You'll need to do this in each new terminal you open before building Element.
+
+## Running the tests
+
+There are a number of application-level tests in the `tests` directory; these
+are designed to run with Jest and JSDOM. To run them
+
+```
+yarn test
+```
+
+### End-to-End tests
+
+See [matrix-react-sdk](https://github.com/matrix-org/matrix-react-sdk/#end-to-end-tests) for how to run the end-to-end tests.
 
 # Translations
 
@@ -199,18 +329,3 @@ For a developer guide, see the [translating dev doc](docs/translating-dev.md).
 Issues are triaged by community members and the Web App Team, following the [triage process](https://github.com/element-hq/element-meta/wiki/Triage-process).
 
 We use [issue labels](https://github.com/element-hq/element-meta/wiki/Issue-labelling) to sort all incoming issues.
-
-## Copyright & License
-
-Copyright (c) 2014-2017 OpenMarket Ltd
-Copyright (c) 2017 Vector Creations Ltd
-Copyright (c) 2017-2025 New Vector Ltd
-
-This software is multi licensed by New Vector Ltd (Element). It can be used either:
-
-(1) for free under the terms of the GNU Affero General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
-
-(2) for free under the terms of the GNU General Public License (as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version); OR
-
-(3) under the terms of a paid-for Element Commercial License agreement between you and Element (the terms of which may vary depending on what you and Element have agreed to).
-Unless required by applicable law or agreed to in writing, software distributed under the Licenses is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Licenses for the specific language governing permissions and limitations under the Licenses.

__mocks__/empty.js

@@ -1,2 +0,0 @@
-// Yes, this is empty.
-module.exports = {};

__mocks__/imageMock.js

@@ -1 +0,0 @@
-module.exports = "image-file-stub";

__mocks__/languages.json

@@ -1,4 +0,0 @@
-{
-    "en": "en_EN.json",
-    "en-us": "en_US.json"
-}

__mocks__/maplibre-gl.js

@@ -1,41 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2022 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-const EventEmitter = require("events");
-const { LngLat, NavigationControl, LngLatBounds } = require("maplibre-gl");
-
-class MockMap extends EventEmitter {
-    addControl = jest.fn();
-    removeControl = jest.fn();
-    zoomIn = jest.fn();
-    zoomOut = jest.fn();
-    setCenter = jest.fn();
-    setStyle = jest.fn();
-    fitBounds = jest.fn();
-    remove = jest.fn();
-}
-const MockMapInstance = new MockMap();
-
-class MockAttributionControl {}
-class MockGeolocateControl extends EventEmitter {
-    trigger = jest.fn();
-}
-const MockGeolocateInstance = new MockGeolocateControl();
-const MockMarker = {};
-MockMarker.setLngLat = jest.fn().mockReturnValue(MockMarker);
-MockMarker.addTo = jest.fn().mockReturnValue(MockMarker);
-MockMarker.remove = jest.fn().mockReturnValue(MockMarker);
-module.exports = {
-    Map: jest.fn().mockReturnValue(MockMapInstance),
-    GeolocateControl: jest.fn().mockReturnValue(MockGeolocateInstance),
-    Marker: jest.fn().mockReturnValue(MockMarker),
-    LngLat,
-    LngLatBounds,
-    NavigationControl,
-    AttributionControl: MockAttributionControl,
-};

__mocks__/svg.js

@@ -1,2 +0,0 @@
-export const Icon = "div";
-export default "image-file-stub";

__mocks__/workerFactoryMock.js

@@ -1,11 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2023 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-export default function workerFactory(options) {
-    return jest.fn;
-}

code_style.md

@@ -3,8 +3,18 @@
 This code style applies to projects which the element-web team directly maintains or is reasonably
 adjacent to. As of writing, these are:
 
-- element-desktop
-- element-web
+-   element-desktop
+-   element-web
+-   matrix-react-sdk
+-   matrix-js-sdk
+
+Other projects might extend this code style for increased strictness. For example, matrix-events-sdk
+has stricter code organization to reduce the maintenance burden. These projects will declare their code
+style within their own repos.
+
+Note that some requirements will be layer-specific. Where the requirements don't make sense for the
+project, they are used to the best of their ability, used in spirit, or ignored if not applicable,
+in that order.
 
 ## Guiding principles
 
@@ -225,19 +235,17 @@ Unless otherwise specified, the following applies to all code:
 
 Inheriting all the rules of TypeScript, the following additionally apply:
 
-1. Component source files are named with upper camel case (e.g. views/rooms/EventTile.js)
-2. They are organised in a typically two-level hierarchy - first whether the component is a view or a structure, and then a broad functional grouping (e.g. 'rooms' here)
-3. Types for lifecycle functions are not required (render, componentDidMount, and so on).
-4. Class components must always have a `Props` interface declared immediately above them. It can be
+1. Types for lifecycle functions are not required (render, componentDidMount, and so on).
+2. Class components must always have a `Props` interface declared immediately above them. It can be
    empty if the component accepts no props.
-5. Class components should have an `State` interface declared immediately above them, but after `Props`.
-6. Props and State should not be exported. Use `React.ComponentProps<typeof ComponentNameHere>`
+3. Class components should have an `State` interface declared immediately above them, but after `Props`.
+4. Props and State should not be exported. Use `React.ComponentProps<typeof ComponentNameHere>`
    instead.
-7. One component per file, except when a component is a utility component specifically for the "primary"
+5. One component per file, except when a component is a utility component specifically for the "primary"
    component. The utility component should not be exported.
-8. Exported constants, enums, interfaces, functions, etc must be separate from files containing components
+6. Exported constants, enums, interfaces, functions, etc must be separate from files containing components
    or stores.
-9. Stores should use a singleton pattern with a static instance property:
+7. Stores should use a singleton pattern with a static instance property:
 
     ```typescript
     class FooStore {
@@ -254,41 +262,44 @@ Inheriting all the rules of TypeScript, the following additionally apply:
     }
     ```
 
-10. Stores must support using an alternative MatrixClient and dispatcher instance.
-11. Utilities which require JSX must be split out from utilities which do not. This is to prevent import
-    cycles during runtime where components accidentally include more of the app than they intended.
-12. Interdependence between stores should be kept to a minimum. Break functions and constants out to utilities
+8. Stores must support using an alternative MatrixClient and dispatcher instance.
+9. Utilities which require JSX must be split out from utilities which do not. This is to prevent import
+   cycles during runtime where components accidentally include more of the app than they intended.
+10. Interdependence between stores should be kept to a minimum. Break functions and constants out to utilities
     if at all possible.
-13. A component should only use CSS class names in line with the component name.
+11. A component should only use CSS class names in line with the component name.
 
     1. When knowingly using a class name from another component, document it with a [comment](#comments).
 
-14. Curly braces within JSX should be padded with a space, however properties on those components should not.
+12. Curly braces within JSX should be padded with a space, however properties on those components should not.
     See above code example.
-15. Functions used as properties should either be defined on the class or stored in a variable. They should not
+13. Functions used as properties should either be defined on the class or stored in a variable. They should not
     be inline unless mocking/short-circuiting the value.
-16. Prefer hooks (functional components) over class components. Be consistent with the existing area if unsure
+14. Prefer hooks (functional components) over class components. Be consistent with the existing area if unsure
     which should be used.
     1. Unless the component is considered a "structure", in which case use classes.
-17. Write more views than structures. Structures are chunks of functionality like MatrixChat while views are
+15. Write more views than structures. Structures are chunks of functionality like MatrixChat while views are
     isolated components.
-18. Components should serve a single, or near-single, purpose.
-19. Prefer to derive information from component properties rather than establish state.
-20. Do not use `React.Component::forceUpdate`.
+16. Components should serve a single, or near-single, purpose.
+17. Prefer to derive information from component properties rather than establish state.
+18. Do not use `React.Component::forceUpdate`.
 
 ## Stylesheets (\*.pcss = PostCSS + Plugins)
 
 Note: We use PostCSS + some plugins to process our styles. It looks like SCSS, but actually it is not.
 
-1. The view's CSS file MUST have the same name as the component (e.g. `view/rooms/_MessageTile.css` for `MessageTile.tsx` component).
-2. Per-view CSS is optional - it could choose to inherit all its styling from the context of the rest of the app, although this is unusual.
-3. Class names must be prefixed with "mx\_".
-4. Class names must strictly denote the component which defines them.
-   For example: `mx_MyFoo` for `MyFoo` component.
-5. Class names for DOM elements within a view which aren't components are named by appending a lower camel case identifier to the view's class name - e.g. .mx_MyFoo_randomDiv is how you'd name the class of an arbitrary div within the MyFoo view.
-6. Use the `$font` variables instead of manual values.
-7. Keep indentation/nesting to a minimum. Maximum suggested nesting is 5 layers.
-8. Use the whole class name instead of shortcuts:
+1. Class names must be prefixed with "mx\_".
+2. Class names must denote the component which defines them, followed by any context.
+   The context is not further specified here in terms of meaning or syntax.
+   Use whatever is appropriate for your implementation use case.
+   Some examples:
+    1. `mx_MyFoo`
+    2. `mx_MyFoo_avatar`
+    3. `mx_MyFoo_avatarUser`
+    4. `mx_MyFoo_avatar--user`
+3. Use the `$font` variables instead of manual values.
+4. Keep indentation/nesting to a minimum. Maximum suggested nesting is 5 layers.
+5. Use the whole class name instead of shortcuts:
 
     ```scss
     .mx_MyFoo {
@@ -299,7 +310,7 @@ Note: We use PostCSS + some plugins to process our styles. It looks like SCSS, b
     }
     ```
 
-9. Break multiple selectors over multiple lines this way:
+6. Break multiple selectors over multiple lines this way:
 
     ```scss
     .mx_MyFoo,
@@ -309,9 +320,9 @@ Note: We use PostCSS + some plugins to process our styles. It looks like SCSS, b
     }
     ```
 
-10. Non-shared variables should use $lowerCamelCase. Shared variables use $dashed-naming.
-11. Overrides to Z indexes, adjustments of dimensions/padding with pixels, and so on should all be
-    [documented](#comments) for what the values mean:
+7. Non-shared variables should use $lowerCamelCase. Shared variables use $dashed-naming.
+8. Overrides to Z indexes, adjustments of dimensions/padding with pixels, and so on should all be
+   [documented](#comments) for what the values mean:
 
     ```scss
     .mx_MyFoo {
@@ -321,9 +332,7 @@ Note: We use PostCSS + some plugins to process our styles. It looks like SCSS, b
     }
     ```
 
-12. Avoid the use of `!important`. If `!important` is necessary, add a [comment](#comments) explaining why.
-13. The CSS for a component can override the rules for child components. For instance, .mxRoomList .mx_RoomTile {} would be the selector to override styles of RoomTiles when viewed in the context of a RoomList view. Overrides must be scoped to the View's CSS class - i.e. don't just define .mx_RoomTile {} in RoomList.css - only RoomTile.css is allowed to define its own CSS. Instead, say .mx_RoomList .mx_RoomTile {} to scope the override only to the context of RoomList views. N.B. overrides should be relatively rare as in general CSS inheritance should be enough.
-14. Components should render only within the bounding box of their outermost DOM element. Page-absolute positioning and negative CSS margins and similar are generally not cool and stop the component from being reused easily in different places.
+9. Avoid the use of `!important`. If `!important` is necessary, add a [comment](#comments) explaining why.
 
 ## Tests
 

components.json

@@ -1 +1,5 @@
-{}
+{
+    "src/components/views/auth/AuthFooter.tsx": "src/components/views/auth/VectorAuthFooter.tsx",
+    "src/components/views/auth/AuthHeaderLogo.tsx": "src/components/views/auth/VectorAuthHeaderLogo.tsx",
+    "src/components/views/auth/AuthPage.tsx": "src/components/views/auth/VectorAuthPage.tsx"
+}

config.sample.json

@@ -12,7 +12,6 @@
     "disable_guests": false,
     "disable_login_language_selector": false,
     "disable_3pid_login": false,
-    "force_verification": false,
     "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
@@ -23,7 +22,7 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "default_widget_container_height": 280,
+    "default_widget_height": 280,
     "default_country_code": "GB",
     "show_labs_settings": false,
     "features": {},

contribute.json

@@ -3,7 +3,7 @@
     "description": "A glossy Matrix collaboration client for the web.",
     "repository": {
         "url": "https://github.com/element-hq/element-web",
-        "license": "AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial"
+        "license": "AGPL-3.0-only OR GPL-3.0-only"
     },
     "bugs": {
         "list": "https://github.com/element-hq/element-web/issues",

debian/control

@@ -8,6 +8,6 @@ Package: element-web
 Architecture: all
 Recommends: httpd, element-io-archive-keyring
 Description:
-  Element: the future of secure communication
+  A feature-rich client for Matrix.org
   This package contains the web-based client that can be served through a web
    server.

developer_guide.md

@@ -1,126 +0,0 @@
-# Developer Guide
-
-## Development
-
-Read the [Choosing an issue](docs/choosing-an-issue.md) page for some guidance
-about where to start. Before starting work on a feature, it's best to ensure
-your plan aligns well with our vision for Element. Please chat with the team in
-[#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org) before
-you start so we can ensure it's something we'd be willing to merge.
-
-You should also familiarise yourself with the ["Here be Dragons" guide
-](https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM)
-to the tame & not-so-tame dragons (gotchas) which exist in the codebase.
-
-Please note that Element is intended to run correctly without access to the public
-internet. So please don't depend on resources (JS libs, CSS, images, fonts)
-hosted by external CDNs or servers but instead please package all dependencies
-into Element itself.
-
-## Setting up a dev environment
-
-Much of the functionality in Element is actually in the `matrix-js-sdk` module.
-It is possible to set these up in a way that makes it easy to track the `develop` branches
-in git and to make local changes without having to manually rebuild each time.
-
-First clone and build `matrix-js-sdk`:
-
-```bash
-git clone https://github.com/matrix-org/matrix-js-sdk.git
-pushd matrix-js-sdk
-yarn link
-yarn install
-popd
-```
-
-Clone the repo and switch to the `element-web` directory:
-
-```bash
-git clone https://github.com/element-hq/element-web.git
-cd element-web
-```
-
-Configure the app by copying `config.sample.json` to `config.json` and
-modifying it. See the [configuration docs](docs/config.md) for details.
-
-Finally, build and start Element itself:
-
-```bash
-yarn link matrix-js-sdk
-yarn install
-yarn start
-```
-
-Wait a few seconds for the initial build to finish; you should see something like:
-
-```
-[element-js] <s> [webpack.Progress] 100%
-[element-js]
-[element-js] ℹ ｢wdm｣:    1840 modules
-[element-js] ℹ ｢wdm｣: Compiled successfully.
-```
-
-Remember, the command will not terminate since it runs the web server
-and rebuilds source files when they change. This development server also
-disables caching, so do NOT use it in production.
-
-Open <http://127.0.0.1:8080/> in your browser to see your newly built Element.
-
-**Note**: The build script uses inotify by default on Linux to monitor directories
-for changes. If the inotify limits are too low your build will fail silently or with
-`Error: EMFILE: too many open files`. To avoid these issues, we recommend a watch limit
-of at least `128M` and instance limit around `512`.
-
-You may be interested in issues [#15750](https://github.com/element-hq/element-web/issues/15750) and
-[#15774](https://github.com/element-hq/element-web/issues/15774) for further details.
-
-To set a new inotify watch and instance limit, execute:
-
-```
-sudo sysctl fs.inotify.max_user_watches=131072
-sudo sysctl fs.inotify.max_user_instances=512
-sudo sysctl -p
-```
-
-If you wish, you can make the new limits permanent, by executing:
-
-```
-echo fs.inotify.max_user_watches=131072 | sudo tee -a /etc/sysctl.conf
-echo fs.inotify.max_user_instances=512 | sudo tee -a /etc/sysctl.conf
-sudo sysctl -p
-```
-
----
-
-When you make changes to `matrix-js-sdk` they should be automatically picked up by webpack and built.
-
-If any of these steps error with, `file table overflow`, you are probably on a mac
-which has a very low limit on max open files. Run `ulimit -Sn 1024` and try again.
-You'll need to do this in each new terminal you open before building Element.
-
-## Running the tests
-
-There are a number of application-level tests in the `tests` directory; these
-are designed to run with Jest and JSDOM. To run them
-
-```
-yarn test
-```
-
-### End-to-End tests
-
-See [matrix-react-sdk](https://github.com/matrix-org/matrix-react-sdk/#end-to-end-tests) for how to run the end-to-end tests.
-
-## General github guidelines
-
-1. **Pull requests must only be filed against the `develop` branch.**
-2. Try to keep your pull requests concise. Split them up if necessary.
-3. Ensure that you provide a description that explains the fix/feature and its intent.
-
-## Adding new code
-
-New code should be committed as follows:
-
-- All new components: https://github.com/element-hq/element-web/tree/develop/src/components
-- CSS: https://github.com/element-hq/element-web/tree/develop/res/css
-- Theme specific CSS & resources: https://github.com/element-hq/element-web/tree/develop/res/themes

docker/docker-entrypoint.d/18-load-element-modules.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# Loads modules from `/tmp/element-web-modules` into config.json's `modules` field
-
-set -e
-
-entrypoint_log() {
-    if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then
-        echo "$@"
-    fi
-}
-
-# Copy these config files as a base
-mkdir -p /tmp/element-web-config
-cp /app/config*.json /tmp/element-web-config/
-
-# If there are modules to be loaded
-if [ -d "/tmp/element-web-modules" ]; then
-    cd /tmp/element-web-modules
-
-    for MODULE in *
-    do
-        # If the module has a package.json, use its main field as the entrypoint
-        ENTRYPOINT="index.js"
-        if [ -f "/tmp/element-web-modules/$MODULE/package.json" ]; then
-            ENTRYPOINT=$(jq -r '.main' "/tmp/element-web-modules/$MODULE/package.json")
-        fi
-
-        entrypoint_log "Loading module $MODULE with entrypoint $ENTRYPOINT"
-
-        # Append the module to the config
-        jq ".modules += [\"/modules/$MODULE/$ENTRYPOINT\"]" /tmp/element-web-config/config.json | sponge /tmp/element-web-config/config.json
-    done
-fi

docs/SUMMARY.md

@@ -1,55 +1,41 @@
 # Summary
 
-- [Introduction](../README.md)
+-   [Introduction](../README.md)
 
 # Usage
 
-- [Betas](betas.md)
-- [Labs](labs.md)
+-   [Betas](betas.md)
+-   [Labs](labs.md)
 
 # Setup
 
-- [Install](install.md)
-- [Config](config.md)
-- [Custom home page](custom-home.md)
-- [Kubernetes](kubernetes.md)
-- [Jitsi](jitsi.md)
-- [Encryption](e2ee.md)
+-   [Install](install.md)
+-   [Config](config.md)
+-   [Custom home page](custom-home.md)
+-   [Kubernetes](kubernetes.md)
+-   [Jitsi](jitsi.md)
+-   [Encryption](e2ee.md)
 
 # Build
 
-- [Customisations](customisations.md)
-- [Modules](modules.md)
-- [Native Node modules](native-node-modules.md)
+-   [Customisations](customisations.md)
+-   [Modules](modules.md)
+-   [Native Node modules](native-node-modules.md)
 
 # Contribution
 
-- [Choosing an issue](choosing-an-issue.md)
-- [Translation](translating.md)
-- [Netlify builds](pr-previews.md)
-- [Code review](review.md)
+-   [Choosing an issue](choosing-an-issue.md)
+-   [Translation](translating.md)
+-   [Netlify builds](pr-previews.md)
+-   [Code review](review.md)
 
 # Development
 
-- [App load order](app-load.md)
-- [Translation](translating-dev.md)
-- [Theming](theming.md)
-- [Playwright end to end tests](playwright.md)
-- [Memory profiling](memory-profiles-and-leaks.md)
-- [Jitsi](jitsi-dev.md)
-- [Feature flags](feature-flags.md)
-- [OIDC and delegated authentication](oidc.md)
-- [Release Process](release.md)
-
-# Deep dive
-
-- [Skinning](skinning.md)
-- [Cider editor](ciderEditor.md)
-- [Iconography](icons.md)
-- [Jitsi](jitsi.md)
-- [Local echo](local-echo-dev.md)
-- [Media](media-handling.md)
-- [Room List Store](room-list-store.md)
-- [Scrolling](scrolling.md)
-- [Usercontent](usercontent.md)
-- [Widget layouts](widget-layouts.md)
+-   [App load order](app-load.md)
+-   [Translation](translating-dev.md)
+-   [Theming](theming.md)
+-   [Memory profiling](memory-profiles-and-leaks.md)
+-   [Jitsi](jitsi-dev.md)
+-   [Feature flags](feature-flags.md)
+-   [OIDC and delegated authentication](oidc.md)
+-   [Release Process](release.md)

docs/app-load.md

@@ -61,18 +61,18 @@ flowchart TD
 
 Key:
 
-- Parallelogram: async/await task
-- Box: sync task
-- Diamond: conditional branch
-- Circle: user interaction
-- Blue arrow: async task is allowed to settle but allowed to fail
-- Red arrow: async task success is asserted
+-   Parallelogram: async/await task
+-   Box: sync task
+-   Diamond: conditional branch
+-   Circle: user interaction
+-   Blue arrow: async task is allowed to settle but allowed to fail
+-   Red arrow: async task success is asserted
 
 Notes:
 
-- A task begins when all its dependencies (arrows going into it) are fulfilled.
-- The success of setting up rageshake is never asserted, element-web has a fallback path for running without IDB (and thus rageshake).
-- Everything is awaited to be settled before the Modernizr check, to allow it to make use of things like i18n if they are successful.
+-   A task begins when all its dependencies (arrows going into it) are fulfilled.
+-   The success of setting up rageshake is never asserted, element-web has a fallback path for running without IDB (and thus rageshake).
+-   Everything is awaited to be settled before the Modernizr check, to allow it to make use of things like i18n if they are successful.
 
 Underlying dependencies:
 

docs/choosing-an-issue.md

@@ -19,7 +19,8 @@ If you're looking for inspiration on where to start, keep reading!
 
 All the issues for Element Web live in the
 [element-web](https://github.com/element-hq/element-web) repository, including
-issues that actually need fixing in one of the related repos.
+issues that actually need fixing in `matrix-react-sdk` or one of the related
+repos.
 
 The first place to look is for
 [issues tagged with "good first issue"](https://github.com/element-hq/element-web/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22).
@@ -32,19 +33,19 @@ someone to add something.
 When you're looking through the list, here are some things that might make an
 issue a **GOOD** choice:
 
-- It is a problem or feature you care about.
-- It concerns a type of code you know a little about.
-- You think you can understand what's needed.
-- It already has approval from Element Web's designers (look for comments from
-  members of the
-  [Product](https://github.com/orgs/element-hq/teams/product/members) or
-  [Design](https://github.com/orgs/element-hq/teams/design/members) teams).
+-   It is a problem or feature you care about.
+-   It concerns a type of code you know a little about.
+-   You think you can understand what's needed.
+-   It already has approval from Element Web's designers (look for comments from
+    members of the
+    [Product](https://github.com/orgs/element-hq/teams/product/members) or
+    [Design](https://github.com/orgs/element-hq/teams/design/members) teams).
 
 Here are some things that might make it a **BAD** choice:
 
-- You don't understand it (maybe add a comment asking a clarifying question).
-- It sounds difficult, or is part of a larger change you don't know about.
-- **It is tagged with `X-Needs-Design` or `X-Needs-Product`.**
+-   You don't understand it (maybe add a comment asking a clarifying question).
+-   It sounds difficult, or is part of a larger change you don't know about.
+-   **It is tagged with `X-Needs-Design` or `X-Needs-Product`.**
 
 **Element Web's Design and Product teams tend to be very busy**, so if you make
 changes that require approval from one of those teams, you will probably have

docs/ciderEditor.md

@@ -1,71 +0,0 @@
-# The CIDER (Contenteditable-Input-Diff-Error-Reconcile) editor
-
-The CIDER editor is a custom editor written for Element.
-Most of the code can be found in the `/editor/` directory.
-It is used to power the composer main composer (both to send and edit messages), and might be used for other usecases where autocomplete is desired (invite box, ...).
-
-## High-level overview.
-
-The editor is backed by a model that contains parts.
-A part has some text and a type (plain text, pill, ...). When typing in the editor,
-the model validates the input and updates the parts.
-The parts are then reconciled with the DOM.
-
-## Inner workings
-
-When typing in the `contenteditable` element, the `input` event fires and
-the DOM of the editor is turned into a string. The way this is done has
-some logic to it to deal with adding newlines for block elements, to make sure
-the caret offset is calculated in the same way as the content string, and to ignore
-caret nodes (more on that later).
-For these reasons it doesn't use `innerText`, `textContent` or anything similar.
-The model addresses any content in the editor within as an offset within this string.
-The caret position is thus also converted from a position in the DOM tree
-to an offset in the content string. This happens in `getCaretOffsetAndText` in `dom.ts`.
-
-Once the content string and caret offset is calculated, it is passed to the `update()`
-method of the model. The model first calculates the same content string of its current parts,
-basically just concatenating their text. It then looks for differences between
-the current and the new content string. The diffing algorithm is very basic,
-and assumes there is only one change around the caret offset,
-so this should be very inexpensive. See `diff.ts` for details.
-
-The result of the diffing is the strings that were added and/or removed from
-the current content. These differences are then applied to the parts,
-where parts can apply validation logic to these changes.
-
-For example, if you type an @ in some plain text, the plain text part rejects
-that character, and this character is then presented to the part creator,
-which will turn it into a pill candidate part.
-Pill candidate parts are what opens the auto completion, and upon picking a completion,
-replace themselves with an actual pill which can't be edited anymore.
-
-The diffing is needed to preserve state in the parts apart from their text
-(which is the only thing the model receives from the DOM), e.g. to build
-the model incrementally. Any text that didn't change is assumed
-to leave the parts it intersects alone.
-
-The benefit of this is that we can use the `input` event, which is broadly supported,
-to find changes in the editor. We don't have to rely on keyboard events,
-which relate poorly to text input or changes, and don't need the `beforeinput` event,
-which isn't broadly supported yet.
-
-Once the parts of the model are updated, the DOM of the editor is then reconciled
-with the new model state, see `renderModel` in `render.ts` for this.
-If the model didn't reject the input and didn't make any additional changes,
-this won't make any changes to the DOM at all, and should thus be fairly efficient.
-
-For the browser to allow the user to place the caret between two pills,
-or between a pill and the start and end of the line, we need some extra DOM nodes.
-These DOM nodes are called caret nodes, and contain an invisble character, so
-the caret can be placed into them. The model is unaware of caret nodes, and they
-are only added to the DOM during the render phase. Likewise, when calculating
-the content string, caret nodes need to be ignored, as they would confuse the model.
-
-As part of the reconciliation, the caret position is also adjusted to any changes
-the model made to the input. The caret is passed around in two formats.
-The model receives the caret _offset_ within the content string (which includes
-an atNodeEnd flag to make it unambiguous if it is at a part and or the next part start).
-The model converts this to a caret _position_ internally, which has a partIndex
-and an offset within the part text, which is more natural to work with.
-From there on, the caret _position_ is used, also during reconciliation.

docs/config.md

@@ -109,7 +109,7 @@ instance. As of writing those settings are not fully documented, however a few a
     }
     ```
     These values will take priority over the hardcoded defaults for the settings. For a list of available settings, see
-    [Settings.tsx](https://github.com/element-hq/element-web/blob/develop/src/settings/Settings.tsx).
+    [Settings.tsx](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.tsx).
 
 ## Customisation & branding
 
@@ -154,8 +154,7 @@ complete re-branding/private labeling, a more personalised experience can be ach
     2. `description`: Required. The description to use for the notice.
     3. `show_once`: Optional. If true then the notice will only be shown once per device.
 18. `help_url`: The URL to point users to for help with the app, defaults to `https://element.io/help`.
-19. `help_encryption_url`: The URL to point users to for help with encryption, defaults to `https://element.io/help#encryption`.
-20. `force_verification`: If true, users must verify new logins (eg. with another device / their recovery key)
+19. `help_encrption_url`: The URL to point users to for help with encryption, defaults to `https://element.io/help#encryption`.
 
 ### `desktop_builds` and `mobile_builds`
 
@@ -455,7 +454,7 @@ If you would like to use Scalar, the integration manager maintained by Element,
 
 For widgets in general (from an integration manager or not) there is also:
 
-- `default_widget_container_height`
+-   `default_widget_container_height`
 
 This controls the height that the top widget panel initially appears as and is the height in pixels, default 280.
 
@@ -551,38 +550,38 @@ preferences.
 
 Currently, the following UI feature flags are supported:
 
-- `UIFeature.urlPreviews` - Whether URL previews are enabled across the entire application.
-- `UIFeature.feedback` - Whether prompts to supply feedback are shown.
-- `UIFeature.voip` - Whether or not VoIP is shown readily to the user. When disabled,
-  Jitsi widgets will still work though they cannot easily be added.
-- `UIFeature.widgets` - Whether or not widgets will be shown.
-- `UIFeature.advancedSettings` - Whether or not sections titled "advanced" in room and
-  user settings are shown to the user.
-- `UIFeature.shareQrCode` - Whether or not the QR code on the share room/event dialog
-  is shown.
-- `UIFeature.shareSocial` - Whether or not the social icons on the share room/event dialog
-  are shown.
-- `UIFeature.identityServer` - Whether or not functionality requiring an identity server
-  is shown. When disabled, the user will not be able to interact with the identity
-  server (sharing email addresses, 3PID invites, etc).
-- `UIFeature.thirdPartyId` - Whether or not UI relating to third party identifiers (3PIDs)
-  is shown. Typically this is considered "contact information" on the homeserver, and is
-  not directly related to the identity server.
-- `UIFeature.registration` - Whether or not the registration page is accessible. Typically
-  useful if accounts are managed externally.
-- `UIFeature.passwordReset` - Whether or not the password reset page is accessible. Typically
-  useful if accounts are managed externally.
-- `UIFeature.deactivate` - Whether or not the deactivate account button is accessible. Typically
-  useful if accounts are managed externally.
-- `UIFeature.advancedEncryption` - Whether or not advanced encryption options are shown to the
-  user.
-- `UIFeature.roomHistorySettings` - Whether or not the room history settings are shown to the user.
-  This should only be used if the room history visibility options are managed by the server.
-- `UIFeature.TimelineEnableRelativeDates` - Display relative date separators (eg: 'Today', 'Yesterday') in the
-  timeline for recent messages. When false day dates will be used.
-- `UIFeature.BulkUnverifiedSessionsReminder` - Display popup reminders to verify or remove unverified sessions. Defaults
-  to true.
-- `UIFeature.locationSharing` - Whether or not location sharing menus will be shown.
+-   `UIFeature.urlPreviews` - Whether URL previews are enabled across the entire application.
+-   `UIFeature.feedback` - Whether prompts to supply feedback are shown.
+-   `UIFeature.voip` - Whether or not VoIP is shown readily to the user. When disabled,
+    Jitsi widgets will still work though they cannot easily be added.
+-   `UIFeature.widgets` - Whether or not widgets will be shown.
+-   `UIFeature.advancedSettings` - Whether or not sections titled "advanced" in room and
+    user settings are shown to the user.
+-   `UIFeature.shareQrCode` - Whether or not the QR code on the share room/event dialog
+    is shown.
+-   `UIFeature.shareSocial` - Whether or not the social icons on the share room/event dialog
+    are shown.
+-   `UIFeature.identityServer` - Whether or not functionality requiring an identity server
+    is shown. When disabled, the user will not be able to interact with the identity
+    server (sharing email addresses, 3PID invites, etc).
+-   `UIFeature.thirdPartyId` - Whether or not UI relating to third party identifiers (3PIDs)
+    is shown. Typically this is considered "contact information" on the homeserver, and is
+    not directly related to the identity server.
+-   `UIFeature.registration` - Whether or not the registration page is accessible. Typically
+    useful if accounts are managed externally.
+-   `UIFeature.passwordReset` - Whether or not the password reset page is accessible. Typically
+    useful if accounts are managed externally.
+-   `UIFeature.deactivate` - Whether or not the deactivate account button is accessible. Typically
+    useful if accounts are managed externally.
+-   `UIFeature.advancedEncryption` - Whether or not advanced encryption options are shown to the
+    user.
+-   `UIFeature.roomHistorySettings` - Whether or not the room history settings are shown to the user.
+    This should only be used if the room history visibility options are managed by the server.
+-   `UIFeature.TimelineEnableRelativeDates` - Display relative date separators (eg: 'Today', 'Yesterday') in the
+    timeline for recent messages. When false day dates will be used.
+-   `UIFeature.BulkUnverifiedSessionsReminder` - Display popup reminders to verify or remove unverified sessions. Defaults
+    to true.
+-   `UIFeature.locationSharing` - Whether or not location sharing menus will be shown.
 
 ## Undocumented / developer options
 
@@ -592,4 +591,4 @@ The following are undocumented or intended for developer use only.
 2. `sync_timeline_limit`
 3. `dangerously_allow_unsafe_and_insecure_passwords`
 4. `latex_maths_delims`: An optional setting to override the default delimiters used for maths parsing. See https://github.com/matrix-org/matrix-react-sdk/pull/5939 for details. Only used when `feature_latex_maths` is enabled.
-5. `modules`: An optional list of modules to load. This is used for testing and development purposes only.
+5. `voice_broadcast.chunk_length`: Target chunk length in seconds for the Voice Broadcast feature currently under development.

docs/customisations.md

@@ -11,8 +11,8 @@ Customisations will be removed from the codebase in a future release.
 Element Web and the React SDK support "customisation points" that can be used to
 easily add custom logic specific to a particular deployment of Element Web.
 
-An example of this is the [media customisations
-module](https://github.com/element-hq/element-web/blob/develop/src/customisations/Media.ts).
+An example of this is the [security customisations
+module](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/customisations/Security.ts).
 This module in the React SDK only defines some empty functions and their types:
 it does not do anything by default.
 
@@ -21,14 +21,14 @@ Web so that you can add your own code. Even though the default module is part of
 the React SDK, you can still override it from the Element Web layer:
 
 1. Copy the default customisation module to
-   `element-web/src/customisations/YourNameMedia.ts`
+   `element-web/src/customisations/YourNameSecurity.ts`
 2. Edit customisations points and make sure export the ones you actually want to
    activate
 3. Create/add an entry to `customisations.json` next to the webpack config:
 
 ```json
 {
-    "src/customisations/Media.ts": "src/customisations/YourNameMedia.ts"
+    "src/customisations/Security.ts": "src/customisations/YourNameSecurity.ts"
 }
 ```
 
@@ -50,11 +50,11 @@ that properties/state machines won't change.
 
 UI for some actions can be hidden via the ComponentVisibility customisation:
 
-- inviting users to rooms and spaces,
-- creating rooms,
-- creating spaces,
+-   inviting users to rooms and spaces,
+-   creating rooms,
+-   creating spaces,
 
-To customise visibility create a customisation module from [ComponentVisibility](https://github.com/element-hq/element-web/blob/master/src/customisations/ComponentVisibility.ts) following the instructions above.
+To customise visibility create a customisation module from [ComponentVisibility](https://github.com/matrix-org/matrix-react-sdk/blob/master/src/customisations/ComponentVisibility.ts) following the instructions above.
 
 `shouldShowComponent` determines whether the active MatrixClient user should be able to use
 the given UI component. When `shouldShowComponent` returns falsy all UI components for that feature will be hidden.

docs/e2ee.md

@@ -31,9 +31,9 @@ Set the following on your homeserver's
 
 When `force_disable` is true:
 
-- all rooms will be created with encryption disabled, and it will not be possible to enable
-  encryption from room settings.
-- any `io.element.e2ee.default` value will be disregarded.
+-   all rooms will be created with encryption disabled, and it will not be possible to enable
+    encryption from room settings.
+-   any `io.element.e2ee.default` value will be disregarded.
 
 Note: If the server is configured to forcibly enable encryption for some or all rooms,
 this behaviour will be overridden.

docs/feature-flags.md

@@ -5,10 +5,10 @@ flexibility and control over when and where those features are enabled.
 
 For example, flags make the following things possible:
 
-- Extended testing of a feature via labs on develop
-- Enabling features when ready instead of the first moment the code is released
-- Testing a feature with a specific set of users (by enabling only on a specific
-  Element instance)
+-   Extended testing of a feature via labs on develop
+-   Enabling features when ready instead of the first moment the code is released
+-   Testing a feature with a specific set of users (by enabling only on a specific
+    Element instance)
 
 The size of the feature controlled by a feature flag may vary widely: it could
 be a large project like reactions or a smaller change to an existing algorithm.
@@ -35,7 +35,7 @@ clients commit to doing the associated clean up work once a feature stabilises.
 When starting work on a feature, we should create a matching feature flag:
 
 1. Add a new
-   [setting](https://github.com/element-hq/element-web/blob/develop/src/settings/Settings.tsx)
+   [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.tsx)
    of the form:
 
 ```js
@@ -93,14 +93,14 @@ Once we're confident that a feature is working well, we should remove or convert
 
 If the feature is meant to be turned off/on by the user:
 
-1. Remove `isFeature` from the [setting](https://github.com/element-hq/element-web/blob/develop/src/settings/Settings.ts)
+1. Remove `isFeature` from the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
 2. Change the `default` to `true` (if desired).
 3. Remove the feature from the [labs documentation](https://github.com/element-hq/element-web/blob/develop/docs/labs.md)
 4. Celebrate! 🥳
 
 If the feature is meant to be forced on (non-configurable):
 
-1. Remove the [setting](https://github.com/element-hq/element-web/blob/develop/src/settings/Settings.ts)
+1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
 2. Remove all `getValue` lines that test for the feature.
 3. Remove the feature from the [labs documentation](https://github.com/element-hq/element-web/blob/develop/docs/labs.md)
 4. If applicable, remove the feature state from

docs/features/README.md

@@ -1,6 +0,0 @@
-# Feature documention
-
-The idea of this folder is to document the features we support in different parts of the app.
-In case anyone needs to work on a given part, and isn't aware of all the features in the area,
-they will hopefully get an idea for all the supported functionality to know what to take into account
-when making changes.

docs/features/composer.md

@@ -1,38 +0,0 @@
-# Composer Features
-
-## Auto Complete
-
-- Hitting tab tries to auto-complete the word before the caret as a room member
-    - If no matching name is found, a visual bell is shown
-- @ + a letter opens auto complete for members starting with the given letter
-    - When inserting a user pill at the start in the composer, a colon and space is appended to the pill
-    - When inserting a user pill anywhere else in composer, only a space is appended to the pill
-- # + a letter opens auto complete for rooms starting with the given letter
-- : open auto complete for emoji
-- Pressing arrow-up/arrow-down while the autocomplete is open navigates between auto complete options
-- Pressing tab while the autocomplete is open goes to the next autocomplete option,
-  wrapping around at the end after reverting to the typed text first.
-
-## Formatting
-
-- When selecting text, a formatting bar appears above the selection.
-- The formatting bar allows to format the selected test as:
-  bold, italic, strikethrough, a block quote, and a code block (inline if no linebreak is selected).
-- Formatting is applied as markdown syntax.
-- Hitting ctrl/cmd+B also marks the selected text as bold
-- Hitting ctrl/cmd+I also marks the selected text as italic
-- Hitting ctrl/cmd+> also marks the selected text as a blockquote
-
-## Misc
-
-- When hitting the arrow-up button while having the caret at the start in the composer,
-  the last message sent by the syncing user is edited.
-- Clicking a display name on an event in the timeline inserts a user pill into the composer
-- Emoticons (like :-), >:-), :-/, ...) are replaced by emojis while typing if the relevant setting is enabled
-- Typing in the composer sends typing notifications in the room
-- Pressing ctrl/mod+z and ctrl/mod+y undoes/redoes modifications
-- Pressing shift+enter inserts a line break
-- Pressing enter sends the message.
-- Choosing "Quote" in the context menu of an event inserts a quote of the event body in the composer.
-- Choosing "Reply" in the context menu of an event shows a preview above the composer to reply to.
-- Pressing alt+arrow up/arrow down navigates in previously sent messages, putting them in the composer.

docs/features/keyboardShortcuts.md

@@ -1,59 +0,0 @@
-# Keyboard shortcuts
-
-## Using the `KeyBindingManager`
-
-The `KeyBindingManager` (accessible using `getKeyBindingManager()`) is a class
-with several methods that allow you to get a `KeyBindingAction` based on a
-`KeyboardEvent | React.KeyboardEvent`.
-
-The event passed to the `KeyBindingManager` gets compared to the list of
-shortcuts that are retrieved from the `IKeyBindingsProvider`s. The
-`IKeyBindingsProvider` is in `KeyBindingDefaults`.
-
-### Examples
-
-Let's say we want to close a menu when the correct keys were pressed:
-
-```ts
-const onKeyDown = (ev: KeyboardEvent): void => {
-    let handled = true;
-    const action = getKeyBindingManager().getAccessibilityAction(ev);
-    switch (action) {
-        case KeyBindingAction.Escape:
-            closeMenu();
-            break;
-        default:
-            handled = false;
-            break;
-    }
-
-    if (handled) {
-        ev.preventDefault();
-        ev.stopPropagation();
-    }
-};
-```
-
-## Managing keyboard shortcuts
-
-There are a few things at play when it comes to keyboard shortcuts. The
-`KeyBindingManager` gets `IKeyBindingsProvider`s one of which is
-`defaultBindingsProvider` defined in `KeyBindingDefaults`. In
-`KeyBindingDefaults` a `getBindingsByCategory()` method is used to create
-`KeyBinding`s based on `KeyboardShortcutSetting`s defined in
-`KeyboardShortcuts`.
-
-### Adding keyboard shortcuts
-
-To add a keyboard shortcut there are two files we have to look at:
-`KeyboardShortcuts.ts` and `KeyBindingDefaults.ts`. In most cases we only need
-to edit `KeyboardShortcuts.ts`: add a `KeyBindingAction` and add the
-`KeyBindingAction` to the `KEYBOARD_SHORTCUTS` object.
-
-Though, to make matters worse, sometimes we want to add a shortcut that has
-multiple keybindings associated with. This keyboard shortcut won't be
-customizable as it would be rather difficult to manage both from the point of
-the settings and the UI. To do this, we have to add a `KeyBindingAction` and add
-the UI representation of that keyboard shortcut to the `getUIOnlyShortcuts()`
-method. Then, we also need to add the keybinding to the correct method in
-`KeyBindingDefaults`.

docs/icons.md

@@ -1,56 +0,0 @@
-# Icons
-
-Icons are loaded using [@svgr/webpack](https://www.npmjs.com/package/@svgr/webpack).
-This is configured in [element-web](https://github.com/vector-im/element-web/blob/develop/webpack.config.js#L458).
-
-Each `.svg` exports a `ReactComponent` at the named export `Icon`.
-Icons have `role="presentation"` and `aria-hidden` automatically applied. These can be overriden by passing props to the icon component.
-
-SVG file recommendations:
-
-- Colours should not be defined absolutely. Use `currentColor` instead.
-- SVG files should be taken from the design compound as they are. Some icons contain special padding.
-  This means that there should be icons for each size, e.g. warning-16px and warning-32px.
-
-Example usage:
-
-```
-import { Icon as FavoriteIcon } from 'res/img/element-icons/favorite.svg';
-
-const MyComponent = () => {
-    return <>
-        <FavoriteIcon className="mx_Icon mx_Icon_16">
-    </>;
-}
-```
-
-If possible, use the icon classes from [here](../res/css/compound/_Icon.pcss).
-
-## Custom styling
-
-Icon components are svg elements and may be custom styled as usual.
-
-`_MyComponents.pcss`:
-
-```css
-.mx_MyComponent-icon {
-    height: 20px;
-    width: 20px;
-
-    * {
-        fill: $accent;
-    }
-}
-```
-
-`MyComponent.tsx`:
-
-```typescript
-import { Icon as FavoriteIcon } from 'res/img/element-icons/favorite.svg';
-
-const MyComponent = () => {
-    return <>
-        <FavoriteIcon className="mx_MyComponent-icon" role="img" aria-hidden="false">
-    </>;
-}
-```

docs/install.md

@@ -41,15 +41,7 @@ The Docker image can be used to serve element-web as a web server. The easiest w
 it is to use the prebuilt image:
 
 ```bash
-docker run --rm -p 127.0.0.1:80:80 vectorim/element-web
-```
-
-A server can also be made available to clients outside the local host by omitting the
-explicit local address as described in
-[docker run documentation](https://docs.docker.com/engine/reference/commandline/run/#publish-or-expose-port--p---expose):
-
-```bash
-docker run --rm -p 80:80 vectorim/element-web
+docker run -p 80:80 vectorim/element-web
 ```
 
 To supply your own custom `config.json`, map a volume to `/app/config.json`. For example,
@@ -57,37 +49,9 @@ if your custom config was located at `/etc/element-web/config.json` then your Do
 would be:
 
 ```bash
-docker run --rm -p 127.0.0.1:80:80 -v /etc/element-web/config.json:/app/config.json vectorim/element-web
+docker run -p 80:80 -v /etc/element-web/config.json:/app/config.json vectorim/element-web
 ```
 
-The Docker image is configured to run as an unprivileged (non-root) user by
-default. This should be fine on modern Docker runtimes, but binding to port 80
-on other runtimes may require root privileges. To resolve this, either run the
-image as root (`docker run --user 0`) or, better, change the port that nginx
-listens on via the `ELEMENT_WEB_PORT` environment variable.
-
-[Element Web Modules](https://github.com/element-hq/element-modules/tree/main/packages/element-web-module-api) can be dynamically loaded
-by being made available (e.g. via bind mount) in a directory within `/tmp/element-web-modules/`.
-The default entrypoint will be index.js in that directory but can be overridden if a package.json file is found with a `main` directive.
-These modules will be presented in a `/modules` subdirectory within the webroot, and automatically added to the config.json `modules` field.
-
-If you wish to use docker in read-only mode,
-you should follow the [upstream instructions](https://hub.docker.com/_/nginx#:~:text=Running%20nginx%20in%20read%2Donly%20mode)
-but additionally include the following directories:
-
-- /tmp/element-web-config/
-- /etc/nginx/conf.d/
-
-The behaviour of the docker image can be customised via the following
-environment variables:
-
-- `ELEMENT_WEB_PORT`
-
-    The port to listen on (within the docker container) for HTTP
-    traffic. Defaults to `80`.
-
-### Building the docker image
-
 To build the image yourself:
 
 ```bash
@@ -103,6 +67,8 @@ element-web branch and then run:
 ```bash
 docker build -t \
     --build-arg USE_CUSTOM_SDKS=true \
+    --build-arg REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git" \
+    --build-arg REACT_SDK_BRANCH="develop" \
     --build-arg JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git" \
     --build-arg JS_SDK_BRANCH="develop" \
     .

docs/jitsi.md

@@ -70,41 +70,3 @@ The domain used is the one specified by the `/.well-known/matrix/client` endpoin
 For active Jitsi widgets in the room, a native Jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data.
 
 Element Android manages allowed native widgets permissions a bit differently than web widgets (as the data shared are different and never shared with the widget URL). For Jitsi widgets, permissions are requested only once per domain (consent saved in account data).
-
-# Jitsi Wrapper
-
-**Note**: These are developer docs. Please consult your client's documentation for
-instructions on setting up Jitsi.
-
-The react-sdk wraps all Jitsi call widgets in a local wrapper called `jitsi.html`
-which takes several parameters:
-
-_Query string_:
-
-- `widgetId`: The ID of the widget. This is needed for communication back to the
-  react-sdk.
-- `parentUrl`: The URL of the parent window. This is also needed for
-  communication back to the react-sdk.
-
-_Hash/fragment (formatted as a query string)_:
-
-- `conferenceDomain`: The domain to connect Jitsi Meet to.
-- `conferenceId`: The room or conference ID to connect Jitsi Meet to.
-- `isAudioOnly`: Boolean for whether this is a voice-only conference. May not
-  be present, should default to `false`.
-- `startWithAudioMuted`: Boolean for whether the calls start with audio
-  muted. May not be present.
-- `startWithVideoMuted`: Boolean for whether the calls start with video
-  muted. May not be present.
-- `displayName`: The display name of the user viewing the widget. May not
-  be present or could be null.
-- `avatarUrl`: The HTTP(S) URL for the avatar of the user viewing the widget. May
-  not be present or could be null.
-- `userId`: The MXID of the user viewing the widget. May not be present or could
-  be null.
-
-The react-sdk will assume that `jitsi.html` is at the path of wherever it is currently
-being served. For example, `https://develop.element.io/jitsi.html` or `vector://webapp/jitsi.html`.
-
-The `jitsi.html` wrapper can use the react-sdk's `WidgetApi` to communicate, making
-it easier to actually implement the feature.

docs/labs.md

@@ -72,13 +72,18 @@ theme definition.
 
 For some sample themes, check out [aaronraimist/element-themes](https://github.com/aaronraimist/element-themes).
 
+## Dehydrated devices (`feature_dehydration`)
+
+Allows users to receive encrypted messages by creating a device that is stored
+encrypted on the server, as described in [MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697).
+
 ## Live location sharing (`feature_location_share_live`) [In Development]
 
 Enables sharing your current location to the timeline, with live updates.
 
 ## Video rooms (`feature_video_rooms`)
 
-Enables support for creating video rooms, which are persistent video chats that users can jump in and out of.
+Enables support for creating and joining video rooms, which are persistent video chats that users can jump in and out of.
 
 ## Element Call video rooms (`feature_element_call_video_rooms`) [In Development]
 
@@ -88,7 +93,7 @@ This flag will not have any effect unless `feature_video_rooms` is also enabled.
 
 ## New group call experience (`feature_group_calls`) [In Development]
 
-This feature allows users to place native [MSC3401](https://github.com/matrix-org/matrix-spec-proposals/pull/3401) group calls in compatible rooms, using Element Call.
+This feature allows users to place and join native [MSC3401](https://github.com/matrix-org/matrix-spec-proposals/pull/3401) group calls in compatible rooms, using Element Call.
 
 If you're enabling this at the deployment level, you may also want to reference the docs for the `element_call` config section.
 
@@ -105,6 +110,10 @@ This is useful while we experiment with encryption and to make calling compatibl
 
 Enables rendering of MD / HTML in room topics.
 
+## New room header & details (`feature_new_room_decoration_ui`) [In Development]
+
+Refactors visually the room header and room sidebar
+
 ## Enable the notifications panel in the room header (`feature_notifications`)
 
 Unreliable in encrypted rooms.
@@ -112,7 +121,3 @@ Unreliable in encrypted rooms.
 ## Knock rooms (`feature_ask_to_join`) [In Development]
 
 Enables knock feature for rooms. This allows users to ask to join a room.
-
-## New room list (`feature_new_room_list`) [In Development]
-
-Enable the new room list that is currently in development.

docs/local-echo-dev.md

@@ -1,38 +0,0 @@
-# Local echo (developer docs)
-
-The React SDK provides some local echo functionality to allow for components to do something
-quickly and fall back when it fails. This is all available in the `local-echo` directory within
-`stores`.
-
-Echo is handled in EchoChambers, with `GenericEchoChamber` being the base implementation for all
-chambers. The `EchoChamber` class is provided as semantic access to a `GenericEchoChamber`
-implementation, such as the `RoomEchoChamber` (which handles echoable details of a room).
-
-Anything that can be locally echoed will be provided by the `GenericEchoChamber` implementation.
-The echo chamber will also need to deal with external changes, and has full control over whether
-or not something has successfully been echoed.
-
-An `EchoContext` is provided to echo chambers (usually with a matching type: `RoomEchoContext`
-gets provided to a `RoomEchoChamber` for example) with details about their intended area of
-effect, as well as manage `EchoTransaction`s. An `EchoTransaction` is simply a unit of work that
-needs to be locally echoed.
-
-The `EchoStore` manages echo chamber instances, builds contexts, and is generally less semantically
-accessible than the `EchoChamber` class. For separation of concerns, and to try and keep things
-tidy, this is an intentional design decision.
-
-**Note**: The local echo stack uses a "whenable" pattern, which is similar to thenables and
-`EventEmitter`. Whenables are ways of actioning a changing condition without having to deal
-with listeners being torn down. Once the reference count of the Whenable causes garbage collection,
-the Whenable's listeners will also be torn down. This is accelerated by the `IDestroyable` interface
-usage.
-
-## Audit functionality
-
-The UI supports a "Server isn't responding" dialog which includes a partial audit log-like
-structure to it. This is partially the reason for added complexity of `EchoTransaction`s
-and `EchoContext`s - this information feeds the UI states which then provide direct retry
-mechanisms.
-
-The `EchoStore` is responsible for ensuring that the appropriate non-urgent toast (lower left)
-is set up, where the dialog then drives through the contexts and transactions.

docs/media-handling.md

@@ -1,19 +0,0 @@
-# Media handling
-
-Surely media should be as easy as just putting a URL into an `img` and calling it good, right?
-Not quite. Matrix uses something called a Matrix Content URI (better known as MXC URI) to identify
-content, which is then converted to a regular HTTPS URL on the homeserver. However, sometimes that
-URL can change depending on deployment considerations.
-
-The react-sdk features a [customisation endpoint](https://github.com/vector-im/element-web/blob/develop/docs/customisations.md)
-for media handling where all conversions from MXC URI to HTTPS URL happen. This is to ensure that
-those obscure deployments can route all their media to the right place.
-
-For development, there are currently two functions available: `mediaFromMxc` and `mediaFromContent`.
-The `mediaFromMxc` function should be self-explanatory. `mediaFromContent` takes an event content as
-a parameter and will automatically parse out the source media and thumbnail. Both functions return
-a `Media` object with a number of options on it, such as getting various common HTTPS URLs for the
-media.
-
-**It is extremely important that all media calls are put through this customisation endpoint.** So
-much so it's a lint rule to avoid accidental use of the wrong functions.

docs/modules.md

@@ -23,11 +23,11 @@ the current directory as the build context (the `.` in `docker build -t my-eleme
 ## Writing modules
 
 While writing modules is meant to be easy, not everything is possible yet. For modules which want to do something we haven't
-exposed in the module API, the module API will need to be updated. This means a PR to both this repo
-and [`matrix-react-sdk-module-api`](https://github.com/matrix-org/matrix-react-sdk-module-api).
+exposed in the module API, the module API will need to be updated. This means a PR to both the
+[`matrix-react-sdk`](https://github.com/matrix-org/matrix-react-sdk) and [`matrix-react-sdk-module-api`](https://github.com/matrix-org/matrix-react-sdk-module-api).
 
 Once your change to the module API is accepted, the `@matrix-org/react-sdk-module-api` dependency gets updated at the
-`element-web` layer (usually by us, the maintainers) to ensure your module can operate.
+`matrix-react-sdk` and `element-web` layers (usually by us, the maintainers) to ensure your module can operate.
 
 If you're not adding anything to the module API, or your change was accepted per above, then start off with a clone of
 our [ILAG module](https://github.com/element-hq/element-web-ilag-module) which will give you a general idea for what the

docs/oidc.md

@@ -1,9 +1,29 @@
 # OIDC and delegated authentication
 
+## Compatibility/OIDC-aware mode
+
+[MSC2965: OIDC provider discovery](https://github.com/matrix-org/matrix-spec-proposals/pull/2965)
+[MSC3824: OIDC aware clients](https://github.com/matrix-org/matrix-spec-proposals/pull/3824)
+This mode uses an SSO flow to gain a `loginToken` from the authentication provider, then continues with SSO login.
+Element Web uses [MSC2965: OIDC provider discovery](https://github.com/matrix-org/matrix-spec-proposals/pull/2965) to discover the configured provider.
+Wherever valid MSC2965 configuration is discovered, OIDC-aware login flow will be the only option offered.
+
+## (🧪Experimental) OIDC-native flow
+
+Can be enabled by a config-level-only setting in `config.json`
+
+```json
+{
+    "features": {
+        "feature_oidc_native_flow": true
+    }
+}
+```
+
 See https://areweoidcyet.com/client-implementation-guide/ for implementation details.
 
 Element Web uses [MSC2965: OIDC provider discovery](https://github.com/matrix-org/matrix-spec-proposals/pull/2965) to discover the configured provider.
-Where a valid MSC2965 configuration is discovered, OIDC native login flow will be the only login option offered.
+Where OIDC native login flow is enabled and valid MSC2965 configuration is discovered, OIDC native login flow will be the only login option offered.
 Element Web will attempt to [dynamically register](https://openid.net/specs/openid-connect-registration-1_0.html) with the configured OP.
 Then, authentication will be completed [as described here](https://areweoidcyet.com/client-implementation-guide/).
 

docs/playwright.md

@@ -1,217 +0,0 @@
-# Playwright in Element Web
-
-## Contents
-
-- How to run the tests
-- How the tests work
-- How to write great Playwright tests
-- Visual testing
-
-## Running the Tests
-
-Our Playwright tests run automatically as part of our CI along with our other tests,
-on every pull request and on every merge to develop & master.
-
-You may need to follow instructions to set up your development environment for running
-Playwright by following <https://playwright.dev/docs/browsers#install-browsers> and
-<https://playwright.dev/docs/browsers#install-system-dependencies>.
-
-However the Playwright tests are run, an element-web instance must be running on
-http://localhost:8080 (this is configured in `playwright.config.ts`) - this is what will
-be tested. When running Playwright tests yourself, the standard `yarn start` from the
-element-web project is fine: leave it running it a different terminal as you would
-when developing. Alternatively if you followed the development set up from element-web then
-Playwright will be capable of running the webserver on its own if it isn't already running.
-
-The tests use [testcontainers](https://node.testcontainers.org/) to launch Homeserver (Synapse or Dendrite)
-instances to test against, so you'll also need to one of the
-[supported container runtimes](#supporter-container-runtimes)
-installed and working in order to run the Playwright tests.
-
-There are a few different ways to run the tests yourself. The simplest is to run:
-
-```shell
-yarn run test:playwright
-```
-
-This will run the Playwright tests once, non-interactively.
-
-You can also run individual tests this way too, as you'd expect:
-
-```shell
-yarn run test:playwright --spec playwright/e2e/register/register.spec.ts
-```
-
-Playwright also has its own UI that you can use to run and debug the tests.
-To launch it:
-
-```shell
-yarn run test:playwright:open --headed --debug
-```
-
-See more command line options at <https://playwright.dev/docs/test-cli>.
-
-## Projects
-
-By default, Playwright will run all "Projects", this means tests will run against Chrome, Firefox and "Safari" (Webkit).
-We only run tests against Chrome in pull request CI, but all projects in the merge queue.
-Some tests are excluded from running on certain browsers due to incompatibilities in the test harness.
-
-## How the Tests Work
-
-Everything Playwright-related lives in the `playwright/` subdirectory
-as is typical for Playwright tests. Likewise, tests live in `playwright/e2e`.
-
-`playwright/testcontainers` contains the testcontainers which start instances
-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:
-
-```typescript
-test.use({
-    synapseConfig: {
-        // 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
-
-Mostly this is the same advice as for writing any other Playwright test: the Playwright
-docs are well worth a read if you're not already familiar with Playwright testing, eg.
-https://playwright.dev/docs/best-practices. To avoid your tests being flaky it is also
-recommended to use [auto-retrying assertions](https://playwright.dev/docs/test-assertions#auto-retrying-assertions).
-
-### Getting a Synapse
-
-We heavily leverage the magic of [Playwright fixtures](https://playwright.dev/docs/test-fixtures).
-To acquire a homeserver within a test just add the `homeserver` fixture to the test:
-
-```typescript
-test("should do something", async ({ homeserver }) => {
-    // homeserver is a Synapse/Dendrite instance
-});
-```
-
-This returns an object with information about the Homeserver instance, including what port
-it was started on and the ID that needs to be passed to shut it down again. It also
-returns the registration shared secret (`registrationSecret`) that can be used to
-register users via the REST API. The Homeserver has been ensured ready to go by awaiting
-its internal health-check.
-
-Homeserver instances should be reasonably cheap to start (you may see the first one take a
-while as it pulls the Docker image).
-You do not need to explicitly clean up the instance as it will be cleaned up by the fixture.
-
-### Logging In
-
-We again heavily leverage the magic of [Playwright fixtures](https://playwright.dev/docs/test-fixtures).
-To acquire a logged-in user within a test just add the `user` fixture to the test:
-
-```typescript
-test("should do something", async ({ user }) => {
-    // user is a logged in user
-});
-```
-
-You can specify a display name for the user via `test.use` `displayName`,
-otherwise a random one will be generated.
-This will register a random userId using the registrationSecret with a random password
-and the given display name. The user fixture will contain details about the credentials for if
-they are needed for User-Interactive Auth or similar but localStorage will already be seeded with them
-and the app loaded (path `/`).
-
-### Joining a Room
-
-Many tests will also want to start with the client in a room, ready to send & receive messages. Best
-way to do this may be to get an access token for the user and use this to create a room with the REST
-API before logging the user in.
-You can make use of the bot fixture and the `client` field on the app fixture to do this.
-
-### Try to write tests from the users' perspective
-
-Like for instance a user will not look for a button by querying a CSS selector.
-Instead, you should work with roles / labels etc, see https://playwright.dev/docs/locators.
-
-### Using matrix-js-sdk
-
-Due to the way we run the Playwright tests in CI, at this time you can only use the matrix-js-sdk module
-exposed on `window.matrixcs`. This has the limitation that it is only accessible with the app loaded.
-This may be revisited in the future.
-
-## Good Test Hygiene
-
-This section mostly summarises general good Playwright testing practice, and should not be news to anyone
-already familiar with Playwright.
-
-1. Test a well-isolated unit of functionality. The more specific, the easier it will be to tell what's
-   wrong when they fail.
-1. Don't depend on state from other tests: any given test should be able to run in isolation.
-1. Try to avoid driving the UI for anything other than the UI you're trying to test. e.g. if you're
-   testing that the user can send a reaction to a message, it's best to send a message using a REST
-   API, then react to it using the UI, rather than using the element-web UI to send the message.
-1. Avoid explicit waits. Playwright locators & assertions will implicitly wait for the specified
-   element to appear and all assertions are retried until they either pass or time out, so you should
-   never need to manually wait for an element.
-    - For example, for asserting about editing an already-edited message, you can't wait for the
-      'edited' element to appear as there was already one there, but you can assert that the body
-      of the message is what is should be after the second edit and this assertion will pass once
-      it becomes true. You can then assert that the 'edited' element is still in the DOM.
-    - You can also wait for other things like network requests in the
-      browser to complete (https://playwright.dev/docs/api/class-page#page-wait-for-response).
-      Needing to wait for things can also be because of race conditions in the app itself, which ideally
-      shouldn't be there!
-
-This is a small selection - the Playwright best practices guide, linked above, has more good advice, and we
-should generally try to adhere to them.
-
-## Screenshot testing
-
-When we previously used Cypress we also dabbled with Percy, and whilst powerful it did not
-lend itself well to being executed on all PRs without needing to budget it substantially.
-
-Playwright has built-in support for [visual comparison testing](https://playwright.dev/docs/test-snapshots).
-Screenshots are saved in `playwright/snapshots` and are rendered in a Linux Docker environment for stability.
-
-One must be careful to exclude any dynamic content from the screenshot, such as timestamps, avatars, etc,
-via the `mask` option. See the [Playwright docs](https://playwright.dev/docs/test-snapshots#masking).
-
-Some UI elements render differently between test runs, such as BaseAvatar when
-there is no avatar set, choosing a colour from the theme palette based on the
-hash of the user/room's Matrix ID. To avoid this creating flaky tests we inject
-some custom CSS, for this to happen we use the custom assertion `toMatchScreenshot`
-instead of the native `toHaveScreenshot`.
-
-If you are running Linux and are unfortunate that the screenshots are not rendering identically,
-you may wish to specify `--ignore-snapshots` and rely on Docker to render them for you.
-
-## Test Tags
-
-We use test tags to categorise tests for running subsets more efficiently.
-
-- `@mergequeue`: Tests that are slow or flaky and cover areas of the app we update seldom, should not be run on every PR commit but will be run in the Merge Queue.
-- `@screenshot`: Tests that use `toMatchScreenshot` to speed up a run of `test:playwright:screenshots`. A test with this tag must not also have the `@mergequeue` tag as this would cause false positives in the stale screenshot detection.
-- `@no-$project`: Tests which are unsupported in $Project. These tests will be skipped when running in $Project.
-
-Anything testing Matrix media will need to have `@no-firefox` and `@no-webkit` as those rely on the service worker which
-has to be disabled in Playwright on Firefox & Webkit to retain routing functionality.
-Anything testing VoIP/microphone will need to have `@no-webkit` as fake microphone functionality is not available
-there at this time.
-
-If you wish to run all tests in a PR, you can give it the label `X-Run-All-Tests`.
-
-## Supporter container runtimes
-
-We use testcontainers to spin up various instances of Synapse, Matrix Authentication Service, and more.
-It supports Docker out of the box but also has support for Podman, Colima, Rancher, you just need to follow some instructions to achieve it:
-https://node.testcontainers.org/supported-container-runtimes/
-
-If you are running under Colima, you may need to set the environment variable `TMPDIR` to `/tmp/colima` or a path
-within `$HOME` to allow bind mounting temporary directories into the Docker containers.

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
 
@@ -24,7 +22,7 @@ The master branch is the most stable as it is the very latest non-RC release. De
 
 <details><summary><h1>Versions</h1></summary><blockquote>
 
-The matrix-js-sdk follows semver, most releases will bump the minor version number.
+The matrix-js-sdk follows semver, the matrix-react-sdk loosely follows semver, most releases for both will bump the minor version number.
 Breaking changes will bump the major version number.
 Element Web & Element Desktop do not follow semver and always have matching version numbers. The patch version number is normally incremented for every release.
 
@@ -82,30 +80,31 @@ This label will automagically convert to `X-Release-Blocker` at the conclusion o
 
 <details><summary><h1>Repositories</h1></summary><blockquote>
 
-This release process revolves around our main repositories:
+This release process revolves around our four main repositories:
 
-- [Element Desktop](https://github.com/element-hq/element-desktop/)
-- [Element Web](https://github.com/element-hq/element-web/)
-- [Matrix JS SDK](https://github.com/matrix-org/matrix-js-sdk/)
+-   [Element Desktop](https://github.com/element-hq/element-desktop/)
+-   [Element Web](https://github.com/element-hq/element-web/)
+-   [Matrix React SDK](https://github.com/matrix-org/matrix-react-sdk/)
+-   [Matrix JS SDK](https://github.com/matrix-org/matrix-js-sdk/)
 
 We own other repositories, but they have more ad-hoc releases and are not part of the bi-weekly cycle:
 
-- https://github.com/matrix-org/matrix-web-i18n/
-- https://github.com/matrix-org/matrix-react-sdk-module-api
+-   https://github.com/matrix-org/matrix-web-i18n/
+-   https://github.com/matrix-org/matrix-react-sdk-module-api
 
 </blockquote></details>
 
 <details><summary><h1>Prerequisites</h1></summary><blockquote>
 
-- You must be part of the 2 Releasers GitHub groups:
-    - <https://github.com/orgs/element-hq/teams/element-web-releasers>
-    - <https://github.com/orgs/matrix-org/teams/element-web-releasers>
-- You will need access to the **VPN** ([docs](https://gitlab.matrix.org/new-vector/internal/-/wikis/SRE/Tailscale)) to be able to follow the instructions under Deploy below.
-- You will need the ability to **SSH** in to the production machines to be able to follow the instructions under Deploy below. Ensure that your SSH key has a non-empty passphrase, and you registered your SSH key with Ops. Log a ticket at https://github.com/matrix-org/matrix-ansible-private and ask for:
-    - Two-factor authentication to be set up on your SSH key. (This is needed to get access to production).
-    - SSH access to `horme` (staging.element.io and app.element.io)
-    - Permission to sudo on horme as the user `element`
-- You need "**jumphost**" configuration in your local `~/.ssh/config`. This should have been set up as part of your onboarding.
+-   You must be part of the 2 Releasers GitHub groups:
+    -   <https://github.com/orgs/element-hq/teams/element-web-releasers>
+    -   <https://github.com/orgs/matrix-org/teams/element-web-releasers>
+-   You will need access to the **VPN** ([docs](https://gitlab.matrix.org/new-vector/internal/-/wikis/SRE/Tailscale)) to be able to follow the instructions under Deploy below.
+-   You will need the ability to **SSH** in to the production machines to be able to follow the instructions under Deploy below. Ensure that your SSH key has a non-empty passphrase, and you registered your SSH key with Ops. Log a ticket at https://github.com/matrix-org/matrix-ansible-private and ask for:
+    -   Two-factor authentication to be set up on your SSH key. (This is needed to get access to production).
+    -   SSH access to `horme` (staging.element.io and app.element.io)
+    -   Permission to sudo on horme as the user `element`
+-   You need "**jumphost**" configuration in your local `~/.ssh/config`. This should have been set up as part of your onboarding.
 
 </blockquote></details>
 
@@ -118,17 +117,18 @@ flowchart TD
 
     subgraph Releasing
         R1[[Releasing matrix-js-sdk]]
-        R2[[Releasing element-web]]
-        R3[[Releasing element-desktop]]
+        R2[[Releasing matrix-react-sdk]]
+        R3[[Releasing element-web]]
+        R4[[Releasing element-desktop]]
 
-        R1 --> R2 --> R3
+        R1 --> R2 --> R3 --> R4
     end
 
-    R3 --> D1
+    R4 --> D1
 
     subgraph Deploying
         D1[\Deploy staging.element.io/]
-        D2[\Check docker build/]
+        D2[\Check dockerhub/]
         D3[\Deploy app.element.io/]
         D4[\Check desktop package/]
 
@@ -179,7 +179,7 @@ For security, you may wish to merge the security advisory private fork or apply
 It is worth noting that at the end of the Final/Hotfix/Security release `staging` is merged to `master` which is merged back into `develop` -
 this means that any commit which goes to `staging` will eventually make its way back to the default branch.
 
-- [ ] The staging branch is prepared
+-   [ ] The staging branch is prepared
 
 # Releasing
 
@@ -194,48 +194,51 @@ switched back to the version of the dependency from the master branch to not lea
 
 ### Matrix JS SDK
 
-- [ ] Check the draft release which has been generated by [the automation](https://github.com/matrix-org/matrix-js-sdk/actions/workflows/release-drafter.yml)
-- [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft**
-- [ ] Kick off a release using [the automation](https://github.com/matrix-org/matrix-js-sdk/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
+-   [ ] Check the draft release which has been generated by [the automation](https://github.com/matrix-org/matrix-js-sdk/actions/workflows/release-drafter.yml)
+-   [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft**
+-   [ ] Kick off a release using [the automation](https://github.com/matrix-org/matrix-js-sdk/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
+
+### Matrix React SDK
+
+-   [ ] Check the draft release which has been generated by [the automation](https://github.com/matrix-org/matrix-react-sdk/actions/workflows/release-drafter.yml)
+-   [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft**
+-   [ ] Kick off a release using [the automation](https://github.com/matrix-org/matrix-react-sdk/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
 
 ### Element Web
 
-- [ ] Check the draft release which has been generated by [the automation](https://github.com/element-hq/element-web/actions/workflows/release-drafter.yml)
-- [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft**
-- [ ] Kick off a release using [the automation](https://github.com/element-hq/element-web/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
+-   [ ] Check the draft release which has been generated by [the automation](https://github.com/element-hq/element-web/actions/workflows/release-drafter.yml)
+-   [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft**
+-   [ ] Kick off a release using [the automation](https://github.com/element-hq/element-web/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
 
 ### Element Desktop
 
-- [ ] Check the draft release which has been generated by [the automation](https://github.com/element-hq/element-desktop/actions/workflows/release-drafter.yml)
-- [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft**
-- [ ] Kick off a release using [the automation](https://github.com/element-hq/element-desktop/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
+-   [ ] Check the draft release which has been generated by [the automation](https://github.com/element-hq/element-desktop/actions/workflows/release-drafter.yml)
+-   [ ] Make any changes to the release notes in the draft release as are necessary - **Do not click publish, only save draft**
+-   [ ] Kick off a release using [the automation](https://github.com/element-hq/element-desktop/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. You should not need to ever switch off either of the Publishing options.
 
 # Deploying
 
 We ship the SDKs to npm, this happens as part of the release process.
-We ship Element Web to dockerhub, ghcr.io, `*.element.io`, and packages.element.io.
+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 & ghcr.io
-- [ ] Check that the staging [deployment](https://github.com/element-hq/element-web/actions/workflows/deploy.yml) has completed successfully
-- [ ] Test staging.element.io
+-   [ ] Check that element-web has shipped to dockerhub
+-   [ ] 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:
 
-- [ ] Deploy app.element.io. [See docs.](https://handbook.element.io/books/element-web-team/page/deploying-appstagingelementio)
-- [ ] Test app.element.io
-- [ ] 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.
+-   [ ] Deploy app.element.io. [See docs.](https://handbook.element.io/books/element-web-team/page/deploying-appstagingelementio)
+-   [ ] Test app.element.io
+-   [ ] Ensure Element Web package has shipped to packages.element.io
+-   [ ] Ensure Element Desktop packages have shipped to packages.element.io
 
 # Housekeeping
 
 We have some manual housekeeping to do in order to prepare for the next release.
 
-- [ ] Update topics using [the automation](https://github.com/element-hq/element-web/actions/workflows/update-topics.yaml). It will autodetect the current latest version. Don't forget the date you supply should be e.g. September 5th (including the "th") for the script to work.
-- [ ] Announce the release in [#element-web-announcements:matrix.org](https://matrix.to/#/#element-web-announcements:matrix.org)
+-   [ ] Update topics using [the automation](https://github.com/element-hq/element-web/actions/workflows/update-topics.yaml). It will autodetect the current latest version. Don't forget the date you supply should be e.g. September 5th (including the "th") for the script to work.
+-   [ ] Announce the release in [#element-web-announcements:matrix.org](https://matrix.to/#/#element-web-announcements:matrix.org)
 
 <details><summary>(show)</summary>
 
@@ -251,15 +254,17 @@ With wording like:
 
 For the first RC of a given release cycle do these steps:
 
-- [ ] Go to the [matrix-js-sdk Renovate dashboard](https://github.com/matrix-org/matrix-js-sdk/issues/2406) and click the checkbox to create/update its PRs.
+-   [ ] Go to the [matrix-js-sdk Renovate dashboard](https://github.com/matrix-org/matrix-js-sdk/issues/2406) and click the checkbox to create/update its PRs.
 
-- [ ] Go to the [element-web Renovate dashboard](https://github.com/element-hq/element-web/issues/22941) and click the checkbox to create/update its PRs.
+-   [ ] Go to the [matrix-react-sdk Renovate dashboard](https://github.com/matrix-org/matrix-react-sdk/issues/9667) and click the checkbox to create/update its PRs.
 
-- [ ] Go to the [element-desktop Renovate dashboard](https://github.com/element-hq/element-desktop/issues/465) and click the checkbox to create/update its PRs.
+-   [ ] Go to the [element-web Renovate dashboard](https://github.com/element-hq/element-web/issues/22941) and click the checkbox to create/update its PRs.
 
-- [ ] Later, check back and merge the PRs that succeeded to build. The ones that failed will get picked up by the [maintainer](https://docs.google.com/document/d/1V5VINWXATMpz9UBw4IKmVVB8aw3CxM0Jt7igtHnDfSk/edit#).
+-   [ ] Go to the [element-desktop Renovate dashboard](https://github.com/element-hq/element-desktop/issues/465) and click the checkbox to create/update its PRs.
+
+-   [ ] Later, check back and merge the PRs that succeeded to build. The ones that failed will get picked up by the [maintainer](https://docs.google.com/document/d/1V5VINWXATMpz9UBw4IKmVVB8aw3CxM0Jt7igtHnDfSk/edit#).
 
 For final releases additionally do these steps:
 
-- [ ] Archive done column on the [team board](https://github.com/orgs/element-hq/projects/67/views/34) _Note: this should be automated_
-- [ ] Add entry to the [milestones diary](https://docs.google.com/document/d/1cpRFJdfNCo2Ps6jqzQmatzbYEToSrQpyBug0aP_iwZE/edit#heading=h.6y55fw4t283z). The document says only to add significant releases, but we add all of them just in case.
+-   [ ] Archive done column on the [team board](https://github.com/orgs/element-hq/projects/67/views/34) _Note: this should be automated_
+-   [ ] Add entry to the [milestones diary](https://docs.google.com/document/d/1cpRFJdfNCo2Ps6jqzQmatzbYEToSrQpyBug0aP_iwZE/edit#heading=h.6y55fw4t283z). The document says only to add significant releases, but we add all of them just in case.

docs/review.md

@@ -10,53 +10,53 @@ When reviewing code, here are some things we look for and also things we avoid:
 
 ### We review for
 
-- Correctness
-- Performance
-- Accessibility
-- Security
-- Quality via automated and manual testing
-- Comments and documentation where needed
-- Sharing knowledge of different areas among the team
-- Ensuring it's something we're comfortable maintaining for the long term
-- Progress indicators and local echo where appropriate with network activity
+-   Correctness
+-   Performance
+-   Accessibility
+-   Security
+-   Quality via automated and manual testing
+-   Comments and documentation where needed
+-   Sharing knowledge of different areas among the team
+-   Ensuring it's something we're comfortable maintaining for the long term
+-   Progress indicators and local echo where appropriate with network activity
 
 ### We should avoid
 
-- Style nits that are already handled by the linter
-- Dramatically increasing scope
+-   Style nits that are already handled by the linter
+-   Dramatically increasing scope
 
 ### Good practices
 
-- Use empathetic language
-    - See also [Mindful Communication in Code
-      Reviews](https://kickstarter.engineering/a-guide-to-mindful-communication-in-code-reviews-48aab5282e5e)
-      and [How to Do Code Reviews Like a Human](https://mtlynch.io/human-code-reviews-1/)
-- Authors should prefer smaller commits for easier reviewing and bisection
-- Reviewers should be explicit about required versus optional changes
-    - Reviews are conversations and the PR author should feel comfortable
-      discussing and pushing back on changes before making them
-- Reviewers are encouraged to ask for tests where they believe it is reasonable
-- Core team should lead by example through their tone and language
-- Take the time to thank and point out good code changes
-- Using softer language like "please" and "what do you think?" goes a long way
-  towards making others feel like colleagues working towards a common goal
+-   Use empathetic language
+    -   See also [Mindful Communication in Code
+        Reviews](https://kickstarter.engineering/a-guide-to-mindful-communication-in-code-reviews-48aab5282e5e)
+        and [How to Do Code Reviews Like a Human](https://mtlynch.io/human-code-reviews-1/)
+-   Authors should prefer smaller commits for easier reviewing and bisection
+-   Reviewers should be explicit about required versus optional changes
+    -   Reviews are conversations and the PR author should feel comfortable
+        discussing and pushing back on changes before making them
+-   Reviewers are encouraged to ask for tests where they believe it is reasonable
+-   Core team should lead by example through their tone and language
+-   Take the time to thank and point out good code changes
+-   Using softer language like "please" and "what do you think?" goes a long way
+    towards making others feel like colleagues working towards a common goal
 
 ### Workflow
 
-- Authors should request review from the element-web team by default (if someone on
-  the team is clearly the expert in an area, a direct review request to them may
-  be more appropriate)
-- Reviewers should remove the team review request and request review from
-  themselves when starting a review to avoid double review
-- If there are multiple related PRs authors should reference each of the PRs in
-  the others before requesting review. Reviewers might start reviewing from
-  different places and could miss other required PRs.
-- Avoid force pushing to a PR after the first round of review
-- Use the GitHub default of merge commits when landing (avoid alternate options
-  like squash or rebase)
-- PR author merges after review (assuming they have write access)
-- Assign issues only when in progress to indicate to others what can be picked
-  up
+-   Authors should request review from the element-web team by default (if someone on
+    the team is clearly the expert in an area, a direct review request to them may
+    be more appropriate)
+-   Reviewers should remove the team review request and request review from
+    themselves when starting a review to avoid double review
+-   If there are multiple related PRs authors should reference each of the PRs in
+    the others before requesting review. Reviewers might start reviewing from
+    different places and could miss other required PRs.
+-   Avoid force pushing to a PR after the first round of review
+-   Use the GitHub default of merge commits when landing (avoid alternate options
+    like squash or rebase)
+-   PR author merges after review (assuming they have write access)
+-   Assign issues only when in progress to indicate to others what can be picked
+    up
 
 ## Code Quality
 
@@ -64,10 +64,10 @@ In the past, we have occasionally written different kinds of tests for
 Element and the SDKs, but it hasn't been a consistent focus. Going forward, we'd
 like to change that.
 
-- For new features, code reviewers will expect some form of automated testing to
-  be included by default
-- For bug fixes, regression tests are of course great to have, but we don't want
-  to block fixes on this, so we won't require them at this time
+-   For new features, code reviewers will expect some form of automated testing to
+    be included by default
+-   For bug fixes, regression tests are of course great to have, but we don't want
+    to block fixes on this, so we won't require them at this time
 
 The above policy is not a strict rule, but instead it's meant to be a
 conversation between the author and reviewer. As an author, try to think about
@@ -104,10 +104,10 @@ perspective.
 In more detail, our usual process for changes that affect the UI or alter user
 functionality is:
 
-- For changes that will go live when merged, always flag Design and Product
-  teams as appropriate
-- For changes guarded by a feature flag, Design and Product review is not
-  required (though may still be useful) since we can continue tweaking
+-   For changes that will go live when merged, always flag Design and Product
+    teams as appropriate
+-   For changes guarded by a feature flag, Design and Product review is not
+    required (though may still be useful) since we can continue tweaking
 
 As it can be difficult to review design work from looking at just the changed
 files in a PR, a [preview site](./pr-previews.md) that includes your changes

docs/room-list-store.md

@@ -1,165 +0,0 @@
-# Room list sorting
-
-It's so complicated it needs its own README.
-
-![](img/RoomListStore2.png)
-
-Legend:
-
-- Orange = External event.
-- Purple = Deterministic flow.
-- Green = Algorithm definition.
-- Red = Exit condition/point.
-- Blue = Process definition.
-
-## Algorithms involved
-
-There's two main kinds of algorithms involved in the room list store: list ordering and tag sorting.
-Throughout the code an intentional decision has been made to call them the List Algorithm and Sorting
-Algorithm respectively. The list algorithm determines the primary ordering of a given tag whereas the
-tag sorting defines how rooms within that tag get sorted, at the discretion of the list ordering.
-
-Behaviour of the overall room list (sticky rooms, etc) are determined by the generically-named Algorithm
-class. Here is where much of the coordination from the room list store is done to figure out which list
-algorithm to call, instead of having all the logic in the room list store itself.
-
-Tag sorting is effectively the comparator supplied to the list algorithm. This gives the list algorithm
-the power to decide when and how to apply the tag sorting, if at all. For example, the importance algorithm,
-later described in this document, heavily uses the list ordering behaviour to break the tag into categories.
-Each category then gets sorted by the appropriate tag sorting algorithm.
-
-### Tag sorting algorithm: Alphabetical
-
-When used, rooms in a given tag will be sorted alphabetically, where the alphabet's order is a problem
-for the browser. All we do is a simple string comparison and expect the browser to return something
-useful.
-
-### Tag sorting algorithm: Manual
-
-Manual sorting makes use of the `order` property present on all tags for a room, per the
-[Matrix specification](https://matrix.org/docs/spec/client_server/r0.6.0#room-tagging). Smaller values
-of `order` cause rooms to appear closer to the top of the list.
-
-### Tag sorting algorithm: Recent
-
-Rooms get ordered by the timestamp of the most recent useful message. Usefulness is yet another algorithm
-in the room list system which determines whether an event type is capable of bubbling up in the room list.
-Normally events like room messages, stickers, and room security changes will be considered useful enough
-to cause a shift in time.
-
-Note that this is reliant on the event timestamps of the most recent message. Because Matrix is eventually
-consistent this means that from time to time a room might plummet or skyrocket across the tag due to the
-timestamp contained within the event (generated server-side by the sender's server).
-
-### List ordering algorithm: Natural
-
-This is the easiest of the algorithms to understand because it does essentially nothing. It imposes no
-behavioural changes over the tag sorting algorithm and is by far the simplest way to order a room list.
-Historically, it's been the only option in Element and extremely common in most chat applications due to
-its relative deterministic behaviour.
-
-### List ordering algorithm: Importance
-
-On the other end of the spectrum, this is the most complicated algorithm which exists. There's major
-behavioural changes, and the tag sorting algorithm gets selectively applied depending on circumstances.
-
-Each tag which is not manually ordered gets split into 4 sections or "categories". Manually ordered tags
-simply get the manual sorting algorithm applied to them with no further involvement from the importance
-algorithm. There are 4 categories: Red, Grey, Bold, and Idle. Each has their own definition based off
-relative (perceived) importance to the user:
-
-- **Red**: The room has unread mentions waiting for the user.
-- **Grey**: The room has unread notifications waiting for the user. Notifications are simply unread
-  messages which cause a push notification or badge count. Typically, this is the default as rooms get
-  set to 'All Messages'.
-- **Bold**: The room has unread messages waiting for the user. Essentially this is a grey room without
-  a badge/notification count (or 'Mentions Only'/'Muted').
-- **Idle**: No useful (see definition of useful above) activity has occurred in the room since the user
-  last read it.
-
-Conveniently, each tag gets ordered by those categories as presented: red rooms appear above grey, grey
-above bold, etc.
-
-Once the algorithm has determined which rooms belong in which categories, the tag sorting algorithm
-gets applied to each category in a sub-list fashion. This should result in the red rooms (for example)
-being sorted alphabetically amongst each other as well as the grey rooms sorted amongst each other, but
-collectively the tag will be sorted into categories with red being at the top.
-
-## Sticky rooms
-
-When the user visits a room, that room becomes 'sticky' in the list, regardless of ordering algorithm.
-From a code perspective, the underlying algorithm is not aware of a sticky room and instead the base class
-manages which room is sticky. This is to ensure that all algorithms handle it the same.
-
-The sticky flag is simply to say it will not move higher or lower down the list while it is active. For
-example, if using the importance algorithm, the room would naturally become idle once viewed and thus
-would normally fly down the list out of sight. The sticky room concept instead holds it in place, never
-letting it fly down until the user moves to another room.
-
-Only one room can be sticky at a time. Room updates around the sticky room will still hold the sticky
-room in place. The best example of this is the importance algorithm: if the user has 3 red rooms and
-selects the middle room, they will see exactly one room above their selection at all times. If they
-receive another notification which causes the room to move into the topmost position, the room that was
-above the sticky room will move underneath to allow for the new room to take the top slot, maintaining
-the sticky room's position.
-
-Though only applicable to the importance algorithm, the sticky room is not aware of category boundaries
-and thus the user can see a shift in what kinds of rooms move around their selection. An example would
-be the user having 4 red rooms, the user selecting the third room (leaving 2 above it), and then having
-the rooms above it read on another device. This would result in 1 red room and 1 other kind of room
-above the sticky room as it will try to maintain 2 rooms above the sticky room.
-
-An exception for the sticky room placement is when there's suddenly not enough rooms to maintain the placement
-exactly. This typically happens if the user selects a room and leaves enough rooms where it cannot maintain
-the N required rooms above the sticky room. In this case, the sticky room will simply decrease N as needed.
-The N value will never increase while selection remains unchanged: adding a bunch of rooms after having
-put the sticky room in a position where it's had to decrease N will not increase N.
-
-## Responsibilities of the store
-
-The store is responsible for the ordering, upkeep, and tracking of all rooms. The room list component simply gets
-an object containing the tags it needs to worry about and the rooms within. The room list component will
-decide which tags need rendering (as it commonly filters out empty tags in most cases), and will deal with
-all kinds of filtering.
-
-## Filtering
-
-Filters are provided to the store as condition classes and have two major kinds: Prefilters and Runtime.
-
-Prefilters flush out rooms which shouldn't appear to the algorithm implementations. Typically this is
-due to some higher order room list filtering (such as spaces or tags) deliberately exposing a subset of
-rooms to the user. The algorithm implementations will not see a room being prefiltered out.
-
-Runtime filters are used for more dynamic filtering, such as the user filtering by room name. These
-filters are passed along to the algorithm implementations where those implementations decide how and
-when to apply the filter. In practice, the base `Algorithm` class ends up doing the heavy lifting for
-optimization reasons.
-
-The results of runtime filters get cached to avoid needlessly iterating over potentially thousands of
-rooms, as the old room list store does. When a filter condition changes, it emits an update which (in this
-case) the `Algorithm` class will pick up and act accordingly. Typically, this also means filtering a
-minor subset where possible to avoid over-iterating rooms.
-
-All filter conditions are considered "stable" by the consumers, meaning that the consumer does not
-expect a change in the condition unless the condition says it has changed. This is intentional to
-maintain the caching behaviour described above.
-
-One might ask why we don't just use prefilter conditions for everything, and the answer is one of slight
-subtlety: in the cases of prefilters we are knowingly exposing the user to a workspace-style UX where
-room notifications are self-contained within that workspace. Runtime filters tend to not want to affect
-visible notification counts (as it doesn't want the room header to suddenly be confusing to the user as
-they type), and occasionally UX like "found 2/12 rooms" is desirable. If prefiltering were used instead,
-the notification counts would vary while the user was typing and "found 2/12" UX would not be possible.
-
-## Class breakdowns
-
-The `RoomListStore` is the major coordinator of various algorithm implementations, which take care
-of the various `ListAlgorithm` and `SortingAlgorithm` options. The `Algorithm` class is responsible
-for figuring out which tags get which rooms, as Matrix specifies them as a reverse map: tags get
-defined on rooms and are not defined as a collection of rooms (unlike how they are presented to the
-user). Various list-specific utilities are also included, though they are expected to move somewhere
-more general when needed. For example, the `membership` utilities could easily be moved elsewhere
-as needed.
-
-The various bits throughout the room list store should also have jsdoc of some kind to help describe
-what they do and how they work.

docs/scrolling.md

@@ -1,27 +0,0 @@
-# ScrollPanel
-
-## Updates
-
-During an onscroll event, we check whether we're getting close to the top or bottom edge of the loaded content. If close enough, we fire a request to load more through the callback passed in the `onFillRequest` prop. This returns a promise is passed down from `TimelinePanel`, where it will call paginate on the `TimelineWindow` and once the events are received back, update its state with the new events. This update trickles down to the `MessagePanel`, which rerenders all tiles and passed that to `ScrollPanel`. ScrollPanels `componentDidUpdate` method gets called, and we do the scroll housekeeping there (read below). Once the rerender has completed, the `setState` callback is called and we resolve the promise returned by `onFillRequest`. Now we check the DOM to see if we need more fill requests.
-
-## Prevent Shrinking
-
-ScrollPanel supports a mode to prevent it shrinking. This is used to prevent a jump when at the bottom of the timeline and people start and stop typing. It gets cleared automatically when 200px above the bottom of the timeline.
-
-## BACAT (Bottom-Aligned, Clipped-At-Top) scrolling
-
-BACAT scrolling implements a different way of restoring the scroll position in the timeline while tiles out of view are changing height or tiles are being added or removed. It was added in https://github.com/matrix-org/matrix-react-sdk/pull/2842.
-
-The motivation for the changes is having noticed that setting scrollTop while scrolling tends to not work well, with it interrupting ongoing scrolling and also querying scrollTop reporting outdated values and consecutive scroll adjustments cancelling each out previous ones. This seems to be worse on macOS than other platforms, presumably because of a higher resolution in scroll events there. Also see https://github.com/vector-im/element-web/issues/528. The BACAT approach allows to only have to change the scroll offset when adding or removing tiles.
-
-The approach taken instead is to vertically align the timeline tiles to the bottom of the scroll container (using flexbox) and give the timeline inside the scroll container an explicit height, initially set to a multiple of the PAGE_SIZE (400px at time of writing) as needed by the content. When scrolled up, we can compensate for anything that grew below the viewport by changing the height of the timeline to maintain what's currently visible in the viewport without adjusting the scrollTop and hence without jumping.
-
-For anything above the viewport growing or shrinking, we don't need to do anything as the timeline is bottom-aligned. We do need to update the height manually to keep all content visible as more is loaded. To maintain scroll position after the portion above the viewport changes height, we need to set the scrollTop, as we cannot balance it out with more height changes. We do this 100ms after the user has stopped scrolling, so setting scrollTop has not nasty side-effects.
-
-As of https://github.com/matrix-org/matrix-react-sdk/pull/4166, we are scrolling to compensate for height changes by calling `scrollBy(0, x)` rather than reading and than setting `scrollTop`, as reading `scrollTop` can (again, especially on macOS) easily return values that are out of sync with what is on the screen, probably because scrolling can be done [off the main thread](https://wiki.mozilla.org/Platform/GFX/APZ) in some circumstances. This seems to further prevent jumps.
-
-### How does it work?
-
-`componentDidUpdate` is called when a tile in the timeline is updated (as we rerender the whole timeline) or tiles are added or removed (see Updates section before). From here, `checkScroll` is called, which calls `restoreSavedScrollState`. Now, we increase the timeline height if something below the viewport grew by adjusting `this.bottomGrowth`. `bottomGrowth` is the height added to the timeline (on top of the height from the number of pages calculated at the last `updateHeight` run) to compensate for growth below the viewport. This is cleared during the next run of `updateHeight`. Remember that the tiles in the timeline are aligned to the bottom.
-
-From `restoreSavedScrollState` we also call `updateHeight` which waits until the user stops scrolling for 100ms and then recalculates the amount of pages of 400px the timeline should be sized to, to be able to show all of its (newly added) content. We have to adjust the scroll offset (which is why we wait until scrolling has stopped) now because the space above the viewport has likely changed.

docs/settings.md

@@ -1,236 +0,0 @@
-# Settings Reference
-
-This document serves as developer documentation for using "Granular Settings". Granular Settings allow users to specify
-different values for a setting at particular levels of interest. For example, a user may say that in a particular room
-they want URL previews off, but in all other rooms they want them enabled. The `SettingsStore` helps mask the complexity
-of dealing with the different levels and exposes easy to use getters and setters.
-
-## Levels
-
-Granular Settings rely on a series of known levels in order to use the correct value for the scenario. These levels, in
-order of priority, are:
-
-- `device` - The current user's device
-- `room-device` - The current user's device, but only when in a specific room
-- `room-account` - The current user's account, but only when in a specific room
-- `account` - The current user's account
-- `room` - A specific room (setting for all members of the room)
-- `config` - Values are defined by the `setting_defaults` key (usually) in `config.json`
-- `default` - The hardcoded default for the settings
-
-Individual settings may control which levels are appropriate for them as part of the defaults. This is often to ensure
-that room administrators cannot force account-only settings upon participants.
-
-## Settings
-
-Settings are the different options a user may set or experience in the application. These are pre-defined in
-`src/settings/Settings.tsx` under the `SETTINGS` constant, and match the `ISetting` interface as defined there.
-
-Settings that support the config level can be set in the config file under the `setting_defaults` key (note that some
-settings, like the "theme" setting, are special cased in the config file):
-
-```json5
-{
-  ...
-  "setting_defaults": {
-    "settingName": true
-  },
-  ...
-}
-```
-
-### Getting values for a setting
-
-After importing `SettingsStore`, simply make a call to `SettingsStore.getValue`. The `roomId` parameter should always
-be supplied where possible, even if the setting does not have a per-room level value. This is to ensure that the value
-returned is best represented in the room, particularly if the setting ever gets a per-room level in the future.
-
-In settings pages it is often desired to have the value at a particular level instead of getting the calculated value.
-Call `SettingsStore.getValueAt` to get the value of a setting at a particular level, and optionally make it explicitly
-at that level. By default `getValueAt` will traverse the tree starting at the provided level; making it explicit means
-it will not go beyond the provided level. When using `getValueAt`, please be sure to use `SettingLevel` to represent the
-target level.
-
-### Setting values for a setting
-
-Values are defined at particular levels and should be done in a safe manner. There are two checks to perform to ensure a
-clean save: is the level supported and can the user actually set the value. In most cases, neither should be an issue
-although there are circumstances where this changes. An example of a safe call is:
-
-```javascript
-const isSupported = SettingsStore.isLevelSupported(SettingLevel.ROOM);
-if (isSupported) {
-    const canSetValue = SettingsStore.canSetValue("mySetting", "!curbf:matrix.org", SettingLevel.ROOM);
-    if (canSetValue) {
-        SettingsStore.setValue("mySetting", "!curbf:matrix.org", SettingLevel.ROOM, newValue);
-    }
-}
-```
-
-These checks may also be performed in different areas of the application to avoid the verbose example above. For
-instance, the component which allows changing the setting may be hidden conditionally on the above conditions.
-
-##### `SettingsFlag` component
-
-Where possible, the `SettingsFlag` component should be used to set simple "flip-a-bit" (true/false) settings. The
-`SettingsFlag` also supports simple radio button options, such as the theme the user would like to use.
-
-```TSX
-<SettingsFlag name="theSettingId" level={SettingsLevel.ROOM} roomId="!curbf:matrix.org"
-    label={_td("Your label here")} // optional, if falsey then the `SettingsStore` will be used
-    onChange={function(newValue) { }} // optional, called after saving
-    isExplicit={false} // this is passed along to `SettingsStore.getValueAt`, defaulting to false
-    manualSave={false} // if true, saving is delayed. You will need to call .save() on this component
-
-    // Options for radio buttons
-    group="your-radio-group" // this enables radio button support
-    value="yourValueHere" // the value for this particular option
-/>
-```
-
-### Getting the display name for a setting
-
-Simply call `SettingsStore.getDisplayName`. The appropriate display name will be returned and automatically translated
-for you. If a display name cannot be found, it will return `null`.
-
-## Features
-
-Feature flags are just like regular settings with some underlying semantics for how they are meant to be used. Usually
-a feature flag is used when a portion of the application is under development or not ready for full release yet, such
-as new functionality or experimental ideas. In these cases, the feature name _should_ be named with the `feature_*`
-convention and must be tagged with `isFeature: true` in the setting definition. By doing so, the feature will automatically
-appear in the "labs" section of the user's settings.
-
-Features can be controlled at the config level using the following structure:
-
-```json
-"features": {
-  "feature_lazyloading": true
-}
-```
-
-When `true`, the user will see the feature as enabled. Similarly, when `false` the user will see the feature as disabled.
-The user will only be able to change/see these states if `show_labs_settings: true` is in the config.
-
-### Determining if a feature is enabled
-
-Call `SettingsStore.getValue()` as you would for any other setting.
-
-### Enabling a feature
-
-Call `SettingsStore.setValue("feature_name", null, SettingLevel.DEVICE, true)`.
-
-### A note on UI features
-
-UI features are a different concept to plain features. Instead of being representative of unstable or
-unpredicatable behaviour, they are logical chunks of UI which can be disabled by deployments for ease
-of understanding with users. They are simply represented as boring settings with a convention of being
-named as `UIFeature.$location` where `$location` is a rough descriptor of what is toggled, such as
-`URLPreviews` or `Communities`.
-
-UI features also tend to have their own setting controller (see below) to manipulate settings which might
-be affected by the UI feature being disabled. For example, if URL previews are disabled as a UI feature
-then the URL preview options will use the `UIFeatureController` to ensure they remain disabled while the
-UI feature is disabled.
-
-## Setting controllers
-
-Settings may have environmental factors that affect their value or need additional code to be called when they are
-modified. A setting controller is able to override the calculated value for a setting and react to changes in that
-setting. Controllers are not a replacement for the level handlers and should only be used to ensure the environment is
-kept up to date with the setting where it is otherwise not possible. An example of this is the notification settings:
-they can only be considered enabled if the platform supports notifications, and enabling notifications requires
-additional steps to actually enable notifications.
-
-For more information, see `src/settings/controllers/SettingController.ts`.
-
-## Local echo
-
-`SettingsStore` will perform local echo on all settings to ensure that immediately getting values does not cause a
-split-brain scenario. As mentioned in the "Setting values for a setting" section, the appropriate checks should be done
-to ensure that the user is allowed to set the value. The local echo system assumes that the user has permission and that
-the request will go through successfully. The local echo only takes effect until the request to save a setting has
-completed (either successfully or otherwise).
-
-```javascript
-SettingsStore.setValue(...).then(() => {
-  // The value has actually been stored at this point.
-});
-SettingsStore.getValue(...); // this will return the value set in `setValue` above.
-```
-
-## Watching for changes
-
-Most use cases do not need to set up a watcher because they are able to react to changes as they are made, or the
-changes which are made are not significant enough for it to matter. Watchers are intended to be used in scenarios where
-it is important to react to changes made by other logged in devices. Typically, this would be done within the component
-itself, however the component should not be aware of the intricacies of setting inversion or remapping to particular
-data structures. Instead, a generic watcher interface is provided on `SettingsStore` to watch (and subsequently unwatch)
-for changes in a setting.
-
-An example of a watcher in action would be:
-
-```javascript
-class MyComponent extends React.Component {
-    settingWatcherRef = null;
-
-    componentDidMount() {
-        const callback = (settingName, roomId, level, newValAtLevel, newVal) => {
-            this.setState({ color: newVal });
-        };
-        this.settingWatcherRef = SettingsStore.watchSetting("roomColor", "!example:matrix.org", callback);
-    }
-
-    componentWillUnmount() {
-        SettingsStore.unwatchSetting(this.settingWatcherRef);
-    }
-}
-```
-
-# Maintainers Reference
-
-The granular settings system has a few complex parts to power it. This section is to document how the `SettingsStore` is
-supposed to work.
-
-### General information
-
-The `SettingsStore` uses the hardcoded `LEVEL_ORDER` constant to ensure that it is using the correct override procedure.
-The array is checked from left to right, simulating the behaviour of overriding values from the higher levels. Each
-level should be defined in this array, including `default`.
-
-Handlers (`src/settings/handlers/SettingsHandler.ts`) represent a single level and are responsible for getting and
-setting values at that level. Handlers also provide additional information to the `SettingsStore` such as if the level
-is supported or if the current user may set values at the level. The `SettingsStore` will use the handler to enforce
-checks and manipulate settings. Handlers are also responsible for dealing with migration patterns or legacy settings for
-their level (for example, a setting being renamed or using a different key from other settings in the underlying store).
-Handlers are provided to the `SettingsStore` via the `LEVEL_HANDLERS` constant. `SettingsStore` will optimize lookups by
-only considering handlers that are supported on the platform.
-
-Local echo is achieved through `src/settings/handlers/LocalEchoWrapper.ts` which acts as a wrapper around a given
-handler. This is automatically applied to all defined `LEVEL_HANDLERS` and proxies the calls to the wrapped handler
-where possible. The echo is achieved by a simple object cache stored within the class itself. The cache is invalidated
-immediately upon the proxied save call succeeding or failing.
-
-Controllers are notified of changes by the `SettingsStore`, and are given the opportunity to override values after the
-`SettingsStore` has deemed the value calculated. Controllers are invoked as the last possible step in the code.
-
-### Features
-
-See above for feature reference.
-
-### Watchers
-
-Watchers can appear complicated under the hood: there is a central `WatchManager` which handles the actual invocation
-of callbacks, and callbacks are managed by the SettingsStore by redirecting the caller's callback to a dedicated
-callback. This is done so that the caller can reuse the same function as their callback without worrying about whether
-or not it'll unsubscribe all watchers.
-
-Setting changes are emitted into the default `WatchManager`, which calculates the new value for the setting. Ideally,
-we'd also try and suppress updates which don't have a consequence on this value, however there's not an easy way to do
-this. Instead, we just dispatch an update for all changes and leave it up to the consumer to deduplicate.
-
-In practice, handlers which rely on remote changes (account data, room events, etc) will always attach a listener to the
-`MatrixClient`. They then watch for changes to events they care about and send off appropriate updates to the
-generalized `WatchManager` - a class specifically designed to deduplicate the logic of managing watchers. The handlers
-which are localized to the local client (device) generally just trigger the `WatchManager` when they manipulate the
-setting themselves as there's nothing to really 'watch'.

docs/skinning.md

@@ -1,18 +0,0 @@
-# Skinning
-
-Skinning in the context of the react-sdk is component replacement rather than CSS. This means you can override (replace)
-any accessible component in the project to implement custom behaviour, look & feel, etc. Depending on your approach,
-overriding CSS classes to apply custom styling is also possible, though harder to do.
-
-At present, the react-sdk offers no stable interface for components - this means properties and state can and do change
-at any time without notice. Once we determine the react-sdk to be stable enough to use as a proper SDK, we will adjust
-this policy. In the meantime, skinning is done completely at your own risk.
-
-The approach you take is up to you - we suggest using a module replacement plugin, as found in
-[webpack](https://webpack.js.org/plugins/normal-module-replacement-plugin/), though you're free to use whichever build
-system works for you. The react-sdk does not have any particular functions to call to load skins, so simply replace or
-extend the components/stores/etc you're after and build. As a reminder though, this is done completely at your own risk
-as we cannot guarantee a stable interface at this time.
-
-Taking a look at [element-web](https://github.com/vector-im/element-web)'s approach to skinning may be worthwhile, as it
-overrides some relatively simple components.

docs/theming.md

@@ -3,17 +3,21 @@
 Themes are a very basic way of providing simple alternative look & feels to the
 Element app via CSS & custom imagery.
 
+They are _NOT_ co be confused with 'skins', which describe apps which sit on top
+of matrix-react-sdk - e.g. in theory Element itself is a react-sdk skin.
+As of March 2022, skins are not fully supported; Element is the only available skin.
+
 To define a theme for Element:
 
 1.  Pick a name, e.g. `teal`. at time of writing we have `light` and `dark`.
-2.  Fork `res/themes/dark/css/dark.pcss` to be `teal.pcss`
-3.  Fork `res/themes/dark/css/_base.pcss` to be `_teal.pcss`
+2.  Fork `src/skins/vector/css/themes/dark.pcss` to be `teal.pcss`
+3.  Fork `src/skins/vector/css/themes/_base.pcss` to be `_teal.pcss`
 4.  Override variables in `_teal.pcss` as desired. You may wish to delete ones
     which don't differ from `_base.pcss`, to make it clear which are being
     overridden. If every single colour is being changed (as per `_dark.pcss`)
     then you might as well keep them all.
 5.  Add the theme to the list of entrypoints in webpack.config.js
-6.  Add the theme to the list of themes in theme.ts
+6.  Add the theme to the list of themes in matrix-react-sdk's UserSettings.js
 7.  Sit back and admire your handywork.
 
 In future, the assets for a theme will probably be gathered together into a
@@ -29,7 +33,7 @@ default theme, you would use `default_theme: "custom-Electric Blue"`.
 
 e.g. in config.json:
 
-```json5
+```
 "setting_defaults": {
         "custom_themes": [
             {
@@ -59,10 +63,6 @@ e.g. in config.json:
                     "timeline-text-color": "#2e2f32",
                     "timeline-text-secondary-color": "#61708b",
                     "timeline-highlights-color": "#f3f8fd",
-
-                    // These should both be 8 values long
-                    "username-colors": ["#ff0000", /*...*/],
-                    "avatar-background-colors": ["#cc0000", /*...*/]
                 },
                 "compound": {
                     "--cpd-color-icon-accent-tertiary": "var(--cpd-color-blue-800)",