v1.11.47

Co-authored-by: t3chguy <t3chguy@users.noreply.github.com>

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Build
 on:
     pull_request: {}
     push:
-        branches: [master]
+        branches: [develop, master]
 # develop pushes and repository_dispatch handled in build_develop.yaml
 env:
     # These must be set for fetchdep.sh to get the right branch
@@ -10,8 +10,25 @@ env:
     PR_NUMBER: ${{ github.event.pull_request.number }}
 jobs:
     build:
-        name: "Build"
-        runs-on: ubuntu-latest
+        name: "Build on ${{ matrix.image }}"
+        # We build on all 3 platforms to ensure we don't have any OS-specific build incompatibilities
+        strategy:
+            fail-fast: false
+            matrix:
+                image:
+                    - ubuntu-latest
+                    - windows-latest
+                    - macos-latest
+                isDevelop:
+                    - ${{ github.event_name == 'push' && github.ref_name == 'develop' }}
+                # Skip the ubuntu-latest build for the develop branch as the dedicated CD build_develop workflow handles that
+                exclude:
+                    - isDevelop: true
+                      image: ubuntu-latest
+        runs-on: ${{ matrix.image }}
+        defaults:
+            run:
+                shell: bash
         steps:
             - uses: actions/checkout@v4
 

.github/workflows/dockerhub.yaml

@@ -18,22 +18,22 @@ jobs:
                   fetch-depth: 0 # needed for docker-package to be able to calculate the version
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2
+              uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55 # v2
+              uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
               with:
                   install: true
 
             - name: Login to Docker Hub
-              uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2
+              uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             - name: Docker meta
               id: meta
-              uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4
+              uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5
               with:
                   images: |
                       vectorim/element-web
@@ -44,7 +44,7 @@ jobs:
                       latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
 
             - name: Build and push
-              uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4
+              uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5
               with:
                   context: .
                   push: true

.github/workflows/docs.yml

@@ -0,0 +1,102 @@
+name: Deploy documentation
+
+on:
+    push:
+        branches: [develop]
+    workflow_dispatch: {}
+
+permissions:
+    contents: read
+    pages: write
+    id-token: write
+
+concurrency:
+    group: "pages"
+    cancel-in-progress: false
+
+jobs:
+    build:
+        name: GitHub Pages
+        runs-on: ubuntu-latest
+        steps:
+            - name: Fetch element-desktop
+              uses: actions/checkout@v4
+              with:
+                  repository: vector-im/element-desktop
+                  path: element-desktop
+
+            - name: Fetch element-web
+              uses: actions/checkout@v4
+              with:
+                  path: element-web
+
+            - name: Fetch matrix-react-sdk
+              uses: actions/checkout@v4
+              with:
+                  repository: matrix-org/matrix-react-sdk
+                  path: matrix-react-sdk
+
+            - name: Fetch matrix-js-sdk
+              uses: actions/checkout@v4
+              with:
+                  repository: matrix-org/matrix-js-sdk
+                  path: matrix-js-sdk
+
+            - name: Setup mdBook
+              uses: peaceiris/actions-mdbook@v1
+              with:
+                  mdbook-version: "0.4.10"
+
+            - name: Install mdbook-combiner
+              run: cargo install mdbook-combiner
+
+            - name: Prepare docs
+              run: |
+                  mkdir docs
+
+                  mv element-desktop/README.md element-desktop/docs/
+                  mv element-desktop/docs "docs/Element Desktop"
+
+                  mv element-web/README.md element-web/docs/
+                  mv element-web/docs "docs/Element Web"
+
+                  mv matrix-react-sdk/README.md matrix-react-sdk/docs/
+                  mv matrix-react-sdk/docs "docs/Matrix React SDK"
+
+                  mv matrix-js-sdk/README.md matrix-js-sdk/docs/
+                  mv matrix-js-sdk/docs "docs/Matrix JS SDK"
+
+                  sed -i -e 's/\.\.\/README.md/README.md/' docs/**/SUMMARY.md
+
+                  mdbook-combiner -m docs
+                  sed -i -E 's/^\t# (.+)$/- [\1]()/gm;t' SUMMARY.md
+                  sed -i -E 's/^- \[(.+)]\(<>\)$/---\n# \1/gm;t' SUMMARY.md
+                  sed -i -E 's/\t- \[Introduction]/- [Introduction]/gm;t' SUMMARY.md
+
+                  cat <<EOF > docs/SUMMARY.md
+                  # Summary
+                  - [Introduction](<Element Web/README.md>)
+
+                  EOF
+                  cat SUMMARY.md >> docs/SUMMARY.md
+
+                  mv element-web/book.toml .
+
+            - name: Build docs
+              run: mdbook build
+
+            - name: Upload artifact
+              uses: actions/upload-pages-artifact@v2
+              with:
+                  path: ./book
+
+    deploy:
+        environment:
+            name: github-pages
+            url: ${{ steps.deployment.outputs.page_url }}
+        runs-on: ubuntu-latest
+        needs: build
+        steps:
+            - name: Deploy to GitHub Pages
+              id: deployment
+              uses: actions/deploy-pages@v2

.github/workflows/localazy_upload.yaml

@@ -3,7 +3,7 @@ on:
     push:
         branches: [develop]
         paths:
