Merge branch 'develop' of https://github.com/vector-im/element-web in…

…to t3chguy/arm64-windows

# Conflicts:
#	playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-CompatibilityView-linux.png

.github/workflows/docker.yaml

@@ -22,13 +22,13 @@ jobs:
                   fetch-depth: 0 # needed for docker-package to be able to calculate the version
 
             - name: Install Cosign
-              uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3
+              uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3
+              uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3
+              uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3
               with:
                   install: true
 

.github/workflows/tests.yml

@@ -104,7 +104,7 @@ jobs:
 
             - name: Skip SonarCloud in merge queue
               if: github.event_name == 'merge_group' || inputs.disable_coverage == 'true'
-              uses: guibranco/github-status-action-v2@119b3320db3f04d89e91df840844b92d57ce3468
+              uses: guibranco/github-status-action-v2@7ca807c2ba3401be532d29a876b93262108099fb
               with:
                   authToken: ${{ secrets.GITHUB_TOKEN }}
                   state: success

package.json

@@ -74,7 +74,7 @@
         "@types/react-dom": "18.3.5",
         "oidc-client-ts": "3.1.0",
         "jwt-decode": "4.0.0",
-        "caniuse-lite": "1.0.30001697",
+        "caniuse-lite": "1.0.30001699",
         "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0",
         "wrap-ansi": "npm:wrap-ansi@^7.0.0"
     },
@@ -88,7 +88,7 @@
         "@matrix-org/emojibase-bindings": "^1.3.4",
         "@matrix-org/react-sdk-module-api": "^2.4.0",
         "@matrix-org/spec": "^1.7.0",
-        "@sentry/browser": "^8.0.0",
+        "@sentry/browser": "^9.0.0",
         "@types/png-chunks-extract": "^1.0.2",
         "@types/react-virtualized": "^9.21.30",
         "@vector-im/compound-design-tokens": "^3.0.0",
@@ -274,7 +274,7 @@
         "postcss-preset-env": "^10.0.0",
         "postcss-scss": "^4.0.4",
         "postcss-simple-vars": "^7.0.1",
-        "prettier": "3.4.2",
+        "prettier": "3.5.1",
         "process": "^0.11.10",
         "raw-loader": "^4.0.2",
         "rimraf": "^6.0.0",

playwright/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/playwright:v1.49.1-noble
+FROM mcr.microsoft.com/playwright:v1.50.1-noble
 
 WORKDIR /work
 

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

@@ -6,22 +6,21 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com
 Please see LICENSE files in the repository root for full details.
 */
 
-import { expect, test as base } from "../../element-web-test";
+import { type CredentialsWithDisplayName, expect, test as base } from "../../element-web-test";
 import { selectHomeserver } from "../utils";
 import { emailHomeserver } from "../../plugins/homeserver/synapse/emailHomeserver.ts";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
-import { type Credentials } from "../../plugins/homeserver";
 
 const email = "[email protected]";
 
-const test = base.extend<{ credentials: Pick<Credentials, "username" | "password"> }>({
+const test = base.extend({
     // eslint-disable-next-line no-empty-pattern
     credentials: async ({}, use, testInfo) => {
         await use({
             username: `user_${testInfo.testId}`,
             // this has to be password-like enough to please zxcvbn. Needless to say it's just from pwgen.
             password: "oETo7MPf0o",
-        });
+        } as CredentialsWithDisplayName);
     },
 });
 

playwright/testcontainers/synapse.ts

@@ -25,7 +25,7 @@ import { type HomeserverContainer, type StartedHomeserverContainer } from "./Hom
 import { type StartedMatrixAuthenticationServiceContainer } from "./mas.ts";
 import { Api, ClientServerApi, type Verb } from "../plugins/utils/api.ts";
 
