From 5dc16843fb4654c5bd54acc244d6eb2692869962 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 30 Jun 2026 12:58:37 +0000 Subject: [PATCH 1/7] Upgrade dependency to matrix-js-sdk@41.9.0-rc.0 --- apps/web/package.json | 2 +- pnpm-lock.yaml | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 2c77a946d7..3c84f96fb6 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -83,7 +83,7 @@ "lodash": "npm:lodash-es@4.18.1", "maplibre-gl": "^5.0.0", "matrix-encrypt-attachment": "^1.0.3", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "41.9.0-rc.0", "matrix-widget-api": "^1.16.1", "memoize-one": "^6.0.0", "mime": "^4.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f44946c460..ce486c0b8c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -637,8 +637,8 @@ importers: specifier: ^1.0.3 version: 1.0.3 matrix-js-sdk: - specifier: github:matrix-org/matrix-js-sdk#develop - version: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6f4ab3278b3b97b0be70e25bc14939680147e4ae + specifier: 41.9.0-rc.0 + version: 41.9.0-rc.0 matrix-widget-api: specifier: ^1.17.0 version: 1.17.0 @@ -10648,9 +10648,8 @@ packages: matrix-events-sdk@0.0.1: resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==} - matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6f4ab3278b3b97b0be70e25bc14939680147e4ae: - resolution: {gitHosted: true, integrity: sha512-EF3PBMY8DoRXW7SzDIL3TdgbCYqziisTTMe7U0OXC9FPSC+AKem/spg2+mBlMA5yoV2tM9bB8m3ibnAJ6t+2hQ==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6f4ab3278b3b97b0be70e25bc14939680147e4ae} - version: 41.8.0 + matrix-js-sdk@41.9.0-rc.0: + resolution: {integrity: sha512-W3KPvaRhmvZxsnOrpsnpyboirfjQDaIZ8K0aJrw5wdkD9YSK02NutaFRG9UFAEOolG0ythj6dQIeUS/icZKzCQ==} engines: {node: '>=22.0.0'} matrix-web-i18n@3.6.0: @@ -24497,7 +24496,7 @@ snapshots: matrix-events-sdk@0.0.1: {} - matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6f4ab3278b3b97b0be70e25bc14939680147e4ae: + matrix-js-sdk@41.9.0-rc.0: dependencies: '@babel/runtime': 8.0.0 '@matrix-org/matrix-sdk-crypto-wasm': 18.3.1 From e49064d374e4e148289dee8d7bcd77573b9ad2d7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 30 Jun 2026 13:07:03 +0000 Subject: [PATCH 2/7] v1.12.23-rc.0 --- apps/desktop/package.json | 2 +- apps/web/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index b19843c583..6de37e6f28 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -3,7 +3,7 @@ "productName": "Element", "main": "lib/electron-main.js", "exports": "./lib/electron-main.js", - "version": "1.12.22", + "version": "1.12.23-rc.0", "description": "Element: the future of secure communication", "author": { "name": "Element", diff --git a/apps/web/package.json b/apps/web/package.json index 3c84f96fb6..9aa29e013a 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.12.22", + "version": "1.12.23-rc.0", "description": "Element: the future of secure communication", "author": "New Vector Ltd.", "repository": { From 713a5c6389b4ca73a9355582b59976bcb0babbca Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Thu, 2 Jul 2026 10:56:47 +0100 Subject: [PATCH 3/7] [Backport staging] Update Compound to fix tooltips (#34097) Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- apps/web/playwright/e2e/spaces/spaces.spec.ts | 22 +++++++++- .../space-panel-home-tooltip-linux.png | Bin 0 -> 2938 bytes .../ReadReceiptGroup-test.tsx.snap | 2 +- pnpm-lock.yaml | 41 ++++++++++++++++-- pnpm-workspace.yaml | 2 +- 5 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 apps/web/playwright/snapshots/spaces/spaces.spec.ts/space-panel-home-tooltip-linux.png diff --git a/apps/web/playwright/e2e/spaces/spaces.spec.ts b/apps/web/playwright/e2e/spaces/spaces.spec.ts index 784adf7d77..b1ce9eb36e 100644 --- a/apps/web/playwright/e2e/spaces/spaces.spec.ts +++ b/apps/web/playwright/e2e/spaces/spaces.spec.ts @@ -6,7 +6,7 @@ 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 { rejectToast } from "@element-hq/element-web-playwright-common"; +import { assertNoToasts, rejectToast } from "@element-hq/element-web-playwright-common"; import type { Locator, Page } from "@playwright/test"; import { test, expect } from "../../element-web-test"; @@ -405,6 +405,26 @@ test.describe("Spaces", () => { ); }); + test("should render render tooltip on focus of metaspace", { tag: "@screenshot" }, async ({ page, user }) => { + await rejectToast(page, "Verify this device"); + await rejectToast(page, "Notifications"); + // Wait for toasts to clear otherwise they will mess with our screenshot + await assertNoToasts(page); + + await page.getByRole("tree", { name: "Spaces" }).getByRole("button", { name: "Home" }).hover(); + await expect(page.getByRole("tooltip", { name: "Home" })).toBeVisible(); + + await expect(page).toMatchScreenshot("space-panel-home-tooltip.png", { + showTooltips: true, + clip: { + x: 0, + y: 60, + width: 140, + height: 60, + }, + }); + }); + test.describe("Should hide public spaces option if not allowed", () => { test.use({ config: { diff --git a/apps/web/playwright/snapshots/spaces/spaces.spec.ts/space-panel-home-tooltip-linux.png b/apps/web/playwright/snapshots/spaces/spaces.spec.ts/space-panel-home-tooltip-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..c98f840f2982a078524b9d75844dd040c00297a6 GIT binary patch literal 2938 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 literal 0 HcmV?d00001 diff --git a/apps/web/test/unit-tests/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap b/apps/web/test/unit-tests/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap index 7b5ddaebc7..df84c2e715 100644 --- a/apps/web/test/unit-tests/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap +++ b/apps/web/test/unit-tests/components/views/rooms/__snapshots__/ReadReceiptGroup-test.tsx.snap @@ -2,7 +2,7 @@ exports[`ReadReceiptGroup should display a tooltip 1`] = `