-            - "src/strings/i18n/en_EN.json"
+            - "src/i18n/strings/en_EN.json"
 jobs:
     upload:
         uses: matrix-org/matrix-web-i18n/.github/workflows/localazy_upload.yaml@main

.github/workflows/tests.yaml

@@ -27,7 +27,7 @@ jobs:
 
             - name: Get number of CPU cores
               id: cpu-cores
-              uses: SimenB/github-actions-cpu-cores@410541432439795d30db6501fb1d8178eb41e502 # v1
+              uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2
 
             - name: Run tests with coverage
               run: "yarn coverage --ci --max-workers ${{ steps.cpu-cores.outputs.count }}"

.github/workflows/triage-labelled.yml

@@ -99,45 +99,6 @@ jobs:
                   project-url: https://github.com/orgs/vector-im/projects/48
                   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: actions/add-to-project@main
-              with:
-                  project-url: https://github.com/orgs/vector-im/projects/56
-                  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: actions/add-to-project@main
-              with:
-                  project-url: https://github.com/orgs/vector-im/projects/58
-                  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: actions/add-to-project@main
-              with:
-                  project-url: https://github.com/orgs/vector-im/projects/57
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
     voip:
         name: Add labelled issues to VoIP project board
         runs-on: ubuntu-latest
@@ -159,3 +120,19 @@ jobs:
               with:
                   project-url: https://github.com/orgs/vector-im/projects/57
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+    tech_debt:
+        name: Add labelled issues to tech debt project
+        runs-on: ubuntu-latest
+        if: >
+            contains(github.event.issue.labels.*.name, 'A-Developer-Experience') ||
+            contains(github.event.issue.labels.*.name, 'A-Documentation') ||
+            contains(github.event.issue.labels.*.name, 'A-Packaging') ||
+            contains(github.event.issue.labels.*.name, 'A-Technical-Debt') ||
+            contains(github.event.issue.labels.*.name, 'A-Testing') ||
+            contains(github.event.issue.labels.*.name, 'Z-Flaky-Test')
+        steps:
+            - uses: actions/add-to-project@main
+              with:
+                  project-url: https://github.com/orgs/vector-im/projects/101
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

.gitignore

@@ -27,3 +27,4 @@ electron/pub
 # Auto-generated file
 /src/modules.ts
 /build_config.yaml
+/book

CHANGELOG.md

