Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ci3

Conflicts: .editorconfig .github/workflows/preview_changelog.yaml .github/workflows/static_analysis.yaml .github/workflows/triage-labelled.yml .github/workflows/triage-priority-bugs.yml .gitignore scripts/layered.sh
strings
2022-06-06 11:47:18 +01:00 · 2022-05-03 09:22:18 +01:00 · 2022-05-03 09:07:47 +01:00 · 2022-05-03 09:04:30 +01:00 · 2022-04-27 23:09:35 +01:00 · 2022-04-27 23:07:06 +01:00
228 changed files with 11162 additions and 14003 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -23,7 +23,7 @@ indent_size = 4
 trim_trailing_whitespace = true

 [*.{yml,yaml}]
-indent_size = 4
+indent_size = 2

 [package.json]
 indent_size = 2
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,3 @@
 src/vector/modernizr.js
 # Legacy skinning file that some people might still have
 src/component-index.js
-# Auto-generated file
-src/modules.ts
--- a/.eslintrc-module_system.js
+++ b/.eslintrc-module_system.js
@@ -1,72 +0,0 @@
-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",
-                            },
-                        ],
-                    },
-                ],
-            },
-        },
-    ],
-};
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,93 +1,70 @@
 module.exports = {
    plugins: ["matrix-org"],
-    extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react"],
-    parserOptions: {
-        project: ["./tsconfig.json"],
-    },
+    extends: [
+        "plugin:matrix-org/babel",
+        "plugin:matrix-org/react",
+    ],
    env: {
        browser: true,
        node: true,
    },
    rules: {
        // Things we do that break the ideal style
-        quotes: "off",
+        "quotes": "off",
    },
    settings: {
        react: {
-            version: "detect",
-        },
+            version: 'detect'
+        }
    },
-    overrides: [
-        {
-            files: ["src/**/*.{ts,tsx}", "test/**/*.{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",
+    overrides: [{
+        files: ["src/**/*.{ts,tsx}"],
+        extends: [
+            "plugin:matrix-org/typescript",
+            "plugin:matrix-org/react",
+        ],
+        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",
+            // 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",
-                            },
-                        ],
-                    },
-                ],
-            },
+            // 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",
+                }],
+            }],
        },
-        {
-            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",
-            },
-        },
-    ],
+    }],
 };
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,2 +0,0 @@
-# prettier
-7921a6cbf86b035d2b0c1daecb4c24beaf5a5abc
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1 @@
-*                         @vector-im/element-web
-/.github/workflows/**     @vector-im/element-web-app-team
-/package.json             @vector-im/element-web-app-team
-/yarn.lock                @vector-im/element-web-app-team
+* @vector-im/element-web
--- a/.github/ISSUE_TEMPLATE/bug-desktop.yml
+++ b/.github/ISSUE_TEMPLATE/bug-desktop.yml
@@ -2,75 +2,75 @@ name: Bug report for the Element desktop app (not in a browser)
 description: File a bug report if you are using the desktop Element application.
 labels: [T-Defect]
 body:
-    - type: markdown
-      attributes:
-          value: |
-              Thanks for taking the time to fill out this bug report!
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!

-              Please report security issues by email to security@matrix.org
-    - type: textarea
-      id: reproduction-steps
-      attributes:
-          label: Steps to reproduce
-          description: Please attach screenshots, videos or logs if you can.
-          placeholder: Tell us what you see!
-          value: |
-              1. Where are you starting? What can you see?
-              2. What do you click?
-              3. More steps…
-      validations:
-          required: true
-    - type: textarea
-      id: result
-      attributes:
-          label: Outcome
-          placeholder: Tell us what went wrong
-          value: |
-              #### What did you expect?
+        Please report security issues by email to security@matrix.org
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: Steps to reproduce
+      description: Please attach screenshots, videos or logs if you can.
+      placeholder: Tell us what you see!
+      value: |
+        1. Where are you starting? What can you see?
+        2. What do you click?
+        3. More steps…
+    validations:
+      required: true
+  - type: textarea
+    id: result
+    attributes:
+      label: Outcome
+      placeholder: Tell us what went wrong
+      value: |
+        #### What did you expect?

-              #### What happened instead?
-      validations:
-          required: true
-    - type: input
-      id: os
-      attributes:
-          label: Operating system
-          placeholder: Windows, macOS, Ubuntu, Arch Linux…
-      validations:
-          required: false
-    - type: input
-      id: version
-      attributes:
-          label: Application version
-          description: You can find the version information in Settings -> Help & About.
-          placeholder: e.g. Element version 1.7.34, olm version 3.2.3
-      validations:
-          required: false
-    - type: input
-      id: source
-      attributes:
-          label: How did you install the app?
-          description: Where did you install the app from? Please give a link or a description.
-          placeholder: e.g. From https://element.io/get-started
-      validations:
-          required: false
-    - type: input
-      id: homeserver
-      attributes:
-          label: Homeserver
-          description: |
-              Which server is your account registered on? If it is a local or non-public homeserver, please tell us what is the homeserver implementation (ex: Synapse/Dendrite/etc.) and the version.
-          placeholder: e.g. matrix.org or Synapse 1.50.0rc1
-      validations:
-          required: false
-    - type: dropdown
-      id: rageshake
-      attributes:
-          label: Will you send logs?
-          description: |
-              Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
-          options:
-              - "Yes"
-              - "No"
-      validations:
-          required: true
+        #### What happened instead?
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      placeholder: Windows, macOS, Ubuntu, Arch Linux…
+    validations:
+      required: false
+  - type: input
+    id: version
+    attributes:
+      label: Application version
+      description: You can find the version information in Settings -> Help & About. 
+      placeholder: e.g. Element version 1.7.34, olm version 3.2.3 
+    validations:
+      required: false
+  - type: input
+    id: source
+    attributes:
+      label: How did you install the app?
+      description: Where did you install the app from? Please give a link or a description.
+      placeholder: e.g. From https://element.io/get-started
+    validations:
+      required: false
+  - type: input
+    id: homeserver
+    attributes:
+      label: Homeserver
+      description: |
+        Which server is your account registered on? If it is a local or non-public homeserver, please tell us what is the homeserver implementation (ex: Synapse/Dendrite/etc.) and the version.
+      placeholder: e.g. matrix.org or Synapse 1.50.0rc1
+    validations:
+      required: false
+  - type: dropdown
+    id: rageshake
+    attributes:
+      label: Will you send logs?
+      description:  |
+        Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
+      options:
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
--- a/.github/ISSUE_TEMPLATE/bug-web.yml
+++ b/.github/ISSUE_TEMPLATE/bug-web.yml
@@ -2,83 +2,83 @@ name: Bug report for Element Web (in browser)
 description: File a bug report if you are using Element in a web browser like Firefox, Chrome, Edge, and so on.
 labels: [T-Defect]
 body:
-    - type: markdown
-      attributes:
-          value: |
-              Thanks for taking the time to fill out this bug report!
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!

-              Please report security issues by email to security@matrix.org
-    - type: textarea
-      id: reproduction-steps
-      attributes:
-          label: Steps to reproduce
-          description: Please attach screenshots, videos or logs if you can.
-          placeholder: Tell us what you see!
-          value: |
-              1. Where are you starting? What can you see?
-              2. What do you click?
-              3. More steps…
-      validations:
-          required: true
-    - type: textarea
-      id: result
-      attributes:
-          label: Outcome
-          placeholder: Tell us what went wrong
-          value: |
-              #### What did you expect?
+        Please report security issues by email to security@matrix.org
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: Steps to reproduce
+      description: Please attach screenshots, videos or logs if you can.
+      placeholder: Tell us what you see!
+      value: |
+        1. Where are you starting? What can you see?
+        2. What do you click?
+        3. More steps…
+    validations:
+      required: true
+  - type: textarea
+    id: result
+    attributes:
+      label: Outcome
+      placeholder: Tell us what went wrong
+      value: |
+        #### What did you expect?

-              #### What happened instead?
-      validations:
-          required: true
-    - type: input
-      id: os
-      attributes:
-          label: Operating system
-          placeholder: Windows, macOS, Ubuntu, Arch Linux…
-      validations:
-          required: false
-    - type: input
-      id: browser
-      attributes:
-          label: Browser information
-          description: Which browser are you using? Which version?
-          placeholder: e.g. Chromium Version 92.0.4515.131
-      validations:
-          required: false
-    - type: input
-      id: webapp-url
-      attributes:
-          label: URL for webapp
-          description: Which URL are you using to access the webapp? If a private server, tell us what version of Element Web you are using.
-          placeholder: e.g. develop.element.io, app.element.io
-      validations:
-          required: false
-    - type: input
-      id: version
-      attributes:
-          label: Application version
-          description: You can find the version information in Settings -> Help & About.
-          placeholder: e.g. Element version 1.7.34, olm version 3.2.3
-      validations:
-          required: false
-    - type: input
-      id: homeserver
-      attributes:
-          label: Homeserver
-          description: |
-              Which server is your account registered on? If it is a local or non-public homeserver, please tell us what is the homeserver implementation (ex: Synapse/Dendrite/etc.) and the version.
-          placeholder: e.g. matrix.org or Synapse 1.50.0rc1
-      validations:
-          required: false
-    - type: dropdown
-      id: rageshake
-      attributes:
-          label: Will you send logs?
-          description: |
-              Did you know that you can send a /rageshake command from the web application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
-          options:
-              - "Yes"
-              - "No"
-      validations:
-          required: true
+        #### What happened instead?
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      placeholder: Windows, macOS, Ubuntu, Arch Linux…
+    validations:
+      required: false
+  - type: input
+    id: browser
+    attributes:
+      label: Browser information
+      description: Which browser are you using? Which version? 
+      placeholder: e.g. Chromium Version 92.0.4515.131
+    validations:
+      required: false
+  - type: input
+    id: webapp-url
+    attributes:
+      label: URL for webapp
+      description: Which URL are you using to access the webapp? If a private server, tell us what version of Element Web you are using.
+      placeholder: e.g. develop.element.io, app.element.io
+    validations:
+      required: false
+  - type: input
+    id: version
+    attributes:
+      label: Application version
+      description: You can find the version information in Settings -> Help & About.
+      placeholder: e.g. Element version 1.7.34, olm version 3.2.3
+    validations:
+      required: false
+  - type: input
+    id: homeserver
+    attributes:
+      label: Homeserver
+      description: |
+        Which server is your account registered on? If it is a local or non-public homeserver, please tell us what is the homeserver implementation (ex: Synapse/Dendrite/etc.) and the version.
+      placeholder: e.g. matrix.org or Synapse 1.50.0rc1
+    validations:
+      required: false
+  - type: dropdown
+    id: rageshake
+    attributes:
+      label: Will you send logs?
+      description:  |
+        Did you know that you can send a /rageshake command from the web application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
+      options:
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-    - name: Questions & support
-      url: https://matrix.to/#/#element-web:matrix.org
-      about: Please ask and answer questions here.
+  - name: Questions & support
+    url: https://matrix.to/#/#element-web:matrix.org
+    about: Please ask and answer questions here.
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -2,35 +2,35 @@ name: Enhancement request
 description: Do you have a suggestion or feature request?
 labels: [T-Enhancement]
 body:
-    - type: markdown
-      attributes:
-          value: |
-              Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas).
-    - type: textarea
-      id: usecase
-      attributes:
-          label: Your use case
-          description: What would you like to be able to do? Please feel welcome to include screenshots or mock ups.
-          placeholder: Tell us what you would like to do!
-          value: |
-              #### What would you like to do?
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to propose a new feature or make a suggestion.
+  - type: textarea
+    id: usecase
+    attributes:
+      label: Your use case
+      description: What would you like to be able to do? Please feel welcome to include screenshots or mock ups.
+      placeholder: Tell us what you would like to do!
+      value: |
+        #### What would you like to do?

-              #### Why would you like to do it?
+        #### Why would you like to do it?

-              #### How would you like to achieve it?
-      validations:
-          required: true
-    - type: textarea
-      id: alternative
-      attributes:
-          label: Have you considered any alternatives?
-          placeholder: A clear and concise description of any alternative solutions or features you've considered.
-      validations:
-          required: false
-    - type: textarea
-      id: additional-context
-      attributes:
-          label: Additional context
-          placeholder: Is there anything else you'd like to add?
-      validations:
-          required: false
+        #### How would you like to achieve it?
+    validations:
+      required: true
+  - type: textarea
+    id: alternative
+    attributes:
+      label: Have you considered any alternatives?
+      placeholder: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      placeholder: Is there anything else you'd like to add?
+    validations:
+      required: false
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,18 +1,11 @@
-<!-- Thanks for submitting a PR! Please ensure the following requirements are met in order for us to review your PR -->
+<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request -->

-## Checklist
+<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off -->

-   [ ] Tests written for new code (and old code if feasible)
-   [ ] Linter and other CI checks pass
-   [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/vector-im/element-web/blob/develop/CONTRIBUTING.md))
-
-<!--
-If you would like to specify text for the changelog entry other than your PR title, add the following:
-
-Notes: Add super cool feature
-
-For PRs which *only* affect the desktop version, please use:
+<!-- To specify text for the changelog entry (otherwise the PR title will be used):
+Notes:

+Changelog entries will also appear in element-desktop. For PRs that *only* affect the desktop version:
 Notes: none
-element-desktop notes: Add super cool feature
+element-desktop notes: <notes>
 -->
--- a/.github/cfp_headers
+++ b/.github/cfp_headers
@@ -1,10 +0,0 @@
-/*
-  X-XSS-Protection: 1; mode=block
-  X-Content-Type-Options: nosniff
-  Strict-Transport-Security: max-age=31536000; includeSubDomains; preload
-
-/version
-  Content-Type: text/plain
-
-/apple-app-site-association
-  Content-Type: application/json
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": ["github>matrix-org/renovate-config-element-web"]
-}
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -1,30 +0,0 @@
-name: Backport
-on:
-    pull_request_target:
-        types:
-            - closed
-            - labeled
-        branches:
-            - develop
-
-jobs:
-    backport:
-        name: Backport
-        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.event.pull_request.merged
-            && (
-              github.event.action == 'closed'
-              || (
-                github.event.action == 'labeled'
-                && contains(github.event.label.name, 'backport')
-              )
-            )
-        steps:
-            - uses: tibdex/backport@v2
-              with:
-                  labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
-                  # We can't use GITHUB_TOKEN here or CI won't run on the new PR
-                  github_token: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,33 @@
+name: Build
+on:
+  pull_request: { }
+  push:
+    branches: [ master ]
+# 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 }}
+jobs:
+  build:
+    name: "Build"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      - name: Install Dependencies
+        run: "./scripts/layered.sh"
+
+      - name: Build & Package
+        run: "./scripts/ci_package.sh"
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: previewbuild
+          path: dist/*.tar.gz
+          retention-days: 28
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,26 +1,26 @@
-name: Build
+name: Build and Package
 on:
-    pull_request: {}
-    push:
-        branches: [master]
+  pull_request: { }
+  push:
+    branches: [ master ]
 # 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 }}
+  # These must be set for fetchdep.sh to get the right branch
+  REPOSITORY: ${{ github.repository }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
 jobs:
-    build:
-        name: "Build"
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
+  build:
+    name: "Build"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2

-            - uses: actions/setup-node@v3
-              with:
-                  cache: "yarn"
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'

-            - name: Install Dependencies
-              run: "./scripts/layered.sh"
+      - name: Install Dependencies
+        run: "./scripts/layered.sh"

-            - name: Build
-              run: "yarn build"
+      - name: Build & Package
+        run: "./scripts/ci_package.sh"
--- a/.github/workflows/build_develop.yaml
+++ b/.github/workflows/build_develop.yaml
@@ -0,0 +1,38 @@
+# Separate to the main build workflow for access to develop
+# environment secrets, largely similar to build.yaml.
+name: Build develop
+on:
+  push:
+    branches: [ develop ]
+  repository_dispatch:
+    types: [ element-web-notify ]
+jobs:
+  build:
+    name: "Build & Upload source maps to Sentry"
+    runs-on: ubuntu-latest
+    environment: develop
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      - name: Install Dependencies
+        run: "./scripts/layered.sh"
+
+      - name: Build, Package & Upload sourcemaps
+        run: "./scripts/ci_package.sh"
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          SENTRY_URL: ${{ secrets.SENTRY_URL }}
+          SENTRY_ORG: sentry
+          SENTRY_PROJECT: riot-web
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: previewbuild
+          path: dist/*.tar.gz
+          retention-days: 1
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -1,114 +1,31 @@
 # Separate to the main build workflow for access to develop
 # environment secrets, largely similar to build.yaml.
-name: Build and Deploy develop
+name: Build and Package develop
 on:
-    push:
-        branches: [develop]
-    repository_dispatch:
-        types: [element-web-notify]
-concurrency:
-    group: ${{ github.repository_owner }}-${{ github.workflow }}-${{ github.ref_name }}
-    cancel-in-progress: true
+  push:
+    branches: [ develop ]
+  repository_dispatch:
+    types: [ element-web-notify ]
 jobs:
-    build:
-        name: "Build & Deploy develop.element.io"
-        # Only respect triggers from our develop branch, ignore that of forks
-        if: github.repository == 'vector-im/element-web'
-        runs-on: ubuntu-latest
-        environment: develop
+  build:
+    name: "Build & Upload source maps to Sentry"
+    runs-on: ubuntu-latest
+    environment: develop
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      - name: Install Dependencies
+        run: "./scripts/layered.sh"
+
+      - name: Build, Package & Upload sourcemaps
+        run: "./scripts/ci_package.sh"
        env:
-            R2_BUCKET: "element-web-develop"
-            R2_URL: ${{ secrets.CF_R2_S3_API }}
-            R2_PUBLIC_URL: "https://element-web-develop.element.io"
-        steps:
-            - uses: actions/checkout@v3
-
-            - uses: actions/setup-node@v3
-              with:
-                  cache: "yarn"
-
-            - name: Install Dependencies
-              run: "./scripts/layered.sh"
-
-            - name: Build, Package & Upload sourcemaps
-              run: "./scripts/ci_package.sh"
-              env:
-                  SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-                  SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-                  SENTRY_URL: ${{ secrets.SENTRY_URL }}
-                  SENTRY_ORG: element
-                  SENTRY_PROJECT: riot-web
-                  # We only deploy the latest bundles to Cloudflare Pages and use _redirects to fallback to R2 for
-                  # older ones. This redirect means that 'self' is insufficient in the CSP,
-                  # and we have to add the R2 URL.
-                  # Once Cloudflare redirects support proxying mode we will be able to ditch this.
-                  # See Proxying in support table at https://developers.cloudflare.com/pages/platform/redirects
-                  CSP_EXTRA_SOURCE: ${{ env.R2_PUBLIC_URL }}
-
-            - run: mv dist/element-*.tar.gz dist/develop.tar.gz
-
-            - uses: actions/upload-artifact@v3
-              with:
-                  name: webapp
-                  path: dist/develop.tar.gz
-                  retention-days: 1
-
-            - name: Extract webapp
-              run: |
-                  mkdir _deploy
-                  tar xf dist/develop.tar.gz -C _deploy --strip-components=1
-
-            - name: Copy config
-              run: cp element.io/develop/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
-
-            # Redirect requests for the develop tarball and the historical bundles to R2
-            - name: Populate _redirects
-              run: |
-                  {
-                    echo "/develop.tar.gz $R2_PUBLIC_URL/develop.tar.gz 301"
-                    for bundle in $(aws s3 ls s3://$R2_BUCKET/bundles/ --endpoint-url $R2_URL --region=auto | awk '{print $2}'); do
-                      echo "/bundles/${bundle}* $R2_PUBLIC_URL/bundles/${bundle}:splat 301"
-                    done
-                  } | tee _deploy/_redirects
-              env:
-                  AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
-                  AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
-
-            - name: Wait for other steps to succeed
-              uses: lewagon/wait-on-check-action@v1.3.1
-              with:
-                  ref: ${{ github.sha }}
-                  running-workflow-name: "Build & Deploy develop.element.io"
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  wait-interval: 10
-                  check-regexp: ^((?!SonarCloud|SonarQube|issue|board|label).)*$
-
-            # We keep the latest develop.tar.gz on R2 instead of relying on the github artifact uploaded earlier
-            # as the expires after 24h and requires auth to download.
-            # Element Desktop's fetch script uses this tarball to fetch latest develop to build Nightlies.
-            - name: Deploy to R2
-              run: |
-                  aws s3 cp dist/develop.tar.gz s3://$R2_BUCKET/develop.tar.gz --endpoint-url $R2_URL --region=auto
-                  aws s3 cp _deploy/ s3://$R2_BUCKET/ --recursive --endpoint-url $R2_URL --region=auto
-              env:
-                  AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
-                  AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
-
-            - name: Deploy to Cloudflare Pages
-              id: cfp
-              uses: cloudflare/pages-action@1
-              with:
-                  apiToken: ${{ secrets.CF_PAGES_TOKEN }}
-                  accountId: ${{ secrets.CF_PAGES_ACCOUNT_ID }}
-                  projectName: element-web-develop
-                  directory: _deploy
-                  gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-
-            - run: |
-                  echo "Deployed to ${{ steps.cfp.outputs.url }}" >> $GITHUB_STEP_SUMMARY
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          SENTRY_URL: ${{ secrets.SENTRY_URL }}
+          SENTRY_ORG: sentry
+          SENTRY_PROJECT: riot-web
--- a/.github/workflows/deploy_develop.yaml
+++ b/.github/workflows/deploy_develop.yaml
@@ -0,0 +1,64 @@
+# Triggers after the Build has finished,
+# because artifacts are not externally available
+# until the end of their workflow.
+name: Deploy develop.element.io
+concurrency: deploy_develop
+on:
+  workflow_run:
+    workflows: [ "Build develop" ]
+    types:
+      - completed
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment: develop
+    if: github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: Find Artifact ID
+        uses: actions/github-script@v3.1.0
+        id: find_artifact
+        with:
+          result-encoding: string
+          script: |
+            const artifacts = await github.actions.listWorkflowRunArtifacts({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: ${{ github.event.workflow_run.id }},
+            });
+            const matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+                return artifact.name == "previewbuild"
+            })[0];
+            const download = await github.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: matchArtifact.id,
+                archive_format: 'zip',
+            });
+            return download.url;
+
+      - name: Create Deployment
+        uses: bobheadxi/deployments@v1
+        id: deployment
+        with:
+          step: start
+          token: ${{ secrets.GITHUB_TOKEN }}
+          env: Develop
+          ref: ${{ github.head_ref }}
+
+      - name: Notify the redeploy script
+        uses: distributhor/workflow-webhook@v2
+        env:
+          webhook_url: ${{ secrets.DEVELOP_DEPLOY_WEBHOOK_URL }}
+          webhook_secret: ${{ secrets.DEVELOP_DEPLOY_WEBHOOK_SECRET }}
+          data: '{"url": "${{ steps.find_artifact.outputs.result }}"}'
+
+      - name: Update deployment status
+        uses: bobheadxi/deployments@v1
+        if: always()
+        with:
+          step: finish
+          token: ${{ secrets.GITHUB_TOKEN }}
+          status: ${{ job.status }}
+          env: ${{ steps.deployment.outputs.env }}
+          deployment_id: ${{ steps.deployment.outputs.deployment_id }}
+          env_url: https://develop.element.io
--- a/.github/workflows/dockerhub.yaml
+++ b/.github/workflows/dockerhub.yaml
@@ -1,61 +0,0 @@
-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.ref_name }}
-jobs:
-    buildx:
-        name: Docker Buildx
-        runs-on: ubuntu-latest
-        environment: dockerhub
-        steps:
-            - uses: actions/checkout@v3
-              with:
-                  fetch-depth: 0 # needed for docker-package to be able to calculate the version
-
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@v2
-
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v2
-              with:
-                  install: true
-
-            - name: Login to Docker Hub
-              uses: docker/login-action@v2
-              with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-            - name: Docker meta
-              id: meta
-              uses: docker/metadata-action@v4
-              with:
-                  images: |
-                      vectorim/element-web
-                  tags: |
-                      type=ref,event=branch
-                      type=ref,event=tag
-                  flavor: |
-                      latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
-
-            - name: Build and push
-              uses: docker/build-push-action@v4
-              with:
-                  context: .
-                  push: true
-                  platforms: linux/amd64,linux/arm64
-                  tags: ${{ steps.meta.outputs.tags }}
-                  labels: ${{ steps.meta.outputs.labels }}
-
-            - name: Update repo description
-              uses: peter-evans/dockerhub-description@v3
-              continue-on-error: true
-              with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
-                  repository: vectorim/element-web
--- a/.github/workflows/issue_closed.yml
+++ b/.github/workflows/issue_closed.yml
@@ -2,155 +2,147 @@
 # For all closed (completed) issues, cascade the closure onto any referenced rageshakes
 # For all closed (not planned) issues, comment on rageshakes to move them into the canonical issue if one exists
 on:
-    issues:
-        types: [closed]
+  issues:
+    types: [ closed ]
 jobs:
-    tidy:
-        name: Tidy closed issues
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/github-script@v6
-              id: main
-              with:
-                  # PAT needed as the GITHUB_TOKEN won't be able to see cross-references from other orgs (matrix-org)
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  script: |
-                      const variables = {
-                        owner: context.repo.owner,
-                        name: context.repo.repo,
-                        number: context.issue.number,
-                      };
+  tidy:
+    name: Tidy closed issues
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v5
+        with:
+          # PAT needed as the GITHUB_TOKEN won't be able to see cross-references from other orgs (matrix-org)
+          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+          script: |
+            const variables = {
+              owner: context.repo.owner,
+              name: context.repo.repo,
+              number: context.issue.number,
+            };

-                      const query = `query($owner:String!, $name:String!, $number:Int!) {
-                        repository(owner: $owner, name: $name) {
-                          issue(number: $number) {
-                            stateReason,
-                            timelineItems(first: 100, itemTypes: [MARKED_AS_DUPLICATE_EVENT, UNMARKED_AS_DUPLICATE_EVENT, CROSS_REFERENCED_EVENT]) {
-                              edges {
-                                node {
-                                  __typename
-                                  ... on MarkedAsDuplicateEvent {
-                                    canonical {
-                                      ... on Issue {
-                                        repository {
-                                          nameWithOwner
-                                        }
-                                        number
-                                      }
-                                      ... on PullRequest {
-                                        repository {
-                                          nameWithOwner
-                                        }
-                                        number
-                                      }
-                                    }
-                                  }
-                                  ... on UnmarkedAsDuplicateEvent {
-                                    canonical {
-                                      ... on Issue {
-                                        repository {
-                                          nameWithOwner
-                                        }
-                                        number
-                                      }
-                                      ... on PullRequest {
-                                        repository {
-                                          nameWithOwner
-                                        }
-                                        number
-                                      }
-                                    }
-                                  }
-                                  ... on CrossReferencedEvent {
-                                    source {
-                                      ... on Issue {
-                                        repository {
-                                          nameWithOwner
-                                        }
-                                        number
-                                      }
-                                      ... on PullRequest {
-                                        repository {
-                                          nameWithOwner
-                                        }
-                                        number
-                                      }
-                                    }
-                                  }
-                                }
+            const query = `query($owner:String!, $name:String!, $number:Int!) {
+              repository(owner: $owner, name: $name) {
+                issue(number: $number) {
+                  stateReason,
+                  timelineItems(first: 100, itemTypes: [MARKED_AS_DUPLICATE_EVENT, UNMARKED_AS_DUPLICATE_EVENT, CROSS_REFERENCED_EVENT]) {
+                    edges {
+                      node {
+                        __typename
+                        ... on MarkedAsDuplicateEvent {
+                          canonical {
+                            ... on Issue {
+                              repository {
+                                nameWithOwner
                              }
+                              number
+                            }
+                            ... on PullRequest {
+                              repository {
+                                nameWithOwner
+                              }
+                              number
                            }
                          }
                        }
-                      }`;
-
-                      const result = await github.graphql(query, variables);
-                      const { stateReason, timelineItems: { edges } } = result.repository.issue;
-
-                      const RAGESHAKE_OWNER = "matrix-org";
-                      const RAGESHAKE_REPO = "element-web-rageshakes";
-                      const rageshakes = new Set();
-                      const duplicateOf = new Set();
-
-                      console.log("Edges: ", JSON.stringify(edges));
-
-                      for (const { node } of edges) {
-                        switch(node.__typename) {
-                          case "MarkedAsDuplicateEvent":
-                            duplicateOf.add(node.canonical.repository.nameWithOwner + "#" + node.canonical.number);
-                            break;
-                          case "UnmarkedAsDuplicateEvent":
-                            duplicateOf.remove(node.canonical.repository.nameWithOwner + "#" + node.canonical.number);
-                            break;
-                          case "CrossReferencedEvent":
-                            if (node.source.repository.nameWithOwner === (RAGESHAKE_OWNER + "/" + RAGESHAKE_REPO)) {
-                              rageshakes.add(node.source.number);
+                        ... on UnmarkedAsDuplicateEvent {
+                          canonical {
+                            ... on Issue {
+                              repository {
+                                nameWithOwner
+                              }
+                              number
                            }
-                            break;
+                            ... on PullRequest {
+                              repository {
+                                nameWithOwner
+                              }
+                              number
+                            }
+                          }
+                        }
+                        ... on CrossReferencedEvent {
+                          source {
+                            ... on Issue {
+                              repository {
+                                nameWithOwner
+                              }
+                              number
+                            }
+                            ... on PullRequest {
+                              repository {
+                                nameWithOwner
+                              }
+                              number
+                            }
+                          }
                        }
                      }
+                    }
+                  }
+                }
+              }
+            }`;

-                      console.log("Duplicate of: ", duplicateOf);
-                      console.log("Found rageshakes: ", rageshakes);
+            const result = await github.graphql(query, variables);
+            const { stateReason, timelineItems: { edges } } = result.repository.issue;

-                      if (duplicateOf.size) {
-                        const body = Array.from(duplicateOf).join("\n");
+            const RAGESHAKE_OWNER = "matrix-org";
+            const RAGESHAKE_REPO = "element-web-rageshakes";
+            const rageshakes = new Set();
+            const duplicateOf = new Set();

-                        // Comment on all rageshakes to create relationship to the issue this was closed as duplicate of
-                        for (const rageshake of rageshakes) {
-                          github.rest.issues.createComment({
-                            owner: RAGESHAKE_OWNER,
-                            repo: RAGESHAKE_REPO,
-                            issue_number: rageshake,
-                            body,
-                          });
-                        }
+            console.log("Edges: ", JSON.stringify(edges));

-                        // Duplicate was closed with wrong reason, fix it
-                        if (stateReason === "COMPLETED") {
-                          core.setOutput("closeAsNotPlanned", "true");
-                        }
-                      } else {
-                        // This issue was closed, close all related rageshakes
-                        for (const rageshake of rageshakes) {
-                          github.rest.issues.update({
-                            owner: RAGESHAKE_OWNER,
-                            repo: RAGESHAKE_REPO,
-                            issue_number: rageshake,
-                            state: "closed",
-                          });
-                        }
-                      }
-            - uses: actions/github-script@v6
-              name: Close duplicate as Not Planned
-              if: steps.main.outputs.closeAsNotPlanned
-              with:
-                  # We do this step separately, and with the default token so as to not re-trigger this workflow when re-closing
-                  script: |
-                      await github.graphql(`mutation($id:ID!) {
-                        closeIssue(input: { issueId:$id, stateReason:NOT_PLANNED }) {
-                          clientMutationId
-                        }
-                      }`, {
-                        id: context.payload.issue.node_id,
-                      });
+            for (const { node } of edges) {
+              switch(node.__typename) {
+                case "MarkedAsDuplicateEvent":
+                  duplicateOf.add(node.canonical.repository.nameWithOwner + "#" + node.canonical.number);
+                  break;
+                case "UnmarkedAsDuplicateEvent":
+                  duplicateOf.remove(node.canonical.repository.nameWithOwner + "#" + node.canonical.number);
+                  break;
+                case "CrossReferencedEvent":
+                  if (node.source.repository.nameWithOwner === (RAGESHAKE_OWNER + "/" + RAGESHAKE_REPO)) {
+                    rageshakes.add(node.source.number);
+                  }
+                  break;
+              }
+            }
+
+            console.log("Duplicate of: ", duplicateOf);
+            console.log("Found rageshakes: ", rageshakes);
+
+            if (duplicateOf.size) {
+              const body = Array.from(duplicateOf).join("\n");
+
+              // Comment on all rageshakes to create relationship to the issue this was closed as duplicate of
+              for (const rageshake of rageshakes) {
+                github.rest.issues.createComment({
+                  owner: RAGESHAKE_OWNER,
+                  repo: RAGESHAKE_REPO,
+                  issue_number: rageshake,
+                  body,
+                });
+              }
+
+              // Duplicate was closed with wrong reason, fix it
+              if (stateReason === "COMPLETED") {
+                await github.graphql(`mutation($id:ID!) {
+                  closeIssue(input: { issueId:$id, stateReason:NOT_PLANNED }) {
+                    clientMutationId
+                  }
+                }`, {
+                  id: context.payload.issue.node_id,
+                });
+              }
+            } else {
+              // This issue was closed, close all related rageshakes
+              for (const rageshake of rageshakes) {
+                github.rest.issues.update({
+                  owner: RAGESHAKE_OWNER,
+                  repo: RAGESHAKE_REPO,
+                  issue_number: rageshake,
+                  state: "closed",
+                });
+              }
+            }
--- a/.github/workflows/pending-reviews.yaml
+++ b/.github/workflows/pending-reviews.yaml
@@ -1,74 +0,0 @@
-name: Pending reviews automation
-on:
-    # We run it on a schedule instead of on pull_request_* events to not create confusing messaging in the PR
-    schedule:
-        - cron: "*/10 * * * *"
-concurrency: ${{ github.workflow }}
-jobs:
-    bot:
-        name: Pending reviews bot
-        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%3Avector-im%2Felement-web+repo%3Avector-im%2Felement-desktop+review-requested%3A%40me+sort%3Aupdated-desc+"
-        steps:
-            - uses: actions/github-script@v6
-              env:
-                  HS_URL: ${{ secrets.BETABOT_HS_URL }}
-                  ROOM_ID: ${{ secrets.ROOM_ID }}
-                  TOKEN: ${{ secrets.BETABOT_ACCESS_TOKEN }}
-              with:
-                  # PAT needed as the GITHUB_TOKEN won't be able to see cross-references from other orgs (matrix-org)
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-                  script: |
-                      const repos = [
-                          "vector-im/element-desktop",
-                          "vector-im/element-web",
-                          "matrix-org/matrix-react-sdk",
-                          "matrix-org/matrix-js-sdk",
-                      ];
-                      const teams = [
-                          "matrix-org/element-web-app-team",
-                          "matrix-org/element-web",
-                          "vector-im/element-web-app-team",
-                          "vector-im/element-web",
-                      ];
-
-                      let issueCount = 0;
-                      for (const team of teams) {
-                          const org = team.split("/", 2)[0];
-                          const reposInOrg = repos.filter(repo => repo.startsWith(org + "/"));
-                          const { data } = await github.rest.search.issuesAndPullRequests({
-                              q: `is:pr is:open review:required ${reposInOrg.map(r => `repo:${r}`).join(" ")} team-review-requested:${team}`,
-                          });
-                          issueCount += data.total_count;
-                      }
-
-                      const { HS_URL, ROOM_ID, TOKEN, URL } = process.env;
-                      const apiUrl = `${HS_URL}/_matrix/client/v3/rooms/${ROOM_ID}/state/re.jki.counter/gh_reviews`;
-                      const headers = {
-                          "Content-Type": "application/json",
-                          "Authorization": `Bearer ${TOKEN}`,
-                      };
-                      const res = await fetch(apiUrl, {
-                          method: "GET",
-                          headers,
-                      });
-
-                      const data = await res.json();
-
-                      if (data.value === issueCount) {
-                          console.log("Pending review count already correct");
-                          return;
-                      }
-
-                      await fetch(apiUrl, {
-                          method: "PUT",
-                          body: JSON.stringify({
-                              "link": URL,
-                              "severity": "warning",
-                              "title": "Pending reviews",
-                              "value": issueCount
-                          }),
-                          headers,
-                      });
--- a/.github/workflows/pull_request.yaml
+++ b/.github/workflows/pull_request.yaml
@@ -1,10 +1,26 @@
 name: Pull Request
 on:
-    pull_request_target:
-        types: [opened, edited, labeled, unlabeled, synchronize]
+  pull_request_target:
+    types: [ opened, edited, labeled, unlabeled, synchronize ]
 concurrency: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}
 jobs:
-    action:
-        uses: matrix-org/matrix-js-sdk/.github/workflows/pull_request.yaml@develop
-        secrets:
-            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  changelog:
+    name: Preview Changelog
+    if: github.event.action != 'synchronize'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: matrix-org/allchange@main
+        with:
+          ghToken: ${{ secrets.GITHUB_TOKEN }}
+
+  enforce-label:
+    name: Enforce Labels
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    steps:
+      - uses: yogevbd/enforce-label-action@2.1.0
+        with:
+          REQUIRED_LABELS_ANY: "T-Defect,T-Enhancement,T-Task"
+          BANNED_LABELS: "X-Blocked"
+          BANNED_LABELS_DESCRIPTION: "Preventing merge whilst PR is marked blocked!"
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -1,15 +1,15 @@
 name: SonarQube
 on:
-    workflow_run:
-        workflows: ["Tests"]
-        types:
-            - completed
+  workflow_run:
+    workflows: [ "Tests" ]
+    types:
+      - completed
 concurrency:
-    group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
-    cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
+  cancel-in-progress: true
 jobs:
-    sonarqube:
-        name: 🩻 SonarQube
-        uses: matrix-org/matrix-js-sdk/.github/workflows/sonarcloud.yml@develop
-        secrets:
-            SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  sonarqube:
+    name: 🩻 SonarQube
+    uses: matrix-org/matrix-js-sdk/.github/workflows/sonarcloud.yml@develop
+    secrets:
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@@ -1,119 +1,65 @@
 name: Static Analysis
 on:
-    pull_request: {}
-    push:
-        branches: [develop, master]
-    repository_dispatch:
-        types: [element-web-notify]
+  pull_request: { }
+  push:
+    branches: [ develop, master ]
+  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 }}
+  # These must be set for fetchdep.sh to get the right branch
+  REPOSITORY: ${{ github.repository }}
+  PR_NUMBER: ${{ github.event.pull_request.number }}
 jobs:
-    ts_lint:
-        name: "Typescript Syntax Check"
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
+  ts_lint:
+    name: "Typescript Syntax Check"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2

-            - uses: actions/setup-node@v3
-              with:
-                  cache: "yarn"
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'

-            - name: Install Dependencies
-              run: "./scripts/layered.sh"
+      - name: Install Dependencies
+        run: "./scripts/layered.sh"

-            - name: Typecheck
-              run: "yarn run lint:types"
+      - name: Typecheck
+        run: "yarn run lint:types"

-    tsc-strict:
-        name: Typescript Strict Error Checker
-        if: github.event_name == 'pull_request'
-        runs-on: ubuntu-latest
-        permissions:
-            pull-requests: read
-            checks: write
-        steps:
-            - uses: actions/checkout@v3
+  i18n_lint:
+    name: "i18n Check"
+    uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop

-            - name: Install Deps
-              run: "scripts/layered.sh"
+  js_lint:
+    name: "ESLint"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2

-            - name: Get diff lines
-              id: diff
-              uses: Equip-Collaboration/diff-line-numbers@v1.0.0
-              with:
-                  include: '["\\.tsx?$"]'
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'

-            - name: Detecting files changed
-              id: files
-              uses: futuratrepadeira/changed-files@v4.0.0
-              with:
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  pattern: '^.*\.tsx?$'
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"

-            - uses: t3chguy/typescript-check-action@main
-              with:
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
-                  use-check: false
-                  check-fail-mode: added
-                  output-behaviour: annotate
-                  ts-extra-args: "--strict --noImplicitAny"
-                  files-changed: ${{ steps.files.outputs.files_updated }}
-                  files-added: ${{ steps.files.outputs.files_created }}
-                  files-deleted: ${{ steps.files.outputs.files_deleted }}
-                  line-numbers: ${{ steps.diff.outputs.lineNumbers }}
+      - name: Run Linter
+        run: "yarn run lint:js"

-    i18n_lint:
-        name: "i18n Check"
-        uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
+  style_lint:
+    name: "Style Lint"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2

-    js_lint:
-        name: "ESLint"
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'

-            - uses: actions/setup-node@v3
-              with:
-                  cache: "yarn"
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"

-            # Does not need branch matching as only analyses this layer
-            - name: Install Deps
-              run: "yarn install --pure-lockfile"
-
-            - name: Run Linter
-              run: "yarn run lint:js"
-
-    style_lint:
-        name: "Style Lint"
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-
-            - uses: actions/setup-node@v3
-              with:
-                  cache: "yarn"
-
-            # 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"
-
-    analyse_dead_code:
-        name: "Analyse Dead Code"
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-
-            - uses: actions/setup-node@v3
-              with:
-                  cache: "yarn"
-
-            - name: Install Deps
-              run: "scripts/layered.sh"
-
-            - name: Dead Code Analysis
-              run: "yarn run analyse:unused-exports"
+      - name: Run Linter
+        run: "yarn run lint:style"
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -0,0 +1,27 @@
+name: Test
+on:
+  pull_request: { }
+  push:
+    branches: [ master, develop ]
+  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:
+  test:
+    name: "Test"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+
+      - name: Install Dependencies
+        run: "./scripts/layered.sh"
+
+      - name: Run Tests
+        run: "yarn test"
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -1,41 +1,37 @@
 name: Tests
 on:
-    pull_request: {}
-    push:
-        branches: [develop, master]
-    repository_dispatch:
-        types: [element-web-notify]
+  pull_request: { }
+  push:
+    branches: [ develop, master ]
+  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 }}
+  # 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@v3
+  jest:
+    name: Jest
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2

-            - name: Yarn cache
-              uses: actions/setup-node@v3
-              with:
-                  cache: "yarn"
+      - name: Yarn cache
+        uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'

-            - name: Install Dependencies
-              run: "./scripts/layered.sh"
+      - name: Install Dependencies
+        run: "./scripts/layered.sh"

-            - name: Get number of CPU cores
-              id: cpu-cores
-              uses: SimenB/github-actions-cpu-cores@v1
+      - name: Run tests with coverage
+        run: "yarn coverage --ci"

-            - name: Run tests with coverage
-              run: "yarn coverage --ci --reporters github-actions --max-workers ${{ steps.cpu-cores.outputs.count }}"
-
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v3
-              with:
-                  name: coverage
-                  path: |
-                      coverage
-                      !coverage/lcov-report
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: coverage
+          path: |
+            coverage
+            !coverage/lcov-report
--- a/.github/workflows/triage-assigned.yml
+++ b/.github/workflows/triage-assigned.yml
@@ -1,31 +1,18 @@
 name: Move issued assigned to specific team members to their boards

 on:
-    issues:
-        types: [assigned]
+  issues:
+    types: [ assigned ]

 jobs:
-    web-app-team:
-        runs-on: ubuntu-latest
-        if: |
-            contains(github.event.issue.assignees.*.login, 't3chguy') ||
-            contains(github.event.issue.assignees.*.login, 'andybalaam') ||
-            contains(github.event.issue.assignees.*.login, 'justjanne')
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              id: add_to_project
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                          item {
-                            id
-                            }
-                          }
-                        }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc4AKjJS"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  web-app-team:
+    runs-on: ubuntu-latest
+    if: |
+      contains(github.event.issue.assignees.*.login, 't3chguy') ||
+      contains(github.event.issue.assignees.*.login, 'turt2live')
+    steps:
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        with:
+          project: Web App Team
+          column: Ready
+          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -1,15 +1,15 @@
 name: Move new issues into Issue triage board

 on:
-    issues:
-        types: [opened]
+  issues:
+    types: [ opened ]

 jobs:
-    automate-project-columns:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43
-              with:
-                  project: Issue triage
-                  column: Incoming
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  automate-project-columns:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        with:
+          project: Issue triage
+          column: Incoming
+          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -1,356 +1,236 @@
 name: Move labelled issues to correct projects

 on:
-    issues:
-        types: [labeled]
+  issues:
+    types: [labeled]

 jobs:
-    apply_Z-Labs_label:
-        name: Add Z-Labs label for features behind labs flags
-        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 ') ||
-            contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
-            contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-            contains(github.event.issue.labels.*.name, 'A-Tags') ||
-            contains(github.event.issue.labels.*.name, 'A-Video-Rooms') ||
-            contains(github.event.issue.labels.*.name, 'A-Message-Starring') ||
-            contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor') ||
-            contains(github.event.issue.labels.*.name, 'A-Element-Call')
-        steps:
-            - uses: actions/github-script@v6
-              with:
-                  script: |
-                      github.rest.issues.addLabels({
-                        issue_number: context.issue.number,
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        labels: ['Z-Labs']
-                      })
+  apply_Z-Labs_label:
+    name: Add Z-Labs label for features behind labs flags
+    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-New-Search-Experience') ||
+      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
+      contains(github.event.issue.labels.*.name, 'Z-IA') ||
+      contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
+      contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
+      contains(github.event.issue.labels.*.name, 'A-Tags') ||
+      contains(github.event.issue.labels.*.name, 'A-Video-Rooms')
+    steps:
+      - uses: actions/github-script@v5
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['Z-Labs']
+            })

-    apply_Help-Wanted_label:
-        name: Add "Help Wanted" label to all "good first issue" and Hacktoberfest
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'good first issue') ||
-            contains(github.event.issue.labels.*.name, 'Hacktoberfest')
-        steps:
-            - uses: actions/github-script@v6
-              with:
-                  script: |
-                      github.rest.issues.addLabels({
-                        issue_number: context.issue.number,
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        labels: ['Help Wanted']
-                      })
+  move_needs_info_issues:
+    name: X-Needs-Info issues to Need info column on triage board
+    runs-on: ubuntu-latest
+    steps:
+      - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
+        with:
+          action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
+          project-url: "https://github.com/vector-im/element-web/projects/27"
+          column-name: "Need info"
+          label-name: "X-Needs-Info"

-    move_needs_info_issues:
-        name: X-Needs-Info issues to Need info column on triage board
-        runs-on: ubuntu-latest
-        steps:
-            - uses: konradpabjan/move-labeled-or-milestoned-issue@190352295fe309fcb113b49193bc81d9aaa9cb01
-              with:
-                  action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-                  project-url: "https://github.com/vector-im/element-web/projects/27"
-                  column-name: "Need info"
-                  label-name: "X-Needs-Info"
+  add_priority_design_issues_to_project:
+    name: P1 X-Needs-Design to Design project board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
+      (contains(github.event.issue.labels.*.name, 'S-Critical') &&
+       (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+       contains(github.event.issue.labels.*.name, 'S-Major') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+       contains(github.event.issue.labels.*.name, 'A11y') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent'))
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc0sUA"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

-    add_priority_design_issues_to_project:
-        name: P1 X-Needs-Design to Design project board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
-            (contains(github.event.issue.labels.*.name, 'S-Critical') &&
-             (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-              contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-             contains(github.event.issue.labels.*.name, 'S-Major') &&
-             contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-             contains(github.event.issue.labels.*.name, 'A11y'))
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              id: add_to_project
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                          item {
-                            id
-                            }
-                          }
-                        }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc0sUA"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  add_product_issues:
+    name: X-Needs-Product to Design project board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'X-Needs-Product')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc4AAg6N"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

-    add_product_issues:
-        name: X-Needs-Product to product project board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'X-Needs-Product')
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              id: add_to_project
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                          item {
-                            id
-                            }
-                          }
-                        }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc4AAg6N"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  Delight_issues_to_board:
+    name: Delight issues to project board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-New-Search-Experience') ||
+      contains(github.event.issue.labels.*.name, 'Team: Delight') ||
+      contains(github.event.issue.labels.*.name, 'Z-NewUserJourney')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc1HvQ"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

-    Search_issues_to_board:
-        name: Search issues to project board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-New-Search-Experience')
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                          item {
-                            id
-                            }
-                          }
-                        }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc4ADtaO"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  move_voice-message_issues:
+    name: A-Voice Messages to voice message board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-Voice Messages')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc2KCw"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

-    move_voice-message_issues:
-        name: A-Voice Messages to voice message board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-Voice Messages')
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                          item {
-                            id
-                            }
-                          }
-                        }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc2KCw"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  move_threads_issues:
+    name: A-Threads to Thread board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-Threads')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc0rRA"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

-    move_message_bubbles_issues:
-        name: A-Message-Bubbles to Message bubbles board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-Message-Bubbles')
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                          item {
-                            id
-                            }
-                          }
-                        }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc3m-g"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  move_message_bubbles_issues:
+    name: A-Message-Bubbles to Message bubbles board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-Message-Bubbles')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc3m-g"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

-    move_ftue_issues:
-        name: Z-FTUE issues to the FTUE project board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'Z-FTUE')
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                          item {
-                            id
-                            }
-                          }
-                        }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc4AAqVx"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  move_ftue_issues:
+    name: Z-FTUE issues to the FTUE project board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'Z-FTUE')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc4AAqVx"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

-    move_WTF_issues:
-        name: Z-WTF issues to the WTF project board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'Z-WTF')
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                          item {
-                            id
-                            }
-                          }
-                        }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc4AArk0"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-    ps_features1:
-        name: Add labelled issues to PS features team 1
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-Polls') ||
-            contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-            (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
-              !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
-            (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
-              contains(github.event.issue.labels.*.name, 'A-User-Settings'))
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              id: add_to_project
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                        item {
-                          id
-                          }
-                        }
-                      }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc4AHJKF"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-    ps_features2:
-        name: Add labelled issues to PS features team 2
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
-            contains(github.event.issue.labels.*.name, 'A-Broadcast')
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              id: add_to_project
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                        item {
-                          id
-                          }
-                        }
-                      }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc4AHJKd"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-    ps_features3:
-        name: Add labelled issues to PS features team 3
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              id: add_to_project
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                        item {
-                          id
-                          }
-                        }
-                      }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc4AHJKW"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-    voip:
-        name: Add labelled issues to VoIP project board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'Team: VoIP')
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              id: add_to_project
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                        item {
-                          id
-                          }
-                        }
-                      }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc4ABMIk"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-    verticals_feature:
-        name: Add labelled issues to Verticals Feature project
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'Team: Verticals Feature')
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              id: add_to_project
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                        item {
-                          id
-                          }
-                        }
-                      }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.issue.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc4AHJKW"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  move_WTF_issues:
+    name: Z-WTF issues to the WTF project board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'Z-WTF')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc4AArk0"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.github/workflows/triage-move-review-requests.yml
+++ b/.github/workflows/triage-move-review-requests.yml
@@ -1,139 +1,139 @@
 name: Move pull requests asking for review to the relevant project
 on:
-    pull_request_target:
-        types: [review_requested]
+  pull_request_target:
+    types: [ review_requested ]

 jobs:
-    add_design_pr_to_project:
-        name: Move PRs asking for design review to the design board
-        runs-on: ubuntu-latest
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              id: find_team_members
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      query find_team_members($team: String!) {
-                        organization(login: "vector-im") {
-                          team(slug: $team) {
-                            members {
-                              nodes {
-                                login
-                              }
-                            }
-                          }
-                        }
-                      }
-                  team: ${{ env.TEAM }}
-              env:
-                  TEAM: "design"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-            - id: any_matching_reviewers
-              run: |
-                  # Fetch requested reviewers, and people who are on the team
-                  echo '${{ tojson(fromjson(steps.find_team_members.outputs.data).organization.team.members.nodes[*].login) }}' | tee /tmp/team_members.json
-                  echo '${{ tojson(github.event.pull_request.requested_reviewers[*].login) }}' | tee /tmp/reviewers.json
-                  jq --raw-output .[] < /tmp/team_members.json | sort | tee /tmp/team_members.txt
-                  jq --raw-output .[] < /tmp/reviewers.json | sort | tee /tmp/reviewers.txt
+  add_design_pr_to_project:
+    name: Move PRs asking for design review to the design board
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: find_team_members
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            query find_team_members($team: String!) {
+              organization(login: "vector-im") {
+                team(slug: $team) {
+                  members {
+                    nodes {
+                      login
+                    }
+                  }
+                }
+              }
+            }
+          team: ${{ env.TEAM }}
+        env:
+          TEAM: "design"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+      - id: any_matching_reviewers
+        run: |
+          # Fetch requested reviewers, and people who are on the team
+          echo '${{ tojson(fromjson(steps.find_team_members.outputs.data).organization.team.members.nodes[*].login) }}' | tee /tmp/team_members.json
+          echo '${{ tojson(github.event.pull_request.requested_reviewers[*].login) }}' | tee /tmp/reviewers.json
+          jq --raw-output .[] < /tmp/team_members.json | sort | tee /tmp/team_members.txt
+          jq --raw-output .[] < /tmp/reviewers.json | sort | tee /tmp/reviewers.txt

-                  # Fetch requested team reviewers, and the name of the team
-                  echo '${{ tojson(github.event.pull_request.requested_teams[*].slug) }}' | tee /tmp/team_reviewers.json
-                  jq --raw-output .[] < /tmp/team_reviewers.json | sort | tee /tmp/team_reviewers.txt
-                  echo '${{ env.TEAM }}' | tee /tmp/team.txt
+          # Fetch requested team reviewers, and the name of the team
+          echo '${{ tojson(github.event.pull_request.requested_teams[*].slug) }}' | tee /tmp/team_reviewers.json
+          jq --raw-output .[] < /tmp/team_reviewers.json | sort | tee /tmp/team_reviewers.txt
+          echo '${{ env.TEAM }}' | tee /tmp/team.txt

-                  # If either a reviewer matches a team member, or a team matches our team, say "true"
-                  if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) != 0 ]; then
-                    echo "::set-output name=match::true"
-                  elif [ $(join /tmp/team.txt /tmp/team_reviewers.txt | wc -l) != 0 ]; then
-                    echo "::set-output name=match::true"
-                  else
-                    echo "::set-output name=match::false"
-                  fi
-              env:
-                  TEAM: "design"
-            - uses: octokit/graphql-action@v2.x
-              id: add_to_project
-              if: steps.any_matching_reviewers.outputs.match == 'true'
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!, $contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                          item {
-                            id
-                          }
-                        }
-                      }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.pull_request.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc0sUA"
-                  TEAM: "design"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+          # If either a reviewer matches a team member, or a team matches our team, say "true"
+          if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) != 0 ]; then
+            echo "::set-output name=match::true"
+          elif [ $(join /tmp/team.txt /tmp/team_reviewers.txt | wc -l) != 0 ]; then
+            echo "::set-output name=match::true"
+          else
+            echo "::set-output name=match::false"
+          fi
+        env:
+          TEAM: "design"
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        if: steps.any_matching_reviewers.outputs.match == 'true'
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!, $contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.pull_request.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc0sUA"
+          TEAM: "design"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

-    add_product_pr_to_project:
-        name: Move PRs asking for design review to the design board
-        runs-on: ubuntu-latest
-        steps:
-            - uses: octokit/graphql-action@v2.x
-              id: find_team_members
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      query find_team_members($team: String!) {
-                        organization(login: "vector-im") {
-                          team(slug: $team) {
-                            members {
-                              nodes {
-                                login
-                              }
-                            }
-                          }
-                        }
-                      }
-                  team: ${{ env.TEAM }}
-              env:
-                  TEAM: "product"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-            - id: any_matching_reviewers
-              run: |
-                  # Fetch requested reviewers, and people who are on the team
-                  echo '${{ tojson(fromjson(steps.find_team_members.outputs.data).organization.team.members.nodes[*].login) }}' | tee /tmp/team_members.json
-                  echo '${{ tojson(github.event.pull_request.requested_reviewers[*].login) }}' | tee /tmp/reviewers.json
-                  jq --raw-output .[] < /tmp/team_members.json | sort | tee /tmp/team_members.txt
-                  jq --raw-output .[] < /tmp/reviewers.json | sort | tee /tmp/reviewers.txt
+  add_product_pr_to_project:
+    name: Move PRs asking for design review to the design board
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: find_team_members
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            query find_team_members($team: String!) {
+              organization(login: "vector-im") {
+                team(slug: $team) {
+                  members {
+                    nodes {
+                      login
+                    }
+                  }
+                }
+              }
+            }
+          team: ${{ env.TEAM }}
+        env:
+          TEAM: "product"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+      - id: any_matching_reviewers
+        run: |
+          # Fetch requested reviewers, and people who are on the team
+          echo '${{ tojson(fromjson(steps.find_team_members.outputs.data).organization.team.members.nodes[*].login) }}' | tee /tmp/team_members.json
+          echo '${{ tojson(github.event.pull_request.requested_reviewers[*].login) }}' | tee /tmp/reviewers.json
+          jq --raw-output .[] < /tmp/team_members.json | sort | tee /tmp/team_members.txt
+          jq --raw-output .[] < /tmp/reviewers.json | sort | tee /tmp/reviewers.txt

-                  # Fetch requested team reviewers, and the name of the team
-                  echo '${{ tojson(github.event.pull_request.requested_teams[*].slug) }}' | tee /tmp/team_reviewers.json
-                  jq --raw-output .[] < /tmp/team_reviewers.json | sort | tee /tmp/team_reviewers.txt
-                  echo '${{ env.TEAM }}' | tee /tmp/team.txt
+          # Fetch requested team reviewers, and the name of the team
+          echo '${{ tojson(github.event.pull_request.requested_teams[*].slug) }}' | tee /tmp/team_reviewers.json
+          jq --raw-output .[] < /tmp/team_reviewers.json | sort | tee /tmp/team_reviewers.txt
+          echo '${{ env.TEAM }}' | tee /tmp/team.txt

-                  # If either a reviewer matches a team member, or a team matches our team, say "true"
-                  if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) != 0 ]; then
-                    echo "::set-output name=match::true"
-                  elif [ $(join /tmp/team.txt /tmp/team_reviewers.txt | wc -l) != 0 ]; then
-                    echo "::set-output name=match::true"
-                  else
-                    echo "::set-output name=match::false"
-                  fi
-              env:
-                  TEAM: "product"
-            - uses: octokit/graphql-action@v2.x
-              id: add_to_project
-              if: steps.any_matching_reviewers.outputs.match == 'true'
-              with:
-                  headers: '{"GraphQL-Features": "projects_next_graphql"}'
-                  query: |
-                      mutation add_to_project($projectid:ID!, $contentid:ID!) {
-                        addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                          item {
-                            id
-                          }
-                        }
-                      }
-                  projectid: ${{ env.PROJECT_ID }}
-                  contentid: ${{ github.event.pull_request.node_id }}
-              env:
-                  PROJECT_ID: "PVT_kwDOAM0swc4AAg6N"
-                  TEAM: "product"
-                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+          # If either a reviewer matches a team member, or a team matches our team, say "true"
+          if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) != 0 ]; then
+            echo "::set-output name=match::true"
+          elif [ $(join /tmp/team.txt /tmp/team_reviewers.txt | wc -l) != 0 ]; then
+            echo "::set-output name=match::true"
+          else
+            echo "::set-output name=match::false"
+          fi
+        env:
+          TEAM: "product"
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        if: steps.any_matching_reviewers.outputs.match == 'true'
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!, $contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.pull_request.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc4AAg6N"
+          TEAM: "product"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.github/workflows/triage-priority-bugs.yml
+++ b/.github/workflows/triage-priority-bugs.yml
@@ -0,0 +1,30 @@
+name: Move P1 bugs to boards
+
+on:
+  issues:
+    types: [labeled, unlabeled]
+
+jobs:
+  P1_issues_to_crypto_team_workboard:
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'Z-UISI') ||
+      (contains(github.event.issue.labels.*.name, 'A-E2EE') ||
+       contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') ||
+       contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
+       contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') ||
+       contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification')) &&
+      (contains(github.event.issue.labels.*.name, 'T-Defect') &&
+       contains(github.event.issue.labels.*.name, 'S-Critical') &&
+       (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+       contains(github.event.issue.labels.*.name, 'S-Major') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+       contains(github.event.issue.labels.*.name, 'A11y') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent'))
+    steps:
+      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        with:
+          project: Crypto Team
+          column: Ready
+          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.github/workflows/triage-unlabelled.yml
+++ b/.github/workflows/triage-unlabelled.yml
@@ -1,71 +1,70 @@
 name: Move unlabelled from needs info columns to triaged

 on:
-    issues:
-        types: [unlabeled]
+  issues:
+    types: [ unlabeled ]

 jobs:
-    Move_Unabeled_Issue_On_Project_Board:
-        name: Move no longer X-Needs-Info issues to Triaged
-        runs-on: ubuntu-latest
-        if: >
-            ${{
-            !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
-        env:
-            BOARD_NAME: "Issue triage"
-            OWNER: ${{ github.repository_owner }}
-            REPO: ${{ github.event.repository.name }}
-            ISSUE: ${{ github.event.issue.number }}
-        steps:
-            - name: Check if issue is already in "${{ env.BOARD_NAME }}"
-              run: |
-                  json=$(curl -s -H 'Content-Type: application/json' -H "Authorization: bearer ${{ secrets.GITHUB_TOKEN }}" -X POST -d '{"query": "query($issue: Int!, $owner: String!, $repo: String!) { repository(owner: $owner, name: $repo) { issue(number: $issue) { projectCards { nodes { project { name } isArchived } } } } } ", "variables" : "{ \"issue\": '${ISSUE}', \"owner\": \"'${OWNER}'\", \"repo\": \"'${REPO}'\" }" }' https://api.github.com/graphql)
-                  if echo $json | jq '.data.repository.issue.projectCards.nodes | length'; then
-                    if [[ $(echo $json | jq '.data.repository.issue.projectCards.nodes[0].project.name') =~ "${BOARD_NAME}" ]]; then
-                      if [[ $(echo $json | jq '.data.repository.issue.projectCards.nodes[0].isArchived') == 'true' ]]; then
-                        echo "Issue is already in Project '$BOARD_NAME', but is archived - skipping workflow";
-                        echo "SKIP_ACTION=true" >> $GITHUB_ENV
-                      else
-                        echo "Issue is already in Project '$BOARD_NAME', proceeding";
-                        echo "ALREADY_IN_BOARD=true" >> $GITHUB_ENV
-                      fi
-                    else
-                      echo "Issue is not in project '$BOARD_NAME', cancelling this workflow"
-                      echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
-                    fi
-                  fi
-            - name: Move issue
-              uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43
-              if: ${{ env.ALREADY_IN_BOARD == 'true' && env.SKIP_ACTION != 'true' }}
-              with:
-                  project: Issue triage
-                  column: Triaged
-                  repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  Move_Unabeled_Issue_On_Project_Board:
+    name: Move no longer X-Needs-Info issues to Triaged
+    runs-on: ubuntu-latest
+    if: >
+      ${{
+      !contains(github.event.issue.labels.*.name, 'X-Needs-Info') }}
+    env:
+      BOARD_NAME: "Issue triage"
+      OWNER: ${{ github.repository_owner }}
+      REPO: ${{ github.event.repository.name }}
+      ISSUE: ${{ github.event.issue.number }}
+    steps:
+      - name: Check if issue is already in "${{ env.BOARD_NAME }}"
+        run: |
+          json=$(curl -s -H 'Content-Type: application/json' -H "Authorization: bearer ${{ secrets.GITHUB_TOKEN }}" -X POST -d '{"query": "query($issue: Int!, $owner: String!, $repo: String!) { repository(owner: $owner, name: $repo) { issue(number: $issue) { projectCards { nodes { project { name } isArchived } } } } } ", "variables" : "{ \"issue\": '${ISSUE}', \"owner\": \"'${OWNER}'\", \"repo\": \"'${REPO}'\" }" }' https://api.github.com/graphql)
+          if echo $json | jq '.data.repository.issue.projectCards.nodes | length'; then
+            if [[ $(echo $json | jq '.data.repository.issue.projectCards.nodes[0].project.name') =~ "${BOARD_NAME}" ]]; then
+              if [[ $(echo $json | jq '.data.repository.issue.projectCards.nodes[0].isArchived') == 'true' ]]; then
+                echo "Issue is already in Project '$BOARD_NAME', but is archived - skipping workflow";
+                echo "SKIP_ACTION=true" >> $GITHUB_ENV
+              else
+                echo "Issue is already in Project '$BOARD_NAME', proceeding";
+                echo "ALREADY_IN_BOARD=true" >> $GITHUB_ENV
+              fi
+            else
+              echo "Issue is not in project '$BOARD_NAME', cancelling this workflow"
+              echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
+            fi
+          fi
+      - name: Move issue
+        uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        if: ${{ env.ALREADY_IN_BOARD == 'true' && env.SKIP_ACTION != 'true' }}
+        with:
+          project: Issue triage
+          column: Triaged
+          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

-    remove_Z-Labs_label:
-        name: Remove Z-Labs label when features behind labs flags are removed
-        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') ||
-            contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
-            contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
-            contains(github.event.issue.labels.*.name, 'A-Tags') ||
-            contains(github.event.issue.labels.*.name, 'A-Video-Rooms') ||
-            contains(github.event.issue.labels.*.name, 'A-Message-Starring') ||
-            contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor') ||
-            contains(github.event.issue.labels.*.name, 'A-Element-Call')) &&
-            contains(github.event.issue.labels.*.name, 'Z-Labs')
-        steps:
-            - uses: actions/github-script@v6
-              with:
-                  script: |
-                      github.rest.issues.removeLabel({
-                        issue_number: context.issue.number,
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        name: ['Z-Labs']
-                      })
+  remove_Z-Labs_label:
+    name: Remove Z-Labs label when features behind labs flags are removed
+    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-Threads') ||
+      contains(github.event.issue.labels.*.name, 'A-Polls') ||
+      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
+      contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
+      contains(github.event.issue.labels.*.name, 'Z-IA') ||
+      contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
+      contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
+      contains(github.event.issue.labels.*.name, 'A-Tags') ||
+      contains(github.event.issue.labels.*.name, 'A-Video-Rooms')) &&
+      contains(github.event.issue.labels.*.name, 'Z-Labs')
+    steps:
+      - uses: actions/github-script@v5
+        with:
+          script: |
+            github.rest.issues.removeLabel({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: ['Z-Labs']
+            })
--- a/.github/workflows/upgrade_dependencies.yml
+++ b/.github/workflows/upgrade_dependencies.yml
@@ -1,8 +1,8 @@
 name: Upgrade Dependencies
 on:
-    workflow_dispatch: {}
+  workflow_dispatch: { }
 jobs:
-    upgrade:
-        uses: matrix-org/matrix-js-sdk/.github/workflows/upgrade_dependencies.yml@develop
-        secrets:
-            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+  upgrade:
+    uses: matrix-org/matrix-js-sdk/.github/workflows/upgrade_dependencies.yml@develop
+    secrets:
+      ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,5 @@ electron/pub
 .vscode/
 .env
 /coverage
-# Auto-generated file
-/src/modules.ts
-/build_config.yaml
+/scripts/extracted/
+/scripts/latest
--- a/.modernizr.json
+++ b/.modernizr.json
@@ -1,36 +1,36 @@
 {
-    "minify": true,
-    "enableClasses": false,
-    "feature-detects": [
-        "test/css/animations",
-        "test/css/displaytable",
-        "test/css/filters",
-        "test/css/flexbox",
-        "test/css/objectfit",
+  "minify": true,
+  "enableClasses": false,
+  "feature-detects": [
+    "test/css/animations",
+    "test/css/displaytable",
+    "test/css/filters",
+    "test/css/flexbox",
+    "test/css/objectfit",

-        "test/es5/date",
-        "test/es5/function",
-        "test/es5/object",
-        "test/es5/undefined",
+    "test/es5/date",
+    "test/es5/function",
+    "test/es5/object",
+    "test/es5/undefined",

-        "test/es6/array",
-        "test/es6/collections",
-        "test/es6/promises",
-        "test/es6/string",
+    "test/es6/array",
+    "test/es6/collections",
+    "test/es6/promises",
+    "test/es6/string",

-        "test/svg",
-        "test/svg/asimg",
-        "test/svg/filters",
+    "test/svg",
+    "test/svg/asimg",
+    "test/svg/filters",

-        "test/url/parser",
-        "test/url/urlsearchparams",
+    "test/url/parser",
+    "test/url/urlsearchparams",

-        "test/cors",
-        "test/crypto",
-        "test/iframe/sandbox",
-        "test/json",
-        "test/network/fetch",
-        "test/storage/localstorage",
-        "test/window/resizeobserver"
-    ]
+    "test/cors",
+    "test/crypto",
+    "test/iframe/sandbox",
+    "test/json",
+    "test/network/fetch",
+    "test/storage/localstorage",
+    "test/window/resizeobserver"
+  ]
 }
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,27 +0,0 @@
-/build
-/dist
-/lib
-/node_modules
-/packages/
-/webapp
-/*.log
-yarn.lock
-electron/dist
-electron/pub
-**/.idea
-/.tmp
-/webpack-stats.json
-.vscode
-.vscode/
-.env
-/coverage
-# Auto-generated file
-/src/modules.ts
-/src/i18n/strings
-/build_config.yaml
-# Raises an error because it contains a template var breaking the script tag
-src/vector/index.html
-src/vector/modernizr.js
-
-# This file is owned, parsed, and generated by allchange, which doesn't comply with prettier
-/CHANGELOG.md
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1 +0,0 @@
-module.exports = require("eslint-plugin-matrix-org/.prettierrc.js");
--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -1,4 +1,26 @@
+// Copied from react-sdk
+// TODO: Only keep one copy of this for synchronization purposes
 module.exports = {
-    ...require("matrix-react-sdk/.stylelintrc.js"),
-    extends: ["stylelint-config-standard", "stylelint-config-prettier"],
+    "extends": "stylelint-config-standard",
+    "plugins": [
+        "stylelint-scss",
+    ],
+    "rules": {
+        "indentation": 4,
+        "comment-empty-line-before": null,
+        "declaration-empty-line-before": null,
+        "length-zero-no-unit": null,
+        "rule-empty-line-before": null,
+        "color-hex-length": null,
+        "max-empty-lines": null,
+        "number-no-trailing-zeros": null,
+        "number-leading-zero": null,
+        "selector-list-comma-newline-after": 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"],
+        }],
+    }
 };
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,937 +1,3 @@
-Changes in [1.11.28](https://github.com/vector-im/element-web/releases/tag/v1.11.28) (2023-03-31)
-=================================================================================================
-
-## 🐛 Bug Fixes
- * (No changes, version bumped to sync with element-desktop.)
-
-Changes in [1.11.27](https://github.com/vector-im/element-web/releases/tag/v1.11.27) (2023-03-31)
-=================================================================================================
-
-## 🐛 Bug Fixes
- * Fix detection of encryption for all users in a room ([\#10487](https://github.com/matrix-org/matrix-react-sdk/pull/10487)). Fixes #24995.
-
-Changes in [1.11.26](https://github.com/vector-im/element-web/releases/tag/v1.11.26) (2023-03-28)
-=================================================================================================
-
-## 🔒 Security
- * Fixes for [CVE-2023-28427](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-28427) / GHSA-mwq8-fjpf-c2gr
- * Fixes for [CVE-2023-28103](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-28103) / GHSA-6g43-88cp-w5gv
-
-Changes in [1.11.25](https://github.com/vector-im/element-web/releases/tag/v1.11.25) (2023-03-15)
-=================================================================================================
-
-## ✨ Features
- * Remove experimental PWA support for Firefox and Safari ([\#24630](https://github.com/vector-im/element-web/pull/24630)).
- * Only allow to start a DM with one email if encryption by default is enabled ([\#10253](https://github.com/matrix-org/matrix-react-sdk/pull/10253)). Fixes #23133.
- * DM rooms are now encrypted if encryption by default is enabled and only inviting a single email address. Any action in the result DM room will be blocked until the other has joined. ([\#10229](https://github.com/matrix-org/matrix-react-sdk/pull/10229)).
- * Reduce bottom margin of ReplyChain on compact modern layout ([\#8972](https://github.com/matrix-org/matrix-react-sdk/pull/8972)). Fixes #22748. Contributed by @luixxiul.
- * Support for v2 of MSC3903 ([\#10165](https://github.com/matrix-org/matrix-react-sdk/pull/10165)). Contributed by @hughns.
- * When starting a DM, existing rooms with pending third-party invites will be reused. ([\#10256](https://github.com/matrix-org/matrix-react-sdk/pull/10256)). Fixes #23139.
- * Polls push rules: synchronise poll rules with message rules ([\#10263](https://github.com/matrix-org/matrix-react-sdk/pull/10263)). Contributed by @kerryarchibald.
- * New verification request toast button labels ([\#10259](https://github.com/matrix-org/matrix-react-sdk/pull/10259)).
- * Remove padding around integration manager iframe ([\#10148](https://github.com/matrix-org/matrix-react-sdk/pull/10148)).
- * Fix block code styling in rich text editor ([\#10246](https://github.com/matrix-org/matrix-react-sdk/pull/10246)). Contributed by @alunturner.
- * Poll history: fetch more poll history ([\#10235](https://github.com/matrix-org/matrix-react-sdk/pull/10235)). Contributed by @kerryarchibald.
- * Sort short/exact emoji matches before longer incomplete matches ([\#10212](https://github.com/matrix-org/matrix-react-sdk/pull/10212)). Fixes #23210. Contributed by @grimhilt.
- * Poll history: detail screen ([\#10172](https://github.com/matrix-org/matrix-react-sdk/pull/10172)). Contributed by @kerryarchibald.
- * Provide a more detailed error message than "No known servers" ([\#6048](https://github.com/matrix-org/matrix-react-sdk/pull/6048)). Fixes #13247. Contributed by @aaronraimist.
- * Say when a call was answered from a different device ([\#10224](https://github.com/matrix-org/matrix-react-sdk/pull/10224)).
- * Widget permissions customizations using module api ([\#10121](https://github.com/matrix-org/matrix-react-sdk/pull/10121)). Contributed by @maheichyk.
- * Fix copy button icon overlapping with copyable text ([\#10227](https://github.com/matrix-org/matrix-react-sdk/pull/10227)). Contributed by @Adesh-Pandey.
- * Support joining non-peekable rooms via the module API ([\#10154](https://github.com/matrix-org/matrix-react-sdk/pull/10154)). Contributed by @maheichyk.
- * The "new login" toast does now display the same device information as in the settings. "No" does now open the device settings. "Yes, it was me" dismisses the toast. ([\#10200](https://github.com/matrix-org/matrix-react-sdk/pull/10200)).
- * Do not prompt for a password when doing a „reset all“ after login ([\#10208](https://github.com/matrix-org/matrix-react-sdk/pull/10208)).
-
-## 🐛 Bug Fixes
- * Fix incorrect copy in space creation flow ([\#10296](https://github.com/matrix-org/matrix-react-sdk/pull/10296)). Fixes #24741.
- * Fix space settings dialog having rogue title tooltip ([\#10293](https://github.com/matrix-org/matrix-react-sdk/pull/10293)). Fixes #24740.
- * Show spinner when starting a DM from the user profile (right panel) ([\#10290](https://github.com/matrix-org/matrix-react-sdk/pull/10290)).
- * Reduce height of toggle on expanded view source event ([\#10283](https://github.com/matrix-org/matrix-react-sdk/pull/10283)). Fixes #22873. Contributed by @luixxiul.
- * Pillify http and non-prefixed matrix.to links ([\#10277](https://github.com/matrix-org/matrix-react-sdk/pull/10277)). Fixes #20844.
- * Fix some features not being configurable via `features` ([\#10276](https://github.com/matrix-org/matrix-react-sdk/pull/10276)).
- * Fix starting a DM from the right panel in some cases ([\#10278](https://github.com/matrix-org/matrix-react-sdk/pull/10278)). Fixes #24722.
- * Align info EventTile and normal EventTile on IRC layout ([\#10197](https://github.com/matrix-org/matrix-react-sdk/pull/10197)). Fixes #22782. Contributed by @luixxiul.
- * Fix blowout of waveform of the voice message player on narrow UI ([\#8861](https://github.com/matrix-org/matrix-react-sdk/pull/8861)). Fixes #22604. Contributed by @luixxiul.
- * Fix the hidden view source toggle on IRC layout ([\#10266](https://github.com/matrix-org/matrix-react-sdk/pull/10266)). Fixes #22872. Contributed by @luixxiul.
- * Fix buttons on the room header being compressed due to long room name ([\#10155](https://github.com/matrix-org/matrix-react-sdk/pull/10155)). Contributed by @luixxiul.
- * Use the room avatar as a placeholder in calls ([\#10231](https://github.com/matrix-org/matrix-react-sdk/pull/10231)).
- * Fix calls showing as 'connecting' after hangup ([\#10223](https://github.com/matrix-org/matrix-react-sdk/pull/10223)).
- * Prevent multiple Jitsi calls started at the same time ([\#10183](https://github.com/matrix-org/matrix-react-sdk/pull/10183)). Fixes #23009.
- * Make localization keys compatible with agglutinative and/or SOV type languages ([\#10159](https://github.com/matrix-org/matrix-react-sdk/pull/10159)). Contributed by @luixxiul.
-
-Changes in [1.11.24](https://github.com/vector-im/element-web/releases/tag/v1.11.24) (2023-02-28)
-=================================================================================================
-
-## ✨ Features
- * Display "The sender has blocked you from receiving this message" error message instead of "Unable to decrypt message" ([\#10202](https://github.com/matrix-org/matrix-react-sdk/pull/10202)). Contributed by @florianduros.
- * Polls: show warning about undecryptable relations ([\#10179](https://github.com/matrix-org/matrix-react-sdk/pull/10179)). Contributed by @kerryarchibald.
- * Poll history: fetch last 30 days of polls ([\#10157](https://github.com/matrix-org/matrix-react-sdk/pull/10157)). Contributed by @kerryarchibald.
- * Poll history - ended polls list items ([\#10119](https://github.com/matrix-org/matrix-react-sdk/pull/10119)). Contributed by @kerryarchibald.
- * Remove threads labs flag and the ability to disable threads ([\#9878](https://github.com/matrix-org/matrix-react-sdk/pull/9878)). Fixes #24365.
- * Show a success dialog after setting up the key backup ([\#10177](https://github.com/matrix-org/matrix-react-sdk/pull/10177)). Fixes #24487.
- * Release Sign in with QR out of labs ([\#10182](https://github.com/matrix-org/matrix-react-sdk/pull/10182)). Contributed by @hughns.
- * Hide indent button in rte ([\#10149](https://github.com/matrix-org/matrix-react-sdk/pull/10149)). Contributed by @alunturner.
- * Add option to find own location in map views ([\#10083](https://github.com/matrix-org/matrix-react-sdk/pull/10083)).
- * Render poll end events in timeline ([\#10027](https://github.com/matrix-org/matrix-react-sdk/pull/10027)). Contributed by @kerryarchibald.
-
-## 🐛 Bug Fixes
- * Stop access token overflowing the box ([\#10069](https://github.com/matrix-org/matrix-react-sdk/pull/10069)). Fixes #24023. Contributed by @sbjaj33.
- * Add link to next file in the export ([\#10190](https://github.com/matrix-org/matrix-react-sdk/pull/10190)). Fixes #20272. Contributed by @grimhilt.
- * Ended poll tiles: add ended the poll message ([\#10193](https://github.com/matrix-org/matrix-react-sdk/pull/10193)). Fixes #24579. Contributed by @kerryarchibald.
- * Fix accidentally inverted condition for room ordering ([\#10178](https://github.com/matrix-org/matrix-react-sdk/pull/10178)). Fixes #24527. Contributed by @justjanne.
- * Re-focus the composer on dialogue quit ([\#10007](https://github.com/matrix-org/matrix-react-sdk/pull/10007)). Fixes #22832. Contributed by @Ashu999.
- * Try to resolve emails before creating a DM ([\#10164](https://github.com/matrix-org/matrix-react-sdk/pull/10164)).
- * Disable poll response loading test ([\#10168](https://github.com/matrix-org/matrix-react-sdk/pull/10168)). Contributed by @justjanne.
- * Fix email lookup in invite dialog ([\#10150](https://github.com/matrix-org/matrix-react-sdk/pull/10150)). Fixes #23353.
- * Remove duplicate white space characters from translation keys ([\#10152](https://github.com/matrix-org/matrix-react-sdk/pull/10152)). Contributed by @luixxiul.
- * Fix the caption of new sessions manager on Labs settings page for localization ([\#10143](https://github.com/matrix-org/matrix-react-sdk/pull/10143)). Contributed by @luixxiul.
- * Prevent start another DM with a user if one already exists ([\#10127](https://github.com/matrix-org/matrix-react-sdk/pull/10127)). Fixes #23138.
- * Remove white space characters before the horizontal ellipsis ([\#10130](https://github.com/matrix-org/matrix-react-sdk/pull/10130)). Contributed by @luixxiul.
- * Fix Selectable Text on 'Delete All' and 'Retry All' Buttons ([\#10128](https://github.com/matrix-org/matrix-react-sdk/pull/10128)). Fixes #23232. Contributed by @akshattchhabra.
- * Correctly Identify emoticons ([\#10108](https://github.com/matrix-org/matrix-react-sdk/pull/10108)). Fixes #19472. Contributed by @adarsh-sgh.
- * Remove a redundant white space ([\#10129](https://github.com/matrix-org/matrix-react-sdk/pull/10129)). Contributed by @luixxiul.
-
-Changes in [1.11.23](https://github.com/vector-im/element-web/releases/tag/v1.11.23) (2023-02-14)
-=================================================================================================
-
-## ✨ Features
- * Description of QR code sign in labs feature ([\#23513](https://github.com/vector-im/element-web/pull/23513)). Contributed by @hughns.
- * Add option to find own location in map views ([\#10083](https://github.com/matrix-org/matrix-react-sdk/pull/10083)).
- * Render poll end events in timeline ([\#10027](https://github.com/matrix-org/matrix-react-sdk/pull/10027)). Contributed by @kerryarchibald.
- * Indicate unread messages in tab title ([\#10096](https://github.com/matrix-org/matrix-react-sdk/pull/10096)). Contributed by @tnt7864.
- * Open message in editing mode when keyboard up is pressed (RTE) ([\#10079](https://github.com/matrix-org/matrix-react-sdk/pull/10079)). Contributed by @florianduros.
- * Hide superseded rooms from the room list using dynamic room predecessors ([\#10068](https://github.com/matrix-org/matrix-react-sdk/pull/10068)). Contributed by @andybalaam.
- * Support MSC3946 in RoomListStore ([\#10054](https://github.com/matrix-org/matrix-react-sdk/pull/10054)). Fixes #24325. Contributed by @andybalaam.
- * Auto focus security key field ([\#10048](https://github.com/matrix-org/matrix-react-sdk/pull/10048)).
- * use Poll model with relations API in poll rendering ([\#9877](https://github.com/matrix-org/matrix-react-sdk/pull/9877)). Contributed by @kerryarchibald.
- * Support MSC3946 in the RoomCreate tile ([\#10041](https://github.com/matrix-org/matrix-react-sdk/pull/10041)). Fixes #24323. Contributed by @andybalaam.
- * Update labs flag description for RTE ([\#10058](https://github.com/matrix-org/matrix-react-sdk/pull/10058)). Contributed by @florianduros.
- * Change ul list style to disc when editing message ([\#10043](https://github.com/matrix-org/matrix-react-sdk/pull/10043)). Contributed by @alunturner.
- * Improved click detection within PiP windows ([\#10040](https://github.com/matrix-org/matrix-react-sdk/pull/10040)). Fixes #24371.
- * Add RTE keyboard navigation in editing ([\#9980](https://github.com/matrix-org/matrix-react-sdk/pull/9980)). Fixes #23621. Contributed by @florianduros.
- * Paragraph integration for rich text editor ([\#10008](https://github.com/matrix-org/matrix-react-sdk/pull/10008)). Contributed by @alunturner.
- * Add  indentation increasing/decreasing to RTE ([\#10034](https://github.com/matrix-org/matrix-react-sdk/pull/10034)). Contributed by @florianduros.
- * Add ignore user confirmation dialog ([\#6116](https://github.com/matrix-org/matrix-react-sdk/pull/6116)). Fixes #14746.
- * Use monospace font for room, message IDs in View Source modal ([\#9956](https://github.com/matrix-org/matrix-react-sdk/pull/9956)). Fixes #21937. Contributed by @paragpoddar.
- * Implement MSC3946 for AdvancedRoomSettingsTab ([\#9995](https://github.com/matrix-org/matrix-react-sdk/pull/9995)). Fixes #24322. Contributed by @andybalaam.
- * Implementation of MSC3824 to make the client OIDC-aware ([\#8681](https://github.com/matrix-org/matrix-react-sdk/pull/8681)). Contributed by @hughns.
- * Improves a11y for avatar uploads ([\#9985](https://github.com/matrix-org/matrix-react-sdk/pull/9985)). Contributed by @GoodGuyMarco.
- * Add support for [token authenticated registration](https ([\#7275](https://github.com/matrix-org/matrix-react-sdk/pull/7275)). Fixes #18931. Contributed by @govynnus.
-
-## 🐛 Bug Fixes
- * Jitsi requests 'requires_client' capability if auth token is provided ([\#24294](https://github.com/vector-im/element-web/pull/24294)). Contributed by @maheichyk.
- * Remove duplicate white space characters from translation keys ([\#10152](https://github.com/matrix-org/matrix-react-sdk/pull/10152)). Contributed by @luixxiul.
- * Fix the caption of new sessions manager on Labs settings page for localization ([\#10143](https://github.com/matrix-org/matrix-react-sdk/pull/10143)). Contributed by @luixxiul.
- * Prevent start another DM with a user if one already exists ([\#10127](https://github.com/matrix-org/matrix-react-sdk/pull/10127)). Fixes #23138.
- * Remove white space characters before the horizontal ellipsis ([\#10130](https://github.com/matrix-org/matrix-react-sdk/pull/10130)). Contributed by @luixxiul.
- * Fix Selectable Text on 'Delete All' and 'Retry All' Buttons ([\#10128](https://github.com/matrix-org/matrix-react-sdk/pull/10128)). Fixes #23232. Contributed by @akshattchhabra.
- * Correctly Identify emoticons ([\#10108](https://github.com/matrix-org/matrix-react-sdk/pull/10108)). Fixes #19472. Contributed by @adarsh-sgh.
- * Should open new 1:1 chat room after leaving the old one ([\#9880](https://github.com/matrix-org/matrix-react-sdk/pull/9880)). Contributed by @ahmadkadri.
- * Remove a redundant white space ([\#10129](https://github.com/matrix-org/matrix-react-sdk/pull/10129)). Contributed by @luixxiul.
- * Fix a crash when removing persistent widgets (updated) ([\#10099](https://github.com/matrix-org/matrix-react-sdk/pull/10099)). Fixes #24412. Contributed by @andybalaam.
- * Fix wrongly grouping 3pid invites into a single repeated transition ([\#10087](https://github.com/matrix-org/matrix-react-sdk/pull/10087)). Fixes #24432.
- * Fix scrollbar colliding with checkbox in add to space section ([\#10093](https://github.com/matrix-org/matrix-react-sdk/pull/10093)). Fixes #23189. Contributed by @Arnabdaz.
- * Add a whitespace character after 'broadcast?' ([\#10097](https://github.com/matrix-org/matrix-react-sdk/pull/10097)). Contributed by @luixxiul.
- * Seekbar in broadcast PiP view is now updated when switching between different broadcasts ([\#10072](https://github.com/matrix-org/matrix-react-sdk/pull/10072)). Fixes #24415.
- * Add border to "reject" button on room preview card for clickable area indication. It fixes vector-im/element-web#22623 ([\#9205](https://github.com/matrix-org/matrix-react-sdk/pull/9205)). Contributed by @gefgu.
- * Element-R: fix rageshages ([\#10081](https://github.com/matrix-org/matrix-react-sdk/pull/10081)). Fixes #24430.
- * Fix markdown paragraph display in timeline ([\#10071](https://github.com/matrix-org/matrix-react-sdk/pull/10071)). Fixes #24419. Contributed by @alunturner.
- * Prevent the remaining broadcast time from being exceeded ([\#10070](https://github.com/matrix-org/matrix-react-sdk/pull/10070)).
- * Fix cursor position when new line is created by pressing enter (RTE) ([\#10064](https://github.com/matrix-org/matrix-react-sdk/pull/10064)). Contributed by @florianduros.
- * Ensure room is actually in space hierarchy when resolving its latest version ([\#10010](https://github.com/matrix-org/matrix-react-sdk/pull/10010)).
- * Fix new line for inline code ([\#10062](https://github.com/matrix-org/matrix-react-sdk/pull/10062)). Contributed by @florianduros.
- * Member avatars without canvas ([\#9990](https://github.com/matrix-org/matrix-react-sdk/pull/9990)). Contributed by @clarkf.
- * Apply more general fix for base avatar regressions ([\#10045](https://github.com/matrix-org/matrix-react-sdk/pull/10045)). Fixes #24382 and #24370.
- * Replace list, code block and quote icons by new icons ([\#10035](https://github.com/matrix-org/matrix-react-sdk/pull/10035)). Contributed by @florianduros.
- * fix regional emojis converted to flags ([\#9294](https://github.com/matrix-org/matrix-react-sdk/pull/9294)). Fixes #19000. Contributed by @grimhilt.
- * resolved emoji description text overflowing issue ([\#10028](https://github.com/matrix-org/matrix-react-sdk/pull/10028)). Contributed by @fahadNoufal.
- * Fix MessageEditHistoryDialog crashing on complex input ([\#10018](https://github.com/matrix-org/matrix-react-sdk/pull/10018)). Fixes #23665. Contributed by @clarkf.
- * Unify unread notification state determination ([\#9941](https://github.com/matrix-org/matrix-react-sdk/pull/9941)). Contributed by @clarkf.
- * Fix layout and visual regressions around default avatars ([\#10031](https://github.com/matrix-org/matrix-react-sdk/pull/10031)). Fixes #24375 and #24369.
- * Fix useUnreadNotifications exploding with falsey room, like in notif panel ([\#10030](https://github.com/matrix-org/matrix-react-sdk/pull/10030)). Fixes matrix-org/element-web-rageshakes#19334.
- * Fix "[object Promise]" appearing in HTML exports ([\#9975](https://github.com/matrix-org/matrix-react-sdk/pull/9975)). Fixes #24272. Contributed by @clarkf.
- * changing the color of message time stamp ([\#10016](https://github.com/matrix-org/matrix-react-sdk/pull/10016)). Contributed by @nawarajshah.
- * Fix link creation with backward selection ([\#9986](https://github.com/matrix-org/matrix-react-sdk/pull/9986)). Fixes #24315. Contributed by @florianduros.
- * Misaligned reply preview in thread composer #23396 ([\#9977](https://github.com/matrix-org/matrix-react-sdk/pull/9977)). Fixes #23396. Contributed by @mustafa-kapadia1483.
-
-Changes in [1.11.22](https://github.com/vector-im/element-web/releases/tag/v1.11.22) (2023-01-31)
-=================================================================================================
-
-## 🐛 Bug Fixes
- * Bump version number to fix problems upgrading from v1.11.21-rc.1
-
-Changes in [1.11.21](https://github.com/vector-im/element-web/releases/tag/v1.11.21) (2023-01-31)
-=================================================================================================
-
-## ✨ Features
- * Move pin drop out of labs ([\#22993](https://github.com/vector-im/element-web/pull/22993)).
- * Quotes for rich text editor (RTE) ([\#9932](https://github.com/matrix-org/matrix-react-sdk/pull/9932)). Contributed by @alunturner.
- * Show the room name in the room header during calls ([\#9942](https://github.com/matrix-org/matrix-react-sdk/pull/9942)). Fixes #24268.
- * Add code blocks to rich text editor ([\#9921](https://github.com/matrix-org/matrix-react-sdk/pull/9921)). Contributed by @alunturner.
- * Add new style for inline code ([\#9936](https://github.com/matrix-org/matrix-react-sdk/pull/9936)). Contributed by @florianduros.
- * Add disabled button state to rich text editor ([\#9930](https://github.com/matrix-org/matrix-react-sdk/pull/9930)). Contributed by @alunturner.
- * Change the rageshake "app" for auto-rageshakes ([\#9909](https://github.com/matrix-org/matrix-react-sdk/pull/9909)).
- * Device manager - tweak settings display ([\#9905](https://github.com/matrix-org/matrix-react-sdk/pull/9905)). Contributed by @kerryarchibald.
- * Add list functionality to rich text editor ([\#9871](https://github.com/matrix-org/matrix-react-sdk/pull/9871)). Contributed by @alunturner.
-
-## 🐛 Bug Fixes
- * Fix RTE focus behaviour in threads ([\#9969](https://github.com/matrix-org/matrix-react-sdk/pull/9969)). Fixes #23755. Contributed by @florianduros.
- * #22204 Issue: Centered File info in lightbox ([\#9971](https://github.com/matrix-org/matrix-react-sdk/pull/9971)). Fixes #22204. Contributed by @Spartan09.
- * Fix seekbar position for zero length audio ([\#9949](https://github.com/matrix-org/matrix-react-sdk/pull/9949)). Fixes #24248.
- * Allow thread panel to be closed after being opened from notification ([\#9937](https://github.com/matrix-org/matrix-react-sdk/pull/9937)). Fixes #23764 #23852 and #24213. Contributed by @justjanne.
- * Only highlight focused menu item if focus is supposed to be visible ([\#9945](https://github.com/matrix-org/matrix-react-sdk/pull/9945)). Fixes #23582.
- * Prevent call durations from breaking onto multiple lines ([\#9944](https://github.com/matrix-org/matrix-react-sdk/pull/9944)).
- * Tweak call lobby buttons to more closely match designs ([\#9943](https://github.com/matrix-org/matrix-react-sdk/pull/9943)).
- * Do not show a broadcast as live immediately after the recording has stopped ([\#9947](https://github.com/matrix-org/matrix-react-sdk/pull/9947)). Fixes #24233.
- * Clear the RTE before sending a message ([\#9948](https://github.com/matrix-org/matrix-react-sdk/pull/9948)). Contributed by @florianduros.
- * Fix {enter} press in RTE ([\#9927](https://github.com/matrix-org/matrix-react-sdk/pull/9927)). Contributed by @florianduros.
- * Fix the problem that the password reset email has to be confirmed twice ([\#9926](https://github.com/matrix-org/matrix-react-sdk/pull/9926)). Fixes #24226.
- * replace .at() with array.length-1 ([\#9933](https://github.com/matrix-org/matrix-react-sdk/pull/9933)). Fixes matrix-org/element-web-rageshakes#19281.
- * Fix broken threads list timestamp layout ([\#9922](https://github.com/matrix-org/matrix-react-sdk/pull/9922)). Fixes #24243 and #24191. Contributed by @justjanne.
- * Disable multiple messages when {enter} is pressed multiple times ([\#9929](https://github.com/matrix-org/matrix-react-sdk/pull/9929)). Fixes #24249. Contributed by @florianduros.
- * Fix logout devices when resetting the password ([\#9925](https://github.com/matrix-org/matrix-react-sdk/pull/9925)). Fixes #24228.
- * Fix: Poll replies overflow when not enough space ([\#9924](https://github.com/matrix-org/matrix-react-sdk/pull/9924)). Fixes #24227. Contributed by @kerryarchibald.
- * State event updates are not forwarded to the widget from invitation room ([\#9802](https://github.com/matrix-org/matrix-react-sdk/pull/9802)). Contributed by @maheichyk.
- * Fix error when viewing source of redacted events ([\#9914](https://github.com/matrix-org/matrix-react-sdk/pull/9914)). Fixes #24165. Contributed by @clarkf.
- * Replace outdated css attribute ([\#9912](https://github.com/matrix-org/matrix-react-sdk/pull/9912)). Fixes #24218. Contributed by @justjanne.
- * Clear isLogin theme override when user is no longer viewing login screens ([\#9911](https://github.com/matrix-org/matrix-react-sdk/pull/9911)). Fixes #23893.
- * Fix reply action in message context menu notif & file panels ([\#9895](https://github.com/matrix-org/matrix-react-sdk/pull/9895)). Fixes #23970.
- * Fix issue where thread dropdown would not show up correctly ([\#9872](https://github.com/matrix-org/matrix-react-sdk/pull/9872)). Fixes #24040. Contributed by @justjanne.
- * Fix unexpected composer growing ([\#9889](https://github.com/matrix-org/matrix-react-sdk/pull/9889)). Contributed by @florianduros.
- * Fix misaligned timestamps for thread roots which are emotes ([\#9875](https://github.com/matrix-org/matrix-react-sdk/pull/9875)). Fixes #23897. Contributed by @justjanne.
-
-Changes in [1.11.20](https://github.com/vector-im/element-web/releases/tag/v1.11.20) (2023-01-20)
-=================================================================================================
-
-## 🐛 Bug Fixes
- * (Part 2) of prevent crash on older browsers (replace .at() with array.length-1)
-
-Changes in [1.11.19](https://github.com/vector-im/element-web/releases/tag/v1.11.19) (2023-01-18)
-=================================================================================================
-
-## 🐛 Bug Fixes
- * fix crash on browsers that don't support `Array.at` ([\#9935](https://github.com/matrix-org/matrix-react-sdk/pull/9935)). Contributed by @andybalaam.
-
-Changes in [1.11.18](https://github.com/vector-im/element-web/releases/tag/v1.11.18) (2023-01-18)
-=================================================================================================
-
-## ✨ Features
- * Switch threads on for everyone ([\#9879](https://github.com/matrix-org/matrix-react-sdk/pull/9879)).
- * Make threads use new Unable to Decrypt UI ([\#9876](https://github.com/matrix-org/matrix-react-sdk/pull/9876)). Fixes #24060.
- * Add edit and remove actions to link in RTE [Labs] ([\#9864](https://github.com/matrix-org/matrix-react-sdk/pull/9864)).
- * Remove extensible events v1 experimental rendering ([\#9881](https://github.com/matrix-org/matrix-react-sdk/pull/9881)).
- * Make create poll dialog scale better (PSG-929) ([\#9873](https://github.com/matrix-org/matrix-react-sdk/pull/9873)). Fixes #21855.
- * Change RTE mode icons ([\#9861](https://github.com/matrix-org/matrix-react-sdk/pull/9861)).
- * Device manager - prune client information events after remote sign out ([\#9874](https://github.com/matrix-org/matrix-react-sdk/pull/9874)).
- * Check connection before starting broadcast ([\#9857](https://github.com/matrix-org/matrix-react-sdk/pull/9857)).
- * Enable sent receipt for poll start events (PSG-962) ([\#9870](https://github.com/matrix-org/matrix-react-sdk/pull/9870)).
- * Change clear notifications to have more readable copy ([\#9867](https://github.com/matrix-org/matrix-react-sdk/pull/9867)).
- * combine search results when the query is present in multiple successive messages ([\#9855](https://github.com/matrix-org/matrix-react-sdk/pull/9855)). Fixes #3977. Contributed by @grimhilt.
- * Disable bubbles for broadcasts ([\#9860](https://github.com/matrix-org/matrix-react-sdk/pull/9860)). Fixes #24140.
- * Enable reactions and replies for broadcasts ([\#9856](https://github.com/matrix-org/matrix-react-sdk/pull/9856)). Fixes #24042.
- * Improve switching between rich and plain editing modes ([\#9776](https://github.com/matrix-org/matrix-react-sdk/pull/9776)).
- * Redesign the picture-in-picture window ([\#9800](https://github.com/matrix-org/matrix-react-sdk/pull/9800)). Fixes #23980.
- * User on-boarding tasks now appear in a static order. ([\#9799](https://github.com/matrix-org/matrix-react-sdk/pull/9799)). Contributed by @GoodGuyMarco.
- * Device manager - contextual menus ([\#9832](https://github.com/matrix-org/matrix-react-sdk/pull/9832)).
- * If listening a non-live broadcast and changing the room, the broadcast will be paused ([\#9825](https://github.com/matrix-org/matrix-react-sdk/pull/9825)). Fixes #24078.
- * Consider own broadcasts from other device as a playback ([\#9821](https://github.com/matrix-org/matrix-react-sdk/pull/9821)). Fixes #24068.
- * Add link creation to rich text editor ([\#9775](https://github.com/matrix-org/matrix-react-sdk/pull/9775)).
- * Add mark as read option in room setting ([\#9798](https://github.com/matrix-org/matrix-react-sdk/pull/9798)). Fixes #24053.
- * Device manager - current device design and copy tweaks ([\#9801](https://github.com/matrix-org/matrix-react-sdk/pull/9801)).
- * Unify notifications panel event design ([\#9754](https://github.com/matrix-org/matrix-react-sdk/pull/9754)).
- * Add actions for integration manager to send and read certain events ([\#9740](https://github.com/matrix-org/matrix-react-sdk/pull/9740)).
- * Device manager - design tweaks ([\#9768](https://github.com/matrix-org/matrix-react-sdk/pull/9768)).
- * Change room list sorting to activity and unread first by default ([\#9773](https://github.com/matrix-org/matrix-react-sdk/pull/9773)). Fixes #24014.
- * Add a config flag to enable the rust crypto-sdk ([\#9759](https://github.com/matrix-org/matrix-react-sdk/pull/9759)).
- * Improve decryption error UI by consolidating error messages and providing instructions when possible ([\#9544](https://github.com/matrix-org/matrix-react-sdk/pull/9544)). Contributed by @duxovni.
- * Honor font settings in Element Call ([\#9751](https://github.com/matrix-org/matrix-react-sdk/pull/9751)). Fixes #23661.
- * Device manager - use deleteAccountData to prune device manager client information events ([\#9734](https://github.com/matrix-org/matrix-react-sdk/pull/9734)).
-
-## 🐛 Bug Fixes
- * Display rooms & threads as unread (bold) if threads have unread messages. ([\#9763](https://github.com/matrix-org/matrix-react-sdk/pull/9763)). Fixes #23907.
- * Don't prefer STIXGeneral over the default font ([\#9711](https://github.com/matrix-org/matrix-react-sdk/pull/9711)). Fixes #23899.
- * Use the same avatar colour when creating 1:1 DM rooms ([\#9850](https://github.com/matrix-org/matrix-react-sdk/pull/9850)). Fixes #23476.
- * Fix space lock icon size ([\#9854](https://github.com/matrix-org/matrix-react-sdk/pull/9854)). Fixes #24128.
- * Make calls automatically disconnect if the widget disappears ([\#9862](https://github.com/matrix-org/matrix-react-sdk/pull/9862)). Fixes #23664.
- * Fix emoji in RTE editing ([\#9827](https://github.com/matrix-org/matrix-react-sdk/pull/9827)).
- * Fix export with attachments on formats txt and json ([\#9851](https://github.com/matrix-org/matrix-react-sdk/pull/9851)). Fixes #24130. Contributed by @grimhilt.
- * Fixed empty `Content-Type` for encrypted uploads ([\#9848](https://github.com/matrix-org/matrix-react-sdk/pull/9848)). Contributed by @K3das.
- * Fix sign-in instead link on password reset page ([\#9820](https://github.com/matrix-org/matrix-react-sdk/pull/9820)). Fixes #24087.
- * The seekbar now initially shows the current position ([\#9796](https://github.com/matrix-org/matrix-react-sdk/pull/9796)). Fixes #24051.
- * Fix: Editing a poll will silently change it to a closed poll ([\#9809](https://github.com/matrix-org/matrix-react-sdk/pull/9809)). Fixes #23176.
- * Make call tiles look less broken in the right panel ([\#9808](https://github.com/matrix-org/matrix-react-sdk/pull/9808)). Fixes #23716.
- * Prevent unnecessary m.direct updates ([\#9805](https://github.com/matrix-org/matrix-react-sdk/pull/9805)). Fixes #24059.
- * Fix checkForPreJoinUISI for thread roots ([\#9803](https://github.com/matrix-org/matrix-react-sdk/pull/9803)). Fixes #24054.
- * Snap in PiP widget when content changed ([\#9797](https://github.com/matrix-org/matrix-react-sdk/pull/9797)). Fixes #24050.
- * Load RTE components only when RTE labs is enabled ([\#9804](https://github.com/matrix-org/matrix-react-sdk/pull/9804)).
- * Ensure that events are correctly updated when they are edited. ([\#9789](https://github.com/matrix-org/matrix-react-sdk/pull/9789)).
- * When stopping a broadcast also stop the playback ([\#9795](https://github.com/matrix-org/matrix-react-sdk/pull/9795)). Fixes #24052.
- * Prevent to start two broadcasts at the same time ([\#9744](https://github.com/matrix-org/matrix-react-sdk/pull/9744)). Fixes #23973.
- * Correctly handle limited sync responses by resetting the thread timeline ([\#3056](https://github.com/matrix-org/matrix-js-sdk/pull/3056)). Fixes vector-im/element-web#23952.
- * Fix failure to start in firefox private browser ([\#3058](https://github.com/matrix-org/matrix-js-sdk/pull/3058)). Fixes vector-im/element-web#24216.
-
-Changes in [1.11.17](https://github.com/vector-im/element-web/releases/tag/v1.11.17) (2022-12-21)
-=================================================================================================
-
-## ✨ Features
- * Add inline code formatting to rich text editor ([\#9720](https://github.com/matrix-org/matrix-react-sdk/pull/9720)).
- * Add emoji handling for plain text mode of the new rich text editor ([\#9727](https://github.com/matrix-org/matrix-react-sdk/pull/9727)).
- * Overlay virtual room call events into main timeline ([\#9626](https://github.com/matrix-org/matrix-react-sdk/pull/9626)). Fixes #22929.
- * Adds a new section under "Room Settings" > "Roles & Permissions" which adds the possibility to multiselect users from this room and grant them more permissions. ([\#9596](https://github.com/matrix-org/matrix-react-sdk/pull/9596)). Contributed by @GoodGuyMarco.
- * Add emoji handling for rich text mode ([\#9661](https://github.com/matrix-org/matrix-react-sdk/pull/9661)).
- * Add setting to hide bold notifications ([\#9705](https://github.com/matrix-org/matrix-react-sdk/pull/9705)).
- * Further password reset flow enhancements ([\#9662](https://github.com/matrix-org/matrix-react-sdk/pull/9662)).
- * Snooze the bulk unverified sessions reminder on dismiss ([\#9706](https://github.com/matrix-org/matrix-react-sdk/pull/9706)).
- * Honor advanced audio processing settings when recording voice messages ([\#9610](https://github.com/matrix-org/matrix-react-sdk/pull/9610)). Contributed by @MrAnno.
- * Improve the visual balance of bubble layout ([\#9704](https://github.com/matrix-org/matrix-react-sdk/pull/9704)).
- * Add config setting to disable bulk unverified sessions nag ([\#9657](https://github.com/matrix-org/matrix-react-sdk/pull/9657)).
- * Only display bulk unverified sessions nag when current sessions is verified ([\#9656](https://github.com/matrix-org/matrix-react-sdk/pull/9656)).
- * Separate labs and betas more clearly ([\#8969](https://github.com/matrix-org/matrix-react-sdk/pull/8969)). Fixes #22706.
- * Show user an error if we fail to create a DM for verification. ([\#9624](https://github.com/matrix-org/matrix-react-sdk/pull/9624)).
-
-## 🐛 Bug Fixes
- * Prevent unnecessary m.direct updates ([\#9805](https://github.com/matrix-org/matrix-react-sdk/pull/9805)). Fixes #24059.
- * Fix checkForPreJoinUISI for thread roots ([\#9803](https://github.com/matrix-org/matrix-react-sdk/pull/9803)). Fixes #24054.
- * Load RTE components only when RTE labs is enabled ([\#9804](https://github.com/matrix-org/matrix-react-sdk/pull/9804)).
- * Fix issue where thread panel did not update correctly ([\#9746](https://github.com/matrix-org/matrix-react-sdk/pull/9746)). Fixes #23971.
- * Remove async call to get virtual room from room load ([\#9743](https://github.com/matrix-org/matrix-react-sdk/pull/9743)). Fixes #23968.
- * Check each thread for unread messages. ([\#9723](https://github.com/matrix-org/matrix-react-sdk/pull/9723)).
- * Device manage - handle sessions that don't support encryption ([\#9717](https://github.com/matrix-org/matrix-react-sdk/pull/9717)). Fixes #23722.
- * Fix hover state for formatting buttons (Rich text editor) (fix vector-im/element-web/issues/23832) ([\#9715](https://github.com/matrix-org/matrix-react-sdk/pull/9715)).
- * Don't allow group calls to be unterminated ([\#9710](https://github.com/matrix-org/matrix-react-sdk/pull/9710)).
- * Fix replies to emotes not showing as inline ([\#9707](https://github.com/matrix-org/matrix-react-sdk/pull/9707)). Fixes #23903.
- * Update copy of 'Change layout' button to match Element Call ([\#9703](https://github.com/matrix-org/matrix-react-sdk/pull/9703)).
- * Fix call splitbrains when switching between rooms ([\#9692](https://github.com/matrix-org/matrix-react-sdk/pull/9692)).
- * bugfix: fix an issue where the Notifier would incorrectly fire for non-timeline events ([\#9664](https://github.com/matrix-org/matrix-react-sdk/pull/9664)). Fixes #17263.
- * Fix power selector being wrongly disabled for admins themselves ([\#9681](https://github.com/matrix-org/matrix-react-sdk/pull/9681)). Fixes #23882.
- * Show day counts in call durations ([\#9641](https://github.com/matrix-org/matrix-react-sdk/pull/9641)).
-
-Changes in [1.11.16](https://github.com/vector-im/element-web/releases/tag/v1.11.16) (2022-12-06)
-=================================================================================================
-
-## ✨ Features
- * Further improve replies ([\#6396](https://github.com/matrix-org/matrix-react-sdk/pull/6396)). Fixes #19074, #18194 #18027 and #19179.
- * Enable users to join group calls from multiple devices ([\#9625](https://github.com/matrix-org/matrix-react-sdk/pull/9625)).
- * fix(visual): make cursor a pointer for summaries ([\#9419](https://github.com/matrix-org/matrix-react-sdk/pull/9419)). Contributed by @r00ster91.
- * Add placeholder for rich text editor ([\#9613](https://github.com/matrix-org/matrix-react-sdk/pull/9613)).
- * Consolidate public room search experience ([\#9605](https://github.com/matrix-org/matrix-react-sdk/pull/9605)). Fixes #22846.
- * New password reset flow ([\#9581](https://github.com/matrix-org/matrix-react-sdk/pull/9581)). Fixes #23131.
- * Device manager - add tooltip to device details toggle ([\#9594](https://github.com/matrix-org/matrix-react-sdk/pull/9594)).
- * sliding sync: add lazy-loading member support ([\#9530](https://github.com/matrix-org/matrix-react-sdk/pull/9530)).
- * Limit formatting bar offset to top of composer ([\#9365](https://github.com/matrix-org/matrix-react-sdk/pull/9365)). Fixes #12359. Contributed by @owi92.
-
-## 🐛 Bug Fixes
- * Fix issues around up arrow event edit shortcut ([\#9645](https://github.com/matrix-org/matrix-react-sdk/pull/9645)). Fixes #18497 and #18964.
- * Fix search not being cleared when clicking on a result ([\#9635](https://github.com/matrix-org/matrix-react-sdk/pull/9635)). Fixes #23845.
- * Fix screensharing in 1:1 calls ([\#9612](https://github.com/matrix-org/matrix-react-sdk/pull/9612)). Fixes #23808.
- * Fix the background color flashing when joining a call ([\#9640](https://github.com/matrix-org/matrix-react-sdk/pull/9640)).
- * Fix the size of the 'Private space' icon ([\#9638](https://github.com/matrix-org/matrix-react-sdk/pull/9638)).
- * Fix reply editing in rich text editor (https ([\#9615](https://github.com/matrix-org/matrix-react-sdk/pull/9615)).
- * Fix thread list jumping back down while scrolling ([\#9606](https://github.com/matrix-org/matrix-react-sdk/pull/9606)). Fixes #23727.
- * Fix regression with TimelinePanel props updates not taking effect ([\#9608](https://github.com/matrix-org/matrix-react-sdk/pull/9608)). Fixes #23794.
- * Fix form tooltip positioning ([\#9598](https://github.com/matrix-org/matrix-react-sdk/pull/9598)). Fixes #22861.
- * Extract Search handling from RoomView into its own Component ([\#9574](https://github.com/matrix-org/matrix-react-sdk/pull/9574)). Fixes #498.
- * Fix call splitbrains when switching between rooms ([\#9692](https://github.com/matrix-org/matrix-react-sdk/pull/9692)).
- * [Backport staging] Fix replies to emotes not showing as inline ([\#9708](https://github.com/matrix-org/matrix-react-sdk/pull/9708)).
-
-Changes in [1.11.15](https://github.com/vector-im/element-web/releases/tag/v1.11.15) (2022-11-22)
-=================================================================================================
-
-## ✨ Features
- * Make clear notifications work with threads ([\#9575](https://github.com/matrix-org/matrix-react-sdk/pull/9575)). Fixes #23751.
- * Change "None" to "Off" in notification options ([\#9539](https://github.com/matrix-org/matrix-react-sdk/pull/9539)). Contributed by @Arnei.
- * Advanced audio processing settings ([\#8759](https://github.com/matrix-org/matrix-react-sdk/pull/8759)). Fixes #6278. Contributed by @MrAnno.
- * Add way to create a user notice via config.json ([\#9559](https://github.com/matrix-org/matrix-react-sdk/pull/9559)).
- * Improve design of the rich text editor ([\#9533](https://github.com/matrix-org/matrix-react-sdk/pull/9533)). Contributed by @florianduros.
- * Enable user to zoom beyond image size ([\#5949](https://github.com/matrix-org/matrix-react-sdk/pull/5949)). Contributed by @jaiwanth-v.
- * Fix: Move "Leave Space" option to the bottom of space context menu ([\#9535](https://github.com/matrix-org/matrix-react-sdk/pull/9535)). Contributed by @hanadi92.
-
-## 🐛 Bug Fixes
- * Make build scripts work on NixOS ([\#23740](https://github.com/vector-im/element-web/pull/23740)).
- * Fix integration manager `get_open_id_token` action and add E2E tests ([\#9520](https://github.com/matrix-org/matrix-react-sdk/pull/9520)).
- * Fix links being mangled by markdown processing ([\#9570](https://github.com/matrix-org/matrix-react-sdk/pull/9570)). Fixes #23743.
- * Fix: inline links selecting radio button ([\#9543](https://github.com/matrix-org/matrix-react-sdk/pull/9543)). Contributed by @hanadi92.
- * Fix wrong error message in registration when phone number threepid is in use. ([\#9571](https://github.com/matrix-org/matrix-react-sdk/pull/9571)). Contributed by @bagvand.
- * Fix missing avatar for show current profiles ([\#9563](https://github.com/matrix-org/matrix-react-sdk/pull/9563)). Fixes #23733.
- * Fix read receipts trickling down correctly ([\#9567](https://github.com/matrix-org/matrix-react-sdk/pull/9567)). Fixes #23746.
- * Resilience fix for homeserver without thread notification support ([\#9565](https://github.com/matrix-org/matrix-react-sdk/pull/9565)).
- * Don't switch to the home page needlessly after leaving a room ([\#9477](https://github.com/matrix-org/matrix-react-sdk/pull/9477)).
- * Differentiate download and decryption errors when showing images ([\#9562](https://github.com/matrix-org/matrix-react-sdk/pull/9562)). Fixes #3892.
- * Close context menu when a modal is opened to prevent user getting stuck ([\#9560](https://github.com/matrix-org/matrix-react-sdk/pull/9560)). Fixes #15610 and #10781.
- * Fix TimelineReset handling when no room associated ([\#9553](https://github.com/matrix-org/matrix-react-sdk/pull/9553)).
- * Always use current profile on thread events ([\#9524](https://github.com/matrix-org/matrix-react-sdk/pull/9524)). Fixes #23648.
- * Fix `ThreadView` tests not using thread flag ([\#9547](https://github.com/matrix-org/matrix-react-sdk/pull/9547)). Contributed by @MadLittleMods.
- * Handle deletion of `m.call` events ([\#9540](https://github.com/matrix-org/matrix-react-sdk/pull/9540)). Fixes #23663.
- * Fix incorrect notification count after leaving a room with notifications ([\#9518](https://github.com/matrix-org/matrix-react-sdk/pull/9518)). Contributed by @Arnei.
-
-Changes in [1.11.14](https://github.com/vector-im/element-web/releases/tag/v1.11.14) (2022-11-08)
-=================================================================================================
-
-## ✨ Features
- * Loading threads with server-side assistance ([\#9356](https://github.com/matrix-org/matrix-react-sdk/pull/9356)). Fixes #21807, #21799, #21911, #22141, #22157, #22641, #22501 #22438 and #21678. Contributed by @justjanne.
- * Make thread replies trigger a room list re-ordering ([\#9510](https://github.com/matrix-org/matrix-react-sdk/pull/9510)). Fixes #21700.
- * Device manager - add extra details to device security and renaming ([\#9501](https://github.com/matrix-org/matrix-react-sdk/pull/9501)). Contributed by @kerryarchibald.
- * Add plain text mode to the wysiwyg composer ([\#9503](https://github.com/matrix-org/matrix-react-sdk/pull/9503)). Contributed by @florianduros.
- * Sliding Sync: improve sort order, show subspace rooms, better tombstoned room handling ([\#9484](https://github.com/matrix-org/matrix-react-sdk/pull/9484)).
- * Device manager - add learn more popups to filtered sessions section ([\#9497](https://github.com/matrix-org/matrix-react-sdk/pull/9497)). Contributed by @kerryarchibald.
- * Show thread notification if thread timeline is closed ([\#9495](https://github.com/matrix-org/matrix-react-sdk/pull/9495)). Fixes #23589.
- * Add message editing to wysiwyg composer ([\#9488](https://github.com/matrix-org/matrix-react-sdk/pull/9488)). Contributed by @florianduros.
- * Device manager - confirm sign out of other sessions ([\#9487](https://github.com/matrix-org/matrix-react-sdk/pull/9487)). Contributed by @kerryarchibald.
- * Automatically request logs from other users in a call when submitting logs ([\#9492](https://github.com/matrix-org/matrix-react-sdk/pull/9492)).
- * Add thread notification with server assistance (MSC3773) ([\#9400](https://github.com/matrix-org/matrix-react-sdk/pull/9400)). Fixes #21114, #21413, #21416, #21433, #21481, #21798, #21823 #23192 and #21765.
- * Support for login + E2EE set up with QR ([\#9403](https://github.com/matrix-org/matrix-react-sdk/pull/9403)). Contributed by @hughns.
- * Allow pressing Enter to send messages in new composer ([\#9451](https://github.com/matrix-org/matrix-react-sdk/pull/9451)). Contributed by @andybalaam.
-
-## 🐛 Bug Fixes
- * Fix regressions around media uploads failing and causing soft crashes ([\#9549](https://github.com/matrix-org/matrix-react-sdk/pull/9549)). Fixes matrix-org/element-web-rageshakes#16831, matrix-org/element-web-rageshakes#16824 matrix-org/element-web-rageshakes#16810 and vector-im/element-web#23641.
- * Fix /myroomavatar slash command ([\#9536](https://github.com/matrix-org/matrix-react-sdk/pull/9536)). Fixes matrix-org/synapse#14321.
- * Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](https://github.com/vector-im/element-web/pull/23577)).
- * Fix NotificationBadge unsent color ([\#9522](https://github.com/matrix-org/matrix-react-sdk/pull/9522)). Fixes #23646.
- * Fix room list sorted by recent on app startup ([\#9515](https://github.com/matrix-org/matrix-react-sdk/pull/9515)). Fixes #23635.
- * Reset custom power selector when blurred on empty ([\#9508](https://github.com/matrix-org/matrix-react-sdk/pull/9508)). Fixes #23481.
- * Reinstate timeline/redaction callbacks when updating notification state ([\#9494](https://github.com/matrix-org/matrix-react-sdk/pull/9494)). Fixes #23554.
- * Only render NotificationBadge when needed ([\#9493](https://github.com/matrix-org/matrix-react-sdk/pull/9493)). Fixes #23584.
- * Fix embedded Element Call screen sharing ([\#9485](https://github.com/matrix-org/matrix-react-sdk/pull/9485)). Fixes #23571.
- * Send Content-Type: application/json header for integration manager /register API ([\#9490](https://github.com/matrix-org/matrix-react-sdk/pull/9490)). Fixes #23580.
- * Fix joining calls without audio or video inputs ([\#9486](https://github.com/matrix-org/matrix-react-sdk/pull/9486)). Fixes #23511.
- * Ensure spaces in the spotlight dialog have rounded square avatars ([\#9480](https://github.com/matrix-org/matrix-react-sdk/pull/9480)). Fixes #23515.
- * Only show mini avatar uploader in room intro when no avatar yet exists ([\#9479](https://github.com/matrix-org/matrix-react-sdk/pull/9479)). Fixes #23552.
- * Fix threads fallback incorrectly targets root event ([\#9229](https://github.com/matrix-org/matrix-react-sdk/pull/9229)). Fixes #23147.
- * Align video call icon with banner text ([\#9460](https://github.com/matrix-org/matrix-react-sdk/pull/9460)).
- * Set relations helper when creating event tile context menu ([\#9253](https://github.com/matrix-org/matrix-react-sdk/pull/9253)). Fixes #22018.
- * Device manager - put client/browser device metadata in correct section ([\#9447](https://github.com/matrix-org/matrix-react-sdk/pull/9447)). Contributed by @kerryarchibald.
- * Update the room unread notification counter when the server changes the value without any related read receipt ([\#9438](https://github.com/matrix-org/matrix-react-sdk/pull/9438)).
-
-Changes in [1.11.13](https://github.com/vector-im/element-web/releases/tag/v1.11.13) (2022-11-01)
-=================================================================================================
-
-## 🐛 Bug Fixes
- * Fix default behavior of Room.getBlacklistUnverifiedDevices ([\#2830](https://github.com/matrix-org/matrix-js-sdk/pull/2830)). Contributed by @duxovni.
- * Catch server versions API call exception when starting the client ([\#2828](https://github.com/matrix-org/matrix-js-sdk/pull/2828)). Fixes vector-im/element-web#23634.
- * Fix authedRequest including `Authorization: Bearer undefined` for password resets ([\#2822](https://github.com/matrix-org/matrix-js-sdk/pull/2822)). Fixes vector-im/element-web#23655.
-
-Changes in [1.11.12](https://github.com/vector-im/element-web/releases/tag/v1.11.12) (2022-10-26)
-=================================================================================================
-
-## 🐛 Bug Fixes
- * Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](https://github.com/vector-im/element-web/pull/23577)).
-
-Changes in [1.11.11](https://github.com/vector-im/element-web/releases/tag/v1.11.11) (2022-10-25)
-=================================================================================================
-
-## ✨ Features
- * Device manager - tweak string formatting of default device name ([\#23457](https://github.com/vector-im/element-web/pull/23457)).
- * Add Element Call participant limit ([\#23431](https://github.com/vector-im/element-web/pull/23431)).
- * Add Element Call `brand` ([\#23443](https://github.com/vector-im/element-web/pull/23443)).
- * Include a file-safe room name and ISO date in chat exports ([\#9440](https://github.com/matrix-org/matrix-react-sdk/pull/9440)). Fixes #21812 and #19724.
- * Room call banner ([\#9378](https://github.com/matrix-org/matrix-react-sdk/pull/9378)). Fixes #23453. Contributed by @toger5.
- * Device manager - spinners while devices are signing out ([\#9433](https://github.com/matrix-org/matrix-react-sdk/pull/9433)). Fixes #15865.
- * Device manager - silence call ringers when local notifications are silenced ([\#9420](https://github.com/matrix-org/matrix-react-sdk/pull/9420)).
- * Pass the current language to Element Call ([\#9427](https://github.com/matrix-org/matrix-react-sdk/pull/9427)).
- * Hide screen-sharing button in Element Call on desktop ([\#9423](https://github.com/matrix-org/matrix-react-sdk/pull/9423)).
- * Add reply support to WysiwygComposer ([\#9422](https://github.com/matrix-org/matrix-react-sdk/pull/9422)). Contributed by @florianduros.
- * Disconnect other connected devices (of the same user) when joining an Element call ([\#9379](https://github.com/matrix-org/matrix-react-sdk/pull/9379)).
- * Device manager - device tile main click target ([\#9409](https://github.com/matrix-org/matrix-react-sdk/pull/9409)).
- * Add formatting buttons to the rich text editor ([\#9410](https://github.com/matrix-org/matrix-react-sdk/pull/9410)). Contributed by @florianduros.
- * Device manager - current session context menu ([\#9386](https://github.com/matrix-org/matrix-react-sdk/pull/9386)).
- * Remove piwik config fallback for privacy policy URL ([\#9390](https://github.com/matrix-org/matrix-react-sdk/pull/9390)).
- * Add the first step to integrate the matrix wysiwyg composer ([\#9374](https://github.com/matrix-org/matrix-react-sdk/pull/9374)). Contributed by @florianduros.
- * Device manager - UA parsing tweaks ([\#9382](https://github.com/matrix-org/matrix-react-sdk/pull/9382)).
- * Device manager - remove client information events when disabling setting ([\#9384](https://github.com/matrix-org/matrix-react-sdk/pull/9384)).
- * Add Element Call participant limit ([\#9358](https://github.com/matrix-org/matrix-react-sdk/pull/9358)).
- * Add Element Call room settings ([\#9347](https://github.com/matrix-org/matrix-react-sdk/pull/9347)).
- * Device manager - render extended device information ([\#9360](https://github.com/matrix-org/matrix-react-sdk/pull/9360)).
- * New group call experience: Room header and PiP designs ([\#9351](https://github.com/matrix-org/matrix-react-sdk/pull/9351)).
- * Pass language to Jitsi Widget ([\#9346](https://github.com/matrix-org/matrix-react-sdk/pull/9346)). Contributed by @Fox32.
- * Add notifications and toasts for Element Call calls ([\#9337](https://github.com/matrix-org/matrix-react-sdk/pull/9337)).
- * Device manager - device type icon ([\#9355](https://github.com/matrix-org/matrix-react-sdk/pull/9355)).
- * Delete the remainder of groups ([\#9357](https://github.com/matrix-org/matrix-react-sdk/pull/9357)). Fixes #22770.
- * Device manager - display client information in device details ([\#9315](https://github.com/matrix-org/matrix-react-sdk/pull/9315)).
-
-## 🐛 Bug Fixes
- * Send Content-Type: application/json header for integration manager /register API ([\#9490](https://github.com/matrix-org/matrix-react-sdk/pull/9490)). Fixes #23580.
- * Make ErrorView & CompatibilityView scrollable ([\#23468](https://github.com/vector-im/element-web/pull/23468)). Fixes #23376.
- * Device manager - put client/browser device metadata in correct section ([\#9447](https://github.com/matrix-org/matrix-react-sdk/pull/9447)).
- * update the room unread notification counter when the server changes the value without any related read receipt ([\#9438](https://github.com/matrix-org/matrix-react-sdk/pull/9438)).
- * Don't show call banners in video rooms ([\#9441](https://github.com/matrix-org/matrix-react-sdk/pull/9441)).
- * Prevent useContextMenu isOpen from being true if the button ref goes away ([\#9418](https://github.com/matrix-org/matrix-react-sdk/pull/9418)). Fixes matrix-org/element-web-rageshakes#15637.
- * Automatically focus the WYSIWYG composer when you enter a room ([\#9412](https://github.com/matrix-org/matrix-react-sdk/pull/9412)).
- * Improve the tooltips on the call lobby join button ([\#9428](https://github.com/matrix-org/matrix-react-sdk/pull/9428)).
- * Pass the homeserver's base URL to Element Call ([\#9429](https://github.com/matrix-org/matrix-react-sdk/pull/9429)). Fixes #23301.
- * Better accommodate long room names in call toasts ([\#9426](https://github.com/matrix-org/matrix-react-sdk/pull/9426)).
- * Hide virtual widgets from the room info panel ([\#9424](https://github.com/matrix-org/matrix-react-sdk/pull/9424)). Fixes #23494.
- * Inhibit clicking on sender avatar in threads list ([\#9417](https://github.com/matrix-org/matrix-react-sdk/pull/9417)). Fixes #23482.
- * Correct the dir parameter of MSC3715 ([\#9391](https://github.com/matrix-org/matrix-react-sdk/pull/9391)). Contributed by @dhenneke.
- * Use a more correct subset of users in `/remakeolm` developer command ([\#9402](https://github.com/matrix-org/matrix-react-sdk/pull/9402)).
- * use correct default for notification silencing ([\#9388](https://github.com/matrix-org/matrix-react-sdk/pull/9388)). Fixes #23456.
- * Device manager - eagerly create `m.local_notification_settings` events ([\#9353](https://github.com/matrix-org/matrix-react-sdk/pull/9353)).
- * Close incoming Element call toast when viewing the call lobby ([\#9375](https://github.com/matrix-org/matrix-react-sdk/pull/9375)).
- * Always allow enabling sending read receipts ([\#9367](https://github.com/matrix-org/matrix-react-sdk/pull/9367)). Fixes #23433.
- * Fixes (vector-im/element-web/issues/22609) where the white theme is not applied when `white -> dark -> white` sequence is done. ([\#9320](https://github.com/matrix-org/matrix-react-sdk/pull/9320)). Contributed by @florianduros.
- * Fix applying programmatically set height for "top" room layout ([\#9339](https://github.com/matrix-org/matrix-react-sdk/pull/9339)). Contributed by @Fox32.
-
-Changes in [1.11.10](https://github.com/vector-im/element-web/releases/tag/v1.11.10) (2022-10-11)
-=================================================================================================
-
-## 🐛 Bug Fixes
- * Use correct default for notification silencing ([\#9388](https://github.com/matrix-org/matrix-react-sdk/pull/9388)). Fixes vector-im/element-web#23456.
-
-Changes in [1.11.9](https://github.com/vector-im/element-web/releases/tag/v1.11.9) (2022-10-11)
-===============================================================================================
-
-##   Deprecations
- * Legacy Piwik config.json option `piwik.policy_url` is deprecated in favour of `privacy_policy_url`. Support will be removed in the next release.
-
-## ✨ Features
- * Device manager - select all devices ([\#9330](https://github.com/matrix-org/matrix-react-sdk/pull/9330)). Contributed by @kerryarchibald.
- * New group call experience: Call tiles ([\#9332](https://github.com/matrix-org/matrix-react-sdk/pull/9332)).
- * Add Shift key to FormatQuote keyboard shortcut ([\#9298](https://github.com/matrix-org/matrix-react-sdk/pull/9298)). Contributed by @owi92.
- * Device manager - sign out of multiple sessions ([\#9325](https://github.com/matrix-org/matrix-react-sdk/pull/9325)). Contributed by @kerryarchibald.
- * Display push toggle for web sessions (MSC3890) ([\#9327](https://github.com/matrix-org/matrix-react-sdk/pull/9327)).
- * Add device notifications enabled switch ([\#9324](https://github.com/matrix-org/matrix-react-sdk/pull/9324)).
- * Implement push notification toggle in device detail ([\#9308](https://github.com/matrix-org/matrix-react-sdk/pull/9308)).
- * New group call experience: Starting and ending calls ([\#9318](https://github.com/matrix-org/matrix-react-sdk/pull/9318)).
- * New group call experience: Room header call buttons ([\#9311](https://github.com/matrix-org/matrix-react-sdk/pull/9311)).
- * Make device ID copyable in device list ([\#9297](https://github.com/matrix-org/matrix-react-sdk/pull/9297)). Contributed by @duxovni.
- * Use display name instead of user ID when rendering power events ([\#9295](https://github.com/matrix-org/matrix-react-sdk/pull/9295)).
- * Read receipts for threads ([\#9239](https://github.com/matrix-org/matrix-react-sdk/pull/9239)). Fixes #23191.
-
-## 🐛 Bug Fixes
- * Use the correct sender key when checking shared secret ([\#2730](https://github.com/matrix-org/matrix-js-sdk/pull/2730)). Fixes vector-im/element-web#23374.
- * Fix device selection in pre-join screen for Element Call video rooms ([\#9321](https://github.com/matrix-org/matrix-react-sdk/pull/9321)). Fixes #23331.
- * Don't render a 1px high room topic if the room topic is empty ([\#9317](https://github.com/matrix-org/matrix-react-sdk/pull/9317)). Contributed by @Arnei.
- * Don't show feedback prompts when that UIFeature is disabled ([\#9305](https://github.com/matrix-org/matrix-react-sdk/pull/9305)). Fixes #23327.
- * Fix soft crash around unknown room pills ([\#9301](https://github.com/matrix-org/matrix-react-sdk/pull/9301)). Fixes matrix-org/element-web-rageshakes#15465.
- * Fix spaces feedback prompt wrongly showing when feedback is disabled ([\#9302](https://github.com/matrix-org/matrix-react-sdk/pull/9302)). Fixes #23314.
- * Fix tile soft crash in ReplyInThreadButton ([\#9300](https://github.com/matrix-org/matrix-react-sdk/pull/9300)). Fixes matrix-org/element-web-rageshakes#15493.
-
-Changes in [1.11.8](https://github.com/vector-im/element-web/releases/tag/v1.11.8) (2022-09-28)
-===============================================================================================
-
-## 🐛 Bug Fixes
- * Bump IDB crypto store version ([\#2705](https://github.com/matrix-org/matrix-js-sdk/pull/2705)).
-
-Changes in [1.11.7](https://github.com/vector-im/element-web/releases/tag/v1.11.7) (2022-09-28)
-===============================================================================================
-
-## 🔒 Security
-* Fix for [CVE-2022-39249](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39249)
-* Fix for [CVE-2022-39250](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39250)
-* Fix for [CVE-2022-39251](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39251)
-* Fix for [CVE-2022-39236](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39236)
-
-Changes in [1.11.6](https://github.com/vector-im/element-web/releases/tag/v1.11.6) (2022-09-20)
-=========================================================================================================
-
-## ✨ Features
- * Element Call video rooms ([\#9267](https://github.com/matrix-org/matrix-react-sdk/pull/9267)).
- * Device manager - rename session ([\#9282](https://github.com/matrix-org/matrix-react-sdk/pull/9282)).
- * Allow widgets to read related events ([\#9210](https://github.com/matrix-org/matrix-react-sdk/pull/9210)). Contributed by @dhenneke.
- * Device manager - logout of other session ([\#9280](https://github.com/matrix-org/matrix-react-sdk/pull/9280)).
- * Device manager - logout current session ([\#9275](https://github.com/matrix-org/matrix-react-sdk/pull/9275)).
- * Device manager - verify other devices ([\#9274](https://github.com/matrix-org/matrix-react-sdk/pull/9274)).
- * Allow integration managers to remove users ([\#9211](https://github.com/matrix-org/matrix-react-sdk/pull/9211)).
- * Device manager - add verify current session button ([\#9252](https://github.com/matrix-org/matrix-react-sdk/pull/9252)).
- * Add NotifPanel dot back. ([\#9242](https://github.com/matrix-org/matrix-react-sdk/pull/9242)). Fixes #17641.
- * Implement MSC3575: Sliding Sync ([\#8328](https://github.com/matrix-org/matrix-react-sdk/pull/8328)).
- * Add the clipboard read permission for widgets ([\#9250](https://github.com/matrix-org/matrix-react-sdk/pull/9250)). Contributed by @stefanmuhle.
-
-## 🐛 Bug Fixes
- * Make autocomplete pop-up wider in thread view ([\#9289](https://github.com/matrix-org/matrix-react-sdk/pull/9289)).
- * Fix soft crash around inviting invalid MXIDs in start DM on first message flow ([\#9281](https://github.com/matrix-org/matrix-react-sdk/pull/9281)). Fixes matrix-org/element-web-rageshakes#15060 and matrix-org/element-web-rageshakes#15140.
- * Fix in-reply-to previews not disappearing when swapping rooms ([\#9278](https://github.com/matrix-org/matrix-react-sdk/pull/9278)).
- * Fix invalid instanceof operand window.OffscreenCanvas ([\#9276](https://github.com/matrix-org/matrix-react-sdk/pull/9276)). Fixes #23275.
- * Fix memory leak caused by unremoved listener ([\#9273](https://github.com/matrix-org/matrix-react-sdk/pull/9273)).
- * Fix thumbnail generation when offscreen canvas fails ([\#9272](https://github.com/matrix-org/matrix-react-sdk/pull/9272)). Fixes #23265.
- * Prevent sliding sync from showing a room under multiple sublists ([\#9266](https://github.com/matrix-org/matrix-react-sdk/pull/9266)).
- * Fix tile crash around tooltipify links ([\#9270](https://github.com/matrix-org/matrix-react-sdk/pull/9270)). Fixes #23253.
- * Device manager - filter out nulled metadatas in device tile properly ([\#9251](https://github.com/matrix-org/matrix-react-sdk/pull/9251)).
- * Fix a sliding sync bug which could cause rooms to loop ([\#9268](https://github.com/matrix-org/matrix-react-sdk/pull/9268)).
- * Remove the grey gradient on images in bubbles in the timeline ([\#9241](https://github.com/matrix-org/matrix-react-sdk/pull/9241)). Fixes #21651.
- * Fix html export not including images ([\#9260](https://github.com/matrix-org/matrix-react-sdk/pull/9260)). Fixes #22059.
- * Fix possible soft crash from a race condition in space hierarchies ([\#9254](https://github.com/matrix-org/matrix-react-sdk/pull/9254)). Fixes matrix-org/element-web-rageshakes#15225.
- * Disable all types of autocorrect, -complete, -capitalize, etc on Spotlight's search field ([\#9259](https://github.com/matrix-org/matrix-react-sdk/pull/9259)).
- * Handle M_INVALID_USERNAME on /register/available ([\#9237](https://github.com/matrix-org/matrix-react-sdk/pull/9237)). Fixes #23161.
- * Fix issue with quiet zone around QR code ([\#9243](https://github.com/matrix-org/matrix-react-sdk/pull/9243)). Fixes #23199.
-
-Changes in [1.11.5](https://github.com/vector-im/element-web/releases/tag/v1.11.5) (2022-09-13)
-===============================================================================================
-
-## ✨ Features
- * Device manager - hide unverified security recommendation when only current session is unverified ([\#9228](https://github.com/matrix-org/matrix-react-sdk/pull/9228)). Contributed by @kerryarchibald.
- * Device manager - scroll to filtered list from security recommendations ([\#9227](https://github.com/matrix-org/matrix-react-sdk/pull/9227)). Contributed by @kerryarchibald.
- * Device manager - updated dropdown style in filtered device list ([\#9226](https://github.com/matrix-org/matrix-react-sdk/pull/9226)). Contributed by @kerryarchibald.
- * Device manager - device type and verification icons on device tile ([\#9197](https://github.com/matrix-org/matrix-react-sdk/pull/9197)). Contributed by @kerryarchibald.
-
-## 🐛 Bug Fixes
- * Description of DM room with more than two other people is now being displayed correctly ([\#9231](https://github.com/matrix-org/matrix-react-sdk/pull/9231)). Fixes #23094.
- * Fix voice messages with multiple composers ([\#9208](https://github.com/matrix-org/matrix-react-sdk/pull/9208)). Fixes #23023. Contributed by @grimhilt.
- * Fix suggested rooms going missing ([\#9236](https://github.com/matrix-org/matrix-react-sdk/pull/9236)). Fixes #23190.
- * Fix tooltip infinitely recursing ([\#9235](https://github.com/matrix-org/matrix-react-sdk/pull/9235)). Fixes matrix-org/element-web-rageshakes#15107, matrix-org/element-web-rageshakes#15093 matrix-org/element-web-rageshakes#15092 and matrix-org/element-web-rageshakes#15077.
- * Fix plain text export saving ([\#9230](https://github.com/matrix-org/matrix-react-sdk/pull/9230)). Contributed by @jryans.
- * Add missing space in SecurityRoomSettingsTab ([\#9222](https://github.com/matrix-org/matrix-react-sdk/pull/9222)). Contributed by @gefgu.
- * Make use of js-sdk roomNameGenerator to handle i18n for generated room names ([\#9209](https://github.com/matrix-org/matrix-react-sdk/pull/9209)). Fixes #21369.
- * Fix progress bar regression throughout the app ([\#9219](https://github.com/matrix-org/matrix-react-sdk/pull/9219)). Fixes #23121.
- * Reuse empty string & space string logic for event types in devtools ([\#9218](https://github.com/matrix-org/matrix-react-sdk/pull/9218)). Fixes #23115.
-
-Changes in [1.11.4](https://github.com/vector-im/element-web/releases/tag/v1.11.4) (2022-08-31)
-===============================================================================================
-
-## 🔒 Security
-* Fixes for [CVE-2022-36059](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D36059) and [CVE-2022-36060](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D36060)
-
-Learn more about what we've been up to at https://element.io/blog/element-web-desktop-1-11-4-a-security-update-deferred-dms-and-more/
-Find more details of the vulnerabilities at https://matrix.org/blog/2022/08/31/security-releases-matrix-js-sdk-19-4-0-and-matrix-react-sdk-3-53-0
-
-## ✨ Features
- * Device manager - scroll to filtered list from security recommendations ([\#9227](https://github.com/matrix-org/matrix-react-sdk/pull/9227)). Contributed by @kerryarchibald.
- * Device manager - updated dropdown style in filtered device list ([\#9226](https://github.com/matrix-org/matrix-react-sdk/pull/9226)). Contributed by @kerryarchibald.
- * Device manager - device type and verification icons on device tile ([\#9197](https://github.com/matrix-org/matrix-react-sdk/pull/9197)). Contributed by @kerryarchibald.
- * Ignore unreads in low priority rooms in the space panel ([\#6518](https://github.com/matrix-org/matrix-react-sdk/pull/6518)). Fixes #16836.
- * Release message right-click context menu out of labs ([\#8613](https://github.com/matrix-org/matrix-react-sdk/pull/8613)).
- * Device manager - expandable session details in device list ([\#9188](https://github.com/matrix-org/matrix-react-sdk/pull/9188)). Contributed by @kerryarchibald.
- * Device manager - device list filtering ([\#9181](https://github.com/matrix-org/matrix-react-sdk/pull/9181)). Contributed by @kerryarchibald.
- * Device manager - add verification details to session details ([\#9187](https://github.com/matrix-org/matrix-react-sdk/pull/9187)). Contributed by @kerryarchibald.
- * Device manager - current session expandable details ([\#9185](https://github.com/matrix-org/matrix-react-sdk/pull/9185)). Contributed by @kerryarchibald.
- * Device manager - security recommendations section ([\#9179](https://github.com/matrix-org/matrix-react-sdk/pull/9179)). Contributed by @kerryarchibald.
- * The Welcome Home Screen: Return Button ([\#9089](https://github.com/matrix-org/matrix-react-sdk/pull/9089)). Fixes #22917. Contributed by @justjanne.
- * Device manager - label devices as inactive ([\#9175](https://github.com/matrix-org/matrix-react-sdk/pull/9175)). Contributed by @kerryarchibald.
- * Device manager - other sessions list ([\#9155](https://github.com/matrix-org/matrix-react-sdk/pull/9155)). Contributed by @kerryarchibald.
- * Implement MSC3846: Allowing widgets to access TURN servers ([\#9061](https://github.com/matrix-org/matrix-react-sdk/pull/9061)).
- * Allow widgets to send/receive to-device messages ([\#8885](https://github.com/matrix-org/matrix-react-sdk/pull/8885)).
-
-## 🐛 Bug Fixes
- * Add super cool feature ([\#9222](https://github.com/matrix-org/matrix-react-sdk/pull/9222)). Contributed by @gefgu.
- * Make use of js-sdk roomNameGenerator to handle i18n for generated room names ([\#9209](https://github.com/matrix-org/matrix-react-sdk/pull/9209)). Fixes #21369.
- * Fix progress bar regression throughout the app ([\#9219](https://github.com/matrix-org/matrix-react-sdk/pull/9219)). Fixes #23121.
- * Reuse empty string & space string logic for event types in devtools ([\#9218](https://github.com/matrix-org/matrix-react-sdk/pull/9218)). Fixes #23115.
- * Reduce amount of requests done by the onboarding task list ([\#9194](https://github.com/matrix-org/matrix-react-sdk/pull/9194)). Fixes #23085. Contributed by @justjanne.
- * Avoid hardcoding branding in user onboarding ([\#9206](https://github.com/matrix-org/matrix-react-sdk/pull/9206)). Fixes #23111. Contributed by @justjanne.
- * End jitsi call when member is banned ([\#8879](https://github.com/matrix-org/matrix-react-sdk/pull/8879)). Contributed by @maheichyk.
- * Fix context menu being opened when clicking message action bar buttons ([\#9200](https://github.com/matrix-org/matrix-react-sdk/pull/9200)). Fixes #22279 and #23100.
- * Add gap between checkbox and text in report dialog following the same pattern (8px) used in the gap between the two buttons. It fixes vector-im/element-web#23060 ([\#9195](https://github.com/matrix-org/matrix-react-sdk/pull/9195)). Contributed by @gefgu.
- * Fix url preview AXE and layout issue & add percy test ([\#9189](https://github.com/matrix-org/matrix-react-sdk/pull/9189)). Fixes #23083.
- * Wrap long space names ([\#9201](https://github.com/matrix-org/matrix-react-sdk/pull/9201)). Fixes #23095.
- * Attempt to fix `Failed to execute 'removeChild' on 'Node'` ([\#9196](https://github.com/matrix-org/matrix-react-sdk/pull/9196)).
- * Fix soft crash around space hierarchy changing between spaces ([\#9191](https://github.com/matrix-org/matrix-react-sdk/pull/9191)). Fixes matrix-org/element-web-rageshakes#14613.
- * Fix soft crash around room view store metrics ([\#9190](https://github.com/matrix-org/matrix-react-sdk/pull/9190)). Fixes matrix-org/element-web-rageshakes#14361.
- * Fix the same person appearing multiple times when searching for them. ([\#9177](https://github.com/matrix-org/matrix-react-sdk/pull/9177)). Fixes #22851.
- * Fix space panel subspace indentation going missing ([\#9167](https://github.com/matrix-org/matrix-react-sdk/pull/9167)). Fixes #23049.
- * Fix invisible power levels tile when showing hidden events ([\#9162](https://github.com/matrix-org/matrix-react-sdk/pull/9162)). Fixes #23013.
- * Space panel accessibility improvements ([\#9157](https://github.com/matrix-org/matrix-react-sdk/pull/9157)). Fixes #22995.
- * Fix inverted logic for showing UserWelcomeTop component ([\#9164](https://github.com/matrix-org/matrix-react-sdk/pull/9164)). Fixes #23037.
-
-Changes in [1.11.3](https://github.com/vector-im/element-web/releases/tag/v1.11.3) (2022-08-16)
-===============================================================================================
-
-## ✨ Features
- * Improve auth aria attributes and semantics ([\#22948](https://github.com/vector-im/element-web/pull/22948)).
- * Device manager - New device tile info design ([\#9122](https://github.com/matrix-org/matrix-react-sdk/pull/9122)). Contributed by @kerryarchibald.
- * Device manager generic settings subsection component ([\#9147](https://github.com/matrix-org/matrix-react-sdk/pull/9147)). Contributed by @kerryarchibald.
- * Migrate the hidden read receipts flag to new "send read receipts" option ([\#9141](https://github.com/matrix-org/matrix-react-sdk/pull/9141)).
- * Live location sharing - share location at most every 5 seconds ([\#9148](https://github.com/matrix-org/matrix-react-sdk/pull/9148)). Contributed by @kerryarchibald.
- * Increase max length of voice messages to 15m ([\#9133](https://github.com/matrix-org/matrix-react-sdk/pull/9133)). Fixes #18620.
- * Move pin drop out of labs ([\#9135](https://github.com/matrix-org/matrix-react-sdk/pull/9135)).
- * Start DM on first message ([\#8612](https://github.com/matrix-org/matrix-react-sdk/pull/8612)). Fixes #14736.
- * Remove "Add Space" button from RoomListHeader when user cannot create spaces ([\#9129](https://github.com/matrix-org/matrix-react-sdk/pull/9129)).
- * The Welcome Home Screen: Dedicated Download Apps Dialog ([\#9120](https://github.com/matrix-org/matrix-react-sdk/pull/9120)). Fixes #22921. Contributed by @justjanne.
- * The Welcome Home Screen: "Submit Feedback" pane ([\#9090](https://github.com/matrix-org/matrix-react-sdk/pull/9090)). Fixes #22918. Contributed by @justjanne.
- * New User Onboarding Task List ([\#9083](https://github.com/matrix-org/matrix-react-sdk/pull/9083)). Fixes #22919. Contributed by @justjanne.
- * Add support for disabling spell checking ([\#8604](https://github.com/matrix-org/matrix-react-sdk/pull/8604)). Fixes #21901.
- * Live location share - leave maximised map open when beacons expire ([\#9098](https://github.com/matrix-org/matrix-react-sdk/pull/9098)). Contributed by @kerryarchibald.
-
-## 🐛 Bug Fixes
- * Some slash-commands (`/myroomnick`) have temporarily been disabled before the first message in a DM is sent. ([\#9193](https://github.com/matrix-org/matrix-react-sdk/pull/9193)).
- * Use stable reference for active tab in tabbedView ([\#9145](https://github.com/matrix-org/matrix-react-sdk/pull/9145)). Contributed by @kerryarchibald.
- * Fix pillification sometimes doubling up ([\#9152](https://github.com/matrix-org/matrix-react-sdk/pull/9152)). Fixes #23036.
- * Fix highlights not being applied to plaintext messages ([\#9126](https://github.com/matrix-org/matrix-react-sdk/pull/9126)). Fixes #22787.
- * Fix dismissing edit composer when change was undone ([\#9109](https://github.com/matrix-org/matrix-react-sdk/pull/9109)). Fixes #22932.
- * 1-to-1 DM rooms with bots now act like DM rooms instead of multi-user-rooms before ([\#9124](https://github.com/matrix-org/matrix-react-sdk/pull/9124)). Fixes #22894.
- * Apply inline start padding to selected lines on modern layout only ([\#9006](https://github.com/matrix-org/matrix-react-sdk/pull/9006)). Fixes #22768. Contributed by @luixxiul.
- * Peek into world-readable rooms from spotlight ([\#9115](https://github.com/matrix-org/matrix-react-sdk/pull/9115)). Fixes #22862.
- * Use default styling on nested numbered lists due to MD being sensitive ([\#9110](https://github.com/matrix-org/matrix-react-sdk/pull/9110)). Fixes #22935.
- * Fix replying using chat effect commands ([\#9101](https://github.com/matrix-org/matrix-react-sdk/pull/9101)). Fixes #22824.
-
-Changes in [1.11.2](https://github.com/vector-im/element-web/releases/tag/v1.11.2) (2022-08-03)
-===============================================================================================
-
-## ✨ Features
- * Live location share -  focus on user location on list item click ([\#9051](https://github.com/matrix-org/matrix-react-sdk/pull/9051)). Contributed by @kerryarchibald.
- * Live location sharing - don't trigger unread counts for beacon location events ([\#9071](https://github.com/matrix-org/matrix-react-sdk/pull/9071)). Contributed by @kerryarchibald.
- * Support for sending voice messages as replies and in threads ([\#9097](https://github.com/matrix-org/matrix-react-sdk/pull/9097)). Fixes #22031.
- * Add `Reply in thread` button to the right-click message context-menu ([\#9004](https://github.com/matrix-org/matrix-react-sdk/pull/9004)). Fixes #22745.
- * Starred_Messages_Feature_Contd_II/Outreachy ([\#9086](https://github.com/matrix-org/matrix-react-sdk/pull/9086)).
- * Use "frequently used emojis" for autocompletion in composer ([\#8998](https://github.com/matrix-org/matrix-react-sdk/pull/8998)). Fixes #18978. Contributed by @grimhilt.
- * Improve clickability of view source event toggle button  ([\#9068](https://github.com/matrix-org/matrix-react-sdk/pull/9068)). Fixes #21856. Contributed by @luixxiul.
- * Improve clickability of "collapse" link button on bubble layout ([\#9037](https://github.com/matrix-org/matrix-react-sdk/pull/9037)). Fixes #22864. Contributed by @luixxiul.
- * Starred_Messages_Feature/Outreachy ([\#8842](https://github.com/matrix-org/matrix-react-sdk/pull/8842)).
- * Implement Use Case Selection screen ([\#8984](https://github.com/matrix-org/matrix-react-sdk/pull/8984)). Contributed by @justjanne.
- * Live location share - handle insufficient permissions in location sharing ([\#9047](https://github.com/matrix-org/matrix-react-sdk/pull/9047)). Contributed by @kerryarchibald.
- * Improve _FilePanel.scss ([\#9031](https://github.com/matrix-org/matrix-react-sdk/pull/9031)). Contributed by @luixxiul.
- * Improve spotlight accessibility by adding context menus ([\#8907](https://github.com/matrix-org/matrix-react-sdk/pull/8907)). Fixes #20875 and #22675. Contributed by @justjanne.
-
-## 🐛 Bug Fixes
- * Replace mask-images with svg components in MessageActionBar ([\#9088](https://github.com/matrix-org/matrix-react-sdk/pull/9088)). Fixes #22912. Contributed by @kerryarchibald.
- * Unbreak in-app permalink tooltips ([\#9087](https://github.com/matrix-org/matrix-react-sdk/pull/9087)). Fixes #22874.
- * Show a back button when viewing a space member ([\#9095](https://github.com/matrix-org/matrix-react-sdk/pull/9095)). Fixes #22898.
- * Align the right edge of info tile lines with normal ones on IRC layout ([\#9058](https://github.com/matrix-org/matrix-react-sdk/pull/9058)). Fixes #22871. Contributed by @luixxiul.
- * Prevent email verification from overriding existing sessions ([\#9075](https://github.com/matrix-org/matrix-react-sdk/pull/9075)). Fixes #22881. Contributed by @justjanne.
- * Fix wrong buttons being used when exploring public rooms ([\#9062](https://github.com/matrix-org/matrix-react-sdk/pull/9062)). Fixes #22862.
- * Re-add padding to generic event list summary on IRC layout ([\#9063](https://github.com/matrix-org/matrix-react-sdk/pull/9063)). Fixes #22869. Contributed by @luixxiul.
- * Joining federated rooms via the spotlight search should no longer cause a "No known servers" error. ([\#9055](https://github.com/matrix-org/matrix-react-sdk/pull/9055)). Fixes #22845. Contributed by @Half-Shot.
-
-Changes in [1.11.1](https://github.com/vector-im/element-web/releases/tag/v1.11.1) (2022-07-26)
-===============================================================================================
-
-## ✨ Features
- * Enable URL tooltips on hover for Element Desktop ([\#22286](https://github.com/vector-im/element-web/pull/22286)). Fixes undefined/element-web#6532.
- * Hide screenshare button in video rooms on Desktop ([\#9045](https://github.com/matrix-org/matrix-react-sdk/pull/9045)).
- * Add a developer command to reset Megolm and Olm sessions ([\#9044](https://github.com/matrix-org/matrix-react-sdk/pull/9044)).
- * add spaces to TileErrorBoundary ([\#9012](https://github.com/matrix-org/matrix-react-sdk/pull/9012)). Contributed by @HarHarLinks.
- * Location sharing - add localised strings to map ([\#9025](https://github.com/matrix-org/matrix-react-sdk/pull/9025)). Fixes #21443. Contributed by @kerryarchibald.
- * Added trim to ignore whitespaces in email check ([\#9027](https://github.com/matrix-org/matrix-react-sdk/pull/9027)). Contributed by @ankur12-1610.
- * Improve _GenericEventListSummary.scss ([\#9005](https://github.com/matrix-org/matrix-react-sdk/pull/9005)). Contributed by @luixxiul.
- * Live location share - tiles without tile server (PSG-591) ([\#8962](https://github.com/matrix-org/matrix-react-sdk/pull/8962)). Contributed by @kerryarchibald.
- * Add option to display tooltip on link hover ([\#8394](https://github.com/matrix-org/matrix-react-sdk/pull/8394)). Fixes #21907.
- * Support a module API surface for custom functionality ([\#8246](https://github.com/matrix-org/matrix-react-sdk/pull/8246)).
- * Adjust encryption copy when creating a video room ([\#8989](https://github.com/matrix-org/matrix-react-sdk/pull/8989)). Fixes #22737.
- * Add bidirectonal isolation for pills ([\#8985](https://github.com/matrix-org/matrix-react-sdk/pull/8985)). Contributed by @sha-265.
- * Delabs `Show current avatar and name for users in message history` ([\#8764](https://github.com/matrix-org/matrix-react-sdk/pull/8764)). Fixes #22336.
- * Live location share - open latest location in map site ([\#8981](https://github.com/matrix-org/matrix-react-sdk/pull/8981)). Contributed by @kerryarchibald.
- * Improve LinkPreviewWidget ([\#8881](https://github.com/matrix-org/matrix-react-sdk/pull/8881)). Fixes #22634. Contributed by @luixxiul.
- * Render HTML topics in rooms on space home ([\#8939](https://github.com/matrix-org/matrix-react-sdk/pull/8939)).
- * Hide timestamp on event tiles being edited on every layout ([\#8956](https://github.com/matrix-org/matrix-react-sdk/pull/8956)). Contributed by @luixxiul.
- * Introduce new copy icon ([\#8942](https://github.com/matrix-org/matrix-react-sdk/pull/8942)).
- * Allow finding group DMs by members in spotlight ([\#8922](https://github.com/matrix-org/matrix-react-sdk/pull/8922)). Fixes #22564. Contributed by @justjanne.
- * Live location share - explicitly stop beacons replaced beacons ([\#8933](https://github.com/matrix-org/matrix-react-sdk/pull/8933)). Contributed by @kerryarchibald.
- * Remove unpin from widget kebab menu ([\#8924](https://github.com/matrix-org/matrix-react-sdk/pull/8924)).
- * Live location share - redact related locations on beacon redaction ([\#8926](https://github.com/matrix-org/matrix-react-sdk/pull/8926)). Contributed by @kerryarchibald.
- * Live location share - disallow message pinning ([\#8928](https://github.com/matrix-org/matrix-react-sdk/pull/8928)). Contributed by @kerryarchibald.
-
-## 🐛 Bug Fixes
- * Remove the ability to hide yourself in video rooms ([\#22806](https://github.com/vector-im/element-web/pull/22806)). Fixes #22805.
- * Unbreak in-app permalink tooltips  ([\#9100](https://github.com/matrix-org/matrix-react-sdk/pull/9100)).
- * Add space for the stroke on message editor on IRC layout ([\#9030](https://github.com/matrix-org/matrix-react-sdk/pull/9030)). Fixes #22785. Contributed by @luixxiul.
- * Fix pinned messages not re-linkifying on edit ([\#9042](https://github.com/matrix-org/matrix-react-sdk/pull/9042)). Fixes #22726.
- * Don't unnecessarily persist the host signup dialog ([\#9043](https://github.com/matrix-org/matrix-react-sdk/pull/9043)). Fixes #22778.
- * Fix URL previews causing messages to become unrenderable ([\#9028](https://github.com/matrix-org/matrix-react-sdk/pull/9028)). Fixes #22766.
- * Fix event list summaries including invalid events ([\#9041](https://github.com/matrix-org/matrix-react-sdk/pull/9041)). Fixes #22790.
- * Correct accessibility labels for unread rooms in spotlight ([\#9003](https://github.com/matrix-org/matrix-react-sdk/pull/9003)). Contributed by @justjanne.
- * Enable search strings highlight on bubble layout ([\#9032](https://github.com/matrix-org/matrix-react-sdk/pull/9032)). Fixes #22786. Contributed by @luixxiul.
- * Unbreak URL preview for formatted links with tooltips ([\#9022](https://github.com/matrix-org/matrix-react-sdk/pull/9022)). Fixes #22764.
- * Re-add margin to tiles based on EventTileBubble ([\#9015](https://github.com/matrix-org/matrix-react-sdk/pull/9015)). Fixes #22772. Contributed by @luixxiul.
- * Fix Shortcut prompt for Search showing in minimized Roomlist ([\#9014](https://github.com/matrix-org/matrix-react-sdk/pull/9014)). Fixes #22739. Contributed by @justjanne.
- * Fix avatar position on event info line for hidden events on a thread ([\#9019](https://github.com/matrix-org/matrix-react-sdk/pull/9019)). Fixes #22777. Contributed by @luixxiul.
- * Fix lost padding of event tile info line ([\#9009](https://github.com/matrix-org/matrix-react-sdk/pull/9009)). Fixes #22754 and #22759. Contributed by @luixxiul.
- * Align verification bubble with normal event tiles on IRC layout ([\#9001](https://github.com/matrix-org/matrix-react-sdk/pull/9001)). Fixes #22758. Contributed by @luixxiul.
- * Ensure timestamp on generic event list summary is not hidden from TimelineCard ([\#9000](https://github.com/matrix-org/matrix-react-sdk/pull/9000)). Fixes #22755. Contributed by @luixxiul.
- * Fix headings margin on security user settings tab ([\#8826](https://github.com/matrix-org/matrix-react-sdk/pull/8826)). Contributed by @luixxiul.
- * Fix timestamp position on file panel ([\#8976](https://github.com/matrix-org/matrix-react-sdk/pull/8976)). Fixes #22718. Contributed by @luixxiul.
- * Stop using :not() pseudo class for mx_GenericEventListSummary ([\#8944](https://github.com/matrix-org/matrix-react-sdk/pull/8944)). Fixes #22602. Contributed by @luixxiul.
- * Don't show the same user twice in Spotlight ([\#8978](https://github.com/matrix-org/matrix-react-sdk/pull/8978)). Fixes #22697.
- * Align the right edge of expand / collapse link buttons of generic event list summary in bubble layout with a variable ([\#8992](https://github.com/matrix-org/matrix-react-sdk/pull/8992)). Fixes #22743. Contributed by @luixxiul.
- * Display own avatars on search results panel in bubble layout ([\#8990](https://github.com/matrix-org/matrix-react-sdk/pull/8990)). Contributed by @luixxiul.
- * Fix text flow of thread summary content on threads list ([\#8991](https://github.com/matrix-org/matrix-react-sdk/pull/8991)). Fixes #22738. Contributed by @luixxiul.
- * Fix the size of the clickable area of images ([\#8987](https://github.com/matrix-org/matrix-react-sdk/pull/8987)). Fixes #22282.
- * Fix font size of MessageTimestamp on TimelineCard ([\#8950](https://github.com/matrix-org/matrix-react-sdk/pull/8950)). Contributed by @luixxiul.
- * Improve security room settings tab style rules ([\#8844](https://github.com/matrix-org/matrix-react-sdk/pull/8844)). Fixes #22575. Contributed by @luixxiul.
- * Align E2E icon and avatar of info tile in compact modern layout ([\#8965](https://github.com/matrix-org/matrix-react-sdk/pull/8965)). Fixes #22652. Contributed by @luixxiul.
- * Fix clickable area of general event list summary toggle ([\#8979](https://github.com/matrix-org/matrix-react-sdk/pull/8979)). Fixes #22722. Contributed by @luixxiul.
- * Fix resizing room topic ([\#8966](https://github.com/matrix-org/matrix-react-sdk/pull/8966)). Fixes #22689.
- * Dismiss the search dialogue when starting a DM ([\#8967](https://github.com/matrix-org/matrix-react-sdk/pull/8967)). Fixes #22700.
- * Fix "greyed out" text style inconsistency on search result panel ([\#8974](https://github.com/matrix-org/matrix-react-sdk/pull/8974)). Contributed by @luixxiul.
- * Add top padding to EventTilePreview loader ([\#8977](https://github.com/matrix-org/matrix-react-sdk/pull/8977)). Fixes #22719. Contributed by @luixxiul.
- * Fix read receipts group position on TimelineCard in compact modern/group layout ([\#8971](https://github.com/matrix-org/matrix-react-sdk/pull/8971)). Fixes #22715. Contributed by @luixxiul.
- * Fix calls on homeservers without the unstable thirdparty endpoints. ([\#8931](https://github.com/matrix-org/matrix-react-sdk/pull/8931)). Fixes #21680. Contributed by @deepbluev7.
- * Enable ReplyChain text to be expanded on IRC layout ([\#8959](https://github.com/matrix-org/matrix-react-sdk/pull/8959)). Fixes #22709. Contributed by @luixxiul.
- * Fix hidden timestamp on message edit history dialog ([\#8955](https://github.com/matrix-org/matrix-react-sdk/pull/8955)). Fixes #22701. Contributed by @luixxiul.
- * Enable ReplyChain text to be expanded on bubble layout ([\#8958](https://github.com/matrix-org/matrix-react-sdk/pull/8958)). Fixes #22709. Contributed by @luixxiul.
- * Fix expand/collapse state wrong in metaspaces ([\#8952](https://github.com/matrix-org/matrix-react-sdk/pull/8952)). Fixes #22632.
- * Location (live) share replies now provide a fallback content ([\#8949](https://github.com/matrix-org/matrix-react-sdk/pull/8949)).
- * Fix space settings not opening for script-created spaces ([\#8957](https://github.com/matrix-org/matrix-react-sdk/pull/8957)). Fixes #22703.
- * Respect `filename` field on `m.file` events ([\#8951](https://github.com/matrix-org/matrix-react-sdk/pull/8951)).
- * Fix PlatformSettingsHandler always returning true due to returning a Promise ([\#8954](https://github.com/matrix-org/matrix-react-sdk/pull/8954)). Fixes #22616.
- * Improve high-contrast support for spotlight ([\#8948](https://github.com/matrix-org/matrix-react-sdk/pull/8948)). Fixes #22481. Contributed by @justjanne.
- * Fix wrong assertions that all media events have a mimetype ([\#8946](https://github.com/matrix-org/matrix-react-sdk/pull/8946)). Fixes matrix-org/element-web-rageshakes#13727.
- * Make invite dialogue fixed height ([\#8934](https://github.com/matrix-org/matrix-react-sdk/pull/8934)). Fixes #22659.
- * Fix all megolm error reported as unknown ([\#8916](https://github.com/matrix-org/matrix-react-sdk/pull/8916)).
- * Remove line-height declarations from _ReplyTile.scss ([\#8932](https://github.com/matrix-org/matrix-react-sdk/pull/8932)). Fixes #22687. Contributed by @luixxiul.
- * Reduce video rooms log spam ([\#8913](https://github.com/matrix-org/matrix-react-sdk/pull/8913)).
- * Correct new search input’s rounded corners ([\#8921](https://github.com/matrix-org/matrix-react-sdk/pull/8921)). Fixes #22576. Contributed by @justjanne.
- * Align unread notification dot on threads list in compact modern=group layout ([\#8911](https://github.com/matrix-org/matrix-react-sdk/pull/8911)). Fixes #22677. Contributed by @luixxiul.
-
-Changes in [1.11.0](https://github.com/vector-im/element-web/releases/tag/v1.11.0) (2022-07-05)
-===============================================================================================
-
-## 🚨 BREAKING CHANGES
- * Remove Piwik support ([\#8835](https://github.com/matrix-org/matrix-react-sdk/pull/8835)).
-
-## ✨ Features
- * Document how to configure a custom `home.html`. ([\#21066](https://github.com/vector-im/element-web/pull/21066)). Contributed by @johannes-krude.
- * Move New Search Experience out of beta ([\#8859](https://github.com/matrix-org/matrix-react-sdk/pull/8859)). Contributed by @justjanne.
- * Switch video rooms to spotlight layout when in PiP mode ([\#8912](https://github.com/matrix-org/matrix-react-sdk/pull/8912)). Fixes #22574.
- * Live location sharing - render message deleted tile for redacted beacons ([\#8905](https://github.com/matrix-org/matrix-react-sdk/pull/8905)). Contributed by @kerryarchibald.
- * Improve view source dialog style ([\#8883](https://github.com/matrix-org/matrix-react-sdk/pull/8883)). Fixes #22636. Contributed by @luixxiul.
- * Improve integration manager dialog style ([\#8888](https://github.com/matrix-org/matrix-react-sdk/pull/8888)). Fixes #22642. Contributed by @luixxiul.
- * Implement MSC3827: Filtering of `/publicRooms` by room type ([\#8866](https://github.com/matrix-org/matrix-react-sdk/pull/8866)). Fixes #22578.
- * Show chat panel when opening a video room with unread messages ([\#8812](https://github.com/matrix-org/matrix-react-sdk/pull/8812)). Fixes #22527.
- * Live location share - forward latest location ([\#8860](https://github.com/matrix-org/matrix-react-sdk/pull/8860)). Contributed by @kerryarchibald.
- * Allow integration managers to validate user identity after opening ([\#8782](https://github.com/matrix-org/matrix-react-sdk/pull/8782)). Contributed by @Half-Shot.
- * Create a common header on right panel cards on BaseCard ([\#8808](https://github.com/matrix-org/matrix-react-sdk/pull/8808)). Contributed by @luixxiul.
- * Integrate searching public rooms and people into the new search experience ([\#8707](https://github.com/matrix-org/matrix-react-sdk/pull/8707)). Fixes #21354 and #19349. Contributed by @justjanne.
- * Bring back waveform for voice messages and retain seeking ([\#8843](https://github.com/matrix-org/matrix-react-sdk/pull/8843)). Fixes #21904.
- * Improve colors in settings  ([\#7283](https://github.com/matrix-org/matrix-react-sdk/pull/7283)).
- * Keep draft in composer when a slash command syntax errors ([\#8811](https://github.com/matrix-org/matrix-react-sdk/pull/8811)). Fixes #22384.
- * Release video rooms as a beta feature ([\#8431](https://github.com/matrix-org/matrix-react-sdk/pull/8431)).
- * Clarify logout key backup warning dialog. Contributed by @notramo. ([\#8741](https://github.com/matrix-org/matrix-react-sdk/pull/8741)). Fixes #15565. Contributed by @MadLittleMods.
- * Slightly improve the look of the `Message edits` dialog ([\#8763](https://github.com/matrix-org/matrix-react-sdk/pull/8763)). Fixes #22410.
- * Add support for MD / HTML in room topics ([\#8215](https://github.com/matrix-org/matrix-react-sdk/pull/8215)). Fixes #5180. Contributed by @Johennes.
- * Live location share - link to timeline tile from share warning ([\#8752](https://github.com/matrix-org/matrix-react-sdk/pull/8752)). Contributed by @kerryarchibald.
- * Improve composer visiblity ([\#8578](https://github.com/matrix-org/matrix-react-sdk/pull/8578)). Fixes #22072 and #17362.
- * Makes the avatar of the user menu non-draggable ([\#8765](https://github.com/matrix-org/matrix-react-sdk/pull/8765)). Contributed by @luixxiul.
- * Improve widget buttons behaviour and layout ([\#8734](https://github.com/matrix-org/matrix-react-sdk/pull/8734)).
- * Use AccessibleButton for 'Reset All' link button on SetupEncryptionBody ([\#8730](https://github.com/matrix-org/matrix-react-sdk/pull/8730)). Contributed by @luixxiul.
- * Adjust message timestamp position on TimelineCard in non-bubble layouts ([\#8745](https://github.com/matrix-org/matrix-react-sdk/pull/8745)). Fixes #22426. Contributed by @luixxiul.
- * Use AccessibleButton for 'In reply to' link button on ReplyChain ([\#8726](https://github.com/matrix-org/matrix-react-sdk/pull/8726)). Fixes #22407. Contributed by @luixxiul.
- * Live location share - enable reply and react to tiles ([\#8721](https://github.com/matrix-org/matrix-react-sdk/pull/8721)). Contributed by @kerryarchibald.
- * Change dash to em dash issues fixed ([\#8455](https://github.com/matrix-org/matrix-react-sdk/pull/8455)). Fixes #21895. Contributed by @goelesha.
-
-## 🐛 Bug Fixes
- * Reduce video rooms log spam ([\#22665](https://github.com/vector-im/element-web/pull/22665)).
- * Connect to Jitsi unmuted by default ([\#22660](https://github.com/vector-im/element-web/pull/22660)). Fixes #22637.
- * Work around a Jitsi bug with display name encoding ([\#22525](https://github.com/vector-im/element-web/pull/22525)). Fixes #22521.
- * Make invite dialogue fixed height ([\#8945](https://github.com/matrix-org/matrix-react-sdk/pull/8945)).
- * Correct issue with tab order in new search experience ([\#8919](https://github.com/matrix-org/matrix-react-sdk/pull/8919)). Fixes #22670. Contributed by @justjanne.
- * Clicking location replies now redirects to the replied event instead of opening the map ([\#8918](https://github.com/matrix-org/matrix-react-sdk/pull/8918)). Fixes #22667.
- * Keep clicks on pills within the app ([\#8917](https://github.com/matrix-org/matrix-react-sdk/pull/8917)). Fixes #22653.
- * Don't overlap tile bubbles with timestamps in modern layout ([\#8908](https://github.com/matrix-org/matrix-react-sdk/pull/8908)). Fixes #22425.
- * Connect to Jitsi unmuted by default ([\#8909](https://github.com/matrix-org/matrix-react-sdk/pull/8909)).
- * Maximize width value of display name on TimelineCard with IRC/modern layout ([\#8904](https://github.com/matrix-org/matrix-react-sdk/pull/8904)). Fixes #22651. Contributed by @luixxiul.
- * Align the avatar and the display name on TimelineCard ([\#8900](https://github.com/matrix-org/matrix-react-sdk/pull/8900)). Contributed by @luixxiul.
- * Remove inline margin from reactions row on IRC layout ([\#8891](https://github.com/matrix-org/matrix-react-sdk/pull/8891)). Fixes #22644. Contributed by @luixxiul.
- * Align "From a thread" on search result panel on IRC layout ([\#8892](https://github.com/matrix-org/matrix-react-sdk/pull/8892)). Fixes #22645. Contributed by @luixxiul.
- * Display description of E2E advanced panel as subsection text ([\#8889](https://github.com/matrix-org/matrix-react-sdk/pull/8889)). Contributed by @luixxiul.
- * Remove inline end margin from images on file panel ([\#8886](https://github.com/matrix-org/matrix-react-sdk/pull/8886)). Fixes #22640. Contributed by @luixxiul.
- * Disable option to `Quote` when we don't have sufficient permissions ([\#8893](https://github.com/matrix-org/matrix-react-sdk/pull/8893)). Fixes #22643.
- * Add padding to font scaling loader for message bubble layout ([\#8875](https://github.com/matrix-org/matrix-react-sdk/pull/8875)). Fixes #22626. Contributed by @luixxiul.
- * Set 100% max-width to display name on reply tiles ([\#8867](https://github.com/matrix-org/matrix-react-sdk/pull/8867)). Fixes #22615. Contributed by @luixxiul.
- * Fix alignment of pill letter ([\#8874](https://github.com/matrix-org/matrix-react-sdk/pull/8874)). Fixes #22622. Contributed by @luixxiul.
- * Move the beta pill to the right side and display the pill on video room only ([\#8873](https://github.com/matrix-org/matrix-react-sdk/pull/8873)). Fixes #22619 and #22620. Contributed by @luixxiul.
- * Stop using absolute property to place beta pill on RoomPreviewCard ([\#8872](https://github.com/matrix-org/matrix-react-sdk/pull/8872)). Fixes #22617. Contributed by @luixxiul.
- * Make the pill text single line ([\#8744](https://github.com/matrix-org/matrix-react-sdk/pull/8744)). Fixes #22427. Contributed by @luixxiul.
- * Hide overflow of public room description on spotlight dialog result ([\#8870](https://github.com/matrix-org/matrix-react-sdk/pull/8870)). Contributed by @luixxiul.
- * Fix position of message action bar on the info tile on TimelineCard in message bubble layout ([\#8865](https://github.com/matrix-org/matrix-react-sdk/pull/8865)). Fixes #22614. Contributed by @luixxiul.
- * Remove inline start margin from display name on reply tiles on TimelineCard ([\#8864](https://github.com/matrix-org/matrix-react-sdk/pull/8864)). Fixes #22613. Contributed by @luixxiul.
- * Improve homeserver dropdown dialog styling ([\#8850](https://github.com/matrix-org/matrix-react-sdk/pull/8850)). Fixes #22552. Contributed by @justjanne.
- * Fix crash when drawing blurHash for portrait videos PSB-139 ([\#8855](https://github.com/matrix-org/matrix-react-sdk/pull/8855)). Fixes #22597. Contributed by @andybalaam.
- * Fix grid blowout on pinned event tiles ([\#8816](https://github.com/matrix-org/matrix-react-sdk/pull/8816)). Fixes #22543. Contributed by @luixxiul.
- * Fix temporary sync errors if there's weird settings stored in account data ([\#8857](https://github.com/matrix-org/matrix-react-sdk/pull/8857)).
- * Fix reactions row overflow and gap between reactions ([\#8813](https://github.com/matrix-org/matrix-react-sdk/pull/8813)). Fixes #22093. Contributed by @luixxiul.
- * Fix issues with the Create new room button in Spotlight ([\#8851](https://github.com/matrix-org/matrix-react-sdk/pull/8851)). Contributed by @justjanne.
- * Remove margin from E2E icon between avatar and hidden event ([\#8584](https://github.com/matrix-org/matrix-react-sdk/pull/8584)). Fixes #22186. Contributed by @luixxiul.
- * Fix waveform on a message bubble ([\#8852](https://github.com/matrix-org/matrix-react-sdk/pull/8852)). Contributed by @luixxiul.
- * Location sharing maps are now loaded after reconnection ([\#8848](https://github.com/matrix-org/matrix-react-sdk/pull/8848)). Fixes #20993.
- * Update the avatar mask so it doesn’t cut off spaces’ avatars anymore ([\#8849](https://github.com/matrix-org/matrix-react-sdk/pull/8849)). Contributed by @justjanne.
- * Add a bit of safety around timestamp handling for threads ([\#8845](https://github.com/matrix-org/matrix-react-sdk/pull/8845)).
- * Remove top margin from event tile on a narrow viewport ([\#8814](https://github.com/matrix-org/matrix-react-sdk/pull/8814)). Contributed by @luixxiul.
- * Fix keyboard shortcuts on settings tab being wrapped ([\#8825](https://github.com/matrix-org/matrix-react-sdk/pull/8825)). Fixes #22547. Contributed by @luixxiul.
- * Add try-catch around blurhash loading ([\#8830](https://github.com/matrix-org/matrix-react-sdk/pull/8830)).
- * Prevent new composer from overflowing from non-breakable text ([\#8829](https://github.com/matrix-org/matrix-react-sdk/pull/8829)). Fixes #22507. Contributed by @justjanne.
- * Use common subheading on sidebar user settings tab ([\#8823](https://github.com/matrix-org/matrix-react-sdk/pull/8823)). Contributed by @luixxiul.
- * Fix clickable area of advanced toggle on appearance user settings tab ([\#8820](https://github.com/matrix-org/matrix-react-sdk/pull/8820)). Fixes #22546. Contributed by @luixxiul.
- * Disable redacting reactions if we don't have sufficient permissions  ([\#8767](https://github.com/matrix-org/matrix-react-sdk/pull/8767)). Fixes #22262.
- * Update the live timeline when the JS SDK resets it ([\#8806](https://github.com/matrix-org/matrix-react-sdk/pull/8806)). Fixes #22421.
- * Fix flex blowout on image reply ([\#8809](https://github.com/matrix-org/matrix-react-sdk/pull/8809)). Fixes #22509 and #22510. Contributed by @luixxiul.
- * Enable background color on hover for chat panel and thread panel ([\#8644](https://github.com/matrix-org/matrix-react-sdk/pull/8644)). Fixes #22273. Contributed by @luixxiul.
- * Fix #20026: send read marker as soon as we change it ([\#8802](https://github.com/matrix-org/matrix-react-sdk/pull/8802)). Fixes #20026. Contributed by @andybalaam.
- * Allow AppTiles to shrink as much as necessary ([\#8805](https://github.com/matrix-org/matrix-react-sdk/pull/8805)). Fixes #22499.
- * Make widgets in video rooms immutable again ([\#8803](https://github.com/matrix-org/matrix-react-sdk/pull/8803)). Fixes #22497.
- * Use MessageActionBar style declarations on pinned message card ([\#8757](https://github.com/matrix-org/matrix-react-sdk/pull/8757)). Fixes #22444. Contributed by @luixxiul.
- * Expire video member events after 1 hour ([\#8776](https://github.com/matrix-org/matrix-react-sdk/pull/8776)).
- * Name lists on invite dialog ([\#8046](https://github.com/matrix-org/matrix-react-sdk/pull/8046)). Fixes #21400 and #19463. Contributed by @luixxiul.
- * Live location share - show loading UI for beacons with start timestamp in the future ([\#8775](https://github.com/matrix-org/matrix-react-sdk/pull/8775)). Fixes #22437. Contributed by @kerryarchibald.
- * Fix scroll jump issue with the composer ([\#8788](https://github.com/matrix-org/matrix-react-sdk/pull/8788)). Fixes #22464.
- * Fix the incorrect nesting of download button on MessageActionBar ([\#8785](https://github.com/matrix-org/matrix-react-sdk/pull/8785)). Contributed by @luixxiul.
- * Revert link color change in composer ([\#8784](https://github.com/matrix-org/matrix-react-sdk/pull/8784)). Fixes #22468.
- * Fix 'Logout' inline link on the splash screen ([\#8770](https://github.com/matrix-org/matrix-react-sdk/pull/8770)). Fixes #22449. Contributed by @luixxiul.
- * Fix disappearing widget poput button when changing the widget layout ([\#8754](https://github.com/matrix-org/matrix-react-sdk/pull/8754)).
- * Reduce gutter with the new read receipt UI ([\#8736](https://github.com/matrix-org/matrix-react-sdk/pull/8736)). Fixes #21890.
- * Add ellipsis effect to hidden beacon status ([\#8755](https://github.com/matrix-org/matrix-react-sdk/pull/8755)). Fixes #22441. Contributed by @luixxiul.
- * Make the pill on the basic message composer compatible with display name in RTL languages ([\#8758](https://github.com/matrix-org/matrix-react-sdk/pull/8758)). Fixes #22445. Contributed by @luixxiul.
- * Prevent the banner text from being selected, replacing the spacing values with the variable ([\#8756](https://github.com/matrix-org/matrix-react-sdk/pull/8756)). Fixes #22442. Contributed by @luixxiul.
- * Ensure the first device on a newly-registered account gets cross-signed properly ([\#8750](https://github.com/matrix-org/matrix-react-sdk/pull/8750)). Fixes #21977. Contributed by @duxovni.
- * Hide live location option in threads composer ([\#8746](https://github.com/matrix-org/matrix-react-sdk/pull/8746)). Fixes #22424. Contributed by @kerryarchibald.
- * Make sure MessageTimestamp is not hidden by EventTile_line on TimelineCard ([\#8748](https://github.com/matrix-org/matrix-react-sdk/pull/8748)). Contributed by @luixxiul.
- * Make PiP motion smoother and react to window resizes correctly ([\#8747](https://github.com/matrix-org/matrix-react-sdk/pull/8747)). Fixes #22292.
- * Prevent Invite and DevTools dialogs from being cut off ([\#8646](https://github.com/matrix-org/matrix-react-sdk/pull/8646)). Fixes #20911 and undefined/matrix-react-sdk#8165. Contributed by @justjanne.
- * Squish event bubble tiles less ([\#8740](https://github.com/matrix-org/matrix-react-sdk/pull/8740)).
- * Use random widget IDs for video rooms ([\#8739](https://github.com/matrix-org/matrix-react-sdk/pull/8739)). Fixes #22417.
- * Fix read avatars overflow from the right chat panel with a maximized widget on bubble message layout ([\#8470](https://github.com/matrix-org/matrix-react-sdk/pull/8470)). Contributed by @luixxiul.
- * Fix `CallView` crash ([\#8735](https://github.com/matrix-org/matrix-react-sdk/pull/8735)). Fixes #22394.
-
-Changes in [1.10.15](https://github.com/vector-im/element-web/releases/tag/v1.10.15) (2022-06-14)
-=================================================================================================
-
-## 🐛 Bug Fixes
- * Fix missing element desktop preferences ([\#8798](https://github.com/matrix-org/matrix-react-sdk/pull/8798)). Contributed by @t3chguy.
-
-Changes in [1.10.14](https://github.com/vector-im/element-web/releases/tag/v1.10.14) (2022-06-07)
-=================================================================================================
-
-## ✨ Features
- * Make Lao translation available ([\#22358](https://github.com/vector-im/element-web/pull/22358)). Fixes #22327.
- * Option to disable hardware acceleration on Element Desktop ([\#22295](https://github.com/vector-im/element-web/pull/22295)). Contributed by @novocaine.
- * Configure custom home.html via `.well-known/matrix/client["io.element.embedded_pages"]["home_url"]` for all your element-web/desktop users ([\#7790](https://github.com/matrix-org/matrix-react-sdk/pull/7790)). Contributed by @johannes-krude.
- * Live location sharing - open location in OpenStreetMap ([\#8695](https://github.com/matrix-org/matrix-react-sdk/pull/8695)). Contributed by @kerryarchibald.
- * Show a dialog when Jitsi encounters an error ([\#8701](https://github.com/matrix-org/matrix-react-sdk/pull/8701)). Fixes #22284.
- * Add support for setting the `avatar_url` of widgets by integration managers. ([\#8550](https://github.com/matrix-org/matrix-react-sdk/pull/8550)). Contributed by @Fox32.
- * Add an option to ignore (block) a user when reporting their events ([\#8471](https://github.com/matrix-org/matrix-react-sdk/pull/8471)).
- * Add the option to disable hardware acceleration ([\#8655](https://github.com/matrix-org/matrix-react-sdk/pull/8655)). Contributed by @novocaine.
- * Slightly better presentation of read receipts to screen reader users ([\#8662](https://github.com/matrix-org/matrix-react-sdk/pull/8662)). Fixes #22293. Contributed by @pvagner.
- * Add jump to related event context menu item ([\#6775](https://github.com/matrix-org/matrix-react-sdk/pull/6775)). Fixes #19883.
- * Add public room directory hook ([\#8626](https://github.com/matrix-org/matrix-react-sdk/pull/8626)).
-
-## 🐛 Bug Fixes
- * Stop Jitsi if we time out while connecting to a video room ([\#22301](https://github.com/vector-im/element-web/pull/22301)). Fixes #22283.
- * Remove inline margin from UTD error message inside a reply tile on ThreadView ([\#8708](https://github.com/matrix-org/matrix-react-sdk/pull/8708)). Fixes #22376. Contributed by @luixxiul.
- * Move unread notification dots of the threads list to the expected position ([\#8700](https://github.com/matrix-org/matrix-react-sdk/pull/8700)). Fixes #22350. Contributed by @luixxiul.
- * Prevent overflow of grid items on a bubble with UTD generally ([\#8697](https://github.com/matrix-org/matrix-react-sdk/pull/8697)). Contributed by @luixxiul.
- * Create 'Unable To Decrypt' grid layout for hidden events on a bubble layout ([\#8704](https://github.com/matrix-org/matrix-react-sdk/pull/8704)). Fixes #22365. Contributed by @luixxiul.
- * Fix - AccessibleButton does not set disabled attribute ([\#8682](https://github.com/matrix-org/matrix-react-sdk/pull/8682)). Contributed by @kerryarchibald.
- * Fix font not resetting when logging out ([\#8670](https://github.com/matrix-org/matrix-react-sdk/pull/8670)). Fixes #17228.
- * Fix local aliases section of room settings not working for some homeservers (ie ([\#8698](https://github.com/matrix-org/matrix-react-sdk/pull/8698)). Fixes #22337.
- * Align EventTile_line with display name on message bubble ([\#8692](https://github.com/matrix-org/matrix-react-sdk/pull/8692)). Fixes #22343. Contributed by @luixxiul.
- * Convert references to direct chat -> direct message ([\#8694](https://github.com/matrix-org/matrix-react-sdk/pull/8694)). Contributed by @novocaine.
- * Improve combining diacritics for U+20D0 to U+20F0 in Chrome ([\#8687](https://github.com/matrix-org/matrix-react-sdk/pull/8687)).
- * Make the empty thread panel fill BaseCard ([\#8690](https://github.com/matrix-org/matrix-react-sdk/pull/8690)). Fixes #22338. Contributed by @luixxiul.
- * Fix edge case around composer handling gendered facepalm emoji ([\#8686](https://github.com/matrix-org/matrix-react-sdk/pull/8686)).
- * Fix a grid blowout due to nowrap displayName on a bubble with UTD ([\#8688](https://github.com/matrix-org/matrix-react-sdk/pull/8688)). Fixes #21914. Contributed by @luixxiul.
- * Apply the same max-width to image tile on the thread timeline as message bubble ([\#8669](https://github.com/matrix-org/matrix-react-sdk/pull/8669)). Fixes #22313. Contributed by @luixxiul.
- * Fix dropdown button size for picture-in-picture CallView ([\#8680](https://github.com/matrix-org/matrix-react-sdk/pull/8680)). Fixes #22316. Contributed by @luixxiul.
- * Live location sharing - fix square border for image-less avatar (PSF-1052) ([\#8679](https://github.com/matrix-org/matrix-react-sdk/pull/8679)). Contributed by @kerryarchibald.
- * Stop connecting to a video room if the widget messaging disappears ([\#8660](https://github.com/matrix-org/matrix-react-sdk/pull/8660)).
- * Fix file button and audio player overflowing from message bubble ([\#8666](https://github.com/matrix-org/matrix-react-sdk/pull/8666)). Fixes #22308. Contributed by @luixxiul.
- * Don't show broken composer format bar when selection is whitespace ([\#8673](https://github.com/matrix-org/matrix-react-sdk/pull/8673)). Fixes #10788.
- * Fix media upload http 413 handling ([\#8674](https://github.com/matrix-org/matrix-react-sdk/pull/8674)).
- * Fix emoji picker for editing thread responses ([\#8671](https://github.com/matrix-org/matrix-react-sdk/pull/8671)). Fixes matrix-org/element-web-rageshakes#13129.
- * Map attribution while sharing live location is now visible ([\#8621](https://github.com/matrix-org/matrix-react-sdk/pull/8621)). Fixes #22236. Contributed by @weeman1337.
- * Fix info tile overlapping the time stamp on TimelineCard ([\#8639](https://github.com/matrix-org/matrix-react-sdk/pull/8639)). Fixes #22256. Contributed by @luixxiul.
- * Fix position of wide images on IRC / modern layout ([\#8667](https://github.com/matrix-org/matrix-react-sdk/pull/8667)). Fixes #22309. Contributed by @luixxiul.
- * Fix other user's displayName being wrapped on the bubble message layout ([\#8456](https://github.com/matrix-org/matrix-react-sdk/pull/8456)). Fixes #22004. Contributed by @luixxiul.
- * Set spacing declarations to elements in mx_EventTile_mediaLine ([\#8665](https://github.com/matrix-org/matrix-react-sdk/pull/8665)). Fixes #22307. Contributed by @luixxiul.
- * Fix wide image overflowing from the thumbnail container ([\#8663](https://github.com/matrix-org/matrix-react-sdk/pull/8663)). Fixes #22303. Contributed by @luixxiul.
- * Fix styles of "Show all" link button on ReactionsRow ([\#8658](https://github.com/matrix-org/matrix-react-sdk/pull/8658)). Fixes #22300. Contributed by @luixxiul.
- * Automatically log in after registration ([\#8654](https://github.com/matrix-org/matrix-react-sdk/pull/8654)). Fixes #19305. Contributed by @justjanne.
- * Fix offline status in window title not working reliably ([\#8656](https://github.com/matrix-org/matrix-react-sdk/pull/8656)).
- * Align input area with event body's first letter in a thread on IRC/modern layout ([\#8636](https://github.com/matrix-org/matrix-react-sdk/pull/8636)). Fixes #22252. Contributed by @luixxiul.
- * Fix crash on null idp for SSO buttons ([\#8650](https://github.com/matrix-org/matrix-react-sdk/pull/8650)). Contributed by @hughns.
- * Don't open the regular browser or our context menu on right-clicking the `Options` button in the message action bar ([\#8648](https://github.com/matrix-org/matrix-react-sdk/pull/8648)). Fixes #22279.
- * Show notifications even when Element is focused ([\#8590](https://github.com/matrix-org/matrix-react-sdk/pull/8590)). Contributed by @sumnerevans.
- * Remove padding from the buttons on edit message composer of a event tile on a thread ([\#8632](https://github.com/matrix-org/matrix-react-sdk/pull/8632)). Contributed by @luixxiul.
- * ensure metaspace changes correctly notify listeners ([\#8611](https://github.com/matrix-org/matrix-react-sdk/pull/8611)). Fixes #21006. Contributed by @justjanne.
- * Hide image banner on stickers, they have a tooltip already ([\#8641](https://github.com/matrix-org/matrix-react-sdk/pull/8641)). Fixes #22244.
- * Adjust EditMessageComposer style declarations ([\#8631](https://github.com/matrix-org/matrix-react-sdk/pull/8631)). Fixes #22231. Contributed by @luixxiul.
-
 Changes in [1.10.13](https://github.com/vector-im/element-web/releases/tag/v1.10.13) (2022-05-24)
 =================================================================================================

@@ -1752,7 +818,7 @@ Changes in [1.10.1](https://github.com/vector-im/element-web/releases/tag/v1.10.
 ===============================================================================================

 ## 🐛 Bug Fixes
- * Fix the sticker picker ([\#7692](https://github.com/matrix-org/matrix-react-sdk/pull/7692)). Fixes vector-im/element-web#20797.
+ * Fix the sticker picker ([\#7692](https://github.com/matrix-org/matrix-react-sdk/pull/7692)). Fixes vector-im/element-web#20797. 
 * Ensure UserInfo can be rendered without a room ([\#7687](https://github.com/matrix-org/matrix-react-sdk/pull/7687)). Fixes vector-im/element-web#20830.
 * Fix publishing address wrongly demanding the alias be available ([\#7690](https://github.com/matrix-org/matrix-react-sdk/pull/7690)). Fixes vector-im/element-web#12013 and vector-im/element-web#20833.

@@ -3089,7 +2155,7 @@ Changes in [1.7.34](https://github.com/vector-im/element-desktop/releases/tag/v1
 * Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
   [\#6394](https://github.com/matrix-org/matrix-react-sdk/pull/6394)
   Fixes #18031
- * Standardise spelling and casing of homeserver, identity server, and integration manager
+ * Standardise spelling and casing of homeserver, identity server, and integration manager 
   [\#6365](https://github.com/matrix-org/matrix-react-sdk/pull/6365)
 * Fix widgets not receiving decrypted events when they have permission.
   [\#6371](https://github.com/matrix-org/matrix-react-sdk/pull/6371)
@@ -4934,7 +4000,7 @@ Changes in [1.4.1](https://github.com/vector-im/riot-web/releases/tag/v1.4.1) (2
 ==========================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.4.0...v1.4.1)

- * Upgrade to React SDK 1.6.1 to fix critical
+ * Upgrade to React SDK 1.6.1 to fix critical 
   [blank screen issue](https://github.com/vector-im/riot-web/issues/10983)
 * Upgrade to JS SDK 2.4.1 to to ignore crypto events with empty content
 * Update from Weblate
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,298 +1,4 @@
-# Contributing code to Element Web
+Contributing code to Element
+============================

-Everyone is welcome to contribute code to Element Web, provided that they are
-willing to license their contributions under the same license as the project
-itself. We follow a simple 'inbound=outbound' model for contributions: the act
-of submitting an 'inbound' contribution means that the contributor agrees to
-license the code under the same terms as the project's overall 'outbound'
-license - in this case, Apache Software License v2 (see
-[LICENSE](LICENSE)).
-
-## How to contribute
-
-The preferred and easiest way to contribute changes to the project is to fork
-it on github, and then create a pull request to ask us to pull your changes
-into our repo (https://help.github.com/articles/using-pull-requests/)
-
-We use GitHub's pull request workflow to review the contribution, and either
-ask you to make any refinements needed or merge it and make them ourselves.
-
-Your PR should have a title that describes what change is being made. This
-is used for the text in the Changelog entry by default (see below), so a good
-title will tell a user succinctly what change is being made. "Fix bug where
-cows had five legs" and, "Add support for miniature horses" are examples of good
-titles. Don't include an issue number here: that belongs in the description.
-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.
-
-### Changelogs
-
-There's no need to manually add Changelog entries: we use information in the
-pull request to populate the information that goes into the changelogs our
-users see, both for Element Web itself and other projects on which it is based.
-This is picked up from both labels on the pull request and the `Notes:`
-annotation in the description. By default, the PR title will be used for the
-changelog entry, but you can specify more options, as follows.
-
-To add a longer, more detailed description of the change for the changelog:
-
-_Fix llama herding bug_
-
-```
-Notes: Fix a bug (https://github.com/matrix-org/notaproject/issues/123) where the 'Herd' button would not herd more than 8 Llamas if the moon was in the waxing gibbous phase
-```
-
-For some PRs, it's not useful to have an entry in the user-facing changelog (this is
-the default for PRs labelled with `T-Task`):
-
-_Remove outdated comment from `Ungulates.ts`_
-
-```
-Notes: none
-```
-
-Sometimes, you're fixing a bug in a downstream project, in which case you want
-an entry in that project's changelog. You can do that too:
-
-_Fix another herding bug_
-
-```
-Notes: Fix a bug where the `herd()` function would only work on Tuesdays
-element-web notes: Fix a bug where the 'Herd' button only worked on Tuesdays
-```
-
-This example is for Element Web. You can specify:
-
-   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
-to specify in the notes that it's a breaking change - this will be added
-automatically based on the label - but remember to tell the developer how to
-migrate:
-
-_Remove legacy class_
-
-```
-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.
-
-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.
-
-We use continuous integration, and all pull requests get automatically tested:
-if your change breaks the build, then the PR will show that there are failed
-checks, so please check back after a few minutes.
-
-## Tests
-
-Your PR should include tests.
-
-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 `/cypress/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
-the start, and gives you a fast feedback loop while you're developing the
-functionality. End-to-end tests should be added prior to the feature
-leaving labs, but don't have to be present from the start (although it might
-be beneficial to have some running early, so you can test things faster).
-
-For bugs in those repos, your change must include at least one unit test or
-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`
-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
-why it's not possible in your PR.
-
-Some sections of code are not sensible to add coverage for, such as those
-which explicitly inhibit noisy logging for tests. Which can be hidden using
-an istanbul magic comment as [documented here][1]. See example:
-
-```javascript
-/* istanbul ignore if */
-if (process.env.NODE_ENV !== "test") {
-    logger.error("Log line that is noisy enough in tests to want to skip");
-}
-```
-
-Tests validate that your change works as intended and also document
-concisely what is being changed. Ideally, your new tests fail
-prior to your change, and succeed once it has been applied. You may
-find this simpler to achieve if you write the tests first.
-
-If you're spiking some code that's experimental and not being used to support
-production features, exceptions can be made to requirements for tests.
-Note that tests will still be required in order to ship the feature, and it's
-strongly encouraged to think about tests early in the process, as adding
-tests later will become progressively more difficult.
-
-If you're not sure how to approach writing tests for your change, ask for help
-in [#element-dev](https://matrix.to/#/#element-dev:matrix.org).
-
-## Code style
-
-Element Web aims to target TypeScript/ES6. All new files should be written in
-TypeScript and existing files should use ES6 principles where possible.
-
-Members should not be exported as a default export in general - it causes problems
-with the architecture of the SDK (index file becomes less clear) and could
-introduce naming problems (as default exports get aliased upon import). In
-general, avoid using `export default`.
-
-The remaining code style is documented in [code_style.md](./code_style.md).
-Contributors are encouraged to it and follow the principles set out there.
-
-Please ensure your changes match the cosmetic style of the existing project,
-and **_never_** mix cosmetic and functional changes in the same commit, as it
-makes it horribly hard to review otherwise.
-
-## Attribution
-
-Everyone who contributes anything to Matrix is welcome to be listed in the
-AUTHORS.rst file for the project in question. Please feel free to include a
-change to AUTHORS.rst in your pull request to list yourself and a short
-description of the area(s) you've worked on. Also, we sometimes have swag to
-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/Documentation/SubmittingPatches), 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
-```
-
-# Review expectations
-
-See https://github.com/vector-im/element-meta/wiki/Review-process
-
-# Merge Strategy
-
-The preferred method for merging pull requests is squash merging to keep the
-commit history trim, but it is up to the discretion of the team member merging
-the change. We do not support rebase merges due to `allchange` being unable to
-handle them. When merging make sure to leave the default commit title, or
-at least leave the PR number at the end in brackets like by default.
-When stacking pull requests, you may wish to do the following:
-
-1. Branch from develop to your branch (branch1), push commits onto it and open a pull request
-2. Branch from your base branch (branch1) to your work branch (branch2), push commits and open a pull request configuring the base to be branch1, saying in the description that it is based on your other PR.
-3. Merge the first PR using a merge commit otherwise your stacked PR will need a rebase. Github will automatically adjust the base branch of your other PR to be develop.
-
-[1]: https://github.com/gotwarlost/istanbul/blob/master/ignoring-code-for-coverage.md
-
-# Decoding Stack Traces
-
-Element Web has crashed and given you an obfuscated stack trace? Don't panic:
-use the [Decoder Ring](https://app.element.io/decoder-ring/) (or /decoder-ring/
-on any Element Web deploy). It is somewhat of a manual process, but it should
-tell you what lines the stack trace corresponds to from the source maps.
+Element follows the same pattern as the [matrix-js-sdk](https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md).
--- a/5
+++ b/5
@@ -1,5 +1,5 @@
 # Builder
-FROM --platform=$BUILDPLATFORM node:16-buster as builder
+FROM node:14-buster as builder

 # Support custom branches of the react-sdk and js-sdk. This also helps us build
 # images of element-web develop.
@@ -27,6 +27,9 @@ FROM nginx:alpine

 COPY --from=builder /src/webapp /app

+# Insert wasm type into Nginx mime.types file so they load correctly.
+RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types
+
 # Override default nginx config
 COPY /nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf

--- a/README.md
+++ b/README.md
@@ -7,34 +7,37 @@
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=element-web&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=element-web)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=element-web&metric=bugs)](https://sonarcloud.io/summary/new_code?id=element-web)

-# Element
+Element
+=======

 Element (formerly known as Vector and Riot) is a Matrix web client built using the [Matrix
 React SDK](https://github.com/matrix-org/matrix-react-sdk).

-# Supported Environments
+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, Safari, and Edge on desktop OSes
-    -   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
-   Experimental
-    -   Definition: Issues **accepted**, regressions **do not block** the release
-    -   Element as an installed PWA via current stable version of Chrome
-    -   Mobile web for current stable version of Chrome, Firefox, and Safari on Android, iOS, and iPadOS
-   Not supported
-    -   Definition: Issues only affecting unsupported environments are **closed**
-    -   Everything else
+* Supported
+  * Definition: Issues **actively triaged**, regressions **block** the release
+  * Last 2 major versions of Chrome, Firefox, Safari, and Edge on desktop OSes
+  * 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
+* Experimental
+  * Definition: Issues **accepted**, regressions **do not block** the release
+  * Element as an installed PWA via current stable version of Chrome, Firefox, and Safari
+  * 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

 For accessing Element on an Android or iOS device, we currently recommend the
 native apps [element-android](https://github.com/vector-im/element-android)
 and [element-ios](https://github.com/vector-im/element-ios).

-# Getting Started
+Getting Started
+===============

 The easiest way to test Element is to just use the hosted copy at <https://app.element.io>.
 The `develop` branch is continuously deployed to <https://develop.element.io>
@@ -64,39 +67,47 @@ and thus allowed.
 To install Element as a desktop application, see [Running as a desktop
 app](#running-as-a-desktop-app) below.

-# Important Security Notes
+Important Security Notes
+========================

-## Separate domains
+Separate domains
+----------------

 We do not recommend running Element from the same domain name as your Matrix
-homeserver. The reason is the risk of XSS (cross-site-scripting)
+homeserver.  The reason is the risk of XSS (cross-site-scripting)
 vulnerabilities that could occur if someone caused Element to load and render
 malicious user generated content from a Matrix API which then had trusted
 access to Element (or other apps) due to sharing the same domain.

 We have put some coarse mitigations into place to try to protect against this
-situation, but it's still not good practice to do it in the first place. See
+situation, but it's still not good practice to do it in the first place.  See
 <https://github.com/vector-im/element-web/issues/1977> for more details.

-## Configuration best practices
+Configuration best practices
+----------------------------

 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 'none'` 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 'none'` 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
-[owasp-clickjacking]: https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html
+[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>
+
+[owasp-clickjacking]:
+<https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html>

 If you are using nginx, this would look something like the following:

@@ -104,23 +115,15 @@ If you are using nginx, this would look something like the following:
 add_header X-Frame-Options SAMEORIGIN;
 add_header X-Content-Type-Options nosniff;
 add_header X-XSS-Protection "1; mode=block";
-add_header Content-Security-Policy "frame-ancestors 'self'";
-```
-
-For Apache, the configuration looks like:
-
-```
-Header set X-Frame-Options SAMEORIGIN
-Header set X-Content-Type-Options nosniff
-Header set X-XSS-Protection "1; mode=block"
-Header set Content-Security-Policy "frame-ancestors 'none'"
+add_header Content-Security-Policy "frame-ancestors 'none'";
 ```

 Note: In case you are already setting a `Content-Security-Policy` header
 elsewhere, you should modify it to include the `frame-ancestors` directive
 instead of adding that last line.

-# Building From Source
+Building From Source
+====================

 Element is a modular webapp built with modern ES6 and uses a Node.js build system.
 Ensure you have the latest LTS version of Node.js installed.
@@ -133,7 +136,7 @@ guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it alread
 1. Clone the repo: `git clone https://github.com/vector-im/element-web.git`.
 1. Switch to the element-web directory: `cd element-web`.
 1. Install the prerequisites: `yarn install`.
-    - If you're using the `develop` branch, then it is recommended to set up a
+   * If you're using the `develop` branch, then it is recommended to set up a
      proper development environment (see [Setting up a dev
      environment](#setting-up-a-dev-environment) below). Alternatively, you
      can use <https://develop.element.io> - the continuous integration release of
@@ -150,7 +153,8 @@ will not appear in Settings without using the dist script. You can then mount th
 `webapp` directory on your web server to actually serve up the app, which is
 entirely static content.

-# Running as a Desktop app
+Running as a Desktop app
+========================

 Element can also be run as a desktop app, wrapped in Electron. You can download a
 pre-built version from <https://element.io/get-started> or, if you prefer,
@@ -162,7 +166,7 @@ Many thanks to @aviraldg for the initial work on the Electron integration.

 Other options for running as a desktop app:

-   @asdf:matrix.org points out that you can use nativefier and it just works(tm)
+* @asdf:matrix.org points out that you can use nativefier and it just works(tm)

 ```bash
 yarn global add nativefier
@@ -172,7 +176,8 @@ nativefier https://app.element.io/
 The [configuration docs](docs/config.md#desktop-app-configuration) show how to
 override the desktop app's default settings if desired.

-# Running from Docker
+Running from Docker
+===================

 The Docker image can be used to serve element-web as a web server. The easiest way to use
 it is to use the prebuilt image:
@@ -211,22 +216,26 @@ docker build -t \
    .
 ```

-# Running in Kubernetes
+Running in Kubernetes
+=====================

 The provided element-web docker image can also be run from within a Kubernetes cluster.
 See the [Kubernetes example](docs/kubernetes.md) for more details.

-# config.json
+config.json
+===========

 Element supports a variety of settings to configure default servers, behaviour, themes, etc.
 See the [configuration docs](docs/config.md) for more details.

-# Labs Features
+Labs Features
+=============

 Some features of Element may be enabled by flags in the `Labs` section of the settings.
 Some of these features are described in [labs.md](https://github.com/vector-im/element-web/blob/develop/docs/labs.md).

-# Caching requirements
+Caching requirements
+====================

 Element requires the following URLs not to be cached, when/if you are serving Element from your own webserver:

@@ -243,7 +252,8 @@ webserver to return `Cache-Control: no-cache` for `/`. This ensures the browser
 the next page load after it's been deployed. Note that this is already configured for you in the nginx config of our
 Dockerfile.

-# Development
+Development
+===========

 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
@@ -265,7 +275,7 @@ 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)
+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.

@@ -273,7 +283,8 @@ 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
+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
@@ -282,7 +293,7 @@ having to manually rebuild each time.

 First clone and build `matrix-js-sdk`:

-```bash
+``` bash
 git clone https://github.com/matrix-org/matrix-js-sdk.git
 pushd matrix-js-sdk
 yarn link
@@ -329,9 +340,9 @@ Wait a few seconds for the initial build to finish; you should see something lik
 [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.
+   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.

@@ -359,7 +370,7 @@ 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.
@@ -368,7 +379,8 @@ If any of these steps error with, `file table overflow`, you are probably on a m
 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
+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
@@ -381,7 +393,8 @@ yarn test

 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
+Translations
+============

 To add a new translation, head to the [translating doc](docs/translating.md).

@@ -389,7 +402,8 @@ For a developer guide, see the [translating dev doc](docs/translating-dev.md).

 [<img src="https://translate.element.io/widgets/element-web/-/multi-auto.svg" alt="translationsstatus" width="340">](https://translate.element.io/engage/element-web/?utm_source=widget)

-# Triaging issues
+Triaging issues
+===============

 Issues are triaged by community members and the Web App Team, following the [triage process](https://github.com/vector-im/element-meta/wiki/Triage-process).

--- a/babel.config.js
+++ b/babel.config.js
@@ -1,34 +1,24 @@
 module.exports = {
-    sourceMaps: true,
-    presets: [
-        [
-            "@babel/preset-env",
-            {
-                targets: [
-                    "last 2 Chrome versions",
-                    "last 2 Firefox versions",
-                    "last 2 Safari versions",
-                    "last 2 Edge versions",
-                ],
-            },
-        ],
+    "sourceMaps": true,
+    "presets": [
+        ["@babel/preset-env", {
+            "targets": [
+                "last 2 Chrome versions",
+                "last 2 Firefox versions",
+                "last 2 Safari versions",
+                "last 2 Edge versions",
+            ],
+        }],
        "@babel/preset-typescript",
        "@babel/preset-react",
    ],
-    plugins: [
+    "plugins": [
        "@babel/plugin-proposal-export-default-from",
        "@babel/plugin-proposal-numeric-separator",
        "@babel/plugin-proposal-class-properties",
        "@babel/plugin-proposal-object-rest-spread",
        "@babel/plugin-proposal-optional-chaining",
        "@babel/plugin-proposal-nullish-coalescing-operator",
-
-        // transform logical assignment (??=, ||=, &&=). preset-env doesn't
-        // normally bother with these (presumably because all the target
-        // browsers support it natively), but they make our webpack version (or
-        // something downstream of babel, at least) fall over.
-        "@babel/plugin-proposal-logical-assignment-operators",
-
        "@babel/plugin-syntax-dynamic-import",
        "@babel/plugin-transform-runtime",
    ],
--- a/build_config.sample.yaml
+++ b/build_config.sample.yaml
@@ -1,25 +0,0 @@
-# A sample build_config.yaml to supply to Element Web's build pipeline,
-# enabling custom functionality at compile time. Copy this file to
-# `build_config.yaml` in the same directory to use, as you would with
-# `config.json`.
-#
-# Note: The vast majority of users DO NOT need this. If you are looking
-# to build your own Element Web as seen on app.element.io or similar then
-# this is not required.
-#
-# This config file does become required if you are looking to add runtime
-# functionality to Element Web, such as customisation endpoints and modules.
-#
-# Over time we might expand this config to better support some use cases.
-# Watch the release notes for features which might impact this config.
-
-# The modules to install. See ./docs/modules.md for more information on
-# what modules are.
-#
-# The values of this are provided to `yarn add` for inclusion.
-modules:
-    # An example of pulling a module from NPM
-    - "@vector-im/element-web-ilag-module@^0.0.1"
-
-    # An example of pulling a module from github
-    - "github:vector-im/element-web-ilag-module#main"
--- a/code_style.md
+++ b/code_style.md
@@ -1,360 +0,0 @@
-# Element Web/Desktop code style guide
-
-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
-   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
-
-1. We want the lint rules to feel natural for most team members. No one should have to think too much
-   about the linter.
-2. We want to stay relatively close to [industry standards](https://google.github.io/styleguide/tsguide.html)
-   to make onboarding easier.
-3. We describe what good code looks like rather than point out bad examples. We do this to avoid
-   excessively punishing people for writing code which fails the linter.
-4. When something isn't covered by the style guide, we come up with a reasonable rule rather than
-   claim that it "passes the linter". We update the style guide and linter accordingly.
-5. While we aim to improve readability, understanding, and other aspects of the code, we deliberately
-   do not let solely our personal preferences drive decisions.
-6. We aim to have an understandable guide.
-
-## Coding practices
-
-1. Lint rules enforce decisions made by this guide. The lint rules and this guide are kept in
-   perfect sync.
-2. Commit messages are descriptive for the changes. When the project supports squash merging,
-   only the squashed commit needs to have a descriptive message.
-3. When there is disagreement with a code style approved by the linter, a PR is opened against
-   the lint rules rather than making exceptions on the responsible code PR.
-4. Rules which are intentionally broken (via eslint-ignore, @ts-ignore, etc) have a comment
-   included in the immediate vicinity for why. Determination of whether this is valid applies at
-   code review time.
-5. When editing a file, nearby code is updated to meet the modern standards. "Nearby" is subjective,
-   but should be whatever is reasonable at review time. Such an example might be to update the
-   class's code style, but not the file's.
-    1. These changes should be minor enough to include in the same commit without affecting a code
-       reviewer's job.
-
-## All code
-
-Unless otherwise specified, the following applies to all code:
-
-1. Files must be formatted with Prettier.
-2. 120 character limit per line. Match existing code in the file if it is using a lower guide.
-3. A tab/indentation is 4 spaces.
-4. Newlines are Unix.
-5. A file has a single empty line at the end.
-6. Lines are trimmed of all excess whitespace, including blank lines.
-7. Long lines are broken up for readability.
-
-## TypeScript / JavaScript {#typescript-javascript}
-
-1. Write TypeScript. Turn JavaScript into TypeScript when working in the area.
-2. Use named exports.
-3. Use semicolons for block/line termination.
-    1. Except when defining interfaces, classes, and non-arrow functions specifically.
-4. When a statement's body is a single line, it must be written without curly braces, so long as the body is placed on
-   the same line as the statement.
-
-    ```typescript
-    if (x) doThing();
-    ```
-
-5. Blocks for `if`, `for`, `switch` and so on must have a space surrounding the condition, but not
-   within the condition.
-
-    ```typescript
-    if (x) {
-        doThing();
-    }
-    ```
-
-6. lowerCamelCase is used for function and variable naming.
-7. UpperCamelCase is used for general naming.
-8. Interface names should not be marked with an uppercase `I`.
-9. One variable declaration per line.
-10. If a variable is not receiving a value on declaration, its type must be defined.
-
-    ```typescript
-    let errorMessage: Optional<string>;
-    ```
-
-11. Objects can use shorthand declarations, including mixing of types.
-
-    ```typescript
-    {
-        room,
-        prop: this.prop,
-    }
-    // ... or ...
-    { room, prop: this.prop }
-    ```
-
-12. Object keys should always be non-strings when possible.
-
-    ```typescript
-    {
-        property: "value",
-        "m.unavoidable": true,
-        [EventType.RoomMessage]: true,
-    }
-    ```
-
-13. Explicitly cast to a boolean.
-
-    ```typescript
-    !!stringVar || Boolean(stringVar);
-    ```
-
-14. Use `switch` statements when checking against more than a few enum-like values.
-15. Use `const` for constants, `let` for mutability.
-16. Describe types exhaustively (ensure noImplictAny would pass).
-    1. Notable exceptions are arrow functions used as parameters, when a void return type is
-       obvious, and when declaring and assigning a variable in the same line.
-17. Declare member visibility (public/private/protected).
-18. Private members are private and not prefixed unless required for naming conflicts.
-    1. Convention is to use an underscore or the word "internal" to denote conflicted member names.
-    2. "Conflicted" typically refers to a getter which wants the same name as the underlying variable.
-19. Prefer readonly members over getters backed by a variable, unless an internal setter is required.
-20. Prefer Interfaces for object definitions, and types for parameter-value-only declarations.
-
-    1. Note that an explicit type is optional if not expected to be used outside of the function call,
-       unlike in this example:
-
-        ```typescript
-        interface MyObject {
-            hasString: boolean;
-        }
-
-        type Options = MyObject | string;
-
-        function doThing(arg: Options) {
-            // ...
-        }
-        ```
-
-21. Variables/properties which are `public static` should also be `readonly` when possible.
-22. Interface and type properties are terminated with semicolons, not commas.
-23. Prefer arrow formatting when declaring functions for interfaces/types:
-
-    ```typescript
-    interface Test {
-        myCallback: (arg: string) => Promise<void>;
-    }
-    ```
-
-24. Prefer a type definition over an inline type. For example, define an interface.
-25. Always prefer to add types or declare a type over the use of `any`. Prefer inferred types
-    when they are not `any`.
-    1. When using `any`, a comment explaining why must be present.
-26. `import` should be used instead of `require`, as `require` does not have types.
-27. Export only what can be reused.
-28. Prefer a type like `Optional<X>` (`type Optional<T> = T | null | undefined`) instead
-    of truly optional parameters.
-
-    1. A notable exception is when the likelihood of a bug is minimal, such as when a function
-       takes an argument that is more often not required than required. An example where the
-       `?` operator is inappropriate is when taking a room ID: typically the caller should
-       supply the room ID if it knows it, otherwise deliberately acknowledge that it doesn't
-       have one with `null`.
-
-        ```typescript
-        function doThingWithRoom(
-            thing: string,
-            room: Optional<string>, // require the caller to specify
-        ) {
-            // ...
-        }
-        ```
-
-29. There should be approximately one interface, class, or enum per file unless the file is named
-    "types.ts", "global.d.ts", or ends with "-types.ts".
-    1. The file name should match the interface, class, or enum name.
-30. Bulk functions can be declared in a single file, though named as "foo-utils.ts" or "utils/foo.ts".
-31. Imports are grouped by external module imports first, then by internal imports.
-32. File ordering is not strict, but should generally follow this sequence:
-    1. Licence header
-    2. Imports
-    3. Constants
-    4. Enums
-    5. Interfaces
-    6. Functions
-    7. Classes
-        1. Public/protected/private static properties
-        2. Public/protected/private properties
-        3. Constructors
-        4. Public/protected/private getters & setters
-        5. Protected and abstract functions
-        6. Public/private functions
-        7. Public/protected/private static functions
-33. Variable names should be noticeably unique from their types. For example, "str: string" instead
-    of "string: string".
-34. Use double quotes to enclose strings. You may use single quotes if the string contains double quotes.
-
-    ```typescript
-    const example1 = "simple string";
-    const example2 = 'string containing "double quotes"';
-    ```
-
-35. Prefer async-await to promise-chaining
-
-    ```typescript
-    async function () {
-        const result = await anotherAsyncFunction();
-        // ...
-    }
-    ```
-
-## React
-
-Inheriting all the rules of TypeScript, the following additionally apply:
-
-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.
-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.
-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.
-6. Exported constants, enums, interfaces, functions, etc must be separate from files containing components
-   or stores.
-7. Stores should use a singleton pattern with a static instance property:
-
-    ```typescript
-    class FooStore {
-        public static readonly instance = new FooStore();
-
-        // or if the instance can't be created eagerly:
-        private static _instance: FooStore;
-        public static get instance(): FooStore {
-            if (!FooStore._instance) {
-                FooStore._instance = new FooStore();
-            }
-            return FooStore._instance;
-        }
-    }
-    ```
-
-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.
-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.
-
-12. Curly braces within JSX should be padded with a space, however properties on those components should not.
-    See above code example.
-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.
-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.
-15. Write more views than structures. Structures are chunks of functionality like MatrixChat while views are
-    isolated components.
-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. Class names must be prefixed with "mx\_".
-2. Class names should denote the component which defines them, followed by any context:
-    1. mx_MyFoo
-    2. mx_MyFoo_avatar
-    3. mx_MyFoo_avatar--user
-3. Use the `$font` and `$spacing` 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 {
-        & .mx_MyFoo_avatar {
-            // instead of &_avatar
-            // ...
-        }
-    }
-    ```
-
-6. Break multiple selectors over multiple lines this way:
-
-    ```scss
-    .mx_MyFoo,
-    .mx_MyBar,
-    .mx_MyFooBar {
-        // ...
-    }
-    ```
-
-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 for what the values mean:
-
-    ```scss
-    .mx_MyFoo {
-        width: calc(100% - 12px); // 12px for read receipts
-        top: -2px; // visually centred vertically
-        z-index: 10; // above user avatar, but below dialogs
-    }
-    ```
-
-9. Avoid the use of `!important`. If necessary, add a comment.
-
-## Tests
-
-1. Tests must be written in TypeScript.
-2. Jest mocks are declared below imports, but above everything else.
-3. Use the following convention template:
-
-    ```typescript
-    // Describe the class, component, or file name.
-    describe("FooComponent", () => {
-        // all test inspecific variables go here
-
-        beforeEach(() => {
-            // exclude if not used.
-        });
-
-        afterEach(() => {
-            // exclude if not used.
-        });
-
-        // Use "it should..." terminology
-        it("should call the correct API", async () => {
-            // test-specific variables go here
-            // function calls/state changes go here
-            // expectations go here
-        });
-    });
-
-    // If the file being tested is a utility class:
-    describe("foo-utils", () => {
-        describe("firstUtilFunction", () => {
-            it("should...", async () => {
-                // ...
-            });
-        });
-
-        describe("secondUtilFunction", () => {
-            it("should...", async () => {
-                // ...
-            });
-        });
-    });
-    ```
--- a/config.sample.json
+++ b/config.sample.json
@@ -26,11 +26,19 @@
    "uisi_autorageshake_app": "element-auto-uisi",
    "default_country_code": "GB",
    "show_labs_settings": false,
-    "features": {},
+    "features": { },
    "default_federate": true,
    "default_theme": "light",
    "room_directory": {
-        "servers": ["matrix.org"]
+        "servers": [
+            "matrix.org"
+        ]
+    },
+    "piwik": {
+        "url": "https://piwik.riot.im/",
+        "whitelisted_hs_urls": ["https://matrix.org"],
+        "whitelisted_is_urls": ["https://vector.im", "https://matrix.org"],
+        "siteId": 1
    },
    "enable_presence_by_hs_url": {
        "https://matrix.org": false,
@@ -42,10 +50,5 @@
    "jitsi": {
        "preferred_domain": "meet.element.io"
    },
-    "element_call": {
-        "url": "https://call.element.io",
-        "participant_limit": 8,
-        "brand": "Element Call"
-    },
    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
--- a/contribute.json
+++ b/contribute.json
@@ -1,13 +1,17 @@
 {
-    "name": "Element",
+  "name": "Element",
    "description": "A glossy Matrix collaboration client for the web.",
    "repository": {
-        "url": "https://github.com/vector-im/element-web",
-        "license": "Apache License 2.0"
+      "url": "https://github.com/vector-im/element-web",
+      "license": "Apache License 2.0"
    },
    "bugs": {
-        "list": "https://github.com/vector-im/element-web/issues",
-        "report": "https://github.com/vector-im/element-web/issues/new/choose"
+      "list": "https://github.com/vector-im/element-web/issues",
+      "report": "https://github.com/vector-im/element-web/issues/new/choose"
    },
-    "keywords": ["chat", "riot", "matrix"]
+    "keywords": [
+      "chat",
+      "riot",
+      "matrix"
+    ]
 }
--- a/docs/app-load.md
+++ b/docs/app-load.md
@@ -15,10 +15,10 @@ Current more parallel flow:
 digraph G {
  node [shape=box];

-subgraph cluster_0 {
-color=orange;
-node [style=filled];
-label = "index.ts";
+  subgraph cluster_0 {
+    color=orange;
+    node [style=filled];
+    label = "index.ts";

    entrypoint, s0, ready [shape=point];
    rageshake, config, i18n, theme, skin, olm [shape=parallelogram];
@@ -52,38 +52,33 @@ label = "index.ts";
    skin -> ready [color=red];
    theme -> ready [color=red];
    i18n -> ready [color=red];
+  }

-}
-
-subgraph cluster_1 {
-color = green;
-node [style=filled];
-label = "init.tsx";
+  subgraph cluster_1 {
+    color = green;
+    node [style=filled];
+    label = "init.tsx";

    ready -> loadApp;
    loadApp -> matrixchat;
-
-}
+  }
 }
 </code></pre>
-
 </p>
 </details>

 Key:
-
-   Parallelogram: async/await task
-   Box: sync task
-   Diamond: conditional branch
-   Egg: 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
+ Egg: 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:
 ![image](https://user-images.githubusercontent.com/2403652/73848977-08624500-4821-11ea-9830-bb0317c41086.png)
--- a/docs/betas.md
+++ b/docs/betas.md
@@ -1,14 +0,0 @@
-# Beta features
-
-Beta features are features that are not ready for production yet but the team
-wants more people to try the features and give feedback on them.
-
-Before a feature gets into its beta phase, it is often a labs feature (see
-[Labs](https://github.com/vector-im/element-web/blob/develop/docs/labs.md)).
-
-**Be warned! Beta features may not be completely finalised or stable!**
-
-## Video rooms (`feature_video_rooms`)
-
-Enables support for creating and joining video rooms, which are persistent video
-chats that users can jump in and out of.
--- a/docs/choosing-an-issue.md
+++ b/docs/choosing-an-issue.md
@@ -33,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/vector-im/teams/product/members) or
-    [Design](https://github.com/orgs/vector-im/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/vector-im/teams/product/members) or
+  [Design](https://github.com/orgs/vector-im/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
--- a/docs/config.md
+++ b/docs/config.md
@@ -1,12 +1,8 @@
 # Configuration

-You can configure the app by copying `config.sample.json` to `config.json` or `config.$domain.json` and customising it.
-Element will attempt to load first `config.$domain.json` and if it fails `config.json`. This mechanism allows different
-configuration options depending on if you're hitting e.g. `app1.example.com` or `app2.example.com`. Configs are not mixed
-in any way, it either entirely uses the domain config, or entirely uses `config.json`.
-
-The possible configuration options are described here. If you run into issues, please visit
-[#element-web:matrix.org](https://matrix.to/#/#element-web:matrix.org) on Matrix.
+You can configure the app by copying `config.sample.json` to `config.json` and customising it. The possible options are
+described here. If you run into issues, please visit [#element-web:matrix.org](https://matrix.to/#/#element-web:matrix.org)
+on Matrix.

 For a good example of a production-tuned config, see https://app.element.io/config.json

@@ -17,7 +13,7 @@ for the desktop app the application will need to be exited fully (including via

 ## Homeserver configuration

-In order for Element to even start you will need to tell it what homeserver to connect to _by default_. Users will be
+In order for Element to even start you will need to tell it what homeserver to connect to *by default*. Users will be
 able to use a different homeserver if they like, though this can be disabled with `"disable_custom_urls": true` in your
 config.

@@ -26,18 +22,18 @@ One of the following options **must** be supplied:
 1. `default_server_config`: The preferred method of setting the homeserver connection information. Simply copy/paste
   your [`/.well-known/matrix/client`](https://spec.matrix.org/latest/client-server-api/#getwell-knownmatrixclient)
   into this field. For example:
-    ```json
-    {
-        "default_server_config": {
-            "m.homeserver": {
-                "base_url": "https://matrix-client.matrix.org"
-            },
-            "m.identity_server": {
-                "base_url": "https://vector.im"
-            }
-        }
-    }
-    ```
+   ```json
+   {
+      "default_server_config": {
+         "m.homeserver": {
+            "base_url": "https://matrix-client.matrix.org"
+         },
+         "m.identity_server": {
+            "base_url": "https://vector.im"
+         }
+      }
+   }
+   ```
 2. `default_server_name`: A different method of connecting to the homeserver by looking up the connection information
   using `.well-known`. When using this option, simply use your server's domain name (the part at the end of user IDs):
   `"default_server_name": "matrix.org"`
@@ -58,10 +54,10 @@ To force a labs flag on or off, use the following:

 ```json
 {
-    "features": {
-        "feature_you_want_to_turn_on": true,
-        "feature_you_want_to_keep_off": false
-    }
+   "features": {
+      "feature_you_want_to_turn_on": true,
+      "feature_you_want_to_keep_off": false
+   }
 }
 ```

@@ -82,25 +78,25 @@ instance. As of writing those settings are not fully documented, however a few a
   inputs.
 3. `room_directory`: Optionally defines how the room directory component behaves. Currently only a single property, `servers`
   is supported to add additional servers to the dropdown. For example:
-    ```json
-    {
-        "room_directory": {
-            "servers": ["matrix.org", "example.org"]
-        }
-    }
-    ```
+   ```json
+   {
+      "room_directory": {
+         "servers": ["matrix.org", "example.org"]
+      }
+   }
+   ```
 4. `setting_defaults`: Optional configuration for settings which are not described by this document and support the `config`
   level. This list is incomplete. For example:
-    ```json
-    {
-        "setting_defaults": {
-            "MessageComposerInput.showStickersButton": false,
-            "MessageComposerInput.showPollsButton": false
-        }
-    }
-    ```
-    These values will take priority over the hardcoded defaults for the settings. For a list of available settings, see
-    [Settings.tsx](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.tsx).
+   ```json
+   {
+      "setting_defaults": {
+         "MessageComposerInput.showStickersButton": false,
+         "MessageComposerInput.showPollsButton": false
+      }
+   }
+   ```
+   These values will take priority over the hardcoded defaults for the settings. For a list of available settings, see
+   [Settings.tsx](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.tsx).

 ## Customisation & branding

@@ -139,11 +135,6 @@ complete re-branding/private labeling, a more personalised experience can be ach
    to hide this dropdown.
 16. `disable_guests`: When `false` (default), **enable** guest-related functionality (peeking/previewing rooms, etc) for unregistered
    users. Set to `true` to disable this functionality.
-17. `user_notice`: Optional notice to show to the user, e.g. for sunsetting a deployment and pushing users to move in their own time.
-    Takes a configuration object as below:
-    1. `title`: Required. Title to show at the top of the notice.
-    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.

 ### `desktop_builds` and `mobile_builds`

@@ -170,16 +161,16 @@ Together, these two options might look like the following in your config:

 ```json
 {
-    "desktop_builds": {
-        "available": true,
-        "logo": "https://example.org/assets/logo-small.svg",
-        "url": "https://example.org/not_element/download"
-    },
-    "mobile_builds": {
-        "ios": null,
-        "android": "https://example.org/not_element/android",
-        "fdroid": "https://example.org/not_element/fdroid"
-    }
+   "desktop_builds": {
+      "available": true,
+      "logo": "https://example.org/assets/logo-small.svg",
+      "url": "https://example.org/not_element/download"
+   },
+   "mobile_builds": {
+      "ios": null,
+      "android": "https://example.org/not_element/android",
+      "fdroid": "https://example.org/not_element/fdroid"
+   }
 }
 ```

@@ -210,18 +201,18 @@ Together, the options might look like this in your config:

 ```json
 {
-    "branding": {
-        "welcome_background_url": "https://example.org/assets/background.jpg",
-        "auth_header_logo_url": "https://example.org/assets/logo.svg",
-        "auth_footer_links": [
-            { "text": "FAQ", "url": "https://example.org/faq" },
-            { "text": "Donate", "url": "https://example.org/donate" }
-        ]
-    },
-    "embedded_pages": {
-        "welcome_url": "https://example.org/assets/welcome.html",
-        "home_url": "https://example.org/assets/home.html"
-    }
+   "branding": {
+      "welcome_background_url": "https://example.org/assets/background.jpg",
+      "auth_header_logo_url": "https://example.org/assets/logo.svg",
+      "auth_footer_links": [
+         {"text": "FAQ", "url": "https://example.org/faq"},
+         {"text": "Donate", "url": "https://example.org/donate"},
+      ]
+   },
+   "embedded_pages": {
+      "welcome_url": "https://example.org/assets/welcome.html",
+      "home_url": "https://example.org/assets/home.html"
+   }
 }
 ```

@@ -240,98 +231,88 @@ When Element is deployed alongside a homeserver with SSO-only login, some option
 2. `sso_redirect_options`: Options to define how to handle unauthenticated users. If the object contains `"immediate": true`, then
   all unauthenticated users will be automatically redirected to the SSO system to start their login. If instead you'd only like to
   have users which land on the welcome page to be redirected, use `"on_welcome_page": true`. As an example:
-    ```json
-    {
-        "sso_redirect_options": {
-            "immediate": false,
-            "on_welcome_page": true
-        }
-    }
-    ```
-    It is most common to use the `immediate` flag instead of `on_welcome_page`.
+   ```json
+   {
+      "sso_redirect_options": {
+         "immediate": false,
+         "on_welcome_page": true
+      }
+   }
+   ```
+   It is most common to use the `immediate` flag instead of `on_welcome_page`.

 ## VoIP / Jitsi calls

-Currently, Element uses Jitsi to offer conference calls in rooms, with an experimental Element Call implementation in the works.
-A set of defaults are applied, pointing at our Jitsi and Element Call instances, to ensure conference calling works, however you
-can point Element at your own if you prefer.
+Currently, Element uses Jitsi to offer conference calls in rooms. A set of defaults are applied, pointing at our Jitsi instance,
+to ensure conference calling works, however you can point Element at your own Jitsi if you prefer.

 More information about the Jitsi setup can be found [here](./jitsi.md).

 The VoIP and Jitsi options are:

 1. `jitsi`: Optional configuration for how to start Jitsi conferences. Currently can only contain a single `preferred_domain`
-   value which points at the domain of the Jitsi instance. Defaults to `meet.element.io`. This is _not_ used if the Jitsi widget
+   value which points at the domain of the Jitsi instance. Defaults to `meet.element.io`. This is *not* used if the Jitsi widget
   was created by an integration manager, or if the homeserver provides Jitsi information in `/.well-known/matrix/client`. For
   example:
-    ```json
-    {
-        "jitsi": {
-            "preferred_domain": "meet.jit.si"
-        }
-    }
-    ```
+   ```json
+   {
+      "jitsi": {
+         "preferred_domain": "meet.jit.si"
+      }
+   }
+   ```
 2. `jitsi_widget`: Optional configuration for the built-in Jitsi widget. Currently can only contain a single `skip_built_in_welcome_screen`
   value, denoting whether the "Join Conference" button should be shown. When `true` (default `false`), Jitsi calls will skip to
   the call instead of having a screen with a single button on it. This is most useful if the Jitsi instance being used already
   has a landing page for users to test audio and video before joining the call, otherwise users will automatically join the call.
   For example:
-    ```json
-    {
-        "jitsi_widget": {
-            "skip_built_in_welcome_screen": true
-        }
-    }
-    ```
+   ```json
+   {
+      "jitsi_widget": {
+         "skip_built_in_welcome_screen": true
+      }
+   }
+   ```
 3. `voip`: Optional configuration for various VoIP features. Currently can only contain a single `obey_asserted_identity` value to
-   send MSC3086-style asserted identity messages during VoIP calls in the room corresponding to the asserted identity. This _must_
+   send MSC3086-style asserted identity messages during VoIP calls in the room corresponding to the asserted identity. This *must*
   only be set in trusted environments. The option defaults to `false`. For example:
-    ```json
-    {
-        "voip": {
-            "obey_asserted_identity": false
-        }
-    }
-    ```
+   ```json
+   {
+      "voip": {
+         "obey_asserted_identity": false
+      }
+   }
+   ```
 4. `widget_build_url`: Optional URL to have Element make a request to when a user presses the voice/video call buttons in the app,
   if a call would normally be started by the action. The URL will be called with a `roomId` query parameter to identify the room
   being called in. The URL must respond with a JSON object similar to the following:
-    ```json
-    {
-        "widget_id": "$arbitrary_string",
-        "widget": {
-            "creatorUserId": "@user:example.org",
-            "id": "$the_same_widget_id",
-            "type": "m.custom",
-            "waitForIframeLoad": true,
-            "name": "My Widget Name Here",
-            "avatar_url": "mxc://example.org/abc123",
-            "url": "https://example.org/widget.html",
-            "data": {
-                "title": "Subtitle goes here"
-            }
-        },
-        "layout": {
-            "container": "top",
-            "index": 0,
-            "width": 65,
-            "height": 50
-        }
-    }
-    ```
-    The `widget` is the `content` of a normal widget state event. The `layout` is the layout specifier for the widget being created,
-    as defined by the `io.element.widgets.layout` state event.
+   ```json
+   {
+      "widget_id": "$arbitrary_string",
+      "widget": {
+         "creatorUserId": "@user:example.org",
+          "id": "$the_same_widget_id",
+          "type": "m.custom",
+          "waitForIframeLoad": true,
+          "name": "My Widget Name Here",
+          "avatar_url": "mxc://example.org/abc123",
+          "url": "https://example.org/widget.html",
+          "data": {
+             "title": "Subtitle goes here"
+          }
+      },
+      "layout": {
+         "container": "top",
+         "index": 0,
+         "width": 65,
+         "height": 50
+      }
+   }
+   ```
+   The `widget` is the `content` of a normal widget state event. The `layout` is the layout specifier for the widget being created,
+   as defined by the `io.element.widgets.layout` state event.
 5. `audio_stream_url`: Optional URL to pass to Jitsi to enable live streaming. This option is considered experimental and may be removed
   at any time without notice.
-6. `element_call`: Optional configuration for native group calls using Element Call, with the following subkeys:
-    - `url`: The URL of the Element Call instance to use for native group calls. This option is considered experimental
-      and may be removed at any time without notice. Defaults to `https://call.element.io`.
-    - `use_exclusively`: A boolean specifying whether Element Call should be used exclusively as the only VoIP stack in
-      the app, removing the ability to start legacy 1:1 calls or Jitsi calls. Defaults to `false`.
-    - `participant_limit`: The maximum number of users who can join a call; if
-      this number is exceeded, the user will not be able to join a given call.
-    - `brand`: Optional name for the app. Defaults to `Element Call`. This is
-      used throughout the application in various strings/locations.

 ## Bug reporting

@@ -341,8 +322,10 @@ If you run your own rageshake server to collect bug reports, the following optio
   not present in the config, the app will disable all rageshake functionality. Set to `https://element.io/bugreports/submit` to submit
   rageshakes to us, or use your own rageshake server.
 2. `uisi_autorageshake_app`: If a user has enabled the "automatically send debug logs on decryption errors" flag, this option will be sent
-   alongside the rageshake so the rageshake server can filter them by app name. By default, this will be `element-auto-uisi`
-   (in contrast to other rageshakes submitted by the app, which use `element-web`).
+   alongside the rageshake so the rageshake server can filter them by app name. By default, this will be `element-web`, as with any other
+   rageshake submitted by the app.
+
+   If you are using the element.io rageshake server, please set this to `element-auto-uisi` so we can better filter them.

 If you would like to use [Sentry](https://sentry.io/) for rageshake data, add a `sentry` object to your config with the following values:

@@ -353,17 +336,18 @@ For example:

 ```json
 {
-    "sentry": {
-        "dsn": "dsn-goes-here",
-        "environment": "production"
-    }
+   "sentry": {
+      "dsn": "dsn-goes-here",
+      "environment": "production"
+   }
 }
 ```

 ## Integration managers

 Integration managers are embedded applications within Element to help the user configure bots, bridges, and widgets. An integration manager
-is a separate piece of software not typically available with your homeserver. To disable integrations, set the options defined here to `null`.
+is a separate piece of software not typically available with your homeserver. To disable integrations, leave the options defined here out of
+your config.

 1. `integrations_ui_url`: The UI URL for the integration manager.
 2. `integrations_rest_url`: The REST interface URL for the integration manager.
@@ -373,15 +357,15 @@ If you would like to use Scalar, the integration manager maintained by Element,

 ```json
 {
-    "integrations_ui_url": "https://scalar.vector.im/",
-    "integrations_rest_url": "https://scalar.vector.im/api",
-    "integrations_widgets_urls": [
-        "https://scalar.vector.im/_matrix/integrations/v1",
-        "https://scalar.vector.im/api",
-        "https://scalar-staging.vector.im/_matrix/integrations/v1",
-        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api"
-    ]
+   "integrations_ui_url": "https://scalar.vector.im/",
+   "integrations_rest_url": "https://scalar.vector.im/api",
+   "integrations_widgets_urls": [
+      "https://scalar.vector.im/_matrix/integrations/v1",
+      "https://scalar.vector.im/api",
+      "https://scalar-staging.vector.im/_matrix/integrations/v1",
+      "https://scalar-staging.vector.im/api",
+      "https://scalar-staging.riot.im/scalar/api"
+   ]
 }
 ```

@@ -391,9 +375,9 @@ If you would like to include a custom message when someone is reporting an event

 ```json
 {
-    "report_event": {
-        "admin_message_md": "Please be sure to review our [terms of service](https://example.org/terms) before reporting a message."
-    }
+   "report_event": {
+      "admin_message_md": "Please be sure to review our [terms of service](https://example.org/terms) before reporting a message."
+   }
 }
 ```

@@ -401,25 +385,66 @@ To add additional "terms and conditions" links throughout the app, use the follo

 ```json
 {
-    "terms_and_conditions_links": [{ "text": "Code of conduct", "url": "https://example.org/code-of-conduct" }]
+   "terms_and_conditions_links": [
+      { "text": "Code of conduct", "url": "https://example.org/code-of-conduct" }
+   ]
 }
 ```

 ## Analytics

+Analytics are currently possible with two systems: `posthog` (preferred) and <del>`piwik`</del> (matomo; deprecated). When
+these configuration options are not present, analytics are deemed impossible and the user won't be asked to opt-in to the
+system.
+
 To configure [Posthog](https://posthog.com/), add the following under `posthog` in your config:

 1. `api_host`: The hostname of the posthog server.
 2. `project_api_key`: The API key from posthog.

-When these configuration options are not present,
-analytics are deemed impossible and the user won't be asked to opt in to the system.
+To configure Piwik (***DEPRECATED***), add the following under `piwik` in your config:

-There are additional root-level options which can be specified:
+1. `url`: The URL of the piwik server.
+2. `site_id`: The site ID to use.
+3. `policy_url`: URL to the analytics collection policy.
+4. `whitelisted_hs_urls`: A list of homeserver client-server URLs to *not* redact from analytics.

-1. `analytics_owner`: the company name used in dialogs talking about analytics - this defaults to `brand`,
-   and is useful when the provider of analytics is different from the provider of the Element instance.
-2. `privacy_policy_url`: URL to the privacy policy including the analytics collection policy.
+Additionally, you may set `"piwik": false` to disable piwik configuration too. An `analytics_owner` can also be specified in your
+config to replace the company name used in dialogs talking about analytics - this defaults to `brand`, and is useful when the
+provider of analytics is different from the provider of the Element instance.
+
+## Server hosting links
+
+If you would like to encourage matrix.org users to sign up for a service like [Element Matrix Services](https://element.io/matrix-services/server-hosting),
+the following configuration options can be set. Note that if the options are missing from the configuration then the hosting prompts
+will not be shown to the user.
+
+1. `hosting_signup_link`: Optional URL to link the user to when talking about "Upgrading your account". Will contain a query parameter
+   of `utm_campaign` to denote which link the user clicked on within the app. Only ever applies to matrix.org users specifically.
+2. `host_signup`: Optional configuration for an account importer to your hosting platform. The API surface of this is not documented
+   at the moment, but can be configured with the following subproperties:
+   1. `brand`: The brand name to use.
+   2. `url`: The iframe URL for the importer.
+   3. `domains`: The homeserver domains to show the importer to.
+   4. `cookie_policy_url`: The URL to the cookie policy for the importer.
+   5. `privacy_policy_url`: The URL to the privacy policy for the importer.
+   6. `terms_of_service_url`: The URL to the terms of service for the importer.
+
+If you're looking to mirror a setup from our production/development environments, the following config should be used:
+
+```json
+{
+   "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
+   "host_signup": {
+      "brand": "Element Home",
+      "domains": [ "matrix.org" ],
+      "url": "https://ems.element.io/element-home/in-app-loader",
+      "cookie_policy_url": "https://element.io/cookie-policy",
+      "privacy_policy_url": "https://element.io/privacy",
+      "terms_of_service_url": "https://element.io/terms-of-service"
+   }
+}
+```

 ## Miscellaneous

@@ -430,10 +455,10 @@ set this value to the following at a minimum:

 ```json
 {
-    "enable_presence_by_hs_url": {
-        "https://matrix.org": false,
-        "https://matrix-client.matrix.org": false
-    }
+   "enable_presence_by_hs_url": {
+      "https://matrix.org": false,
+      "https://matrix-client.matrix.org": false
+   }
 }
 ```

@@ -450,8 +475,8 @@ Element will check multiple sources when looking for an identity server to use i
 the following order of preference:

 1. The identity server set in the user's account data
-    - For a new user, no value is present in their account data. It is only set
-      if the user visits Settings and manually changes their identity server.
+   * For a new user, no value is present in their account data. It is only set
+     if the user visits Settings and manually changes their identity server.
 2. The identity server provided by the `.well-known` lookup that occurred at
   login
 3. The identity server provided by the Riot config file
@@ -477,37 +502,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.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.flair` - Whether or not community flair is shown in rooms.
+* `UIFeature.communities` - Whether or not to show any UI related to communities. Implicitly
+  disables `UIFeature.flair` when disabled.
+* `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.

 ## Undocumented / developer options

@@ -517,4 +543,3 @@ 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. `voice_broadcast.chunk_length`: Target chunk length in seconds for the Voice Broadcast feature currently under development.
--- a/docs/custom-home.md
+++ b/docs/custom-home.md
@@ -26,6 +26,7 @@ The home page can be overridden in `config.json` to provide all users of an elem
 }
 ```

+
 ## `home.html` Example

 The following is a simple example for a custom `home.html`:
@@ -61,3 +62,4 @@ It may be needed to set CORS headers for the `home.html` to enable element-deskt
 ```
 add_header Access-Control-Allow-Origin *;
 ```
+
--- a/docs/customisations.md
+++ b/docs/customisations.md
@@ -30,7 +30,7 @@ maintenance.

 **Note**: The project deliberately does not exclude `customisations.json` from Git.
 This is to ensure that in shared projects it's possible to have a common config. By
-default, Element Web does _not_ ship with this file to prevent conflicts.
+default, Element Web does *not* ship with this file to prevent conflicts.

 ### Custom components

@@ -41,10 +41,9 @@ that properties/state machines won't change.
 ### Component visibility customisation

 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/matrix-org/matrix-react-sdk/blob/master/src/customisations/ComponentVisibility.ts) following the instructions above.

@@ -56,7 +55,6 @@ might be shown to the user, but they won't have permission to invite users to
 the current room: the button will appear disabled.

 For example, to only allow users who meet a certain condition to create spaces:
-
 ```typescript
 function shouldShowComponent(component: UIComponent): boolean {
    if (component === UIComponent.CreateSpaces) {
@@ -67,5 +65,4 @@ function shouldShowComponent(component: UIComponent): boolean {
    return true;
 }
 ```
-
 In this example, all UI related to creating a space will be hidden unless the users meets the custom condition.
--- a/docs/e2ee.md
+++ b/docs/e2ee.md
@@ -10,9 +10,9 @@ Set the following on your homeserver's

 ```json
 {
-    "io.element.e2ee": {
-        "default": false
-    }
+  "io.element.e2ee": {
+    "default": false
+  }
 }
 ```

@@ -29,9 +29,9 @@ following on your homeserver's `/.well-known/matrix/client` config:

 ```json
 {
-    "io.element.e2ee": {
-        "secure_backup_required": true
-    }
+  "io.element.e2ee": {
+    "secure_backup_required": true
+  }
 }
 ```

@@ -44,9 +44,9 @@ only offer one of these, you can signal this via the

 ```json
 {
-    "io.element.e2ee": {
-        "secure_backup_setup_methods": ["passphrase"]
-    }
+  "io.element.e2ee": {
+    "secure_backup_setup_methods": ["passphrase"]
+  }
 }
 ```

--- a/docs/feature-flags.md
+++ b/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.
@@ -37,7 +37,6 @@ When starting work on a feature, we should create a matching feature flag:
 1. Add a new
   [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.tsx)
   of the form:
-
 ```js
    "feature_cats": {
        isFeature: true,
@@ -46,13 +45,10 @@ When starting work on a feature, we should create a matching feature flag:
        default: false,
    },
 ```
-
 2. Check whether the feature is enabled as appropriate:
-
 ```js
-SettingsStore.getValue("feature_cats");
+    SettingsStore.getValue("feature_cats")
 ```
-
 3. Document the feature in the [labs documentation](https://github.com/vector-im/element-web/blob/develop/docs/labs.md)

 With these steps completed, the feature is disabled by default, but can be
@@ -92,14 +88,12 @@ cover these cases, change the setting's `default` in `Settings.tsx` to `true`.
 Once we're confident that a feature is working well, we should remove or convert the flag.

 If the feature is meant to be turned off/on by the user:
-
 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/vector-im/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/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/vector-im/element-web/blob/develop/docs/labs.md)
--- a/docs/jitsi-dev.md
+++ b/docs/jitsi-dev.md
@@ -1,7 +1,7 @@
 # Jitsi wrapper developer docs

-_If you're looking for information on how to set up Jitsi in your Element, see
-[jitsi.md](./jitsi.md) instead._
+*If you're looking for information on how to set up Jitsi in your Element, see 
+[jitsi.md](./jitsi.md) instead.*

 These docs are for developers wondering how the different conference buttons work
 within Element. If you're not a developer, you're probably looking for [jitsi.md](./jitsi.md).
@@ -46,24 +46,24 @@ end up creating a widget with a URL like `https://integrations.example.org?widge
 The integration manager's wrapper will typically have another iframe to isolate the
 widget from the client by yet another layer. The wrapper often provides other functionality
 which might not be available on the embedded site, such as a fullscreen button or the
-communication layer with the client (all widgets _should_ be talking to the client
+communication layer with the client (all widgets *should* be talking to the client
 over `postMessage`, even if they aren't going to be using the widget APIs).

-Widgets added with the `/addwidget` command will _not_ be wrapped as they are not going
-through an integration manager. The widgets themselves _should_ also work outside of
+Widgets added with the `/addwidget` command will *not* be wrapped as they are not going
+through an integration manager. The widgets themselves *should* also work outside of
 Element. Widgets currently have a "pop out" button which opens them in a new tab and
 therefore have no connection back to Riot.

 ## Jitsi widgets from integration managers

 Integration managers will create an entire widget event and send it over `postMessage`
-for the client to add to the room. This means that the integration manager gets to
+for the client to add to the room. This means that the integration manager gets to 
 decide the conference domain, conference name, and other aspects of the widget. As
 a result, users can end up with a Jitsi widget that does not use the same conference
 server they specified in their config.json - this is expected.

 Some integration managers allow the user to change the conference name while others
-will generate one for the user.
+will generate one for the user. 

 ## Jitsi widgets generated by Element itself

@@ -79,7 +79,7 @@ The Jitsi widget created by Element uses a local `jitsi.html` wrapper (or one ho
 required `postMessage` calls are fulfilled.

 **Note**: Per [jitsi.md](./jitsi.md) the `preferredDomain` can also come from the server's
-client .well-known data.
+client .well-known data. 

 ## The Jitsi wrapper in Element

@@ -92,9 +92,9 @@ and less risky to load. The local wrapper URL is populated with the conference i
 from the original widget (which could be a v1 or v2 widget) so the user joins the right
 call.

-Critically, when the widget URL is reconstructed it does _not_ take into account the
+Critically, when the widget URL is reconstructed it does *not* take into account the
 config.json's `preferredDomain` for Jitsi. If it did this, users would end up on different
-conference servers and therefore different calls entirely.
+conference servers and therefore different calls entirely. 

 **Note**: Per [jitsi.md](./jitsi.md) the `preferredDomain` can also come from the server's
 client .well-known data.
--- a/docs/jitsi.md
+++ b/docs/jitsi.md
@@ -24,14 +24,13 @@ Element will use the Jitsi server that is embedded in the widget, even if it is
 one you configured. This is because conference calls must be held on a single Jitsi
 server and cannot be split over multiple servers.

-However, you can configure Element to _start_ a conference with your Jitsi server by adding
+However, you can configure Element to *start* a conference with your Jitsi server by adding
 to your [config](./config.md) the following:
-
 ```json
 {
-    "jitsi": {
-        "preferredDomain": "your.jitsi.example.org"
-    }
+  "jitsi": {
+    "preferredDomain": "your.jitsi.example.org"
+  }
 }
 ```

@@ -47,12 +46,11 @@ domain will appear later in the URL as a configuration parameter.
 **Hint**: If you want everyone on your homeserver to use the same Jitsi server by
 default, and you are using element-web 1.6 or newer, set the following on your homeserver's
 `/.well-known/matrix/client` config:
-
 ```json
 {
-    "im.vector.riot.jitsi": {
-        "preferredDomain": "your.jitsi.example.org"
-    }
+  "im.vector.riot.jitsi": {
+    "preferredDomain": "your.jitsi.example.org"
+  }
 }
 ```

--- a/docs/kubernetes.md
+++ b/docs/kubernetes.md
@@ -1,4 +1,5 @@
-# Running in Kubernetes
+Running in Kubernetes
+=====================

 In case you would like to deploy element-web in a kubernetes cluster you can use
 the provided Kubernetes example below as a starting point. Note that this example assumes the
@@ -69,6 +70,12 @@ Then you can deploy it to your cluster with something like `kubectl apply -f my-
                        "matrix.org"
                ]
            },
+            "piwik": {
+                "url": "https://piwik.riot.im/",
+                "whitelistedHSUrls": ["https://matrix.org"],
+                "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
+                "siteId": 1
+            },
            "enable_presence_by_hs_url": {
                "https://matrix.org": false,
                "https://matrix-client.matrix.org": false
@@ -162,7 +169,7 @@ Then you can deploy it to your cluster with something like `kubectl apply -f my-
          add_header X-Frame-Options SAMEORIGIN;
          add_header X-Content-Type-Options nosniff;
          add_header X-XSS-Protection "1; mode=block";
-          add_header Content-Security-Policy "frame-ancestors 'self'";
+          add_header Content-Security-Policy "frame-ancestors 'none'";
    spec:
      rules:
        - host: element.example.nl
@@ -177,3 +184,4 @@ Then you can deploy it to your cluster with something like `kubectl apply -f my-
                      number: 80

    ---
+
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -4,9 +4,6 @@ If Labs is enabled in the [Element config](config.md), you can enable some of th
 to `Settings->Labs`. This list is non-exhaustive and subject to change, chat in
 [#element-web:matrix.org](https://matrix.to/#/#element-web:matrix.org) for more information.

-If a labs features gets more stable, it _may_ be promoted to a beta feature
-(see [Betas](https://github.com/vector-im/element-web/blob/develop/docs/betas.md)).
-
 **Be warned! Labs features are not finalised, they may be fragile, they may change, they may be
 dropped. Ask in the room if you are unclear about any details here.**

@@ -111,6 +108,10 @@ To enable message previews for reactions in DMs only, enable `feature_roomlist_p
 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).

+## Hidden read receipts (`feature_hidden_read_receipts`)
+
+Enables sending hidden read receipts as per [MSC2285](https://github.com/matrix-org/matrix-doc/pull/2285)
+
 ## Breadcrumbs v2 (`feature_breadcrumbs_v2`)

 Instead of showing the horizontal list of breadcrumbs under the filter field, the new UX is an interactive context menu
@@ -122,7 +123,7 @@ Switches to a new room search experience.

 ## Extensible events rendering (`feature_extensible_events`) [In Development]

-_Intended for developer use only at the moment._
+*Intended for developer use only at the moment.*

 Extensible Events are a [new event format](https://github.com/matrix-org/matrix-doc/pull/1767) which
 supports graceful fallback in unknown event types. Instead of rendering nothing or a blank space, events
@@ -145,45 +146,36 @@ If no right panel state is known for the room or it was closed on the last room
 visit, it will default to the room member list. Otherwise, the saved card last
 used in that room is shown.

+## Show current profile of users on historical messages (`feature_use_only_current_profiles`)
+
+An experimental flag to determine how the app would behave if a user's current display
+name and avatar (profile) were shown on historical messages instead of the profile details
+at the time when the message was sent.
+
+When enabled, historical messages will use the current profile for the sender.
+
+## Pin drop location sharing (`feature_location_share_pin_drop`) [In Development]
+
+Enables sharing a pin drop location to the timeline.
+
 ## 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`)
+## Threaded Messaging (`feature_thread`)
+
+Threading allows users to branch out a new conversation from the main timeline of a room. This is particularly useful in high traffic rooms where multiple conversations can happen in parallel or when a single discussion might stretch over a very long period of time.
+
+Threads can be access by clicking their summary below the root event on the room timeline. Users can find a comprehensive list of threads by click the icon on the room header button.
+
+This feature might work in degraded mode if the homeserver a user is connected to does not advertise support for the unstable feature `org.matrix.msc3440`  when calling the `/versions` API endpoint.
+
+## Right-click Message Context Menu (`feature_message_right_click_context_menu`)
+
+Enables showing a right-click context menu when right-clicking messages in the
+timeline. This menu shows options that can usually be found in the message
+action bar or in the message options.
+
+## Voice & video rooms (`feature_video_rooms`) [In Development]

 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]
-
-Enables support for video rooms that use Element Call rather than Jitsi, and causes the 'New video room' option to create Element Call video rooms rather than Jitsi ones.
-
-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 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.
-
-## Rich text in room topics (`feature_html_topic`) [In Development]
-
-Enables rendering of MD / HTML in room topics.
-
-## Exploring public spaces (`feature_exploring_public_spaces`)
-
-Enables exploring public spaces in the new search dialog. Requires the server to
-have [MSC3827](https://github.com/matrix-org/matrix-spec-proposals/pull/3827) enabled.
-
-## Favourite Messages (`feature_favourite_messages`) [In Development]
-
-Enables users to bookmark a message or content for a later reference.
-
-## Sign in another device by showing a QR code (`feature_qr_signin_reciprocate_show`)
-
-Add capability to the session/device manager screens to generate a QR code to sign in another device + set up E2EE. This requires the homeserver to have support for [MSC3882](https://github.com/matrix-org/matrix-spec-proposals/pull/3882) and [MSC3886](https://github.com/matrix-org/matrix-spec-proposals/pull/3886) enabled.
-
-## Use the Rust cryptography implementation (`feature_rust_crypto`) [In Development]
-
-Configures Element to use a new cryptography implementation based on the [matrix-rust-sdk](https://github.com/matrix-org/matrix-rust-sdk).
-
-This setting is (currently) _sticky_ to a user's session: it only takes effect when the user logs in to a new session. Likewise, even after disabling the setting in `config.json`, the Rust implemention will remain in use until users log out.
--- a/docs/memory-profiles-and-leaks.md
+++ b/docs/memory-profiles-and-leaks.md
@@ -1,11 +1,11 @@
 ## Memory leaks

-Element usually emits slow behaviour just before it is about to crash. Getting a
+Element usually emits slow behaviour just before it is about to crash. Getting a 
 memory snapshot (below) just before that happens is ideal in figuring out what
 is going wrong.

 Common symptoms are clicking on a room and it feels like the tab froze and scrolling
-becoming jumpy/staggered.
+becoming jumpy/staggered. 

 If you receive a white screen (electron) or the chrome crash page, it is likely
 run out of memory and it is too late for a memory profile. Please do report when
@@ -22,8 +22,8 @@ and anything newer is still in the warmup stages of the app.

 **Memory profiles can contain sensitive information.** If you are submitting a memory
 profile to us for debugging purposes, please pick the appropriate Element developer and
-send them over an encrypted private message. _Do not share your memory profile in
-public channels or with people you do not trust._
+send them over an encrypted private message. *Do not share your memory profile in
+public channels or with people you do not trust.*

 ### Taking a memory profile (Firefox)

--- a/docs/modules.md
+++ b/docs/modules.md
@@ -1,49 +0,0 @@
-# Module system
-
-The module system in Element Web is a way to add or modify functionality of Element Web itself, bundled at compile time
-for the app. This means that modules are loaded as part of the `yarn build` process but have an effect on user experience
-at runtime.
-
-## Installing modules
-
-If you already have a module you want to install, such as our [ILAG Module](https://github.com/vector-im/element-web-ilag-module),
-then copy `build_config.sample.yaml` to `build_config.yaml` in the same directory. In your new `build_config.yaml` simply
-add the reference to the module as described by the sample file, using the same syntax you would for `yarn add`:
-
-```yaml
-modules:
-    # Our module happens to be published on NPM, so we use that syntax to reference it.
-    - "@vector-im/element-web-ilag-module@latest"
-```
-
-Then build the app as you normally would: `yarn build` or `yarn dist` (if compatible on your platform). If you are building
-the Docker image then ensure your `build_config.yaml` ends up in the build directory. Usually this works fine if you use
-the current directory as the build context (the `.` in `docker build -t my-element-web .`).
-
-## 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 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
-`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/vector-im/element-web-ilag-module) which will give you a general idea for what the
-structure of a module is and how it works.
-
-The following requirements are key for any module:
-
-1. The module must depend on `@matrix-org/react-sdk-module-api` (usually as a dev dependency).
-2. The module's `main` entrypoint must have a `default` export for the `RuntimeModule` instance, supporting a constructor
-   which takes a single parameter: a `ModuleApi` instance. This instance is passed to `super()`.
-3. The module must be deployed in a way where `yarn add` can access it, as that is how the build system will try to
-   install it. Note that while this is often NPM, it can also be a GitHub/GitLab repo or private NPM registry.
-
-... and that's pretty much it. As with any code, please be responsible and call things in line with the documentation.
-Both `RuntimeModule` and `ModuleApi` have extensive documentation to describe what is proper usage and how to set things
-up.
-
-If you have any questions then please visit [#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org) on
-Matrix and we'll help as best we can.
--- a/docs/review.md
+++ b/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
--- a/docs/theming.md
+++ b/docs/theming.md
@@ -1,29 +1,31 @@
-# Theming Element
+Theming Element
+============

 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
+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 `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`)
+ 1. Pick a name, e.g. `teal`. at time of writing we have `light` and `dark`.
+ 2. Fork `src/skins/vector/css/themes/dark.scss` to be `teal.scss`
+ 3. Fork `src/skins/vector/css/themes/_base.scss` to be `_teal.scss`
+ 4. Override variables in `_teal.scss` as desired. You may wish to delete ones
+    which don't differ from `_base.scss`, to make it clear which are being
+    overridden. If every single colour is being changed (as per `_dark.scss`)
    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 matrix-react-sdk's UserSettings.js
-7.  Sit back and admire your handywork.
+ 5. Add the theme to the list of entrypoints in webpack.config.js
+ 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
 single directory tree.

-# Custom Themes
+Custom Themes
+=============

 Themes derived from the built in themes may also be defined in settings.

--- a/docs/translating-dev.md
+++ b/docs/translating-dev.md
@@ -2,11 +2,11 @@

 ## Requirements

-   A working [Development Setup](../README.md#setting-up-a-dev-environment)
-    -   Including up-to-date versions of matrix-react-sdk and matrix-js-sdk
-   Latest LTS version of Node.js installed
-   Be able to understand English
-   Be able to understand the language you want to translate Element into
+- A working [Development Setup](../README.md#setting-up-a-dev-environment)
+  - Including up-to-date versions of matrix-react-sdk and matrix-js-sdk
+- Latest LTS version of Node.js installed
+- Be able to understand English
+- Be able to understand the language you want to translate Element into

 ## Translating strings vs. marking strings for translation

@@ -15,7 +15,6 @@ Translating strings are done with the `_t()` function found in matrix-react-sdk/
 Basically, whenever a translatable string is introduced, you should call either `_t()` immediately OR `_td()` and later `_t()`.

 Example:
-
 ```
 // Module-level constant
 const COLORS = {
@@ -31,10 +30,10 @@ function getColorName(hex) {

 ## Adding new strings

-1.  Check if the import `import { _t } from 'matrix-react-sdk/src/languageHandler';` is present. If not add it to the other import statements. Also import `_td` if needed.
-1.  Add `_t()` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method). If the string is introduced at a point before the translation system has not yet been initialized, use `_td()` instead, and call `_t()` at the appropriate time.
-1.  Run `yarn i18n` to update `src/i18n/strings/en_EN.json`
-1.  If you added a string with a plural, you can add other English plural variants to `src/i18n/strings/en_EN.json` (remeber to edit the one in the same project as the source file containing your new translation).
+ 1. Check if the import ``import { _t } from 'matrix-react-sdk/src/languageHandler';`` is present. If not add it to the other import statements. Also import `_td` if needed.
+ 1. Add ``_t()`` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method). If the string is introduced at a point before the translation system has not yet been initialized, use `_td()` instead, and call `_t()` at the appropriate time.
+ 1. Run `yarn i18n` to update ``src/i18n/strings/en_EN.json``
+ 1. If you added a string with a plural, you can add other English plural variants to ``src/i18n/strings/en_EN.json`` (remeber to edit the one in the same project as the source file containing your new translation).

 ## Editing existing strings

@@ -44,21 +43,21 @@ function getColorName(hex) {

 ## Adding variables inside a string.

-1. Extend your `_t()` call. Instead of `_t(STRING)` use `_t(STRING, {})`
+1. Extend your ``_t()`` call. Instead of ``_t(STRING)`` use ``_t(STRING, {})``
 1. Decide how to name it. Please think about if the person who has to translate it can understand what it does. E.g. using the name 'recipient' is bad, because a translator does not know if it is the name of a person, an email address, a user ID, etc. Rather use e.g. recipientEmailAddress.
-1. Add it to the array in `_t` for example `_t(STRING, {variable: this.variable})`
-1. Add the variable inside the string. The syntax for variables is `%(variable)s`. Please note the _s_ at the end. The name of the variable has to match the previous used name.
+1. Add it to the array in ``_t`` for example ``_t(STRING, {variable: this.variable})``
+1. Add the variable inside the string. The syntax for variables is ``%(variable)s``. Please note the _s_ at the end. The name of the variable has to match the previous used name.

-   You can use the special `count` variable to choose between multiple versions of the same string, in order to get the correct pluralization. E.g. `_t('You have %(count)s new messages', { count: 2 })` would show 'You have 2 new messages', while `_t('You have %(count)s new messages', { count: 1 })` would show 'You have one new message' (assuming a singular version of the string has been added to the translation file. See above). Passing in `count` is much prefered over having an if-statement choose the correct string to use, because some languages have much more complicated plural rules than english (e.g. they might need a completely different form if there are three things rather than two).
-   If you want to translate text that includes e.g. hyperlinks or other HTML you have to also use tag substitution, e.g. `_t('<a>Click here!</a>', {}, { 'a': (sub) => <a>{sub}</a> })`. If you don't do the tag substitution you will end up showing literally '<a>' rather than making a hyperlink.
-   You can also use React components with normal variable substitution if you want to insert HTML markup, e.g. `_t('Your email address is %(emailAddress)s', { emailAddress: <i>{userEmailAddress}</i> })`.
+- You can use the special ``count`` variable to choose between multiple versions of the same string, in order to get the correct pluralization. E.g. ``_t('You have %(count)s new messages', { count: 2 })`` would show 'You have 2 new messages', while ``_t('You have %(count)s new messages', { count: 1 })`` would show 'You have one new message' (assuming a singular version of the string has been added to the translation file. See above). Passing in ``count`` is much prefered over having an if-statement choose the correct string to use, because some languages have much more complicated plural rules than english (e.g. they might need a completely different form if there are three things rather than two).
+- If you want to translate text that includes e.g. hyperlinks or other HTML you have to also use tag substitution, e.g. ``_t('<a>Click here!</a>', {}, { 'a': (sub) => <a>{sub}</a> })``. If you don't do the tag substitution you will end up showing literally '<a>' rather than making a hyperlink.
+- You can also use React components with normal variable substitution if you want to insert HTML markup, e.g. ``_t('Your email address is %(emailAddress)s', { emailAddress: <i>{userEmailAddress}</i> })``.

 ## Things to know/Style Guides

-   Do not use `_t()` inside `getDefaultProps`: the translations aren't loaded when `getDefaultProps` is called, leading to missing translations. Use `_td()` to indicate that `_t()` will be called on the string later.
-   If using translated strings as constants, translated strings can't be in constants loaded at class-load time since the translations won't be loaded. Mark the strings using `_td()` instead and perform the actual translation later.
-   If a string is presented in the UI with punctuation like a full stop, include this in the translation strings, since punctuation varies between languages too.
-   Avoid "translation in parts", i.e. concatenating translated strings or using translated strings in variable substitutions. Context is important for translations, and translating partial strings this way is simply not always possible.
-   Concatenating strings often also introduces an implicit assumption about word order (e.g. that the subject of the sentence comes first), which is incorrect for many languages.
-   Translation 'smell test': If you have a string that does not begin with a capital letter (is not the start of a sentence) or it ends with e.g. ':' or a preposition (e.g. 'to') you should recheck that you are not trying to translate a partial sentence.
-   If you have multiple strings, that are almost identical, except some part (e.g. a word or two) it is still better to translate the full sentence multiple times. It may seem like inefficient repetion, but unlike programming where you try to minimize repetition, translation is much faster if you have many, full, clear, sentences to work with, rather than fewer, but incomplete sentence fragments.
+- Do not use `_t()` inside ``getDefaultProps``: the translations aren't loaded when `getDefaultProps` is called, leading to missing translations. Use `_td()` to indicate that `_t()` will be called on the string later.
+- If using translated strings as constants, translated strings can't be in constants loaded at class-load time since the translations won't be loaded. Mark the strings using `_td()` instead and perform the actual translation later.
+- If a string is presented in the UI with punctuation like a full stop, include this in the translation strings, since punctuation varies between languages too.
+- Avoid "translation in parts", i.e. concatenating translated strings or using translated strings in variable substitutions. Context is important for translations, and translating partial strings this way is simply not always possible.
+- Concatenating strings often also introduces an implicit assumption about word order (e.g. that the subject of the sentence comes first), which is incorrect for many languages.
+- Translation 'smell test': If you have a string that does not begin with a capital letter (is not the start of a sentence) or it ends with e.g. ':' or a preposition (e.g. 'to') you should recheck that you are not trying to translate a partial sentence.
+- If you have multiple strings, that are almost identical, except some part (e.g. a word or two) it is still better to translate the full sentence multiple times. It may seem like inefficient repetion, but unlike programming where you try to minimize repetition, translation is much faster if you have many, full, clear, sentences to work with, rather than fewer, but incomplete sentence fragments.
--- a/docs/translating.md
+++ b/docs/translating.md
@@ -2,15 +2,15 @@

 ## Requirements

-   Web Browser
-   Be able to understand English
-   Be able to understand the language you want to translate Element into
+- Web Browser
+- Be able to understand English
+- Be able to understand the language you want to translate Element into

 ## Step 0: Join #element-translations:matrix.org

-1. Come and join https://matrix.to/#/#element-translations:matrix.org for general discussion
+1. Come and join https://matrix.to/#/#element-translations:matrix.org for general discussion 
 2. Join https://matrix.to/#/#element-translators:matrix.org for language-specific rooms
-3. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed. In general little-or-no coordination is needed though :)
+3. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed.  In general little-or-no coordination is needed though :)

 ## Step 1: Preparing your Weblate Profile

@@ -27,7 +27,7 @@ If your language is listed go to Step 2a and if not go to Step 2b
 ## Step 2a: Helping on existing languages.

 1. Head to one of the projects listed https://translate.element.io/projects/element-web/
-2. Click on the `translate` button on the right side of your language
+2. Click on the ``translate`` button on the right side of your language
 3. Fill in the translations in the writeable field. You will see the original English string and the string of your second language above.

 Head to the explanations under Steb 2b
@@ -35,7 +35,7 @@ Head to the explanations under Steb 2b
 ## Step 2b: Adding a new language

 1. Go to one of the projects listed https://translate.element.io/projects/element-web/
-2. Click the `Start new translation` button at the bottom
+2. Click the ``Start new translation`` button at the bottom
 3. Select a language
 4. Start translating like in 2a.3
 5. Repeat these steps for the other projects which are listed at the link of step 2b.1
@@ -52,12 +52,13 @@ The yellow button has to be used if you are unsure about the translation but you

 These things are variables that are expanded when displayed by Element. They can be room names, usernames or similar. If you find one, you can move to the right place for your language, but not delete it as the variable will be missing if you do.

-A special case is `%(urlStart)s` and `%(urlEnd)s` which are used to mark the beginning of a hyperlink (i.e. `<a href="/somewhere">` and `</a>`. You must keep these markers surrounding the equivalent string in your language that needs to be hyperlinked.
+A special case is `%(urlStart)s` and `%(urlEnd)s` which are used to mark the beginning of a hyperlink (i.e. `<a href="/somewhere">` and `</a>`.  You must keep these markers surrounding the equivalent string in your language that needs to be hyperlinked.

 ### "I want to come back to this string. How?"

 You can use inside the translation field "Review needed" checkbox. It will be shown as Strings that need to be reviewed.

+
 ### Further reading

-The official Weblate doc provides some more in-depth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html
+The official Weblate doc provides some more in-depth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html
--- a/element.io/app/config.json
+++ b/element.io/app/config.json
@@ -10,11 +10,21 @@
        "https://scalar-staging.vector.im/api",
        "https://scalar-staging.riot.im/scalar/api"
    ],
+    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
    "uisi_autorageshake_app": "element-auto-uisi",
    "showLabsSettings": false,
+    "piwik": {
+        "url": "https://piwik.riot.im/",
+        "siteId": 1,
+        "policyUrl": "https://element.io/cookie-policy"
+    },
    "roomDirectory": {
-        "servers": ["matrix.org", "gitter.im", "libera.chat"]
+        "servers": [
+            "matrix.org",
+            "gitter.im",
+            "libera.chat"
+        ]
    },
    "enable_presence_by_hs_url": {
        "https://matrix.org": false,
@@ -30,10 +40,19 @@
            "text": "Cookie Policy"
        }
    ],
+    "hostSignup": {
+      "brand": "Element Home",
+      "cookiePolicyUrl": "https://element.io/cookie-policy",
+      "domains": [
+          "matrix.org"
+      ],
+      "privacyPolicyUrl": "https://element.io/privacy",
+      "termsOfServiceUrl": "https://element.io/terms-of-service",
+      "url": "https://ems.element.io/element-home/in-app-loader"
+    },
    "posthog": {
        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
        "apiHost": "https://posthog.element.io"
    },
-    "privacy_policy_url": "https://element.io/cookie-policy",
    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
--- a/element.io/app/deploy.py
+++ b/element.io/app/deploy.py
@@ -0,0 +1,191 @@
+#!/usr/bin/env python
+#
+# download and unpack a element-web tarball.
+#
+# Allows `bundles` to be extracted to a common directory, and a link to
+# config.json to be added.
+
+from __future__ import print_function
+
+import argparse
+import os
+import os.path
+import subprocess
+import sys
+import tarfile
+import shutil
+import glob
+
+try:
+    # python3
+    from urllib.request import urlretrieve
+except ImportError:
+    # python2
+    from urllib import urlretrieve
+
+class DeployException(Exception):
+    pass
+
+def create_relative_symlink(linkname, target):
+    relpath = os.path.relpath(target, os.path.dirname(linkname))
+    print ("Symlink %s -> %s" % (linkname, relpath))
+    os.symlink(relpath, linkname)
+
+
+def move_bundles(source, dest):
+    """Move the contents of the 'bundles' directory to a common dir
+
+    We check that we will not be overwriting anything before we proceed.
+
+    Args:
+        source (str): path to 'bundles' within the extracted tarball
+        dest (str): target common directory
+    """
+
+    if not os.path.isdir(dest):
+        os.mkdir(dest)
+
+    # build a map from source to destination, checking for non-existence as we go.
+    renames = {}
+    for f in os.listdir(source):
+        dst = os.path.join(dest, f)
+        if os.path.exists(dst):
+            print (
+                "Skipping bundle. The bundle includes '%s' which we have previously deployed."
+                % f
+            )
+        else:
+            renames[os.path.join(source, f)] = dst
+
+    for (src, dst) in renames.iteritems():
+        print ("Move %s -> %s" % (src, dst))
+        os.rename(src, dst)
+
+class Deployer:
+    def __init__(self):
+        self.packages_path = "."
+        self.bundles_path = None
+        self.should_clean = False
+        # filename -> symlink path e.g 'config.localhost.json' => '../localhost/config.json'
+        self.symlink_paths = {}
+        self.verify_signature = True
+
+    def deploy(self, tarball, extract_path):
+        """Download a tarball if necessary, and unpack it
+
+        Returns:
+            (str) the path to the unpacked deployment
+        """
+        print("Deploying %s to %s" % (tarball, extract_path))
+
+        name_str = os.path.basename(tarball).replace(".tar.gz", "")
+        extracted_dir = os.path.join(extract_path, name_str)
+        if os.path.exists(extracted_dir):
+            raise DeployException('Cannot unpack %s: %s already exists' % (
+                tarball, extracted_dir))
+
+        downloaded = False
+        if tarball.startswith("http://") or tarball.startswith("https://"):
+            tarball = self.download_and_verify(tarball)
+            print("Downloaded file: %s" % tarball)
+            downloaded = True
+
+        try:
+            with tarfile.open(tarball) as tar:
+                tar.extractall(extract_path)
+        finally:
+            if self.should_clean and downloaded:
+                os.remove(tarball)
+
+        print ("Extracted into: %s" % extracted_dir)
+
+        if self.symlink_paths:
+            for link_path, file_path in self.symlink_paths.iteritems():
+                create_relative_symlink(
+                    target=file_path,
+                    linkname=os.path.join(extracted_dir, link_path)
+                )
+
+        if self.bundles_path:
+            extracted_bundles = os.path.join(extracted_dir, 'bundles')
+            move_bundles(source=extracted_bundles, dest=self.bundles_path)
+
+            # replace the extracted_bundles dir (which may not be empty if some
+            # bundles were skipped) with a symlink to the common dir.
+            shutil.rmtree(extracted_bundles)
+            create_relative_symlink(
+                target=self.bundles_path,
+                linkname=extracted_bundles,
+            )
+        return extracted_dir
+
+    def download_and_verify(self, url):
+        tarball = self.download_file(url)
+
+        if self.verify_signature:
+            sigfile = self.download_file(url + ".asc")
+            subprocess.check_call(["gpg", "--verify", sigfile, tarball])
+
+        return tarball
+
+    def download_file(self, url):
+        if not os.path.isdir(self.packages_path):
+            os.mkdir(self.packages_path)
+        local_filename = os.path.join(self.packages_path,
+                                      url.split('/')[-1])
+        sys.stdout.write("Downloading %s -> %s..." % (url, local_filename))
+        sys.stdout.flush()
+        urlretrieve(url, local_filename)
+        print ("Done")
+        return local_filename
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser("Deploy a Riot build on a web server.")
+    parser.add_argument(
+        "-p", "--packages-dir", default="./packages", help=(
+            "The directory to download the tarball into. (Default: '%(default)s')"
+        )
+    )
+    parser.add_argument(
+        "-e", "--extract-path", default="./deploys", help=(
+            "The location to extract .tar.gz files to. (Default: '%(default)s')"
+        )
+    )
+    parser.add_argument(
+        "-b", "--bundles-dir", nargs='?', default="./bundles", help=(
+            "A directory to move the contents of the 'bundles' directory to. A \
+            symlink to the bundles directory will also be written inside the \
+            extracted tarball. Example: './bundles'. \
+            (Default: '%(default)s')"
+        )
+    )
+    parser.add_argument(
+        "-c", "--clean", action="store_true", default=False, help=(
+            "Remove .tar.gz files after they have been downloaded and extracted. \
+            (Default: %(default)s)"
+        )
+    )
+    parser.add_argument(
+        "--include", nargs='*', default=['./config*.json'], help=(
+            "Symlink these files into the root of the deployed tarball. \
+             Useful for config files and home pages. Supports glob syntax. \
+             (Default: '%(default)s')"
+        )
+    )
+    parser.add_argument(
+        "tarball", help=(
+            "filename of tarball, or URL to download."
+        ),
+    )
+
+    args = parser.parse_args()
+
+    deployer = Deployer()
+    deployer.packages_path = args.packages_dir
+    deployer.bundles_path = args.bundles_dir
+    deployer.should_clean = args.clean
+
+    for include in args.include:
+        deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
+
+    deployer.deploy(args.tarball, args.extract_path)
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -10,11 +10,21 @@
        "https://scalar-staging.vector.im/api",
        "https://scalar-staging.riot.im/scalar/api"
    ],
+    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
    "uisi_autorageshake_app": "element-auto-uisi",
    "showLabsSettings": true,
+    "piwik": {
+        "url": "https://piwik.riot.im/",
+        "siteId": 1,
+        "policyUrl": "https://element.io/cookie-policy"
+    },
    "roomDirectory": {
-        "servers": ["matrix.org", "gitter.im", "libera.chat"]
+        "servers": [
+            "matrix.org",
+            "gitter.im",
+            "libera.chat"
+        ]
    },
    "enable_presence_by_hs_url": {
        "https://matrix.org": false,
@@ -30,6 +40,16 @@
            "text": "Cookie Policy"
        }
    ],
+    "hostSignup": {
+      "brand": "Element Home",
+      "cookiePolicyUrl": "https://element.io/cookie-policy",
+      "domains": [
+          "matrix.org"
+      ],
+      "privacyPolicyUrl": "https://element.io/privacy",
+      "termsOfServiceUrl": "https://element.io/terms-of-service",
+      "url": "https://ems.element.io/element-home/in-app-loader"
+    },
    "sentry": {
        "dsn": "https://029a0eb289f942508ae0fb17935bd8c5@sentry.matrix.org/6",
        "environment": "develop"
@@ -38,13 +58,8 @@
        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
        "apiHost": "https://posthog.element.io"
    },
-    "privacy_policy_url": "https://element.io/cookie-policy",
    "features": {
-        "feature_spotlight": true,
-        "feature_video_rooms": true
-    },
-    "element_call": {
-        "url": "https://element-call.netlify.app"
+        "feature_spotlight": true
    },
    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
--- a/module_system/BuildConfig.ts
+++ b/module_system/BuildConfig.ts
@@ -1,33 +0,0 @@
-/*
-Copyright 2022 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import * as YAML from "yaml";
-import * as fs from "fs";
-
-export type BuildConfig = {
-    // Dev note: make everything here optional for user safety. Invalid
-    // configs are very possible.
-
-    // The module references to include in the build.
-    modules?: string[];
-};
-
-export function readBuildConfig(): BuildConfig {
-    if (fs.existsSync("./build_config.yaml")) {
-        return YAML.parse(fs.readFileSync("./build_config.yaml", "utf-8"));
-    }
-    return {}; // no config
-}
--- a/module_system/installer.ts
+++ b/module_system/installer.ts
@@ -1,195 +0,0 @@
-/*
-Copyright 2022 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import * as fs from "fs";
-import * as childProcess from "child_process";
-import * as semver from "semver";
-
-import { BuildConfig } from "./BuildConfig";
-
-// This expects to be run from ./scripts/install.ts
-
-const moduleApiDepName = "@matrix-org/react-sdk-module-api";
-
-const MODULES_TS_HEADER = `
-/*
- * THIS FILE IS AUTO-GENERATED
- * You can edit it you like, but your changes will be overwritten,
- * so you'd just be trying to swim upstream like a salmon.
- * You are not a salmon.
- */
-
-import { RuntimeModule } from "@matrix-org/react-sdk-module-api/lib/RuntimeModule";
-`;
-const MODULES_TS_DEFINITIONS = `
-export const INSTALLED_MODULES: RuntimeModule[] = [];
-`;
-
-export function installer(config: BuildConfig): void {
-    if (!config.modules?.length) {
-        // nothing to do
-        writeModulesTs(MODULES_TS_HEADER + MODULES_TS_DEFINITIONS);
-        return;
-    }
-
-    let exitCode = 0;
-
-    // We cheat a bit and store the current package.json and lockfile so we can safely
-    // run `yarn add` without creating extra committed files for people. We restore
-    // these files by simply overwriting them when we're done.
-    const packageDeps = readCurrentPackageDetails();
-
-    // Record which optional dependencies there are currently, if any, so we can exclude
-    // them from our "must be a module" assumption later on.
-    const currentOptDeps = getOptionalDepNames(packageDeps.packageJson);
-
-    try {
-        // Install the modules with yarn
-        const yarnAddRef = config.modules.join(" ");
-        callYarnAdd(yarnAddRef); // install them all at once
-
-        // Grab the optional dependencies again and exclude what was there already. Everything
-        // else must be a module, we assume.
-        const pkgJsonStr = fs.readFileSync("./package.json", "utf-8");
-        const optionalDepNames = getOptionalDepNames(pkgJsonStr);
-        const installedModules = optionalDepNames.filter((d) => !currentOptDeps.includes(d));
-
-        // Ensure all the modules are compatible. We check them all and report at the end to
-        // try and save the user some time debugging this sort of failure.
-        const ourApiVersion = getTopLevelDependencyVersion(moduleApiDepName);
-        const incompatibleNames: string[] = [];
-        for (const moduleName of installedModules) {
-            const modApiVersion = getModuleApiVersionFor(moduleName);
-            if (!isModuleVersionCompatible(ourApiVersion, modApiVersion)) {
-                incompatibleNames.push(moduleName);
-            }
-        }
-        if (incompatibleNames.length > 0) {
-            console.error(
-                "The following modules are not compatible with this version of element-web. Please update the module " +
-                    "references and try again.",
-                JSON.stringify(incompatibleNames, null, 4), // stringify to get prettier/complete output
-            );
-            exitCode = 1;
-            return; // hit the finally{} block before exiting
-        }
-
-        // If we reach here, everything seems fine. Write modules.ts and log some output
-        // Note: we compile modules.ts in two parts for developer friendliness if they
-        // happen to look at it.
-        console.log("The following modules have been installed: ", installedModules);
-        let modulesTsHeader = MODULES_TS_HEADER;
-        let modulesTsDefs = MODULES_TS_DEFINITIONS;
-        let index = 0;
-        for (const moduleName of installedModules) {
-            const importName = `Module${++index}`;
-            modulesTsHeader += `import ${importName} from "${moduleName}";\n`;
-            modulesTsDefs += `INSTALLED_MODULES.push(${importName});\n`;
-        }
-        writeModulesTs(modulesTsHeader + modulesTsDefs);
-        console.log("Done installing modules");
-    } finally {
-        // Always restore package details (or at least try to)
-        writePackageDetails(packageDeps);
-
-        if (exitCode > 0) {
-            process.exit(exitCode);
-        }
-    }
-}
-
-type RawDependencies = {
-    lockfile: string;
-    packageJson: string;
-};
-
-function readCurrentPackageDetails(): RawDependencies {
-    return {
-        lockfile: fs.readFileSync("./yarn.lock", "utf-8"),
-        packageJson: fs.readFileSync("./package.json", "utf-8"),
-    };
-}
-
-function writePackageDetails(deps: RawDependencies): void {
-    fs.writeFileSync("./yarn.lock", deps.lockfile, "utf-8");
-    fs.writeFileSync("./package.json", deps.packageJson, "utf-8");
-}
-
-function callYarnAdd(dep: string): void {
-    // Add the module to the optional dependencies section just in case something
-    // goes wrong in restoring the original package details.
-    childProcess.execSync(`yarn add -O ${dep}`, {
-        env: process.env,
-        stdio: ["inherit", "inherit", "inherit"],
-    });
-}
-
-function getOptionalDepNames(pkgJsonStr: string): string[] {
-    return Object.keys(JSON.parse(pkgJsonStr)?.["optionalDependencies"] ?? {});
-}
-
-function findDepVersionInPackageJson(dep: string, pkgJsonStr: string): string {
-    const pkgJson = JSON.parse(pkgJsonStr);
-    const packages = {
-        ...(pkgJson["optionalDependencies"] ?? {}),
-        ...(pkgJson["devDependencies"] ?? {}),
-        ...(pkgJson["dependencies"] ?? {}),
-    };
-    return packages[dep];
-}
-
-function getTopLevelDependencyVersion(dep: string): string {
-    const dependencyTree = JSON.parse(
-        childProcess
-            .execSync(`npm list ${dep} --depth=0 --json`, {
-                env: process.env,
-                stdio: ["inherit", "pipe", "pipe"],
-            })
-            .toString("utf-8"),
-    );
-
-    /*
-        What a dependency tree looks like:
-        {
-          "version": "1.10.13",
-          "name": "element-web",
-          "dependencies": {
-            "@matrix-org/react-sdk-module-api": {
-              "version": "0.0.1",
-              "resolved": "file:../../../matrix-react-sdk-module-api"
-            }
-          }
-        }
-     */
-
-    return dependencyTree["dependencies"][dep]["version"];
-}
-
-function getModuleApiVersionFor(moduleName: string): string {
-    // We'll just pretend that this isn't highly problematic...
-    // Yarn is fairly stable in putting modules in a flat hierarchy, at least.
-    const pkgJsonStr = fs.readFileSync(`./node_modules/${moduleName}/package.json`, "utf-8");
-    return findDepVersionInPackageJson(moduleApiDepName, pkgJsonStr);
-}
-
-function isModuleVersionCompatible(ourApiVersion: string, moduleApiVersion: string): boolean {
-    if (!moduleApiVersion) return false;
-    return semver.satisfies(ourApiVersion, moduleApiVersion);
-}
-
-function writeModulesTs(content: string): void {
-    fs.writeFileSync("./src/modules.ts", content, "utf-8");
-}
--- a/module_system/scripts/install.ts
+++ b/module_system/scripts/install.ts
@@ -1,21 +0,0 @@
-/*
-Copyright 2022 New Vector Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { readBuildConfig } from "../BuildConfig";
-import { installer } from "../installer";
-
-const buildConf = readBuildConfig();
-installer(buildConf);
--- a/package.json
+++ b/package.json
@@ -1,230 +1,206 @@
 {
-    "name": "element-web",
-    "version": "1.11.28",
-    "description": "A feature-rich client for Matrix.org",
-    "author": "New Vector Ltd.",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/vector-im/element-web"
-    },
-    "license": "Apache-2.0",
-    "files": [
-        "lib",
-        "res",
-        "src",
-        "webpack.config.js",
-        "scripts",
-        "docs",
-        "release.sh",
-        "deploy",
-        "CHANGELOG.md",
-        "CONTRIBUTING.rst",
-        "LICENSE",
-        "README.md",
-        "AUTHORS.rst",
-        "package.json",
-        "contribute.json"
+  "name": "element-web",
+  "version": "1.10.13",
+  "description": "A feature-rich client for Matrix.org",
+  "author": "New Vector Ltd.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vector-im/element-web"
+  },
+  "license": "Apache-2.0",
+  "files": [
+    "lib",
+    "res",
+    "src",
+    "webpack.config.js",
+    "scripts",
+    "docs",
+    "release.sh",
+    "deploy",
+    "CHANGELOG.md",
+    "CONTRIBUTING.rst",
+    "LICENSE",
+    "README.md",
+    "AUTHORS.rst",
+    "package.json",
+    "contribute.json"
+  ],
+  "style": "bundle.css",
+  "scripts": {
+    "i18n": "matrix-gen-i18n",
+    "prunei18n": "matrix-prune-i18n",
+    "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
+    "clean": "rimraf lib webapp",
+    "build": "yarn clean && yarn build:genfiles && yarn build:bundle",
+    "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats",
+    "build:jitsi": "node scripts/build-jitsi.js",
+    "build:res": "node scripts/copy-res.js",
+    "build:genfiles": "yarn build:res && yarn build:jitsi",
+    "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
+    "build:bundle": "webpack --progress --bail --mode production",
+    "build:bundle-stats": "webpack --progress --bail --mode production --json > webpack-stats.json",
+    "dist": "scripts/package.sh",
+    "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js\"",
+    "start:https": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js --https\"",
+    "start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
+    "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --mode development --disable-host-check --hot",
+    "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
+    "lint:js": "eslint --max-warnings 0 src",
+    "lint:js-fix": "eslint --fix src",
+    "lint:types": "tsc --noEmit --jsx react",
+    "lint:style": "stylelint \"res/css/**/*.scss\"",
+    "test": "jest",
+    "coverage": "yarn test --coverage"
+  },
+  "dependencies": {
+    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
+    "browser-request": "^0.3.3",
+    "gfm.css": "^1.1.2",
+    "jsrsasign": "^10.2.0",
+    "katex": "^0.12.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-widget-api": "^0.1.0-beta.18",
+    "prop-types": "^15.7.2",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "sanitize-html": "^2.3.2",
+    "ua-parser-js": "^0.7.24"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.12.10",
+    "@babel/eslint-parser": "^7.12.10",
+    "@babel/eslint-plugin": "^7.12.10",
+    "@babel/plugin-proposal-class-properties": "^7.12.1",
+    "@babel/plugin-proposal-export-default-from": "^7.12.1",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+    "@babel/plugin-proposal-numeric-separator": "^7.12.7",
+    "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+    "@babel/plugin-proposal-optional-chaining": "^7.12.7",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-transform-runtime": "^7.12.10",
+    "@babel/preset-env": "^7.12.11",
+    "@babel/preset-react": "^7.12.10",
+    "@babel/preset-typescript": "^7.12.7",
+    "@babel/register": "^7.12.10",
+    "@babel/runtime": "^7.12.5",
+    "@principalstudio/html-webpack-inject-preload": "^1.2.7",
+    "@sentry/webpack-plugin": "^1.18.1",
+    "@svgr/webpack": "^5.5.0",
+    "@types/flux": "^3.1.9",
+    "@types/jest": "^27.0.2",
+    "@types/modernizr": "^3.5.3",
+    "@types/node": "^14.14.22",
+    "@types/react": "17.0.14",
+    "@types/react-dom": "17.0.9",
+    "@types/sanitize-html": "^2.3.1",
+    "@types/ua-parser-js": "^0.7.36",
+    "@typescript-eslint/eslint-plugin": "^5.6.0",
+    "@typescript-eslint/parser": "^5.6.0",
+    "allchange": "^1.0.6",
+    "autoprefixer": "^9.8.6",
+    "babel-jest": "^26.6.3",
+    "babel-loader": "^8.2.2",
+    "chokidar": "^3.5.1",
+    "concurrently": "^5.3.0",
+    "cpx": "^1.5.0",
+    "css-loader": "^3.6.0",
+    "dotenv": "^10.0.0",
+    "eslint": "8.9.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-matrix-org": "^0.4.0",
+    "eslint-plugin-react": "^7.28.0",
+    "eslint-plugin-react-hooks": "^4.3.0",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
+    "fake-indexeddb": "^3.1.2",
+    "file-loader": "^5.1.0",
+    "fs-extra": "^0.30.0",
+    "html-webpack-plugin": "^4.5.2",
+    "jest": "^26.6.3",
+    "jest-environment-jsdom-sixteen": "^1.0.3",
+    "jest-raw-loader": "^1.0.1",
+    "jest-sonar-reporter": "^2.0.0",
+    "json-loader": "^0.5.7",
+    "loader-utils": "^1.4.0",
+    "matrix-mock-request": "^2.0.0",
+    "matrix-react-test-utils": "^0.2.3",
+    "matrix-web-i18n": "^1.2.0",
+    "mini-css-extract-plugin": "^0.12.0",
+    "minimist": "^1.2.6",
+    "mkdirp": "^1.0.4",
+    "modernizr": "^3.12.0",
+    "node-fetch": "^2.6.7",
+    "optimize-css-assets-webpack-plugin": "^5.0.4",
+    "postcss-easings": "^2.0.0",
+    "postcss-hexrgba": "^2.0.1",
+    "postcss-import": "^12.0.1",
+    "postcss-loader": "^3.0.0",
+    "postcss-mixins": "^6.2.3",
+    "postcss-nested": "^4.2.3",
+    "postcss-preset-env": "^6.7.0",
+    "postcss-scss": "^2.1.1",
+    "postcss-simple-vars": "^5.0.2",
+    "postcss-strip-inline-comments": "^0.1.5",
+    "raw-loader": "^4.0.2",
+    "rimraf": "^3.0.2",
+    "shell-escape": "^0.2.0",
+    "simple-proxy-agent": "^1.1.0",
+    "string-replace-loader": "2",
+    "style-loader": "2",
+    "stylelint": "^13.9.0",
+    "stylelint-config-standard": "^20.0.0",
+    "stylelint-scss": "^3.18.0",
+    "terser-webpack-plugin": "^2.3.8",
+    "typescript": "^4.5.3",
+    "webpack": "^4.46.0",
+    "webpack-cli": "^3.3.12",
+    "webpack-dev-server": "^3.11.2",
+    "worker-loader": "^2.0.0",
+    "worklet-loader": "^2.0.0"
+  },
+  "resolutions": {
+    "@types/react": "17.0.14"
+  },
+  "jest": {
+    "testEnvironment": "jest-environment-jsdom-sixteen",
+    "testMatch": [
+      "<rootDir>/test/**/*-test.[tj]s?(x)"
    ],
-    "style": "bundle.css",
-    "scripts": {
-        "i18n": "matrix-gen-i18n",
-        "prunei18n": "matrix-prune-i18n",
-        "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
-        "clean": "rimraf lib webapp",
-        "build": "yarn clean && yarn build:genfiles && yarn build:bundle",
-        "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats",
-        "build:jitsi": "node scripts/build-jitsi.js",
-        "build:res": "node scripts/copy-res.js",
-        "build:genfiles": "yarn build:res && yarn build:jitsi && yarn build:module_system",
-        "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
-        "build:bundle": "webpack --progress --bail --mode production",
-        "build:bundle-stats": "webpack --progress --bail --mode production --json > webpack-stats.json",
-        "build:module_system": "tsc --project ./tsconfig.module_system.json && node ./lib/module_system/scripts/install.js",
-        "dist": "scripts/package.sh",
-        "start": "yarn build:module_system && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js\"",
-        "start:https": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n res,element-js \"yarn start:res\" \"yarn start:js --https\"",
-        "start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
-        "start:js": "webpack-dev-server --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --mode development --disable-host-check --hot",
-        "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
-        "lint:js": "yarn lint:js:src && yarn lint:js:module_system",
-        "lint:js:src": "eslint --max-warnings 0 src test && prettier --check .",
-        "lint:js:module_system": "eslint --max-warnings 0 --config .eslintrc-module_system.js module_system",
-        "lint:js-fix": "yarn lint:js-fix:src && yarn lint:js-fix:module_system",
-        "lint:js-fix:src": "prettier --write . && eslint --fix src test",
-        "lint:js-fix:module_system": "eslint --fix --config .eslintrc-module_system.js module_system",
-        "lint:types": "yarn lint:types:src && yarn lint:types:module_system",
-        "lint:types:src": "tsc --noEmit --jsx react",
-        "lint:types:module_system": "tsc --noEmit --project ./tsconfig.module_system.json",
-        "lint:style": "stylelint \"res/css/**/*.pcss\"",
-        "test": "jest",
-        "coverage": "yarn test --coverage",
-        "analyse:unused-exports": "node ./scripts/analyse_unused_exports.js"
+    "setupFilesAfterEnv": [
+      "<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"
+    ],
+    "moduleNameMapper": {
+      "\\.(css|scss)$": "<rootDir>/__mocks__/cssMock.js",
+      "\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",
+      "\\.svg$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/svg.js",
+      "\\$webapp/i18n/languages.json": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/languages.json",
+      "^browser-request$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/browser-request.js",
+      "^react$": "<rootDir>/node_modules/react",
+      "^react-dom$": "<rootDir>/node_modules/react-dom",
+      "^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src",
+      "^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src",
+      "decoderWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
+      "decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
+      "waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
+      "context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
+      "FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
+      "workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js",
+      "^!!raw-loader!.*": "jest-raw-loader",
+      "RecorderWorklet": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js"
    },
-    "resolutions": {
-        "@types/react-dom": "17.0.19",
-        "@types/react": "17.0.53"
-    },
-    "dependencies": {
-        "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz",
-        "@matrix-org/react-sdk-module-api": "^0.0.4",
-        "gfm.css": "^1.1.2",
-        "jsrsasign": "^10.5.25",
-        "katex": "^0.16.0",
-        "matrix-js-sdk": "24.0.0",
-        "matrix-react-sdk": "3.69.1",
-        "matrix-widget-api": "^1.1.1",
-        "react": "17.0.2",
-        "react-dom": "17.0.2",
-        "sanitize-html": "^2.3.2",
-        "ua-parser-js": "^1.0.0"
-    },
-    "devDependencies": {
-        "@babel/core": "^7.12.10",
-        "@babel/eslint-parser": "^7.12.10",
-        "@babel/eslint-plugin": "^7.12.10",
-        "@babel/plugin-proposal-class-properties": "^7.12.1",
-        "@babel/plugin-proposal-export-default-from": "^7.12.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-        "@babel/plugin-proposal-numeric-separator": "^7.12.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.12.10",
-        "@babel/preset-env": "^7.12.11",
-        "@babel/preset-react": "^7.12.10",
-        "@babel/preset-typescript": "^7.12.7",
-        "@babel/register": "^7.12.10",
-        "@babel/runtime": "^7.12.5",
-        "@casualbot/jest-sonar-reporter": "^2.2.5",
-        "@principalstudio/html-webpack-inject-preload": "^1.2.7",
-        "@sentry/webpack-plugin": "^1.18.1",
-        "@svgr/webpack": "^5.5.0",
-        "@testing-library/react": "^12.1.5",
-        "@types/flux": "^3.1.9",
-        "@types/jest": "^29.0.0",
-        "@types/jsrsasign": "^10.5.4",
-        "@types/modernizr": "^3.5.3",
-        "@types/node": "^16",
-        "@types/react": "17.0.53",
-        "@types/react-dom": "17.0.19",
-        "@types/sanitize-html": "^2.3.1",
-        "@types/ua-parser-js": "^0.7.36",
-        "@typescript-eslint/eslint-plugin": "^5.45.0",
-        "@typescript-eslint/parser": "^5.45.0",
-        "allchange": "^1.0.6",
-        "babel-jest": "^29.0.0",
-        "babel-loader": "^8.2.2",
-        "chokidar": "^3.5.1",
-        "concurrently": "^7.0.0",
-        "cpx": "^1.5.0",
-        "css-loader": "^4",
-        "dotenv": "^16.0.2",
-        "eslint": "8.35.0",
-        "eslint-config-google": "^0.14.0",
-        "eslint-config-prettier": "^8.5.0",
-        "eslint-plugin-deprecate": "^0.7.0",
-        "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-matrix-org": "^1.0.0",
-        "eslint-plugin-react": "^7.28.0",
-        "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-unicorn": "^45.0.0",
-        "extract-text-webpack-plugin": "^4.0.0-beta.0",
-        "fake-indexeddb": "^4.0.0",
-        "fetch-mock-jest": "^1.5.1",
-        "file-loader": "^6.0.0",
-        "fs-extra": "^11.0.0",
-        "html-webpack-plugin": "^4.5.2",
-        "jest": "^29.0.0",
-        "jest-canvas-mock": "^2.3.0",
-        "jest-environment-jsdom": "^29.0.0",
-        "jest-mock": "^29.0.0",
-        "jest-raw-loader": "^1.0.1",
-        "json-loader": "^0.5.7",
-        "loader-utils": "^3.0.0",
-        "matrix-mock-request": "^2.5.0",
-        "matrix-web-i18n": "^1.3.0",
-        "mini-css-extract-plugin": "^1",
-        "minimist": "^1.2.6",
-        "mkdirp": "^2.0.0",
-        "modernizr": "^3.12.0",
-        "node-fetch": "^2.6.7",
-        "optimize-css-assets-webpack-plugin": "^6.0.0",
-        "postcss": "^8.4.16",
-        "postcss-easings": "^2.0.0",
-        "postcss-hexrgba": "2.0.1",
-        "postcss-import": "^12.0.1",
-        "postcss-loader": "^3.0.0",
-        "postcss-mixins": "^6.2.3",
-        "postcss-nested": "^4.2.3",
-        "postcss-preset-env": "^6.7.0",
-        "postcss-scss": "^4.0.4",
-        "postcss-simple-vars": "^5.0.2",
-        "prettier": "2.8.4",
-        "raw-loader": "^4.0.2",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.7",
-        "simple-proxy-agent": "^1.1.0",
-        "string-replace-loader": "3",
-        "style-loader": "2",
-        "stylelint": "^15.0.0",
-        "stylelint-config-prettier": "^9.0.4",
-        "stylelint-config-standard": "^30.0.0",
-        "stylelint-scss": "^4.2.0",
-        "terser-webpack-plugin": "^4.0.0",
-        "ts-prune": "^0.10.3",
-        "typescript": "4.9.5",
-        "webpack": "^4.46.0",
-        "webpack-cli": "^3.3.12",
-        "webpack-dev-server": "^3.11.2",
-        "worker-loader": "^3.0.0",
-        "worklet-loader": "^2.0.0",
-        "yaml": "^2.0.1"
-    },
-    "jest": {
-        "testEnvironment": "jsdom",
-        "testEnvironmentOptions": {
-            "url": "http://localhost/"
-        },
-        "testMatch": [
-            "<rootDir>/test/**/*-test.[tj]s?(x)"
-        ],
-        "setupFiles": [
-            "jest-canvas-mock"
-        ],
-        "setupFilesAfterEnv": [
-            "<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"
-        ],
-        "moduleNameMapper": {
-            "\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
-            "\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",
-            "\\.svg$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/svg.js",
-            "\\$webapp/i18n/languages.json": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/languages.json",
-            "^react$": "<rootDir>/node_modules/react",
-            "^react-dom$": "<rootDir>/node_modules/react-dom",
-            "^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src",
-            "^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src",
-            "decoderWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-            "decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-            "waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-            "context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-            "FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
-            "workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js",
-            "^!!raw-loader!.*": "jest-raw-loader",
-            "RecorderWorklet": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js"
-        },
-        "transformIgnorePatterns": [
-            "/node_modules/(?!matrix-js-sdk).+$",
-            "/node_modules/(?!matrix-react-sdk).+$"
-        ],
-        "coverageReporters": [
-            "text-summary",
-            "lcov"
-        ],
-        "testResultsProcessor": "@casualbot/jest-sonar-reporter"
-    },
-    "@casualbot/jest-sonar-reporter": {
-        "outputDirectory": "coverage",
-        "outputName": "jest-sonar-report.xml",
-        "relativePaths": true
-    }
+    "transformIgnorePatterns": [
+      "/node_modules/(?!matrix-js-sdk).+$",
+      "/node_modules/(?!matrix-react-sdk).+$"
+    ],
+    "coverageReporters": [
+      "text-summary",
+      "lcov"
+    ],
+    "testResultsProcessor": "jest-sonar-reporter"
+  },
+  "jestSonar": {
+    "reportPath": "coverage",
+    "sonar56x": true
+  }
 }
--- a/release.sh
+++ b/release.sh
@@ -1,9 +1,68 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #
 # Script to perform a release of element-web.
+#
+# Requires github-changelog-generator; to install, do
+#   pip install git+https://github.com/matrix-org/github-changelog-generator.git

 set -e

-cd "$(dirname "$0")"
+orig_args=$@

-./node_modules/matrix-js-sdk/release.sh "$@"
+# chomp any args starting with '-' as these need to go
+# through to the release script and otherwise we'll get
+# confused about what the version arg is.
+while [[ "$1" == -* ]]; do
+    shift
+done
+
+cd `dirname $0`
+
+for i in matrix-js-sdk matrix-react-sdk
+do
+    echo "Checking version of $i..."
+    depver=`cat package.json | jq -r .dependencies[\"$i\"]`
+    latestver=`yarn info -s $i dist-tags.next`
+    if [ "$depver" != "$latestver" ]
+    then
+        echo "The latest version of $i is $latestver but package.json depends on $depver."
+        echo -n "Type 'u' to auto-upgrade, 'c' to continue anyway, or 'a' to abort:"
+        read resp
+        if [ "$resp" != "u" ] && [ "$resp" != "c" ]
+        then
+            echo "Aborting."
+            exit 1
+        fi
+        if [ "$resp" == "u" ]
+        then
+            echo "Upgrading $i to $latestver..."
+            yarn add -E $i@$latestver
+            git add -u
+            git commit -m "Upgrade $i to $latestver"
+        fi
+    fi
+done
+
+./node_modules/matrix-js-sdk/release.sh -n "$orig_args"
+
+release="${1#v}"
+tag="v${release}"
+prerelease=0
+# We check if this build is a prerelease by looking to
+# see if the version has a hyphen in it. Crude,
+# but semver doesn't support postreleases so anything
+# with a hyphen is a prerelease.
+echo $release | grep -q '-' && prerelease=1
+
+if [ $prerelease -eq 0 ]
+then
+    # For a release, reset SDK deps back to the `develop` branch.
+    for i in matrix-js-sdk matrix-react-sdk
+    do
+        echo "Resetting $i to develop branch..."
+        yarn add github:matrix-org/$i#develop
+        git add -u
+        git commit -m "Reset $i back to develop branch"
+    done
+    git push origin develop
+fi
--- a/release_config.yaml
+++ b/release_config.yaml
@@ -2,5 +2,3 @@ signing_id: releases@riot.im
 subprojects:
    matrix-react-sdk:
        includeByDefault: true
-    matrix-js-sdk:
-        includeByDefault: false
--- a/res/apple-app-site-association
+++ b/res/apple-app-site-association
@@ -1,18 +0,0 @@
-{
-    "applinks": {
-        "apps": [],
-        "details": [
-            {
-                "appID": "7J4U792NQT.im.vector.app",
-                "paths": [
-                    "*"
-                ]
-            }
-        ]
-    },
-    "webcredentials": {
-        "apps": [
-            "7J4U792NQT.im.vector.app"
-        ]
-    }
-}
--- a/res/css/structures/ErrorView.scss
+++ b/res/css/structures/ErrorView.scss
@@ -14,25 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// import font-size variables manually,
-// ideally this file would get loaded by the theme which has all variables in context
-@import "../../../node_modules/matrix-react-sdk/res/css/_font-sizes.pcss";
+// import font-size variables manually, ideally this scss would get loaded by the theme which has all variables in context
+@import "../../../node_modules/matrix-react-sdk/res/css/_font-sizes.scss";

 .mx_ErrorView {
    background: #c5e0f7;
    background: -moz-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
    background: -webkit-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
    background: linear-gradient(to bottom, #c5e0f7 0%, #ffffff 100%);
-    /* stylelint-disable-next-line function-no-unknown */
    filter: progid:dximagetransform.microsoft.gradient(startColorstr='#c5e0f7', endColorstr='#ffffff', GradientType=0);
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif,
-        "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-    color: #000;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
    width: 100%;
-    height: 100%;
-    overflow: auto;
-    padding: 0 20px;
-    box-sizing: border-box;
+    min-height: 100%;
+    height: auto;
+    color: #000;

    .mx_ErrorView_container {
        max-width: 680px;
@@ -90,8 +85,7 @@ limitations under the License.
        margin: auto 20px auto 0;
    }

-    h1,
-    h2 {
+    h1, h2 {
        font-weight: 600;
        margin-bottom: 32px;
    }
--- a/res/decoder-ring/datatypes.js
+++ b/res/decoder-ring/datatypes.js
@@ -20,7 +20,7 @@

 class Optional {
    static from(value) {
-        return (value && Some.of(value)) || None;
+        return value && Some.of(value) || None;
    }
    map(f) {
        return this;
--- a/res/decoder-ring/decoder.js
+++ b/res/decoder-ring/decoder.js
@@ -10,11 +10,11 @@ async function getBundleName(baseUrl) {
        throw new StartupError(`Couldn't fetch index.html to prefill bundle; ${res.status} ${res.statusText}`);
    }
    const index = await res.text();
-    return index
-        .split("\n")
-        .map((line) => line.match(/<script src="bundles\/([^/]+)\/bundle.js"/))
-        .filter((result) => result)
-        .map((result) => result[1])[0];
+    return index.split("\n").map((line) =>
+        line.match(/<script src="bundles\/([^/]+)\/bundle.js"/),
+    )
+    .filter((result) => result)
+    .map((result) => result[1])[0];
 }

 function validateBundle(value) {
@@ -69,7 +69,7 @@ function observeReadableStream(readableStream, pendingContext = {}) {
                return;
            }
            bytesReceived += value.length;
-            pendingSubject.next(Pending.of({ ...pendingContext, bytesReceived }));
+            pendingSubject.next(Pending.of({...pendingContext, bytesReceived }));
            /* string concatenation is apparently the most performant way to do this */
            buffer += utf8Decoder.decode(value);
            readNextChunk();
@@ -120,27 +120,25 @@ const e = React.createElement;
 * Provides user feedback given a FetchStatus object.
 */
 function ProgressBar({ fetchStatus }) {
-    return e(
-        "span",
-        { className: "progress " },
+    return e('span', { className: "progress "},
        fetchStatus.fold({
            pending: ({ bytesReceived, length }) => {
                if (!bytesReceived) {
-                    return e("span", { className: "spinner" }, "\u29b5");
+                    return e('span', { className: "spinner" }, "\u29b5");
                }
-                const kB = Math.floor((10 * bytesReceived) / 1024) / 10;
+                const kB = Math.floor(10 * bytesReceived / 1024) / 10;
                if (!length) {
-                    return e("span", null, `Fetching (${kB}kB)`);
+                    return e('span', null, `Fetching (${kB}kB)`);
                }
-                const percent = Math.floor((100 * bytesReceived) / length);
-                return e("span", null, `Fetching (${kB}kB) ${percent}%`);
+                const percent = Math.floor(100 * bytesReceived / length);
+                return e('span', null, `Fetching (${kB}kB) ${percent}%`);
            },
-            success: () => e("span", null, "\u2713"),
+            success: () => e('span', null, "\u2713"),
            error: (reason) => {
-                return e("span", { className: "error" }, `\u2717 ${reason}`);
+                return e('span', { className: 'error'}, `\u2717 ${reason}`);
            },
-        }),
-    );
+        },
+    ));
 }

 /*
@@ -195,24 +193,23 @@ function BundlePicker() {
        setColumn(value);
    }, []);

+
    /* ------------------------------------------------ */
    /* Plumb data-fetching observables through to React */
    /* ------------------------------------------------ */

    /* Whenever a valid bundle name is input, go see if it's a real bundle on the server */
-    React.useEffect(
-        () =>
-            validateBundle(bundle).fold({
-                some: (value) => {
-                    const subscription = bundleSubject(baseUrl, value)
-                        .pipe(rxjs.operators.map(Some.of))
-                        .subscribe(setBundleFetchStatus);
-                    return () => subscription.unsubscribe();
-                },
-                none: () => setBundleFetchStatus(None),
-            }),
-        [baseUrl, bundle],
-    );
+    React.useEffect(() =>
+        validateBundle(bundle).fold({
+            some: (value) => {
+                const subscription = bundleSubject(baseUrl, value)
+                    .pipe(rxjs.operators.map(Some.of))
+                    .subscribe(setBundleFetchStatus);
+                return () => subscription.unsubscribe();
+            },
+            none: () => setBundleFetchStatus(None),
+        }),
+    [baseUrl, bundle]);

    /* Whenever a valid javascript file is input, see if it corresponds to a sourcemap file and initiate a fetch
     * if so. */
@@ -221,18 +218,17 @@ function BundlePicker() {
            setFileFetchStatus(None);
            return;
        }
-        const observable = fetchAsSubject(new URL(`bundles/${bundle}/${file}.map`, baseUrl).toString()).pipe(
-            rxjs.operators.map((fetchStatus) =>
-                fetchStatus.flatMap((value) => {
+        const observable = fetchAsSubject(new URL(`bundles/${bundle}/${file}.map`, baseUrl).toString())
+            .pipe(
+                rxjs.operators.map((fetchStatus) => fetchStatus.flatMap(value => {
                    try {
                        return Success.of(JSON.parse(value));
                    } catch (e) {
                        return FetchError.of(e);
                    }
-                }),
-            ),
-            rxjs.operators.map(Some.of),
-        );
+                })),
+                rxjs.operators.map(Some.of),
+            );
        const subscription = observable.subscribe(setFileFetchStatus);
        return () => subscription.unsubscribe();
    }, [baseUrl, bundle, file]);
@@ -260,33 +256,26 @@ function BundlePicker() {
        });
    }, [fileFetchStatus, line, column]);

+
    /* ------ */
    /* Render */
    /* ------ */
-    return e(
-        "div",
-        {},
-        e(
-            "div",
-            { className: "inputs" },
-            e(
-                "div",
-                { className: "baseUrl" },
-                e("label", { htmlFor: "baseUrl" }, "Base URL"),
-                e("input", {
-                    name: "baseUrl",
+    return e('div', {},
+        e('div', { className: 'inputs' },
+            e('div', { className: 'baseUrl' },
+                e('label', { htmlFor: 'baseUrl'}, 'Base URL'),
+                e('input', {
+                    name: 'baseUrl',
                    required: true,
                    pattern: ".+",
                    onChange: onBaseUrlChange,
                    value: baseUrl,
                }),
            ),
-            e(
-                "div",
-                { className: "bundle" },
-                e("label", { htmlFor: "bundle" }, "Bundle"),
-                e("input", {
-                    name: "bundle",
+            e('div', { className: 'bundle' },
+                e('label', { htmlFor: 'bundle'}, 'Bundle'),
+                e('input', {
+                    name: 'bundle',
                    required: true,
                    pattern: "[0-9a-f]{20}",
                    onChange: onBundleChange,
@@ -297,12 +286,10 @@ function BundlePicker() {
                    none: () => null,
                }),
            ),
-            e(
-                "div",
-                { className: "file" },
-                e("label", { htmlFor: "file" }, "File"),
-                e("input", {
-                    name: "file",
+            e('div', { className: 'file' },
+                e('label', { htmlFor: 'file' }, 'File'),
+                e('input', {
+                    name: 'file',
                    required: true,
                    pattern: ".+\\.js",
                    onChange: onFileChange,
@@ -313,24 +300,20 @@ function BundlePicker() {
                    none: () => null,
                }),
            ),
-            e(
-                "div",
-                { className: "line" },
-                e("label", { htmlFor: "line" }, "Line"),
-                e("input", {
-                    name: "line",
+            e('div', { className: 'line' },
+                e('label', { htmlFor: 'line' }, 'Line'),
+                e('input', {
+                    name: 'line',
                    required: true,
                    pattern: "[0-9]+",
                    onChange: onLineChange,
                    value: line,
                }),
            ),
-            e(
-                "div",
-                { className: "column" },
-                e("label", { htmlFor: "column" }, "Column"),
-                e("input", {
-                    name: "column",
+            e('div', { className: 'column' },
+                e('label', { htmlFor: 'column' }, 'Column'),
+                e('input', {
+                    name: 'column',
                    required: true,
                    pattern: "[0-9]+",
                    onChange: onColumnChange,
@@ -338,12 +321,10 @@ function BundlePicker() {
                }),
            ),
        ),
-        e(
-            "div",
-            null,
+        e('div', null,
            result.fold({
                none: () => "Select a bundle, file and line",
-                some: (value) => e("pre", null, value),
+                some: (value) => e('pre', null, value),
            }),
        ),
    );
--- a/res/decoder-ring/index.html
+++ b/res/decoder-ring/index.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
    <head>
        <title>Rageshake decoder ring</title>
        <script crossorigin src="https://unpkg.com/source-map@0.7.3/dist/source-map.js"></script>
        <script>
            sourceMap.SourceMapConsumer.initialize({
-                "lib/mappings.wasm": "https://unpkg.com/source-map@0.7.3/lib/mappings.wasm",
+                "lib/mappings.wasm": "https://unpkg.com/source-map@0.7.3/lib/mappings.wasm"
            });
        </script>
        <script crossorigin src="https://unpkg.com/react@16/umd/react.production.min.js"></script>
@@ -18,16 +18,12 @@

        <style>
            @keyframes spin {
-                from {
-                    transform: rotate(0deg);
-                }
-                to {
-                    transform: rotate(359deg);
-                }
+                from {transform:rotate(0deg);}
+                to {transform:rotate(359deg);}
            }

            body {
-                font-family: sans-serif;
+                font-family: sans-serif
            }

            .spinner {
@@ -48,7 +44,7 @@
            }

            .valid::after {
-                content: "✓";
+                content: "✓"
            }

            label {
@@ -72,7 +68,7 @@
        <script type="text/javascript">
            document.addEventListener("DOMContentLoaded", () => {
                try {
-                    ReactDOM.render(React.createElement(Decoder.BundlePicker), document.getElementById("main"));
+                    ReactDOM.render(React.createElement(Decoder.BundlePicker), document.getElementById("main"))
                } catch (e) {
                    const n = document.createElement("div");
                    n.innerText = `Error starting: ${e.message}`;
--- a/res/sw.js
+++ b/res/sw.js
@@ -1 +1 @@
-self.addEventListener("fetch", () => {});
+self.addEventListener('fetch', () => {});
--- a/res/welcome.html
+++ b/res/welcome.html
@@ -1,173 +1,175 @@
 <style type="text/css">
-    /* we deliberately inline style here to avoid flash-of-CSS problems, and to avoid
+
+/* we deliberately inline style here to avoid flash-of-CSS problems, and to avoid
 * voodoo where we have to set display: none by default
 */

-    h1::after {
-        content: "!";
-    }
+h1::after {
+    content: "!";
+}

-    .mx_Parent {
-        display: -webkit-box;
-        display: -webkit-flex;
-        display: -ms-flexbox;
-        display: flex;
-        -webkit-box-orient: vertical;
-        -webkit-box-direction: normal;
-        -webkit-flex-direction: column;
-        -ms-flex-direction: column;
-        flex-direction: column;
-        -webkit-box-pack: center;
-        -webkit-justify-content: center;
-        -ms-flex-pack: center;
-        justify-content: center;
-        -webkit-box-align: center;
-        -webkit-align-items: center;
-        -ms-flex-align: center;
-        align-items: center;
-        text-align: center;
-        padding: 25px 35px;
-        color: #2e2f32;
-    }
+.mx_Parent {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-orient: vertical;
+    -webkit-box-direction: normal;
+    -webkit-flex-direction: column;
+    -ms-flex-direction: column;
+    flex-direction: column;
+    -webkit-box-pack: center;
+    -webkit-justify-content: center;
+    -ms-flex-pack: center;
+    justify-content: center;
+    -webkit-box-align: center;
+    -webkit-align-items: center;
+    -ms-flex-align: center;
+    align-items: center;
+    text-align: center;
+    padding: 25px 35px;
+    color: #2e2f32;
+}

-    .mx_Logo {
-        height: 54px;
-        margin-top: 2px;
-    }
+.mx_Logo {
+    height: 54px;
+    margin-top: 2px;
+}

-    .mx_ButtonGroup {
-        margin-top: 10px;
-    }
+.mx_ButtonGroup {
+    margin-top: 10px;
+}

-    .mx_ButtonRow {
-        display: -webkit-box;
-        display: -webkit-flex;
-        display: -ms-flexbox;
-        display: flex;
-        -webkit-justify-content: space-around;
-        -ms-flex-pack: distribute;
-        -webkit-box-align: center;
-        -webkit-align-items: center;
-        -ms-flex-align: center;
-        align-items: center;
-        justify-content: space-between;
-        box-sizing: border-box;
-        margin: 12px 0 0;
-    }
+.mx_ButtonRow {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-justify-content: space-around;
+    -ms-flex-pack: distribute;
+    -webkit-box-align: center;
+    -webkit-align-items: center;
+    -ms-flex-align: center;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    margin: 12px 0 0;
+}

-    .mx_ButtonRow > * {
-        margin: 0 10px;
-    }
+.mx_ButtonRow > * {
+    margin: 0 10px;
+}

-    .mx_ButtonRow > *:first-child {
-        margin-left: 0;
-    }
+.mx_ButtonRow > *:first-child {
+    margin-left: 0;
+}

-    .mx_ButtonRow > *:last-child {
-        margin-right: 0;
-    }
+.mx_ButtonRow > *:last-child {
+    margin-right: 0;
+}

-    .mx_ButtonParent {
-        display: -webkit-box;
-        display: -webkit-flex;
-        display: -ms-flexbox;
-        display: flex;
-        padding: 10px 20px;
-        -webkit-box-orient: horizontal;
-        -webkit-box-direction: normal;
-        -webkit-flex-direction: row;
-        -ms-flex-direction: row;
-        flex-direction: row;
-        -webkit-box-pack: center;
-        -webkit-justify-content: center;
-        -ms-flex-pack: center;
-        justify-content: center;
-        -webkit-box-align: center;
-        -webkit-align-items: center;
-        -ms-flex-align: center;
-        align-items: center;
-        border-radius: 4px;
-        width: 150px;
-        background-repeat: no-repeat;
-        background-position: 10px center;
-        text-decoration: none;
-        color: #2e2f32 !important;
-    }
+.mx_ButtonParent {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+    padding: 10px 20px;
+    -webkit-box-orient: horizontal;
+    -webkit-box-direction: normal;
+    -webkit-flex-direction: row;
+    -ms-flex-direction: row;
+    flex-direction: row;
+    -webkit-box-pack: center;
+    -webkit-justify-content: center;
+    -ms-flex-pack: center;
+    justify-content: center;
+    -webkit-box-align: center;
+    -webkit-align-items: center;
+    -ms-flex-align: center;
+    align-items: center;
+    border-radius: 4px;
+    width: 150px;
+    background-repeat: no-repeat;
+    background-position: 10px center;
+    text-decoration: none;
+    color: #2e2f32 !important;
+}

-    .mx_ButtonLabel {
-        margin-left: 20px;
-    }
+.mx_ButtonLabel {
+    margin-left: 20px;
+}

-    .mx_Header_title {
-        font-size: 24px;
-        font-weight: 600;
-        margin: 20px 0 0;
-    }
+.mx_Header_title {
+    font-size: 24px;
+    font-weight: 600;
+    margin: 20px 0 0;
+}

-    .mx_Header_subtitle {
-        font-size: 12px;
-        font-weight: normal;
-        margin: 8px 0 0;
-    }
+.mx_Header_subtitle {
+    font-size: 12px;
+    font-weight: normal;
+    margin: 8px 0 0;
+}

-    .mx_ButtonSignIn {
-        background-color: #368bd6;
-        color: white !important;
-    }
+.mx_ButtonSignIn {
+    background-color: #368BD6;
+    color: white !important;
+}

-    .mx_ButtonCreateAccount {
-        background-color: #0dbd8b;
-        color: white !important;
-    }
+.mx_ButtonCreateAccount {
+    background-color: #0DBD8B;
+    color: white !important;
+}

-    .mx_SecondaryButton {
-        background-color: #ffffff;
-        color: #2e2f32;
-    }
+.mx_SecondaryButton {
+    background-color: #FFFFFF;
+    color: #2E2F32;
+}

-    .mx_Button_iconSignIn {
-        background-image: url("welcome/images/icon-sign-in.svg");
-    }
-    .mx_Button_iconCreateAccount {
-        background-image: url("welcome/images/icon-create-account.svg");
-    }
-    .mx_Button_iconHelp {
-        background-image: url("welcome/images/icon-help.svg");
-    }
-    .mx_Button_iconRoomDirectory {
-        background-image: url("welcome/images/icon-room-directory.svg");
-    }
+.mx_Button_iconSignIn {
+    background-image: url('welcome/images/icon-sign-in.svg');
+}
+.mx_Button_iconCreateAccount {
+    background-image: url('welcome/images/icon-create-account.svg');
+}
+.mx_Button_iconHelp {
+    background-image: url('welcome/images/icon-help.svg');
+}
+.mx_Button_iconRoomDirectory {
+    background-image: url('welcome/images/icon-room-directory.svg');
+}

-    /*
+/*
 .mx_WelcomePage_loggedIn is applied by EmbeddedPage from the Welcome component
 If it is set on the page, we should show the buttons. Otherwise, we have to assume
 we don't have an account and should hide them. No account == no guest account either.
 */
-    .mx_WelcomePage:not(.mx_WelcomePage_loggedIn) .mx_WelcomePage_guestFunctions {
-        display: none;
+.mx_WelcomePage:not(.mx_WelcomePage_loggedIn) .mx_WelcomePage_guestFunctions {
+    display: none;
+}
+
+.mx_ButtonRow.mx_WelcomePage_guestFunctions {
+    margin-top: 20px;
+}
+.mx_ButtonRow.mx_WelcomePage_guestFunctions > div {
+    margin: 0 auto;
+}
+
+@media only screen and (max-width: 480px) {
+    .mx_ButtonRow {
+        flex-direction: column;
    }

-    .mx_ButtonRow.mx_WelcomePage_guestFunctions {
-        margin-top: 20px;
-    }
-    .mx_ButtonRow.mx_WelcomePage_guestFunctions > div {
-        margin: 0 auto;
+    .mx_ButtonRow > * {
+        margin: 0 0 10px 0;
    }
+}

-    @media only screen and (max-width: 480px) {
-        .mx_ButtonRow {
-            flex-direction: column;
-        }
-
-        .mx_ButtonRow > * {
-            margin: 0 0 10px 0;
-        }
-    }
 </style>

 <div class="mx_Parent">
    <a href="https://element.io" target="_blank" rel="noopener">
-        <img src="welcome/images/logo.svg" alt="" class="mx_Logo" />
+        <img src="welcome/images/logo.svg" alt="" class="mx_Logo"/>
    </a>
    <h1 class="mx_Header_title">_t("Welcome to Element")</h1>
    <!-- XXX: Our translations system isn't smart enough to recognize variables in the HTML, so we manually do it -->
--- a/scripts/analyse_unused_exports.js
+++ b/scripts/analyse_unused_exports.js
@@ -1,48 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-const fs = require("fs");
-const { exec } = require("node:child_process");
-
-const includeJSSDK = process.argv.includes("--include-js-sdk");
-const ignore = [];
-
-ignore.push(...Object.values(JSON.parse(fs.readFileSync(`${__dirname}/../components.json`))));
-ignore.push("/index.ts");
-// We ignore js-sdk by default as it may export for other non element-web projects
-if (!includeJSSDK) ignore.push("matrix-js-sdk");
-
-const command = `yarn ts-prune --ignore "${ignore.join("|")}" | grep -v "(used in module)"`;
-
-exec(command, (error, stdout, stderr) => {
-    if (error) throw error;
-    // We have to do this as piping the output of ts-prune causes the return
-    // code to be 0
-    if (stderr) throw Error(stderr);
-
-    let lines = stdout.split("\n");
-    // Remove the first line as that is the command that was being run and we
-    // log that only in case of an error
-    lines.splice(0, 1);
-    // Remove the last line as it is empty
-    lines.pop();
-
-    // ts-prune has bug where if the unused export is in a dependency, the path
-    // won't have an "/" character at the start, so we try to fix that for
-    // better UX
-    // TODO: This might break on Windows
-    lines = lines.reduce((newLines, line) => {
-        if (!line.startsWith("/")) newLines.push("/" + line);
-        else newLines.push(line);
-        return newLines;
-    }, []);
-
-    // If an unused export has been found, we error
-    if (lines.length > 0) {
-        console.log(`Command that was run: ${command}`);
-        console.log(lines.join("\n"));
-        throw Error("Unused exports found!");
-    }
-
-    console.log("Success - no unused exports found!");
-});
--- a/scripts/build-jitsi.js
+++ b/scripts/build-jitsi.js
@@ -21,13 +21,11 @@ if (process.env.HTTPS_PROXY) {
    options.agent = new ProxyAgent(process.env.HTTPS_PROXY, { tunnel: true });
 }

-fetch("https://meet.element.io/libs/external_api.min.js", options)
-    .then((res) => {
-        const stream = fs.createWriteStream(fname);
-        return new Promise((resolve, reject) => {
-            res.body.pipe(stream);
-            res.body.on("error", (err) => reject(err));
-            res.body.on("finish", () => resolve());
-        });
-    })
-    .then(() => console.log("Done with Jitsi download"));
+fetch("https://meet.element.io/libs/external_api.min.js", options).then(res => {
+    const stream = fs.createWriteStream(fname);
+    return new Promise((resolve, reject) => {
+        res.body.pipe(stream);
+        res.body.on('error', err => reject(err));
+        res.body.on('finish', () => resolve());
+    });
+}).then(() => console.log('Done with Jitsi download'));
--- a/scripts/ci_package.sh
+++ b/scripts/ci_package.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 # Runs package.sh, passing DIST_VERSION determined by git

--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -11,59 +11,58 @@ const loaderUtils = require("loader-utils");
 // This could readily be automated, but it's nice to explicitly
 // control when new languages are available.
 const INCLUDE_LANGS = [
-    { value: "bg", label: "Български" },
-    { value: "ca", label: "Català" },
-    { value: "cs", label: "čeština" },
-    { value: "da", label: "Dansk" },
-    { value: "de_DE", label: "Deutsch" },
-    { value: "el", label: "Ελληνικά" },
-    { value: "en_EN", label: "English" },
-    { value: "en_US", label: "English (US)" },
-    { value: "eo", label: "Esperanto" },
-    { value: "es", label: "Español" },
-    { value: "et", label: "Eesti" },
-    { value: "eu", label: "Euskara" },
-    { value: "fi", label: "Suomi" },
-    { value: "fr", label: "Français" },
-    { value: "gl", label: "Galego" },
-    { value: "he", label: "עברית" },
-    { value: "hi", label: "हिन्दी" },
-    { value: "hu", label: "Magyar" },
-    { value: "id", label: "Bahasa Indonesia" },
-    { value: "is", label: "íslenska" },
-    { value: "it", label: "Italiano" },
-    { value: "ja", label: "日本語" },
-    { value: "kab", label: "Taqbaylit" },
-    { value: "ko", label: "한국어" },
-    { value: "lo", label: "ລາວ" },
-    { value: "lt", label: "Lietuvių" },
-    { value: "lv", label: "Latviešu" },
-    { value: "nb_NO", label: "Norwegian Bokmål" },
-    { value: "nl", label: "Nederlands" },
-    { value: "nn", label: "Norsk Nynorsk" },
-    { value: "pl", label: "Polski" },
-    { value: "pt", label: "Português" },
-    { value: "pt_BR", label: "Português do Brasil" },
-    { value: "ru", label: "Русский" },
-    { value: "sk", label: "Slovenčina" },
-    { value: "sq", label: "Shqip" },
-    { value: "sr", label: "српски" },
-    { value: "sv", label: "Svenska" },
-    { value: "te", label: "తెలుగు" },
-    { value: "th", label: "ไทย" },
-    { value: "tr", label: "Türkçe" },
-    { value: "uk", label: "українська мова" },
-    { value: "vi", label: "Tiếng Việt" },
-    { value: "vls", label: "West-Vlaams" },
-    { value: "zh_Hans", label: "简体中文" }, // simplified chinese
-    { value: "zh_Hant", label: "繁體中文" }, // traditional chinese
+    {'value': 'bg', 'label': 'Български'},
+    {'value': 'ca', 'label': 'Català'},
+    {'value': 'cs', 'label': 'čeština'},
+    {'value': 'da', 'label': 'Dansk'},
+    {'value': 'de_DE', 'label': 'Deutsch'},
+    {'value': 'el', 'label': 'Ελληνικά'},
+    {'value': 'en_EN', 'label': 'English'},
+    {'value': 'en_US', 'label': 'English (US)'},
+    {'value': 'eo', 'label': 'Esperanto'},
+    {'value': 'es', 'label': 'Español'},
+    {'value': 'et', 'label': 'Eesti'},
+    {'value': 'eu', 'label': 'Euskara'},
+    {'value': 'fi', 'label': 'Suomi'},
+    {'value': 'fr', 'label': 'Français'},
+    {'value': 'gl', 'label': 'Galego'},
+    {'value': 'he', 'label': 'עברית'},
+    {'value': 'hi', 'label': 'हिन्दी'},
+    {'value': 'hu', 'label': 'Magyar'},
+    {'value': 'id', 'label': 'Bahasa Indonesia'},
+    {'value': 'is', 'label': 'íslenska'},
+    {'value': 'it', 'label': 'Italiano'},
+    {'value': 'ja', 'label': '日本語'},
+    {'value': 'kab', 'label': 'Taqbaylit'},
+    {'value': 'ko', 'label': '한국어'},
+    {'value': 'lo', 'label': 'ລາວ'},
+    {'value': 'lt', 'label': 'Lietuvių'},
+    {'value': 'lv', 'label': 'Latviešu'},
+    {'value': 'nb_NO', 'label': 'Norwegian Bokmål'},
+    {'value': 'nl', 'label': 'Nederlands'},
+    {'value': 'nn', 'label': 'Norsk Nynorsk'},
+    {'value': 'pl', 'label': 'Polski'},
+    {'value': 'pt', 'label': 'Português'},
+    {'value': 'pt_BR', 'label': 'Português do Brasil'},
+    {'value': 'ru', 'label': 'Русский'},
+    {'value': 'sk', 'label': 'Slovenčina'},
+    {'value': 'sq', 'label': 'Shqip'},
+    {'value': 'sr', 'label': 'српски'},
+    {'value': 'sv', 'label': 'Svenska'},
+    {'value': 'te', 'label': 'తెలుగు'},
+    {'value': 'th', 'label': 'ไทย'},
+    {'value': 'tr', 'label': 'Türkçe'},
+    {'value': 'uk', 'label': 'українська мова'},
+    {'value': 'vi', 'label': 'Tiếng Việt'},
+    {'value': 'vls', 'label': 'West-Vlaams'},
+    {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese
+    {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese
 ];

 // cpx includes globbed parts of the filename in the destination, but excludes
 // common parents. Hence, "res/{a,b}/**": the output will be "dest/a/..." and
 // "dest/b/...".
 const COPY_LIST = [
-    ["res/apple-app-site-association", "webapp"],
    ["res/manifest.json", "webapp"],
    ["res/sw.js", "webapp"],
    ["res/welcome.html", "webapp"],
@@ -77,13 +76,15 @@ const COPY_LIST = [
    ["contribute.json", "webapp"],
 ];

-const parseArgs = require("minimist");
-const Cpx = require("cpx");
-const chokidar = require("chokidar");
-const fs = require("fs");
-const rimraf = require("rimraf");
+const parseArgs = require('minimist');
+const Cpx = require('cpx');
+const chokidar = require('chokidar');
+const fs = require('fs');
+const rimraf = require('rimraf');

-const argv = parseArgs(process.argv.slice(2), {});
+const argv = parseArgs(
+    process.argv.slice(2), {}
+);

 const watch = argv.w;
 const verbose = argv.v;
@@ -96,12 +97,12 @@ function errCheck(err) {
 }

 // Check if webapp exists
-if (!fs.existsSync("webapp")) {
-    fs.mkdirSync("webapp");
+if (!fs.existsSync('webapp')) {
+    fs.mkdirSync('webapp');
 }
 // Check if i18n exists
-if (!fs.existsSync("webapp/i18n/")) {
-    fs.mkdirSync("webapp/i18n/");
+if (!fs.existsSync('webapp/i18n/')) {
+    fs.mkdirSync('webapp/i18n/');
 }

 function next(i, err) {
@@ -130,9 +131,7 @@ function next(i, err) {
        });
    }

-    const cb = (err) => {
-        next(i + 1, err);
-    };
+    const cb = (err) => { next(i + 1, err) };

    if (watch) {
        if (opts.directwatch) {
@@ -140,12 +139,14 @@ function next(i, err) {
            // which in the case of config.json is '.', which inevitably takes
            // ages to crawl. So we create our own watcher on the files
            // instead.
-            const copy = () => {
-                cpx.copy(errCheck);
-            };
-            chokidar.watch(source).on("add", copy).on("change", copy).on("ready", cb).on("error", errCheck);
+            const copy = () => { cpx.copy(errCheck) };
+            chokidar.watch(source)
+                .on('add', copy)
+                .on('change', copy)
+                .on('ready', cb)
+                .on('error', errCheck);
        } else {
-            cpx.on("watch-ready", cb);
+            cpx.on('watch-ready', cb);
            cpx.on("watch-error", cb);
            cpx.watch();
        }
@@ -155,14 +156,17 @@ function next(i, err) {
 }

 function genLangFile(lang, dest) {
-    const reactSdkFile = "node_modules/matrix-react-sdk/src/i18n/strings/" + lang + ".json";
-    const riotWebFile = "src/i18n/strings/" + lang + ".json";
+    const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + lang + '.json';
+    const riotWebFile = 'src/i18n/strings/' + lang + '.json';

    let translations = {};
-    [reactSdkFile, riotWebFile].forEach(function (f) {
+    [reactSdkFile, riotWebFile].forEach(function(f) {
        if (fs.existsSync(f)) {
            try {
-                Object.assign(translations, JSON.parse(fs.readFileSync(f).toString()));
+                Object.assign(
+                    translations,
+                    JSON.parse(fs.readFileSync(f).toString())
+                );
            } catch (e) {
                console.error("Failed: " + f, e);
                throw e;
@@ -187,16 +191,16 @@ function genLangFile(lang, dest) {

 function genLangList(langFileMap) {
    const languages = {};
-    INCLUDE_LANGS.forEach(function (lang) {
+    INCLUDE_LANGS.forEach(function(lang) {
        const normalizedLanguage = lang.value.toLowerCase().replace("_", "-");
-        const languageParts = normalizedLanguage.split("-");
+        const languageParts = normalizedLanguage.split('-');
        if (languageParts.length == 2 && languageParts[0] == languageParts[1]) {
-            languages[languageParts[0]] = { fileName: langFileMap[lang.value], label: lang.label };
+            languages[languageParts[0]] = {'fileName': langFileMap[lang.value], 'label': lang.label};
        } else {
-            languages[normalizedLanguage] = { fileName: langFileMap[lang.value], label: lang.label };
+            languages[normalizedLanguage] = {'fileName': langFileMap[lang.value], 'label': lang.label};
        }
    });
-    fs.writeFile("webapp/i18n/languages.json", JSON.stringify(languages, null, 4), function (err) {
+    fs.writeFile('webapp/i18n/languages.json', JSON.stringify(languages, null, 4), function(err) {
        if (err) {
            console.error("Copy Error occured: " + err);
            throw new Error("Failed to generate languages.json");
@@ -225,7 +229,7 @@ function weblateToCounterpart(inTrs) {
    const outTrs = {};

    for (const key of Object.keys(inTrs)) {
-        const keyParts = key.split("|", 2);
+        const keyParts = key.split('|', 2);
        if (keyParts.length === 2) {
            let obj = outTrs[keyParts[0]];
            if (obj === undefined) {
@@ -234,7 +238,7 @@ function weblateToCounterpart(inTrs) {
                // This is a transitional edge case if a string went from singular to pluralised and both still remain
                // in the translation json file. Use the singular translation as `other` and merge pluralisation atop.
                obj = outTrs[keyParts[0]] = {
-                    other: inTrs[key],
+                    "other": inTrs[key],
                };
                console.warn("Found entry in i18n file in both singular and pluralised form", keyParts[0]);
            }
@@ -253,8 +257,8 @@ regenerate the file, adding its content-hashed filename to langFileMap
 and regenerating languages.json with the new filename
 */
 function watchLanguage(lang, dest, langFileMap) {
-    const reactSdkFile = "node_modules/matrix-react-sdk/src/i18n/strings/" + lang + ".json";
-    const riotWebFile = "src/i18n/strings/" + lang + ".json";
+    const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + lang + '.json';
+    const riotWebFile = 'src/i18n/strings/' + lang + '.json';

    // XXX: Use a debounce because for some reason if we read the language
    // file immediately after the FS event is received, the file contents
@@ -266,13 +270,16 @@ function watchLanguage(lang, dest, langFileMap) {
        }
        makeLangDebouncer = setTimeout(() => {
            const filename = genLangFile(lang, dest);
-            langFileMap[lang] = filename;
+            langFileMap[lang]=filename;
            genLangList(langFileMap);
        }, 500);
    };

-    [reactSdkFile, riotWebFile].forEach(function (f) {
-        chokidar.watch(f).on("add", makeLang).on("change", makeLang).on("error", errCheck);
+    [reactSdkFile, riotWebFile].forEach(function(f) {
+        chokidar.watch(f)
+            .on('add', makeLang)
+            .on('change', makeLang)
+            .on('error', errCheck);
    });
 }

@@ -286,7 +293,7 @@ const I18N_FILENAME_MAP = INCLUDE_LANGS.reduce((m, l) => {
 genLangList(I18N_FILENAME_MAP);

 if (watch) {
-    INCLUDE_LANGS.forEach((l) => watchLanguage(l.value, I18N_DEST, I18N_FILENAME_MAP));
+    INCLUDE_LANGS.forEach(l => watchLanguage(l.value, I18N_DEST, I18N_FILENAME_MAP));
 }

 // non-language resources
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -1,12 +1,13 @@
-#!/usr/bin/env python3
-#
+#!/usr/bin/env python
+
 # download and unpack a element-web tarball.
-#
+
 # Allows `bundles` to be extracted to a common directory, and a link to
 # config.json to be added.

+from __future__ import print_function
+
 import argparse
-import errno
 import os
 import os.path
 import subprocess
@@ -14,7 +15,13 @@ import sys
 import tarfile
 import shutil
 import glob
-from urllib.request import urlretrieve
+
+try:
+    # python3
+    from urllib.request import urlretrieve
+except ImportError:
+    # python2
+    from urllib import urlretrieve


 class DeployException(Exception):
@@ -23,17 +30,8 @@ class DeployException(Exception):

 def create_relative_symlink(linkname, target):
    relpath = os.path.relpath(target, os.path.dirname(linkname))
-    print("Symlink %s -> %s" % (linkname, relpath))
-
-    try:
-        os.symlink(relpath, linkname)
-    except OSError as e:
-        if e.errno == errno.EEXIST:
-            # atomic modification
-            os.symlink(relpath, linkname + ".tmp")
-            os.rename(linkname + ".tmp", linkname)
-        else:
-            raise e
+    print ("Symlink %s -> %s" % (linkname, relpath))
+    os.symlink(relpath, linkname)


 def move_bundles(source, dest):
@@ -54,7 +52,7 @@ def move_bundles(source, dest):
    for f in os.listdir(source):
        dst = os.path.join(dest, f)
        if os.path.exists(dst):
-            print(
+            print (
                "Skipping bundle. The bundle includes '%s' which we have previously deployed."
                % f
            )
@@ -62,7 +60,7 @@ def move_bundles(source, dest):
            renames[os.path.join(source, f)] = dst

    for (src, dst) in renames.items():
-        print("Move %s -> %s" % (src, dst))
+        print ("Move %s -> %s" % (src, dst))
        os.rename(src, dst)


@@ -71,18 +69,17 @@ class Deployer:
        self.packages_path = "."
        self.bundles_path = None
        self.should_clean = False
-        self.symlink_latest = None
        # filename -> symlink path e.g 'config.localhost.json' => '../localhost/config.json'
        self.symlink_paths = {}
        self.verify_signature = True

-    def fetch(self, tarball, extract_path):
-        """Download a tarball, verifies it if needed, and unpacks it
+    def deploy(self, tarball, extract_path):
+        """Download a tarball if necessary, and unpack it

        Returns:
-            (str) the path to the unpacked directory
+            (str) the path to the unpacked deployment
        """
-        print("Fetching %s to %s" % (tarball, extract_path))
+        print("Deploying %s to %s" % (tarball, extract_path))

        name_str = os.path.basename(tarball).replace(".tar.gz", "")
        extracted_dir = os.path.join(extract_path, name_str)
@@ -98,34 +95,12 @@ class Deployer:

        try:
            with tarfile.open(tarball) as tar:
-                def is_within_directory(directory, target):
-                    abs_directory = os.path.abspath(directory)
-                    abs_target = os.path.abspath(target)
-                
-                    prefix = os.path.commonprefix([abs_directory, abs_target])
-                    
-                    return prefix == abs_directory
-                
-                def safe_extract(tar, path=".", members=None, *, numeric_owner=False):
-                    for member in tar.getmembers():
-                        member_path = os.path.join(path, member.name)
-                        if not is_within_directory(path, member_path):
-                            raise Exception("Attempted Path Traversal in Tar File")
-                
-                    tar.extractall(path, members, numeric_owner=numeric_owner) 
-                    
-                
-                safe_extract(tar, extract_path)
+                tar.extractall(extract_path)
        finally:
            if self.should_clean and downloaded:
                os.remove(tarball)

-        print("Extracted into: %s" % extracted_dir)
-        return extracted_dir
-
-    def deploy(self, extracted_dir):
-        """Applies symlinks and handles the bundles directory on an extracted tarball"""
-        print("Deploying %s" % extracted_dir)
+        print ("Extracted into: %s" % extracted_dir)

        if self.symlink_paths:
            for link_path, file_path in self.symlink_paths.items():
@@ -145,12 +120,7 @@ class Deployer:
                target=self.bundles_path,
                linkname=extracted_bundles,
            )
-
-        if self.symlink_latest:
-            create_relative_symlink(
-                target=extracted_dir,
-                linkname=self.symlink_latest,
-            )
+        return extracted_dir

    def download_and_verify(self, url):
        tarball = self.download_file(url)
@@ -207,15 +177,8 @@ if __name__ == "__main__":
        )
    )
    parser.add_argument(
-        "-s", "--symlink", dest="symlink", default="./latest", help=(
-            "Write a symlink to this location pointing to the extracted tarball. \
-            New builds will keep overwriting this symlink. The symlink will point \
-            to the webapp directory INSIDE the tarball."
-        )
-    )
-    parser.add_argument(
-        "target", help=(
-            "filename of extracted directory, tarball, or URL to download."
+        "tarball", help=(
+            "filename of tarball, or URL to download."
        ),
    )

@@ -225,18 +188,8 @@ if __name__ == "__main__":
    deployer.packages_path = args.packages_dir
    deployer.bundles_path = args.bundles_dir
    deployer.should_clean = args.clean
-    deployer.symlink_latest = args.symlink

    for include in args.include:
        deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })

-    if os.path.isdir(args.target):
-        # If the given directory contains a single directory then use that instead, the ci package wraps in an extra dir
-        files = os.listdir(args.target)
-        if len(files) == 1 and os.path.isdir(os.path.join(args.target, files[0])):
-            extracted_dir = os.path.join(args.target, files[0])
-        else:
-            extracted_dir = args.target
-    else:
-        extracted_dir = deployer.fetch(args.target, args.extract_path)
-    deployer.deploy(extracted_dir)
+    deployer.deploy(args.tarball, args.extract_path)
--- a/scripts/docker-link-repos.sh
+++ b/scripts/docker-link-repos.sh
@@ -1,11 +1,11 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -ex

 # Automatically link to develop if we're building develop, but only if the caller
 # hasn't asked us to build something else
 BRANCH=$(git rev-parse --abbrev-ref HEAD)
-if [[ $USE_CUSTOM_SDKS == false ]] && [[ $BRANCH == 'develop' ]]
+if [ $USE_CUSTOM_SDKS == false ] && [ $BRANCH == 'develop' ]
 then
    echo "using develop dependencies for react-sdk and js-sdk"
    USE_CUSTOM_SDKS=true
@@ -13,21 +13,21 @@ then
    REACT_SDK_BRANCH='develop'
 fi

-if [[ $USE_CUSTOM_SDKS == false ]]
+if [ $USE_CUSTOM_SDKS == false ]
 then
    echo "skipping react-sdk and js-sdk installs: USE_CUSTOM_SDKS is false"
    exit 0
 fi

 echo "Linking js-sdk"
-git clone --depth 1 --branch $JS_SDK_BRANCH "$JS_SDK_REPO" js-sdk
+git clone --depth 1 --branch $JS_SDK_BRANCH $JS_SDK_REPO js-sdk
 cd js-sdk
 yarn link
 yarn --network-timeout=100000 install
 cd ../

 echo "Linking react-sdk"
-git clone --depth 1 --branch $REACT_SDK_BRANCH "$REACT_SDK_REPO" react-sdk
+git clone --depth 1 --branch $REACT_SDK_BRANCH $REACT_SDK_REPO react-sdk
 cd react-sdk
 yarn link
 yarn link matrix-js-sdk
--- a/scripts/docker-package.sh
+++ b/scripts/docker-package.sh
@@ -1,20 +1,21 @@
-#!/usr/bin/env bash
+#!/bin/sh

 set -ex

+TAG=$(git describe --tags)
 BRANCH=$(git rev-parse --abbrev-ref HEAD)
-DIST_VERSION=$(git describe --abbrev=0 --tags)
-
-DIR=$(dirname "$0")
+DIST_VERSION=$TAG

 # If the branch comes out as HEAD then we're probably checked out to a tag, so if the thing is *not*
 # coming out as HEAD then we're on a branch. When we're on a branch, we want to resolve ourselves to
 # a few SHAs rather than a version.
+# Docker Hub doesn't always check out the tag and sometimes checks out the branch, so we should look
+# for an appropriately tagged branch as well (heads/v1.2.3).
 if [[ $BRANCH != HEAD && ! $BRANCH =~ heads/v.+ ]]
 then
-    DIST_VERSION=$("$DIR"/get-version-from-git.sh)
+    DIST_VERSION=`$(dirname $0)/get-version-from-git.sh`
 fi

-DIST_VERSION=$("$DIR"/normalize-version.sh "$DIST_VERSION")
+DIST_VERSION=`$(dirname $0)/normalize-version.sh ${DIST_VERSION}`
 VERSION=$DIST_VERSION yarn build
-echo "$DIST_VERSION" > /src/webapp/version
+echo $DIST_VERSION > /src/webapp/version
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -1,99 +0,0 @@
-#!/usr/bin/env bash
-
-# Fetches the js-sdk and matrix-react-sdk dependencies for development
-# or testing purposes
-# If there exists a branch of that dependency with the same name as
-# the branch the current checkout is on, use that branch. Otherwise,
-# use develop.
-
-set -x
-
-GIT_CLONE_ARGS=("$@")
-[ -z "$defbranch" ] && defbranch="develop"
-
-# clone a specific branch of a github repo
-function clone() {
-    org=$1
-    repo=$2
-    branch=$3
-
-    # Chop 'origin' off the start as jenkins ends up using
-    # branches on the origin, but this doesn't work if we
-    # specify the branch when cloning.
-    branch=${branch#origin/}
-
-    if [ -n "$branch" ]
-    then
-        echo "Trying to use $org/$repo#$branch"
-        # Disable auth prompts: https://serverfault.com/a/665959
-        GIT_TERMINAL_PROMPT=0 git clone https://github.com/$org/$repo.git $repo --branch $branch \
-            "${GIT_CLONE_ARGS[@]}"
-        return $?
-    fi
-    return 1
-}
-
-function dodep() {
-    deforg=$1
-    defrepo=$2
-    rm -rf $defrepo
-
-    # Try the PR author's branch in case it exists on the deps as well.
-    # Try the target branch of the push or PR.
-    # Use the default branch as the last resort.
-    if [[ "$BUILDKITE" == true ]]; then
-        # If BUILDKITE_BRANCH is set, it will contain either:
-        #   * "branch" when the author's branch and target branch are in the same repo
-        #   * "author:branch" when the author's branch is in their fork
-        # We can split on `:` into an array to check.
-        BUILDKITE_BRANCH_ARRAY=(${BUILDKITE_BRANCH//:/ })
-        if [[ "${#BUILDKITE_BRANCH_ARRAY[@]}" == "2" ]]; then
-            prAuthor=${BUILDKITE_BRANCH_ARRAY[0]}
-            prBranch=${BUILDKITE_BRANCH_ARRAY[1]}
-        else
-            prAuthor=$deforg
-            prBranch=$BUILDKITE_BRANCH
-        fi
-        clone $prAuthor $defrepo $prBranch ||
-        clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH ||
-        clone $deforg $defrepo $defbranch ||
-        return $?
-    else
-        clone $deforg $defrepo $ghprbSourceBranch ||
-        clone $deforg $defrepo $GIT_BRANCH ||
-        clone $deforg $defrepo `git rev-parse --abbrev-ref HEAD` ||
-        clone $deforg $defrepo $defbranch ||
-        return $?
-    fi
-
-    echo "$defrepo set to branch "`git -C "$defrepo" rev-parse --abbrev-ref HEAD`
-}
-
-##############################
-
-echo 'Setting up matrix-js-sdk'
-
-dodep matrix-org matrix-js-sdk
-
-pushd matrix-js-sdk
-yarn link
-yarn install --pure-lockfile
-popd
-
-yarn link matrix-js-sdk
-
-##############################
-
-echo 'Setting up matrix-react-sdk'
-
-dodep matrix-org matrix-react-sdk
-
-pushd matrix-react-sdk
-yarn link
-yarn link matrix-js-sdk
-yarn install --pure-lockfile
-popd
-
-yarn link matrix-react-sdk
-
-##############################
--- a/scripts/fetchdep.sh
+++ b/scripts/fetchdep.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+set -x
+
+deforg="$1"
+defrepo="$2"
+defbranch="$3"
+
+[ -z "$defbranch" ] && defbranch="develop"
+
+rm -r "$defrepo" || true
+
+# A function that clones a branch of a repo based on the org, repo and branch
+clone() {
+    org=$1
+    repo=$2
+    branch=$3
+    if [ -n "$branch" ]
+    then
+        echo "Trying to use $org/$repo#$branch"
+        # Disable auth prompts: https://serverfault.com/a/665959
+        GIT_TERMINAL_PROMPT=0 git clone https://github.com/$org/$repo.git $repo --branch "$branch" --depth 1 && exit 0
+    fi
+}
+
+# A function that gets info about a PR from the GitHub API based on its number
+getPRInfo() {
+    number=$1
+    if [ -n "$number" ]; then
+        echo "Getting info about a PR with number $number"
+
+        apiEndpoint="https://api.github.com/repos/${REPOSITORY:-"vector-im/element-web"}/pulls/"
+        apiEndpoint+=$number
+
+        head=$(curl $apiEndpoint | jq -r '.head.label')
+    fi
+}
+
+# Some CIs don't give us enough info, so we just get the PR number and ask the
+# GH API for more info - "fork:branch". Some give us this directly.
+if [ -n "$BUILDKITE_BRANCH" ]; then
+    # BuildKite
+    head=$BUILDKITE_BRANCH
+elif [ -n "$PR_NUMBER" ]; then
+    # GitHub
+    getPRInfo $PR_NUMBER
+elif [ -n "$REVIEW_ID" ]; then
+    # Netlify
+    getPRInfo $REVIEW_ID
+fi
+
+# for forks, $head will be in the format "fork:branch", so we split it by ":"
+# into an array. On non-forks, this has the effect of splitting into a single
+# element array given ":" shouldn't appear in the head - it'll just be the
+# branch name. Based on the results, we clone.
+BRANCH_ARRAY=(${head//:/ })
+TRY_ORG=$deforg
+TRY_BRANCH=${BRANCH_ARRAY[0]}
+if [[ "$head" == *":"* ]]; then
+    # ... but only match that fork if it's a real fork
+    if [ "${BRANCH_ARRAY[0]}" != "matrix-org" ]; then
+        TRY_ORG=${BRANCH_ARRAY[0]}
+    fi
+    TRY_BRANCH=${BRANCH_ARRAY[1]}
+fi
+clone ${TRY_ORG} $defrepo ${TRY_BRANCH}
+
+# Try the target branch of the push or PR.
+if [ -n "$GITHUB_BASE_REF" ]; then
+    clone $deforg $defrepo $GITHUB_BASE_REF
+elif [ -n "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" ]; then
+    clone $deforg $defrepo $BUILDKITE_PULL_REQUEST_BASE_BRANCH
+fi
+
+# Try HEAD which is the branch name in Netlify (not BRANCH which is pull/xxxx/head for PR builds)
+clone $deforg $defrepo $HEAD
+# Use the default branch as the last resort.
+clone $deforg $defrepo $defbranch
--- a/scripts/genflags.sh
+++ b/scripts/genflags.sh
@@ -25,8 +25,6 @@
 # all phonenumber.js-supported country flags (as SVGs) into
 # PNGs that can be used by CountryDropdown.js.

-set -e
-
 # Allow CTRL+C to terminate the script
 trap "echo Exited!; exit;" SIGINT SIGTERM

--- a/scripts/get-version-from-git.sh
+++ b/scripts/get-version-from-git.sh
@@ -1,10 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/bash

 # Echoes a version based on the git hashes of the element-web, react-sdk & js-sdk checkouts, for the case where
 # these dependencies are git checkouts.

-set -e
-
 # Since the deps are fetched from git, we can rev-parse
 REACT_SHA=$(git -C node_modules/matrix-react-sdk rev-parse --short=12 HEAD)
 JSSDK_SHA=$(git -C node_modules/matrix-js-sdk rev-parse --short=12 HEAD)
--- a/scripts/layered.sh
+++ b/scripts/layered.sh
@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/bash

-set -ex
+set -x

 # Creates a layered environment with the full repo for the app and SDKs cloned
 # and linked. This gives an element-web dev environment ready to build with
@@ -33,7 +33,6 @@ node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-analytics-ev
 pushd matrix-analytics-events
 yarn link
 yarn install --pure-lockfile
-yarn build:ts
 popd

 # Now set up the react-sdk
@@ -41,7 +40,7 @@ node_modules/matrix-react-sdk/scripts/fetchdep.sh matrix-org matrix-react-sdk
 pushd matrix-react-sdk
 yarn link
 yarn link matrix-js-sdk
-yarn link @matrix-org/analytics-events
+yarn link matrix-analytics-events
 yarn install --pure-lockfile
 popd

--- a/scripts/make-icons.sh
+++ b/scripts/make-icons.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #
 # Converts an svg logo into the various image resources required by
 # the various platforms deployments.
@@ -12,7 +12,8 @@ then
    exit
 fi

-set -ex
+set -e
+set -x

 tmpdir=`mktemp -d 2>/dev/null || mktemp -d -t 'icontmp'`

--- a/scripts/normalize-version.sh
+++ b/scripts/normalize-version.sh
@@ -1,6 +1,4 @@
-#!/usr/bin/env bash
-
-set -e
+#!/bin/bash

 # If $1 looks like v1.2.3 or v1.2.3-foo, strip the leading v, then print it to stdout
 if [[ $1 =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -e

--- a/scripts/redeploy.py
+++ b/scripts/redeploy.py
@@ -0,0 +1,206 @@
+#!/usr/bin/env python
+
+# auto-deploy script for https://develop.element.io
+
+# Listens for Github Action webhook pokes (https://github.com/marketplace/actions/workflow-webhook-action)
+# When it gets one: downloads the artifact from github actions and deploys it as the new version.
+
+# Requires the following python packages:
+#
+#   - flask
+#   - python-github-webhook
+
+from __future__ import print_function
+import argparse
+import os
+import errno
+import time
+import traceback
+
+import glob
+from io import BytesIO
+from urllib.request import urlopen
+from zipfile import ZipFile
+
+from github_webhook import Webhook
+from flask import Flask, abort
+
+from deploy import Deployer, DeployException
+
+app = Flask(__name__)
+webhook = Webhook(app, endpoint="/")
+
+
+def create_symlink(source: str, linkname: str):
+    try:
+        os.symlink(source, linkname)
+    except OSError as e:
+        if e.errno == errno.EEXIST:
+            # atomic modification
+            os.symlink(source, linkname + ".tmp")
+            os.rename(linkname + ".tmp", linkname)
+        else:
+            raise e
+
+
+@webhook.hook(event_type="workflow_run")
+def on_deployment(payload: dict):
+    repository = payload.get("repository")
+    if repository is None:
+        abort(400, "No 'repository' specified")
+        return
+
+    workflow = payload.get("workflow")
+    if repository is None:
+        abort(400, "No 'workflow' specified")
+        return
+
+    request_id = payload.get("requestID")
+    if request_id is None:
+        abort(400, "No 'request_id' specified")
+        return
+
+    if arg_github_org is not None and not repository.startswith(arg_github_org):
+        print("Denying poke for repository with incorrect prefix: %s" % (repository,))
+        abort(400, "Invalid repository")
+        return
+
+    if arg_github_workflow is not None and workflow != arg_github_workflow:
+        print("Denying poke for incorrect workflow: %s" % (workflow,))
+        abort(400, "Incorrect workflow")
+        return
+
+    artifact_url = payload.get("data", {}).get("url")
+    if artifact_url is None:
+        abort(400, "No 'data.url' specified")
+        return
+
+    deploy_artifact(artifact_url, request_id)
+
+
+def deploy_artifact(artifact_url: str, request_id: str):
+    # we extract into a directory based on the build number. This avoids the
+    # problem of multiple builds building the same git version and thus having
+    # the same tarball name. That would lead to two potential problems:
+    #   (a) sometimes jenkins serves corrupted artifacts; we would replace
+    #       a good deploy with a bad one
+    #   (b) we'll be overwriting the live deployment, which means people might
+    #       see half-written files.
+    build_dir = os.path.join(arg_extract_path, "gha-%s" % (request_id,))
+
+    if os.path.exists(build_dir):
+        # We have already deployed this, nop
+        return
+    os.mkdir(build_dir)
+
+    try:
+        with urlopen(artifact_url) as f:
+            with ZipFile(BytesIO(f.read()), "r") as z:
+                name = next((x for x in z.namelist() if x.endswith(".tar.gz")))
+                z.extract(name, build_dir)
+        extracted_dir = deployer.deploy(os.path.join(build_dir, name), build_dir)
+        create_symlink(source=extracted_dir, linkname=arg_symlink)
+    except DeployException as e:
+        traceback.print_exc()
+        abort(400, str(e))
+    finally:
+        if deployer.should_clean:
+            os.remove(os.path.join(build_dir, name))
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser("Runs an Element redeployment server.")
+    parser.add_argument(
+        "-p", "--port", dest="port", default=4000, type=int, help=(
+            "The port to listen on for redeployment requests."
+        )
+    )
+    parser.add_argument(
+        "-e", "--extract", dest="extract", default="./extracted", type=str, help=(
+            "The location to extract .tar.gz files to."
+        )
+    )
+    parser.add_argument(
+        "-b", "--bundles-dir", dest="bundles_dir", type=str, help=(
+            "A directory to move the contents of the 'bundles' directory to. A \
+            symlink to the bundles directory will also be written inside the \
+            extracted tarball. Example: './bundles'."
+        )
+    )
+    parser.add_argument(
+        "-c", "--clean", dest="clean", action="store_true", default=False, help=(
+            "Remove .tar.gz files after they have been downloaded and extracted."
+        )
+    )
+    parser.add_argument(
+        "-s", "--symlink", dest="symlink", default="./latest", type=str, help=(
+            "Write a symlink to this location pointing to the extracted tarball. \
+            New builds will keep overwriting this symlink. The symlink will point \
+            to the /vector directory INSIDE the tarball."
+        )
+    )
+
+    # --include ../../config.json ./localhost.json homepages/*
+    parser.add_argument(
+        "--include", nargs='*', default='./config*.json', type=str, help=(
+            "Symlink these files into the root of the deployed tarball. \
+             Useful for config files and home pages. Supports glob syntax. \
+             (Default: '%(default)s')"
+        )
+    )
+    parser.add_argument(
+        "--test", dest="tarball_uri", type=str, help=(
+            "Don't start an HTTP listener. Instead download a build from this URL immediately."
+        ),
+    )
+
+    parser.add_argument(
+        "--webhook-token", dest="webhook_token", type=str, help=(
+            "Only accept pokes signed with this github token."
+        ), required=True,
+    )
+
+    # We require a matching webhook token, but because we take everything else
+    # about what to deploy from the poke body, we can be a little more paranoid
+    # and only accept builds / artifacts from a specific github org
+    parser.add_argument(
+        "--org", dest="github_org", type=str, help=(
+            "Lock down to this github org"
+        )
+    )
+    # Optional matching workflow name
+    parser.add_argument(
+        "--workflow", dest="github_workflow", type=str, help=(
+            "Lock down to this github workflow"
+        )
+    )
+
+    args = parser.parse_args()
+    arg_extract_path = args.extract
+    arg_symlink = args.symlink
+    arg_github_org = args.github_org
+    arg_github_workflow = args.github_workflow
+
+    if not os.path.isdir(arg_extract_path):
+        os.mkdir(arg_extract_path)
+
+    webhook.secret = args.webhook_token
+
+    deployer = Deployer()
+    deployer.bundles_path = args.bundles_dir
+    deployer.should_clean = args.clean
+
+    for include in args.include.split(" "):
+        deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
+
+    print(
+        "Listening on port %s. Extracting to %s%s. Symlinking to %s. Include files: %s" %
+        (args.port,
+         arg_extract_path,
+         " (clean after)" if deployer.should_clean else "",
+         arg_symlink,
+         deployer.symlink_paths,
+        )
+    )
+
+    app.run(port=args.port, debug=False)
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -11,4 +11,4 @@ sonar.exclusions=__mocks__,docs,element.io,nginx
 sonar.typescript.tsconfigPath=./tsconfig.json
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
 sonar.coverage.exclusions=test/**/*,res/**/*
-sonar.testExecutionReportPaths=coverage/jest-sonar-report.xml
+sonar.testExecutionReportPaths=coverage/test-report.xml
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -19,20 +19,20 @@ import type { Renderer } from "react-dom";
 import type { logger } from "matrix-js-sdk/src/logger";

 type ElectronChannel =
-    | "app_onAction"
-    | "before-quit"
-    | "check_updates"
-    | "install_update"
-    | "ipcCall"
-    | "ipcReply"
-    | "loudNotification"
-    | "preferences"
-    | "seshat"
-    | "seshatReply"
-    | "setBadgeCount"
-    | "update-downloaded"
-    | "userDownloadCompleted"
-    | "userDownloadAction";
+    "app_onAction" |
+    "before-quit" |
+    "check_updates" |
+    "install_update" |
+    "ipcCall" |
+    "ipcReply" |
+    "loudNotification" |
+    "preferences" |
+    "seshat" |
+    "seshatReply" |
+    "setBadgeCount" |
+    "update-downloaded" |
+    "userDownloadCompleted" |
+    "userDownloadAction";

 declare global {
    interface Window {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Telatynski	b7052a5c5f	Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ci3 Conflicts: .editorconfig .github/workflows/preview_changelog.yaml .github/workflows/static_analysis.yaml .github/workflows/triage-labelled.yml .github/workflows/triage-priority-bugs.yml .gitignore scripts/layered.sh	2022-06-06 11:47:18 +01:00
Michael Telatynski	b18c944b42	strings	2022-05-03 09:22:18 +01:00
Michael Telatynski	0bbad38929	Must it really be single quotes only?	2022-05-03 09:07:47 +01:00
Michael Telatynski	a431363768	Add CI to prevent i18n non-EN changes	2022-05-03 09:04:30 +01:00
Michael Telatynski	2d7bada5c4	Tweak	2022-04-27 23:09:35 +01:00
Michael Telatynski	0e22503860	Reusable workflows don't help us here	2022-04-27 23:07:06 +01:00
Michael Telatynski	a340358551	🤦	2022-04-27 23:01:00 +01:00
Michael Telatynski	e53f2695a4	Fix reusable workflow call	2022-04-27 22:56:46 +01:00
Michael Telatynski	0a239a30fa	Update fetchdep to also take into account forks	2022-04-27 22:50:28 +01:00
Michael Telatynski	dab1488ffe	Fix PR_NUMBER env variable	2022-04-27 22:43:51 +01:00
Michael Telatynski	61f8ec5e10	Test	2022-04-27 22:41:12 +01:00
Michael Telatynski	7a01c6c61b	Update deploy_develop.yaml	2022-04-27 22:31:03 +01:00
Michael Telatynski	0ab7cd05c7	Consolidate the two secrets environments	2022-04-27 22:27:00 +01:00
Michael Telatynski	fa28d2400b	Fix layered.sh	2022-04-27 22:11:23 +01:00
Michael Telatynski	7cc52e68d1	Consolidate workflows by means of reuse	2022-04-27 17:23:06 +01:00
Michael Telatynski	8bdd965122	Use fetchdep everywhere	2022-04-27 17:12:34 +01:00
Michael Telatynski	418de7998a	Switch up develop redeploy script to work off Github Actions	2022-04-27 16:48:02 +01:00
Michael Telatynski	008889d2a8	Split back out into two workflows for artifact access	2022-04-27 13:29:14 +01:00
Michael Telatynski	b577d0f2f2	Fix usage of wrong action	2022-04-27 13:15:16 +01:00
Michael Telatynski	98733057a7	Attempt to use deployments more properly	2022-04-27 13:10:39 +01:00
Michael Telatynski	0cd6e02c99	Iterate	2022-04-27 12:41:46 +01:00
Michael Telatynski	449a0e64d9	Test	2022-04-27 12:38:09 +01:00
Michael Telatynski	89b3e4aaab	Lets try this	2022-04-27 08:38:12 +01:00
Michael Telatynski	fe8c583e09	Attempt all of the CI	2022-04-27 07:53:30 +01:00
Michael Telatynski	5adf38c87f	temporarily increase trigger	2022-04-26 18:19:19 +01:00
Michael Telatynski	59d7265e69	Test deployment hook	2022-04-26 18:17:47 +01:00
Michael Telatynski	446b510b82	Delint workflow scripts	2022-04-26 18:17:31 +01:00
				`@@ -1 +0,0 @@`
				`module.exports = require("eslint-plugin-matrix-org/.prettierrc.js");`