Merge branch 'develop' into prbranch

Author: nmscode

.eslintrc.js

@@ -144,20 +144,6 @@ module.exports = {
                             "!matrix-js-sdk/src/models/read-receipt",
                             "!matrix-js-sdk/src/models/relations-container",
                             "!matrix-js-sdk/src/models/related-relations",
-                            "!matrix-js-sdk/src/@types",
-                            "!matrix-js-sdk/src/@types/global",
-                            "!matrix-js-sdk/src/@types/auth",
-                            "!matrix-js-sdk/src/@types/beacon",
-                            "!matrix-js-sdk/src/@types/threepids",
-                            "!matrix-js-sdk/src/@types/polls",
-                            "!matrix-js-sdk/src/@types/crypto",
-                            "!matrix-js-sdk/src/@types/local_notifications",
-                            "!matrix-js-sdk/src/@types/location",
-                            "!matrix-js-sdk/src/@types/topic",
-                            "!matrix-js-sdk/src/@types/registration",
-                            "!matrix-js-sdk/src/@types/read_receipts",
-                            "!matrix-js-sdk/src/@types/extensible_events",
-                            "!matrix-js-sdk/src/@types/IIdentityServerProvider",
                         ],
                         message: "Please use matrix-js-sdk/src/matrix instead",
                     },

.github/workflows/cypress.yaml

@@ -163,7 +163,7 @@ jobs:
                   echo "CYPRESS_RUST_CRYPTO=1" >> "$GITHUB_ENV"
 
             - name: Run Cypress tests
-              uses: cypress-io/github-action@90dff940a41c08c7c344310eac7e57eda636326a
+              uses: cypress-io/github-action@fa88e4afe551e64c8827a4b9e379afc63d8f691a
               with:
                   working-directory: matrix-react-sdk
                   # The built-in Electron runner seems to grind to a halt trying to run the tests, so use chrome.

.github/workflows/i18n_check.yml

@@ -11,8 +11,8 @@ jobs:
 
             - name: "Get modified files"
               id: changed_files