@@ -1,3 +1,95 @@
+Changes in [1.11.47](https://github.com/vector-im/element-web/releases/tag/v1.11.47) (2023-10-24)
+=================================================================================================
+
+## 🦖 Deprecations
+ * Deprecate customisations in favour of Module API ([\#25736](https://github.com/vector-im/element-web/pull/25736)). Fixes #25733.
+
+## ✨ Features
+ * vector-im/element-x-ios/issues/1824 - Convert the apple-app-site-association file to a newer format… ([\#26307](https://github.com/vector-im/element-web/pull/26307)). Contributed by @stefanceriu.
+ * Iterate `io.element.late_event` decoration ([\#11760](https://github.com/matrix-org/matrix-react-sdk/pull/11760)). Fixes #26384.
+ * Render timeline separator for late event groups ([\#11739](https://github.com/matrix-org/matrix-react-sdk/pull/11739)).
+ * OIDC: revoke tokens on logout ([\#11718](https://github.com/matrix-org/matrix-react-sdk/pull/11718)). Fixes #25394. Contributed by @kerryarchibald.
+ * Show `io.element.late_event` in MessageTimestamp when known ([\#11733](https://github.com/matrix-org/matrix-react-sdk/pull/11733)).
+ * Show all labs flags if developerMode enabled ([\#11746](https://github.com/matrix-org/matrix-react-sdk/pull/11746)). Fixes #24571 and #8498.
+ * Use Compound tooltips on MessageTimestamp to improve UX of date time discovery ([\#11732](https://github.com/matrix-org/matrix-react-sdk/pull/11732)). Fixes #25913.
+ * Consolidate 4s passphrase input fields and use stable IDs ([\#11743](https://github.com/matrix-org/matrix-react-sdk/pull/11743)). Fixes #26228.
+ * Disable upgraderoom command without developer mode enabled ([\#11744](https://github.com/matrix-org/matrix-react-sdk/pull/11744)). Fixes #17620.
+ * Avoid rendering app download buttons if disabled in config ([\#11741](https://github.com/matrix-org/matrix-react-sdk/pull/11741)). Fixes #26309.
+ * OIDC: refresh tokens ([\#11699](https://github.com/matrix-org/matrix-react-sdk/pull/11699)). Fixes #25839. Contributed by @kerryarchibald.
+ * OIDC: register ([\#11727](https://github.com/matrix-org/matrix-react-sdk/pull/11727)). Fixes #25393. Contributed by @kerryarchibald.
+ * Use stable get_login_token and remove unstable MSC3882 support ([\#11001](https://github.com/matrix-org/matrix-react-sdk/pull/11001)). Contributed by @hughns.
+
+## 🐛 Bug Fixes
+ * Set max size for Element logo in search warning ([\#11779](https://github.com/matrix-org/matrix-react-sdk/pull/11779)). Fixes #26408.
+ * Avoid error when DMing oneself ([\#11754](https://github.com/matrix-org/matrix-react-sdk/pull/11754)). Fixes #7242.
+ * Fix: Message shield alignment is not right. ([\#11703](https://github.com/matrix-org/matrix-react-sdk/pull/11703)). Fixes #26142. Contributed by @manancodes.
+ * fix logging full event ([\#11755](https://github.com/matrix-org/matrix-react-sdk/pull/11755)). Fixes #26376.
+ * OIDC: use delegated auth account URL from `OidcClientStore` ([\#11723](https://github.com/matrix-org/matrix-react-sdk/pull/11723)). Fixes #26305. Contributed by @kerryarchibald.
+ * Fix: Members list shield alignment is not right. ([\#11700](https://github.com/matrix-org/matrix-react-sdk/pull/11700)). Fixes #26261. Contributed by @manancodes.
+ * Fix: <detail> HTML elements clickable area too wide. ([\#11666](https://github.com/matrix-org/matrix-react-sdk/pull/11666)). Fixes #25454. Contributed by @manancodes.
+ * Fix untranslated headings in the devtools dialog ([\#11734](https://github.com/matrix-org/matrix-react-sdk/pull/11734)).
+ * Fixes invite dialog alignment and pill color contrast ([\#11722](https://github.com/matrix-org/matrix-react-sdk/pull/11722)). Contributed by @gabrc52.
+ * Prevent select element in General settings overflowing in a room with very long room-id ([\#11597](https://github.com/matrix-org/matrix-react-sdk/pull/11597)). Contributed by @ABHIXIT2.
+ * Fix: Clicking on members pile does nothing. ([\#11657](https://github.com/matrix-org/matrix-react-sdk/pull/11657)). Fixes #26164. Contributed by @manancodes.
+ * Fix: Wierd shadow below room avatar in dark mode. ([\#11678](https://github.com/matrix-org/matrix-react-sdk/pull/11678)). Fixes #26153. Contributed by @manancodes.
+ * Fix start_sso / start_cas URLs failing to redirect to a authentication prompt ([\#11681](https://github.com/matrix-org/matrix-react-sdk/pull/11681)). Contributed by @Half-Shot.
+
+Changes in [1.11.46](https://github.com/vector-im/element-web/releases/tag/v1.11.46) (2023-10-10)
+=================================================================================================
+
+## ✨ Features
+ * Use .well-known to discover a default rendezvous server for use with Sign in with QR ([\#11655](https://github.com/matrix-org/matrix-react-sdk/pull/11655)). Contributed by @hughns.
+ * Message layout will update according to the selected style  ([\#10170](https://github.com/matrix-org/matrix-react-sdk/pull/10170)). Fixes #21782. Contributed by @manancodes.
+ * Implement MSC4039: Add an MSC for a new Widget API action to upload files into the media repository ([\#11311](https://github.com/matrix-org/matrix-react-sdk/pull/11311)). Contributed by @dhenneke.
+ * Render space pills with square corners to match new avatar ([\#11632](https://github.com/matrix-org/matrix-react-sdk/pull/11632)). Fixes #26056.
+ * Linkify room topic ([\#11631](https://github.com/matrix-org/matrix-react-sdk/pull/11631)). Fixes #26185.
+ * Show knock rooms in the list ([\#11573](https://github.com/matrix-org/matrix-react-sdk/pull/11573)). Contributed by @maheichyk.
+
+## 🐛 Bug Fixes
+ * Bump matrix-web-i18n dependency to 3.1.3 ([\#26287](https://github.com/vector-im/element-web/pull/26287))
+ * Fix: Avatar shrinks with long names ([\#11698](https://github.com/matrix-org/matrix-react-sdk/pull/11698)). Fixes #26252. Contributed by @manancodes.
+ * Update custom translations to support nested fields in structured JSON ([\#11685](https://github.com/matrix-org/matrix-react-sdk/pull/11685)).
+ * Fix: Edited message remove button is hard to reach. ([\#11674](https://github.com/matrix-org/matrix-react-sdk/pull/11674)). Fixes #24917. Contributed by @manancodes.
+ * Fix: Theme selector radio button not aligned in center with the text ([\#11676](https://github.com/matrix-org/matrix-react-sdk/pull/11676)). Fixes #25460. Contributed by @manancodes.
+ * Fix: Unread notification dot aligned ([\#11658](https://github.com/matrix-org/matrix-react-sdk/pull/11658)). Fixes #25285. Contributed by @manancodes.
+ * Fix: sync intentional mentions push rules with legacy rules ([\#11667](https://github.com/matrix-org/matrix-react-sdk/pull/11667)). Fixes #26227. Contributed by @kerryarchibald.
+ * Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](https://github.com/matrix-org/matrix-react-sdk/pull/11634)). Fixes #26209.
+ * Fix: Alignment Fixed ([\#11648](https://github.com/matrix-org/matrix-react-sdk/pull/11648)). Fixes #26169. Contributed by @manancodes.
+ * Fix: onFinished added which closes the menu ([\#11647](https://github.com/matrix-org/matrix-react-sdk/pull/11647)). Fixes #25556. Contributed by @manancodes.
+ * Don't start key backups when opening settings ([\#11640](https://github.com/matrix-org/matrix-react-sdk/pull/11640)).
+ * Fix add to space avatar text centering ([\#11643](https://github.com/matrix-org/matrix-react-sdk/pull/11643)). Fixes #26154.
+ * fix avatar styling in lightbox ([\#11641](https://github.com/matrix-org/matrix-react-sdk/pull/11641)). Fixes #26196.
+
+Changes in [1.11.45](https://github.com/vector-im/element-web/releases/tag/v1.11.45) (2023-09-29)
+=================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix Emoji font on Safari 17 ([\#11673](https://github.com/matrix-org/matrix-react-sdk/pull/11673)).
+
+Changes in [1.11.44](https://github.com/vector-im/element-web/releases/tag/v1.11.44) (2023-09-26)
+=================================================================================================
+
+## ✨ Features
+ * Make video & voice call buttons pin conference widget if unpinned ([\#11576](https://github.com/matrix-org/matrix-react-sdk/pull/11576)). Fixes vector-im/customer-retainer#72.
+ * OIDC: persist refresh token ([\#11249](https://github.com/matrix-org/matrix-react-sdk/pull/11249)). Contributed by @kerryarchibald.
+ * ElementR: Cross user verification ([\#11364](https://github.com/matrix-org/matrix-react-sdk/pull/11364)). Fixes #25752. Contributed by @florianduros.
+ * Default intentional mentions ([\#11602](https://github.com/matrix-org/matrix-react-sdk/pull/11602)).
+ * Notify users about denied access on ask-to-join  rooms ([\#11480](https://github.com/matrix-org/matrix-react-sdk/pull/11480)). Contributed by @nurjinjafar.
+ * Allow setting knock room directory visibility ([\#11529](https://github.com/matrix-org/matrix-react-sdk/pull/11529)). Contributed by @charlynguyen.
+
+## 🐛 Bug Fixes
+ * Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](https://github.com/matrix-org/matrix-react-sdk/pull/11634)). Fixes #26209.
+ * Escape placeholder before injecting it into the style ([\#11607](https://github.com/matrix-org/matrix-react-sdk/pull/11607)).
+ * Move ViewUser action callback to RoomView ([\#11495](https://github.com/matrix-org/matrix-react-sdk/pull/11495)). Fixes #26040.
+ * Fix room timeline search toggling behaviour edge case ([\#11605](https://github.com/matrix-org/matrix-react-sdk/pull/11605)). Fixes #26105.
+ * Avoid rendering view-message link in RoomKnocksBar unnecessarily ([\#11598](https://github.com/matrix-org/matrix-react-sdk/pull/11598)). Contributed by @charlynguyen.
+ * Use knock rooms sync to reflect the knock state ([\#11596](https://github.com/matrix-org/matrix-react-sdk/pull/11596)). Fixes #26043 and #26044. Contributed by @charlynguyen.
+ * Fix avatar in right panel not using the correct font ([\#11593](https://github.com/matrix-org/matrix-react-sdk/pull/11593)). Fixes #26061. Contributed by @MidhunSureshR.
+ * Add waits in Spotlight Cypress tests, hoping this unflakes them ([\#11590](https://github.com/matrix-org/matrix-react-sdk/pull/11590)). Fixes #26053, #26140 #26139 and #26138. Contributed by @andybalaam.
+ * Fix vertical alignment of default avatar font ([\#11582](https://github.com/matrix-org/matrix-react-sdk/pull/11582)). Fixes #26081.
+ * Fix avatars in public room & space search being flex shrunk ([\#11580](https://github.com/matrix-org/matrix-react-sdk/pull/11580)). Fixes #26133.
+ * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](https://github.com/matrix-org/matrix-react-sdk/pull/11558)). Fixes #26075.
+
 Changes in [1.11.43](https://github.com/vector-im/element-web/releases/tag/v1.11.43) (2023-09-15)
 =================================================================================================
 

CONTRIBUTING.md

@@ -204,7 +204,7 @@ and we'll try to fix it :)
 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://www.kernel.org/doc/html/latest/process/submitting-patches.html), Docker
 (https://github.com/docker/docker/blob/master/CONTRIBUTING.md), and many other
 projects use: the DCO (Developer Certificate of Origin:
 http://developercertificate.org/). This is a simple declaration that you wrote

book.toml

@@ -0,0 +1,26 @@
+# Documentation for possible options in this file is at
+# https://rust-lang.github.io/mdBook/format/config.html
+[book]
+title = "Element Web & Desktop"
+authors = ["New Vector Ltd.", "The Matrix.org Foundation C.I.C."]
+language = "en"
+multilingual = false
+
+# The directory that documentation files are stored in
+src = "docs"
+
+[build]
+# Prevent markdown pages from being automatically generated when they're
+# linked to in SUMMARY.md
+create-missing = false
+
+[output.html]
+# Remove the numbers that appear before each item in the sidebar, as they can
+# get quite messy as we nest deeper
+no-section-label = true
+
+# The source code URL of the repository
+git-repository-url = "https://github.com/vector-im/element-web"
+
+# The path that the docs are hosted on
+site-url = "/element-web/"

code_style.md

@@ -113,17 +113,30 @@ Unless otherwise specified, the following applies to all code:
     }
     ```
 
-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).
+14. If a variable's type should be boolean, make sure it really is one.
+
+    ```typescript
+    const isRealUser = !!userId && ...; // good
+    const isRealUser = Boolean(userId) && Boolean(userName); // also good
+    const isRealUser = Boolean(userId) && isReal; // also good (where isReal is another boolean variable)
+    const isRealUser = Boolean(userId && userName); // also fine
+    const isRealUser = Boolean(userId || userName); // good: same as &&
+    const isRealUser = userId && ...;   // bad: isRealUser is userId's type, not a boolean
+
+    if (userId) // fine: userId is evaluated for truthiness, not stored as a boolean
+    ```
+
+15. Use `switch` statements when checking against more than a few enum-like values.
+16. Use `const` for constants, `let` for mutability.
+17. 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.
+18. Declare member visibility (public/private/protected).
+19. 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.
+20. Prefer readonly members over getters backed by a variable, unless an internal setter is required.
+21. 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:
@@ -140,9 +153,9 @@ Unless otherwise specified, the following applies to all code:
         }
         ```
 
-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:
+22. Variables/properties which are `public static` should also be `readonly` when possible.
+23. Interface and type properties are terminated with semicolons, not commas.
+24. Prefer arrow formatting when declaring functions for interfaces/types:
 
     ```typescript
     interface Test {
@@ -150,13 +163,13 @@ Unless otherwise specified, the following applies to all code:
     }
     ```
 
-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
+25. Prefer a type definition over an inline type. For example, define an interface.
+26. 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
+27. `import` should be used instead of `require`, as `require` does not have types.
+28. Export only what can be reused.
+29. 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
@@ -174,12 +187,12 @@ Unless otherwise specified, the following applies to all code:
         }
         ```
 
-29. There should be approximately one interface, class, or enum per file unless the file is named
+30. 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:
+31. Bulk functions can be declared in a single file, though named as "foo-utils.ts" or "utils/foo.ts".
+32. Imports are grouped by external module imports first, then by internal imports.
+33. File ordering is not strict, but should generally follow this sequence:
     1. Licence header
     2. Imports
     3. Constants
@@ -194,16 +207,16 @@ Unless otherwise specified, the following applies to all code:
         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
+34. 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.
+35. 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
+36. Prefer async-await to promise-chaining
 
     ```typescript
     async function () {

docs/SUMMARY.md

@@ -0,0 +1,38 @@
+# Summary
+
+-   [Introduction](../README.md)
+
+# Usage
+
+-   [Betas](betas.md)
+-   [Labs](labs.md)
+
+# Setup
+
+-   [Config](config.md)
+-   [Custom home page](custom-home.md)
+-   [Kubernetes](kubernetes.md)
+-   [Jitsi](jitsi.md)
+-   [Encryption](e2ee.md)
+
+# Build
+
+-   [Customisations](customisations.md)
+-   [Modules](modules.md)
+-   [Native Node modules](native-node-modules.md)
+
+# Contribution
+
+-   [Choosing an issue](choosing-an-issue.md)
+-   [Translation](translating.md)
+-   [Netlify builds](pr-previews.md)
+-   [Code review](review.md)
+
+# Development
+
+-   [App load order](app-load.md)
+-   [Translation](translating-dev.md)
+-   [Theming](theming.md)
+-   [Memory profiling](memory-profiles-and-leaks.md)
+-   [Jitsi](jitsi-dev.md)
+-   [Feature flags](feature-flags.md)

docs/config.md

@@ -139,7 +139,7 @@ complete re-branding/private labeling, a more personalised experience can be ach
    configuration found in the well-known location is used instead.
 10. `welcome_user_id`: An optional user ID to start a DM with after creating an account. Defaults to nothing (no DM created).
 11. `custom_translations_url`: An optional URL to allow overriding of translatable strings. The JSON file must be in a format of
-    `{"affected string": {"languageCode": "new string"}}`. See https://github.com/matrix-org/matrix-react-sdk/pull/7886 for details.
+    `{"affected|translation|key": {"languageCode": "new string"}}`. See https://github.com/matrix-org/matrix-react-sdk/pull/7886 for details.
 12. `branding`: Options for configuring various assets used within the app. Described in more detail down below.
 13. `embedded_pages`: Further optional URLs for various assets used within the app. Described in more detail down below.
 14. `disable_3pid_login`: When `false` (default), **enables** the options to log in with email address or phone number. Set to

docs/labs.md

@@ -134,6 +134,10 @@ This setting is (currently) _sticky_ to a user's session: it only takes effect w
 
 Refactors visually the room header and room sidebar
 
+## Enable the notifications panel in the room header (`feature_notifications`)
+
+Unreliable in encrypted rooms.
+
 ## Knock rooms (`feature_ask_to_join`) [In Development]
 
 Enables knock feature for rooms. This allows users to ask to join a room.

docs/translating.md

@@ -1,7 +1,5 @@
 # How to translate Element
 
-# 🚨 Translations are currently frozen as we are migrating Translation Management Systems! 🚨
-
 ## Requirements
 
 -   Web Browser

element.io/develop/config.json

@@ -51,7 +51,7 @@
         "feature_video_rooms": true
     },
     "element_call": {
-        "url": "https://element-call-livekit.netlify.app"
+        "url": "https://call.element.dev"
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

jest.config.ts

@@ -25,10 +25,7 @@ const config: Config = {
     },
     testMatch: ["<rootDir>/test/**/*-test.[tj]s?(x)"],
     setupFiles: ["jest-canvas-mock"],
-    setupFilesAfterEnv: [
-        "<rootDir>/node_modules/matrix-react-sdk/test/setupTests.ts",
-        "<rootDir>/test/setup/setupLanguage.ts",
-    ],
+    setupFilesAfterEnv: ["<rootDir>/node_modules/matrix-react-sdk/test/setupTests.ts"],
     moduleNameMapper: {
         "\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
         "\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.43",
+    "version": "1.11.47",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -76,8 +76,8 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "lodash": "^4.17.21",
-        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-        "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+        "matrix-js-sdk": "29.1.0",
+        "matrix-react-sdk": "3.83.0",
         "matrix-widget-api": "^1.3.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
@@ -150,14 +150,14 @@
         "json-loader": "^0.5.7",
         "loader-utils": "^3.0.0",
         "matrix-mock-request": "^2.5.0",
-        "matrix-web-i18n": "^3.1.1",
+        "matrix-web-i18n": "^3.1.3",
         "mini-css-extract-plugin": "^1",
         "minimist": "^1.2.6",
         "mkdirp": "^3.0.0",
         "modernizr": "^3.12.0",
         "node-fetch": "^2.6.7",
         "optimize-css-assets-webpack-plugin": "^6.0.0",
-        "postcss": "^8.4.16",
+        "postcss": "^8.4.31",
         "postcss-easings": "^2.0.0",
         "postcss-hexrgba": "2.0.1",
         "postcss-import": "^12.0.1",

res/apple-app-site-association

@@ -1,26 +1,35 @@
 {
-    "applinks": {
-        "apps": [],
-        "details": [
-            {
-                "appIDs":[
-                    "7J4U792NQT.im.vector.app",
-                    "7J4U792NQT.io.element.elementx",
-                    "7J4U792NQT.io.element.elementx.nightly",
-                    "7J4U792NQT.io.element.elementx.pr"
-                ],
-                "paths": [
-                    "*"
-                ]
-            }
+  "applinks": {
+    "details": [
+      {
+        "appIDs": [
+          "7J4U792NQT.im.vector.app",
+          "7J4U792NQT.io.element.elementx",
+          "7J4U792NQT.io.element.elementx.nightly",
+          "7J4U792NQT.io.element.elementx.pr"
+        ],
+        "components": [
+          {
+            "?": {
+              "no_universal_links": "?*"
+            },
+            "exclude": true,
+            "comment": "Opt out of universal links"
+          },
+          {
+            "/": "/*",
+            "comment": "Matches any URL"
+          }
         ]
-    },
-    "webcredentials": {
-        "apps": [
-            "7J4U792NQT.im.vector.app",
-            "7J4U792NQT.io.element.elementx",
-            "7J4U792NQT.io.element.elementx.nightly",
-            "7J4U792NQT.io.element.elementx.pr"
-        ]
-    }
+      }
+    ]
+  },
+  "webcredentials": {
+    "apps": [
+      "7J4U792NQT.im.vector.app",
+      "7J4U792NQT.io.element.elementx",
+      "7J4U792NQT.io.element.elementx.nightly",
+      "7J4U792NQT.io.element.elementx.pr"
+    ]
+  }
 }

res/manifest.json

@@ -77,6 +77,11 @@
             "url": "https://play.google.com/store/apps/details?id=im.vector.app",
             "id": "im.vector.app"
         },
+        {
+            "platform": "f-droid",
+            "url": "https://f-droid.org/repository/browse/?fdid=im.vector.app",
+            "id": "im.vector.app"
+        },
         {
             "platform": "itunes",
             "url": "https://apps.apple.com/app/vector/id1083446067"

src/async-components/structures/CompatibilityView.tsx

@@ -40,12 +40,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
                 <p>
                     <strong>iOS</strong> (iPhone or iPad)
                 </p>
-                <a
-                    href={iosCustomUrl || "https://apps.apple.com/app/vector/id1083446067"}
-                    target="_blank"
-                    rel="noreferrer noopener"
-                    className="mx_ClearDecoration"
-                >
+                <a href={iosCustomUrl} target="_blank" rel="noreferrer noopener" className="mx_ClearDecoration">
                     <img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
                 </a>
             </>
@@ -63,7 +58,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
         // undefined or string
         android.push(
             <a
-                href={andCustomUrl || "https://play.google.com/store/apps/details?id=im.vector.app"}
+                href={andCustomUrl}
                 target="_blank"
                 rel="noreferrer noopener"
                 className="mx_ClearDecoration"
@@ -77,7 +72,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
         // undefined or string
         android.push(
             <a
-                href={fdroidCustomUrl || "https://f-droid.org/repository/browse/?fdid=im.vector.app"}
+                href={fdroidCustomUrl}
                 target="_blank"
                 rel="noreferrer noopener"
                 className="mx_ClearDecoration"

src/i18n/strings/bg.json

@@ -1,38 +0,0 @@
-{
-    "action": {
-        "create_account": "Създай профил",
-        "dismiss": "Затвори",
-        "explore_rooms": "Открий стаи",
-        "open": "Отвори",
-        "sign_in": "Вписване"
-    },
-    "auth": {
-        "sso_complete_in_browser_dialog_title": "Отидете в браузъра за да завършите влизането"
-    },
-    "download_completed": "Свалянето завърши",
-    "error": {
-        "app_launch_unexpected_error": "Неочаквана грешка при подготвянето на приложението. Вижте конзолата за подробности.",
-        "cannot_load_config": "Неуспешно зареждане на конфигурационния файл: презаредете страницата за да опитате пак.",
-        "invalid_configuration_no_server": "Невалидна конфигурация: не е указан сървър по подразбиране.",
-        "invalid_json": "Вашата Element конфигурация съдържа невалиден JSON. Коригирайте проблема и презаредете страницата.",
-        "invalid_json_detail": "Грешката от парсъра е: %(message)s",
-        "invalid_json_generic": "Невалиден JSON",
-        "misconfigured": "Вашият Element не е конфигуриран правилно"
-    },
-    "failed_to_start": "Неуспешно стартиране",
-    "go_to_element_io": "Отиди на element.io",
-    "incompatible_browser": {
-        "browser_links": "Инсталирайте <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> или <safariLink>Safari</safariLink> за най-добра работа.",
-        "continue_warning": "Разбирам рисковете и желая да продължа",
-        "feature_warning": "Може да продължите да използвате сегашния си браузър, но някои или всички функции може да се окажат неработещи, или пък външния вид на приложението да изглежда неправилен.",
-        "features": "%(brand)s използва модерни функции на браузъра, които не се поддържат от Вашия.",
-        "summary": "Браузърът ви не може да изпълни %(brand)s",
-        "title": "Неподдържан браузър"
-    },
-    "powered_by_matrix": "Базирано на Matrix",
-    "powered_by_matrix_with_logo": "Децентрализиран, криптиран чат &amp; сътрудничество, захранено от $matrixlogo",
-    "unknown_device": "Непознато устройство",
-    "use_brand_on_mobile": "Използвайте %(brand)s на мобилен телефон",
-    "web_default_device_name": "%(appName)s: %(browserName)s под %(osName)s",
-    "welcome_to_element": "Добре дошли в Element"
-}

src/i18n/strings/pl.json

@@ -16,7 +16,7 @@
         "cannot_load_config": "Nie udało się załadować pliku konfiguracyjnego: odśwież stronę, aby spróbować ponownie.",
         "invalid_configuration_mixed_server": "Nieprawidłowa konfiguracja: nie można określić default_hs_url wraz z default_server_name lub default_server_config",
         "invalid_configuration_no_server": "Błędna konfiguracja: nie wybrano domyślnego serwera.",
-        "invalid_json": "Twoja konfiguracja Elementa zawiera nieprawidłowy JSON. Rozwiąż problem i odśwież stronę.",
+        "invalid_json": "Twoja konfiguracja Element zawiera nieprawidłowy JSON. Rozwiąż problem i odśwież stronę.",
         "invalid_json_detail": "Wiadomość od parsera to: %(message)s",
         "invalid_json_generic": "Błędny JSON",
         "misconfigured": "Twój Element jest nieprawidłowo skonfigurowany"

src/i18n/strings/tr.json

@@ -1,37 +0,0 @@
-{
-    "action": {
-        "create_account": "Hesap Oluştur",
-        "dismiss": "Kapat",
-        "explore_rooms": "Odaları keşfet",
-        "open": "Aç",
-        "sign_in": "Giriş Yap"
-    },
-    "auth": {
-        "sso_complete_in_browser_dialog_title": "Oturum açmayı tamamlamak için tarayıcınıza gidin"
-    },
-    "download_completed": "İndirme Tamamlandı",
-    "error": {
-        "app_launch_unexpected_error": "Uygulama hazırlanırken beklenmeyen bir hata oldu. Detaylar için konsola bakın.",
-        "cannot_load_config": "Yapılandırma (config) dosyası yüklenemedi: lütfen yeniden denemek için sayfayı yenileyin.",
-        "invalid_configuration_no_server": "Hatalı ayarlar: varsayılan sunucu belirlenmemiş.",
-        "invalid_json": "Element uygulamasının ayarları hatalı JSON içeriyor. Lütfen hatayı düzeltip sayfayı yenileyin.",
-        "invalid_json_detail": "Ayrıştırıcıdan gelen mesaj: %(message)s",
-        "invalid_json_generic": "Hatalı JSON",
-        "misconfigured": "Element uygulaması hatalı ayarlanmış"
-    },
-    "failed_to_start": "Başlatılamadı",
-    "go_to_element_io": "element.io adresine git",
-    "incompatible_browser": {
-        "browser_links": "Daha iyi bir deneyim için lütfen <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ya da <safariLink>Safari</safariLink> tarayıcılarından birini yükleyin.",
-        "continue_warning": "Riskleri anlıyorum ve devam etmek istiyorum",
-        "feature_warning": "Şu anda kullanmış olduğunuz tarayıcınızı kullanmaya devam edebilirsiniz ancak uygulamanın sunduğu bazı ya da bütün özellikler çalışmayabilir ve deneyiminizi kötü yönde etkileyebilir.",
-        "features": "%(brand)s, kullandığınız tarayıcı tarafından desteklenmeyen, gelişmiş tarayıcı özellikleri kullanıyor.",
-        "summary": "Tarayıcınız %(brand)s uygulamasını çalıştıramıyor",
-        "title": "Desteklenmeyen tarayıcı"
-    },
-    "powered_by_matrix": "Gücünü Matrix'ten alır",
-    "powered_by_matrix_with_logo": "$matrixLogo tarafından merkeziyetsiz, şifrelenmiş sohbet &amp; iş birliği",
-    "unknown_device": "Bilinmeyen aygıt",
-    "use_brand_on_mobile": "Mobilde %(brand)s kullan",
-    "welcome_to_element": "Element'e hoş geldiniz"
-}

src/languageHandler.tsx

@@ -39,7 +39,7 @@ import type EN from "./i18n/strings/en_EN.json";
  * which we know will be injected by webpack.
  */
 
-export type TranslationKey = Leaves<typeof EN & typeof ReactEN, "|", string | { other: string }>;
+export type TranslationKey = Leaves<typeof EN & typeof ReactEN, "|", string | { other: string }, 4>;
 
 export class UserFriendlyError extends ReactUserFriendlyError {
     public constructor(message: TranslationKey, substitutionVariablesAndCause?: IVariables & ErrorOptions) {

test/setup/setupLanguage.ts

@@ -25,6 +25,6 @@ fetchMock.config.overwriteRoutes = false;
 
 export function setupLanguageMock() {
     reactSetupLanguageMock();
-    fetchMock.get("end:en_EN.json", _.merge(en, reactEn), { overwriteRoutes: true });
+    fetchMock.get("end:en_EN.json", _.merge({}, en, reactEn), { overwriteRoutes: true });
 }
 setupLanguageMock();

test/unit-tests/async-components/structures/ErrorView-test.tsx

@@ -18,8 +18,13 @@ import * as React from "react";
 import { render } from "@testing-library/react";
 
 import ErrorView from "../../../../src/async-components/structures/ErrorView";
+import { setupLanguageMock } from "../../../setup/setupLanguage";
 
 describe("<ErrorView />", () => {
+    beforeEach(() => {
+        setupLanguageMock();
+    });
+
     it("should match snapshot", () => {
         const { asFragment } = render(<ErrorView title="TITLE" messages={["MSG1", "MSG2"]} />);
         expect(asFragment()).toMatchSnapshot();

test/unit-tests/components/views/auth/VectorAuthFooter-test.tsx

@@ -18,8 +18,13 @@ import * as React from "react";
 import { render } from "@testing-library/react";
 
 import VectorAuthFooter from "../../../../../src/components/views/auth/VectorAuthFooter";
+import { setupLanguageMock } from "../../../../setup/setupLanguage";
 
 describe("<VectorAuthFooter />", () => {
+    beforeEach(() => {
+        setupLanguageMock();
+    });
+
     it("should match snapshot", () => {
         const { asFragment } = render(<VectorAuthFooter />);
         expect(asFragment()).toMatchSnapshot();

test/unit-tests/components/views/auth/VectorAuthPage-test.tsx

@@ -18,8 +18,13 @@ import * as React from "react";
 import { render } from "@testing-library/react";
 
 import VectorAuthPage from "../../../../../src/components/views/auth/VectorAuthPage";
+import { setupLanguageMock } from "../../../../setup/setupLanguage";
 
 describe("<VectorAuthPage />", () => {
+    beforeEach(() => {
+        setupLanguageMock();
+    });
+
     it("should match snapshot", () => {
         const { asFragment } = render(<VectorAuthPage />);
         expect(asFragment()).toMatchSnapshot();

test/unit-tests/vector/platform/ElectronPlatform-test.ts

@@ -26,6 +26,7 @@ import DesktopCapturerSourcePicker from "matrix-react-sdk/src/components/views/e
 import { mocked } from "jest-mock";
 
 import ElectronPlatform from "../../../../src/vector/platform/ElectronPlatform";
+import { setupLanguageMock } from "../../../setup/setupLanguage";
 
 jest.mock("matrix-react-sdk/src/rageshake/rageshake", () => ({
     flush: jest.fn(),
@@ -51,6 +52,7 @@ describe("ElectronPlatform", () => {
         window.electron = mockElectron;
         jest.clearAllMocks();
         Object.defineProperty(window, "navigator", { value: { userAgent: defaultUserAgent }, writable: true });
+        setupLanguageMock();
     });
 
     const getElectronEventHandlerCall = (eventType: string): [type: string, handler: Function] | undefined =>

test/unit-tests/vector/platform/WebPlatform-test.ts

@@ -19,12 +19,14 @@ import { UpdateCheckStatus } from "matrix-react-sdk/src/BasePlatform";
 import { MatrixClientPeg } from "matrix-react-sdk/src/MatrixClientPeg";
 
 import WebPlatform from "../../../../src/vector/platform/WebPlatform";
+import { setupLanguageMock } from "../../../setup/setupLanguage";
 
 fetchMock.config.overwriteRoutes = true;
 
 describe("WebPlatform", () => {
     beforeEach(() => {
         jest.clearAllMocks();
+        setupLanguageMock();
     });
 
     it("returns human readable name", () => {

tsconfig.json

@@ -12,7 +12,7 @@
         "outDir": "./lib",
         "declaration": true,
         "jsx": "react",
-        "lib": ["es2020", "dom", "dom.iterable"],
+        "lib": ["es2021", "dom", "dom.iterable"],
         "strict": true
     },
     "include": [