-const TAG = "develop@sha256:32ee365ad97dde86033e8a33e143048167271299e4c727413f3cdff48c65f8d9";
+const TAG = "develop@sha256:fa3090607a5e07a4ff245247aa3b598c6bbcff9231fd89a558de97c37adbd744";
 
 const DEFAULT_CONFIG = {
     server_name: "localhost",

res/css/structures/ErrorView.pcss

@@ -10,8 +10,9 @@ Please see LICENSE files in the repository root for full details.
     --cpd-separator-inset: calc(50% - (var(--width) / 2));
     --cpd-separator-spacing: var(--cpd-space-8x);
 
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif,
-        "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+    font-family:
+        -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji",
+        "Segoe UI Emoji", "Segoe UI Symbol";
     text-align: center;
     color: var(--cpd-color-text-primary);
     width: 100%;

res/css/structures/_SpacePanel.pcss

@@ -365,7 +365,8 @@ Please see LICENSE files in the repository root for full details.
                Note the top fade is much smaller because the spaces start close to the top,
                so otherwise a large gradient suddenly appears when you scroll down.
              */
-            mask-image: linear-gradient(to bottom, transparent, black 16px),
+            mask-image:
+                linear-gradient(to bottom, transparent, black 16px),
                 linear-gradient(
                     to top,
                     transparent,

res/css/structures/_SplashPage.pcss

@@ -16,7 +16,8 @@ Please see LICENSE files in the repository root for full details.
         position: absolute;
         z-index: -1;
         opacity: 0.6;
-        background-image: radial-gradient(
+        background-image:
+            radial-gradient(
                 53.85% 66.75% at 87.55% 0%,
                 hsla(250deg, 76%, 71%, 0.261) 0%,
                 hsla(250deg, 100%, 88%, 0) 100%

res/themes/dark/css/_dark.pcss

@@ -309,11 +309,8 @@ body {
 
 /* Splash Page Gradient */
 .mx_SplashPage::before {
-    background-image: radial-gradient(
-            53.85% 66.75% at 87.55% 0%,
-            hsla(0deg, 0%, 11%, 0.15) 0%,
-            hsla(250deg, 100%, 88%, 0) 100%
-        ),
+    background-image:
+        radial-gradient(53.85% 66.75% at 87.55% 0%, hsla(0deg, 0%, 11%, 0.15) 0%, hsla(250deg, 100%, 88%, 0) 100%),
         radial-gradient(41.93% 41.93% at 0% 0%, hsla(0deg, 0%, 38%, 0.28) 0%, hsla(250deg, 100%, 88%, 0) 100%),
         radial-gradient(100% 100% at 0% 0%, hsla(250deg, 100%, 88%, 0.3) 0%, hsla(0deg, 100%, 86%, 0) 100%),
         radial-gradient(106.35% 96.26% at 100% 0%, hsla(25deg, 100%, 88%, 0.4) 0%, hsla(167deg, 76%, 82%, 0) 100%) !important;

res/themes/legacy-light/css/_legacy-light.pcss

@@ -10,11 +10,13 @@
 /* Noto Color Emoji contains digits, in fixed-width, therefore causing
    digits in flowed text to stand out.
    TODO: Consider putting all emoji fonts to the end rather than the front. */
-$font-family: "Nunito", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Arial", "Helvetica",
-    sans-serif, "Noto Color Emoji";
+$font-family:
+    "Nunito", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Arial", "Helvetica", sans-serif,
+    "Noto Color Emoji";
 
-$monospace-font-family: "Inconsolata", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Courier",
-    monospace, "Noto Color Emoji";
+$monospace-font-family:
+    "Inconsolata", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Courier", monospace,
+    "Noto Color Emoji";
 
 /* unified palette */
 /* try to use these colors when possible */

res/themes/light/css/_light.pcss

@@ -10,11 +10,13 @@
 /* Noto Color Emoji contains digits, in fixed-width, therefore causing
    digits in flowed text to stand out.
    TODO: Consider putting all emoji fonts to the end rather than the front. */
-$font-family: "Inter", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Arial", "Helvetica",
-    sans-serif, "Noto Color Emoji";
+$font-family:
+    "Inter", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Arial", "Helvetica", sans-serif,
+    "Noto Color Emoji";
 
-$monospace-font-family: "Inconsolata", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Courier",
-    monospace, "Noto Color Emoji";
+$monospace-font-family:
+    "Inconsolata", var(--emoji-font-family), "Apple Color Emoji", "Segoe UI Emoji", "Courier", monospace,
+    "Noto Color Emoji";
 
 /* Colors from Figma Compound https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=559%3A120 */
 /* ******************** */

src/DeviceListener.ts

@@ -48,6 +48,11 @@ import { asyncSomeParallel } from "./utils/arrays.ts";
 
 const KEY_BACKUP_POLL_INTERVAL = 5 * 60 * 1000;
 
+// Unfortunately named account data key used by Element X to indicate that the user
+// has chosen to disable server side key backups. We need to set and honour this
+// to prevent Element X from automatically turning key backup back on.
+const BACKUP_DISABLED_ACCOUNT_DATA_KEY = "m.org.matrix.custom.backup_disabled";
+
 const logger = baseLogger.getChild("DeviceListener:");
 
 export default class DeviceListener {
@@ -323,9 +328,11 @@ export default class DeviceListener {
                 logger.info("Some secrets not cached: showing KEY_STORAGE_OUT_OF_SYNC toast");
                 showSetupEncryptionToast(SetupKind.KEY_STORAGE_OUT_OF_SYNC);
             } else if (defaultKeyId === null) {
-                // the user just hasn't set up 4S yet: prompt them to do so
-                logger.info("No default 4S key: showing SET_UP_RECOVERY toast");
-                showSetupEncryptionToast(SetupKind.SET_UP_RECOVERY);
+                // the user just hasn't set up 4S yet: prompt them to do so (unless they've explicitly said no to key storage)
+                const disabledEvent = cli.getAccountData(BACKUP_DISABLED_ACCOUNT_DATA_KEY);
+                if (!disabledEvent?.getContent().disabled) {
+                    showSetupEncryptionToast(SetupKind.SET_UP_RECOVERY);
+                }
             } else {
                 // some other condition... yikes! Show the 'set up encryption' toast: this is what we previously did
                 // in 'other' situations. Possibly we should consider prompting for a full reset in this case?

src/i18n/strings/cy.json

@@ -712,6 +712,44 @@
         "category_room": "Stafell",
         "caution_colon": "Rhybudd:",
         "client_versions": "Fersiynau Cleient",
+        "crypto": {
+            "4s_public_key_in_account_data": "mewn data cyfrif",
+            "4s_public_key_not_in_account_data": "heb ei ganfod",
+            "4s_public_key_status": "Allwedd gyhoeddus storio gyfrinachol:",
+            "backup_key_cached": "wedi'i storio'n lleol",
+            "backup_key_cached_status": "Allwedd wrth gefn wedi'i storio:",
+            "backup_key_not_stored": "heb ei storio",
+            "backup_key_stored": "mewn storfa gyfrinachol",
+            "backup_key_stored_status": "Allwedd wrth gefn wedi'i storio:",
+            "backup_key_unexpected_type": "math annisgwyl",
+            "backup_key_well_formed": "wedi'i ffurfio'n dda",
+            "cross_signing": "Traws-arwyddo",
+            "cross_signing_cached": "wedi'i storio'n lleol",
+            "cross_signing_not_ready": "Nid yw traws-arwyddo wedi'i osod.",
+            "cross_signing_private_keys_in_storage": "mewn storfa gyfrinachol",
+            "cross_signing_private_keys_in_storage_status": "Traws-lofnodi allweddi preifat:",
+            "cross_signing_private_keys_not_in_storage": "heb ei ganfod yn y storfa",
+            "cross_signing_public_keys_on_device": "yn y cof",
+            "cross_signing_public_keys_on_device_status": "Traws-lofnodi allweddi cyhoeddus:",
+            "cross_signing_ready": "Mae croes-arwyddo yn barod i'w ddefnyddio.",
+            "cross_signing_status": "Statws traws-arwyddo:",
+            "cross_signing_untrusted": "Mae gan eich cyfrif hunaniaeth traws-lofnodi mewn storfa gyfrinachol, ond nid yw'r sesiwn hon yn ymddiried ynddo eto.",
+            "crypto_not_available": "Nid yw modiwl cryptograffig ar gael",
+            "key_backup_active_version": "Fersiwn wrth gefn gweithredol:",
+            "key_backup_active_version_none": "Dim",
+            "key_backup_inactive_warning": "Nid yw'ch allweddi'n cael eu gwneud wrth gefn o'r sesiwn hon.",
+            "key_backup_latest_version": "Fersiwn wrth gefn diweddaraf ar y gweinydd:",
+            "key_storage": "Storio Allwedd",
+            "master_private_key_cached_status": "Prif allwedd breifat:",
+            "not_found": "heb ei ganfod",
+            "not_found_locally": "heb ei ganfod yn lleol",
+            "secret_storage_not_ready": "ddim yn barod",
+            "secret_storage_ready": "barod",
+            "secret_storage_status": "Storio cyfrinachol:",
+            "self_signing_private_key_cached_status": "Allwedd breifat hunan-arwyddo:",
+            "title": "Amgryptio o ben i ben",
+            "user_signing_private_key_cached_status": "Defnyddiwr yn arwyddo allwedd breifat:"
+        },
         "developer_mode": "Modd datblygwr",
         "developer_tools": "Offer Datblygwr",
         "edit_setting": "Golygu gosodiad",
@@ -989,8 +1027,11 @@
             "waiting_other_user": "Aros i %(displayName)s wirio…"
         },
         "verification_requested_toast_title": "Gofynnwyd am ddilysiad",
+        "verified_identity_changed": "Mae hunaniaeth %(displayName)s ( <b>%(userId)s</b> ) a ddilyswyd wedi newid. <a>Dysgwch fwy</a>",
+        "verified_identity_changed_no_displayname": "Mae hunaniaeth ddilysedig <b>%(userId)s</b> wedi newid. <a>Dysgwch fwy</a>",
         "verify_toast_description": "Efallai na fydd defnyddwyr eraill yn ymddiried ynddo",
-        "verify_toast_title": "Gwiriwch y sesiwn hon"
+        "verify_toast_title": "Gwiriwch y sesiwn hon",
+        "withdraw_verification_action": "Tynnu'r dilysiad yn ôl"
     },
     "error": {
         "admin_contact": "<a>Cysylltwch â gweinyddwr eich gwasanaeth</a> i barhau i ddefnyddio'r gwasanaeth hwn.",
@@ -1399,6 +1440,7 @@
         "location_share_live_description": "Gweithredu dros dro. Mae lleoliadau'n parhau yn hanes ystafelloedd.",
         "mjolnir": "Ffyrdd newydd o anwybyddu pobl",
         "msc3531_hide_messages_pending_moderation": "Gadael i safonwyr guddio negeseuon tra'n aros i'w safoni.",
+        "new_room_list": "Galluogi rhestr ystafelloedd newydd",
         "notification_settings": "Gosodiadau Hysbysu Newydd",
         "notification_settings_beta_caption": "Cyflwyno ffordd symlach o newid eich gosodiadau hysbysu. Addaswch eich %(brand)s, yn union fel y dymunwch.",
         "notification_settings_beta_title": "Gosodiadau Hysbysiadau",
@@ -2279,6 +2321,25 @@
         "enable_markdown": "Galluogi Markdown",
         "enable_markdown_description": "Dechreuwch negeseuon gyda <code>/plain</code> i'w hanfon heb eu marcio i lawr.",
         "encryption": {
+            "advanced": {
+                "breadcrumb_first_description": "Bydd manylion eich cyfrif, eich cysylltiadau, eich dewisiadau a'ch rhestr sgwrsio yn cael eu cadw",
+                "breadcrumb_page": "Ailosod amgryptio",
+                "breadcrumb_second_description": "Byddwch yn colli unrhyw hanes neges sydd wedi'i storio ar y gweinydd yn unig",
+                "breadcrumb_third_description": "Bydd angen i chi wirio'ch holl ddyfeisiau a chysylltiadau presennol eto",
+                "breadcrumb_title": "Ydych chi'n siŵr eich bod am ailosod eich hunaniaeth?",
+                "breadcrumb_title_forgot": "Wedi anghofio eich allwedd adfer? Bydd angen i chi ailosod eich hunaniaeth.",
+                "breadcrumb_warning": "Gwnewch hyn dim ond os ydych chi'n credu bod eich cyfrif wedi'i beryglu.",
+                "details_title": "Manylion amgryptio",
+                "export_keys": "Allforio allweddi",
+                "import_keys": "Mewnforio bysellau",
+                "other_people_device_description": "Yn ragosodedig mewn ystafelloedd wedi'u hamgryptio, peidiwch ag anfon negeseuon wedi'u hamgryptio at unrhyw un nes i chi eu gwirio",
+                "other_people_device_label": "Peidiwch byth ag anfon negeseuon wedi'u hamgryptio i ddyfeisiau heb eu gwirio",
+                "other_people_device_title": "Dyfeisiau pobl eraill",
+                "reset_identity": "Ailosod hunaniaeth cryptograffig",
+                "session_id": "ID y sesiwn:",
+                "session_key": "Allwedd sesiwn:",
+                "title": "Uwch"
+            },
             "device_not_verified_button": "Dilyswch y ddyfais hon",
             "device_not_verified_description": "Mae angen i chi wirio'r ddyfais hon er mwyn gweld eich gosodiadau amgryptio.",
             "device_not_verified_title": "Dyfais heb ei gwirio",
@@ -2293,6 +2354,7 @@
                 "description": "Adfer eich hunaniaeth cryptograffig a hanes neges gydag allwedd adfer os ydych chi wedi colli'ch holl ddyfeisiau presennol.",
                 "enter_key_error": "Nid yw'r allwedd adfer a roesoch yn gywir.",
                 "enter_recovery_key": "Rhowch allwedd adfer",
+                "forgot_recovery_key": "Wedi anghofio allwedd adfer?",
                 "key_storage_warning": "Nid yw eich storfa allweddi wedi'i chysoni. Cliciwch ar y botwm isod i ddatrys y broblem.",
                 "save_key_description": "Peidiwch â rhannu hwn gyda neb!",
                 "save_key_title": "Allwedd adfer",
@@ -3198,6 +3260,7 @@
             "left_reason": "Gadawodd %(targetName)s yr ystafell: %(reason)s",
             "no_change": "Ni wnaeth %(senderName)s unrhyw newid",
             "reject_invite": "Mae %(targetName)s wedi gwrthod y gwahoddiad",
+            "reject_invite_reason": "Mae %(targetName)s wedi gwrthod y gwahoddiad: %(reason)s",
             "remove_avatar": "Mae %(senderName)s wedi tynnu eu llun proffil",
             "remove_name": "Mae %(senderName)s wedi tynnu eu henw arddangos (%(oldDisplayName)s)",
             "set_avatar": "Mae %(senderName)s wedi gosod llun proffil",
@@ -3233,6 +3296,10 @@
             "sent": "Anfonodd %(senderName)s wahoddiad at %(targetDisplayName)s i ymuno â'r ystafell."
         },
         "m.room.tombstone": "Mae %(senderDisplayName)s wedi uwchraddio'r ystafell hon.",
+        "m.room.topic": {
+            "changed": "Newidiodd %(senderDisplayName)s y pwnc i \"%(topic)s\".",
+            "removed": "Mae %(senderDisplayName)s wedi dileu'r pwnc."
+        },
         "m.sticker": "Anfonodd %(senderDisplayName)s sticer.",
         "m.video": {
             "error_decrypting": "Gwall wrth ddadgryptio fideo"
@@ -3417,6 +3484,7 @@
         "unban_space_specific": "Gwahardd nhw o bethau penodol y gallaf",
         "unban_space_warning": "Ni fyddant yn gallu cael mynediad at beth bynnag nad ydych yn weinyddwr iddo.",
         "unignore_button": "Anwybyddu",
+        "verification_unavailable": "Nid yw dilysu defnyddiwr ar gael",
         "verify_button": "Dilysu Defnyddiwr",
         "verify_explainer": "Ar gyfer diogelwch ychwanegol, gwiriwch y defnyddiwr hwn trwy wirio cod un-amser ar eich dwy ddyfais."
     },

src/sentry.ts

@@ -213,7 +213,6 @@ export async function initSentry(sentryConfig: IConfigOptions["sentry"]): Promis
         release: process.env.VERSION,
         environment: sentryConfig.environment,
         defaultIntegrations: false,
-        autoSessionTracking: false,
         integrations,
         // Set to 1.0 which is reasonable if we're only submitting Rageshakes; will need to be set < 1.0
         // if we collect more frequently.

src/vector/mobile_guide/index.html

@@ -16,7 +16,8 @@
                 background: #f9fafb;
                 max-width: 680px;
                 margin: auto;
-                font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif,
+                font-family:
+                    -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif,
                     "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
             }
 

src/vector/static/incompatible-browser.html

@@ -16,7 +16,8 @@
             background: #f9fafb;
             max-width: 680px;
             margin: auto;
-            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif,
+            font-family:
+                -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif,
                 "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
         }