-              if: github.event_name == 'pull_request' && github.event.pull_request.user.login != 'RiotTranslateBot'
-              uses: tj-actions/changed-files@87697c0dca7dd44e37a2b79a79489332556ff1f3 # v37
+              if: github.event_name == 'pull_request' && github.event.pull_request.user.login != 'RiotTranslateBot' && github.event.pull_request.user.login != 't3chguy'
+              uses: tj-actions/changed-files@17f3fec1edef0c3916d59cbcee1585fcd457e456 # v38
               with:
                   files: |
                       src/i18n/strings/*
@@ -25,8 +25,8 @@ jobs:
                   github.event.pull_request.user.login != 'RiotTranslateBot' &&
                   steps.changed_files.outputs.any_modified == 'true'
               run: |
-                  echo "Only translation files modified by `yarn i18n` can be committed - other translation files will confuse weblate in unrecoverable ways."
                   exit 1
+                  echo "Only translation files modified by 'yarn i18n' can be committed - other translation files will confuse weblate in unrecoverable ways."
 
             - uses: actions/setup-node@v3
               with:

__mocks__/languages.json

@@ -1,10 +1,4 @@
 {
-    "en": {
-        "fileName": "en_EN.json",
-        "label": "English"
-    },
-    "en-us": {
-        "fileName": "en_US.json",
-        "label": "English (US)"
-    }
+    "en": "en_EN.json",
+    "en-us": "en_US.json"
 }

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

@@ -168,7 +168,8 @@ describe("Audio player", () => {
     it("should be correctly rendered - light theme with monospace font", () => {
         uploadFile("cypress/fixtures/1sec-long-name-audio-file.ogg");
 
-        takeSnapshots("Selected EventTile of audio player (light theme, monospace font)", true); // Enable monospace
+        // Disabled because flaky - see https://github.com/vector-im/element-web/issues/24881
+        //takeSnapshots("Selected EventTile of audio player (light theme, monospace font)", true); // Enable monospace
     });
 
     it("should be correctly rendered - high contrast theme", () => {
@@ -186,7 +187,8 @@ describe("Audio player", () => {
 
         uploadFile("cypress/fixtures/1sec-long-name-audio-file.ogg");
 
-        takeSnapshots("Selected EventTile of audio player (high contrast)");
+        // Disabled because flaky - see https://github.com/vector-im/element-web/issues/24881
+        //takeSnapshots("Selected EventTile of audio player (high contrast)");
     });
 
     it("should be correctly rendered - dark theme", () => {
@@ -254,8 +256,8 @@ describe("Audio player", () => {
             });
         });
 
-        // Take snapshots
-        takeSnapshots("Selected EventTile of audio player with a reply");
+        // Disabled because flaky - see https://github.com/vector-im/element-web/issues/24881
+        //takeSnapshots("Selected EventTile of audio player with a reply");
     });
 
     it("should support creating a reply chain with multiple audio files", () => {

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

@@ -16,8 +16,7 @@ limitations under the License.
 
 /// <reference types="cypress" />
 
-import type { MatrixClient, MatrixEvent, ISendEventResponse } from "matrix-js-sdk/src/matrix";
-import type { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
+import type { MatrixClient, MatrixEvent, ISendEventResponse, ReceiptType } from "matrix-js-sdk/src/matrix";
 import { HomeserverInstance } from "../../plugins/utils/homeserver";
 
 describe("Read receipts", () => {

cypress/e2e/settings/general-user-settings-tab.spec.ts

@@ -133,10 +133,12 @@ describe("General user settings tab", () => {
                     cy.findByRole("button", { name: "Language Dropdown" }).click();
 
                     // Assert that the default option is rendered and highlighted
-                    cy.findByRole("option", { name: /Bahasa Indonesia/ })
+                    cy.findByRole("option", { name: /Albanian/ })
                         .should("be.visible")
                         .should("have.class", "mx_Dropdown_option_highlight");
 
+                    cy.findByRole("option", { name: /Deutsch/ }).should("be.visible");
+
                     // Click again to close the dropdown
                     cy.findByRole("button", { name: "Language Dropdown" }).click();
 
@@ -230,7 +232,7 @@ describe("General user settings tab", () => {
         cy.closeDialog();
 
         // Assert the avatar's initial characters are set
-        cy.get(".mx_UserMenu .mx_BaseAvatar_initial").findByText("A").should("exist"); // Alice
-        cy.get(".mx_RoomView_wrapper .mx_BaseAvatar_initial").findByText("A").should("exist"); // Alice
+        cy.get(".mx_UserMenu .mx_BaseAvatar").findByText("A").should("exist"); // Alice
+        cy.get(".mx_RoomView_wrapper .mx_BaseAvatar").findByText("A").should("exist"); // Alice
     });
 });

cypress/e2e/threads/threads.spec.ts

@@ -98,7 +98,7 @@ describe("Threads", () => {
         // Wait until the both messages are read
         cy.get(".mx_ThreadView .mx_EventTile_last[data-layout=group]").within(() => {
             cy.get(".mx_EventTile_line .mx_MTextBody").findByText(MessageLong).should("exist");
-            cy.get(".mx_ReadReceiptGroup .mx_BaseAvatar_image").should("be.visible");
+            cy.get(".mx_ReadReceiptGroup .mx_BaseAvatar").should("be.visible");
 
             // Make sure the CSS style for spacing is applied to mx_EventTile_line on group/modern layout
             cy.get(".mx_EventTile_line").should("have.css", "padding-inline-start", ThreadViewGroupSpacingStart);
@@ -118,7 +118,7 @@ describe("Threads", () => {
             cy.get(".mx_EventTile_line .mx_MTextBody").findByText(MessageLong).should("exist");
 
             // Make sure the avatar inside ReadReceiptGroup is visible on the group layout
-            cy.get(".mx_ReadReceiptGroup .mx_BaseAvatar_image").should("be.visible");
+            cy.get(".mx_ReadReceiptGroup .mx_BaseAvatar").should("be.visible");
         });
 
         // Enable the bubble layout
@@ -127,12 +127,12 @@ describe("Threads", () => {
         cy.get(".mx_ThreadView .mx_EventTile[data-layout='bubble'].mx_EventTile_last").within(() => {
             // TODO: remove this after fixing the issue of ReadReceiptGroup being hidden on the bubble layout
             // See: https://github.com/vector-im/element-web/issues/23569
-            cy.get(".mx_ReadReceiptGroup .mx_BaseAvatar_image").should("exist");
+            cy.get(".mx_ReadReceiptGroup .mx_BaseAvatar").should("exist");
 
             // Make sure the avatar inside ReadReceiptGroup is visible on bubble layout
             // TODO: enable this after fixing the issue of ReadReceiptGroup being hidden on the bubble layout
             // See: https://github.com/vector-im/element-web/issues/23569
-            // cy.get(".mx_ReadReceiptGroup .mx_BaseAvatar_image").should("be.visible");
+            // cy.get(".mx_ReadReceiptGroup .mx_BaseAvatar").should("be.visible");
         });
 
         // Re-enable the group layout

cypress/e2e/timeline/timeline.spec.ts

@@ -45,7 +45,7 @@ const expectDisplayName = (e: JQuery<HTMLElement>, displayName: string): void =>
 const expectAvatar = (e: JQuery<HTMLElement>, avatarUrl: string): void => {
     cy.all([cy.window({ log: false }), cy.getClient()]).then(([win, cli]) => {
         const size = AVATAR_SIZE * win.devicePixelRatio;
-        expect(e.find(".mx_BaseAvatar_image").attr("src")).to.equal(
+        expect(e.find(".mx_BaseAvatar img").attr("src")).to.equal(
             // eslint-disable-next-line no-restricted-properties
             cli.mxcUrlToHttp(avatarUrl, size, size, AVATAR_RESIZE_METHOD),
         );
@@ -197,10 +197,10 @@ describe("Timeline", () => {
 
             cy.get(".mx_GenericEventListSummary").within(() => {
                 // Click "expand" link button
-                cy.findByRole("button", { name: "expand" }).click();
+                cy.findByRole("button", { name: "Expand" }).click();
 
                 // Assert that the "expand" link button worked
-                cy.findByRole("button", { name: "collapse" }).should("exist");
+                cy.findByRole("button", { name: "Collapse" }).should("exist");
             });
 
             cy.get(".mx_MainSplit").percySnapshotElement("Expanded GELS on IRC layout", { percyCSS });
@@ -224,10 +224,10 @@ describe("Timeline", () => {
 
             cy.get(".mx_GenericEventListSummary").within(() => {
                 // Click "expand" link button
-                cy.findByRole("button", { name: "expand" }).click();
+                cy.findByRole("button", { name: "Expand" }).click();
 
                 // Assert that the "expand" link button worked
-                cy.findByRole("button", { name: "collapse" }).should("exist");
+                cy.findByRole("button", { name: "Collapse" }).should("exist");
             });
 
             cy.get(".mx_MainSplit").percySnapshotElement("Expanded GELS on modern layout", { percyCSS });
@@ -247,10 +247,10 @@ describe("Timeline", () => {
 
             cy.get(".mx_GenericEventListSummary").within(() => {
                 // Click "expand" link button
-                cy.findByRole("button", { name: "expand" }).click();
+                cy.findByRole("button", { name: "Expand" }).click();
 
                 // Assert that the "expand" link button worked
-                cy.findByRole("button", { name: "collapse" }).should("exist");
+                cy.findByRole("button", { name: "Collapse" }).should("exist");
             });
 
             // Make sure spacer is not visible on bubble layout
@@ -270,10 +270,10 @@ describe("Timeline", () => {
                     .realHover()
                     .findByRole("toolbar", { name: "Message Actions" })
                     .should("be.visible");
-                cy.findByRole("button", { name: "collapse" }).click();
+                cy.findByRole("button", { name: "Collapse" }).click();
 
                 // Assert that "collapse" link button worked
-                cy.findByRole("button", { name: "expand" }).should("exist");
+                cy.findByRole("button", { name: "Expand" }).should("exist");
             });
 
             // Save snapshot of collapsed generic event list summary on bubble layout
@@ -292,7 +292,7 @@ describe("Timeline", () => {
             });
 
             // Click "expand" link button
-            cy.get(".mx_GenericEventListSummary").findByRole("button", { name: "expand" }).click();
+            cy.get(".mx_GenericEventListSummary").findByRole("button", { name: "Expand" }).click();
 
             // Check the event line has margin instead of inset property
             // cf. _EventTile.pcss
@@ -388,7 +388,7 @@ describe("Timeline", () => {
 
             // 2. Alignment of expanded GELS and messages
             // Click "expand" link button
-            cy.get(".mx_GenericEventListSummary").findByRole("button", { name: "expand" }).click();
+            cy.get(".mx_GenericEventListSummary").findByRole("button", { name: "Expand" }).click();
             // Check inline start spacing of info line on expanded GELS
             cy.get(".mx_EventTile[data-layout=irc].mx_EventTile_info:first-of-type .mx_EventTile_line")
                 // See: _EventTile.pcss

cypress/global.d.ts

@@ -17,6 +17,7 @@ limitations under the License.
 import "../src/@types/global";
 import "../src/@types/svg";
 import "../src/@types/raw-loader";
+// eslint-disable-next-line no-restricted-imports
 import "matrix-js-sdk/src/@types/global";
 import type {
     MatrixClient,