Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit 1ac90c0

Browse files
committed
Merge branch 'develop' into florianduros/rip-out-legacy-crypto/remove-deprecated-call-client
2 parents e83cb57 + 950ab19 commit 1ac90c0

File tree

127 files changed

+887
-1504
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+887
-1504
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"@sentry/browser": "^8.0.0",
8383
"@testing-library/react-hooks": "^8.0.1",
8484
"@vector-im/compound-design-tokens": "^1.8.0",
85-
"@vector-im/compound-web": "^6.3.1",
85+
"@vector-im/compound-web": "^7.0.0",
8686
"@zxcvbn-ts/core": "^3.0.4",
8787
"@zxcvbn-ts/language-common": "^3.0.4",
8888
"@zxcvbn-ts/language-en": "^3.0.2",

playwright/e2e/crypto/crypto.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ test.describe("Cryptography", function () {
226226
// Assert that verified icon is rendered
227227
await page.getByTestId("base-card-back-button").click();
228228
await page.getByLabel("Room info").nth(1).click();
229-
await expect(page.locator('.mx_RoomSummaryCard_badges [data-kind="success"]')).toContainText("Encrypted");
229+
await expect(page.locator('.mx_RoomSummaryCard_badges [data-kind="green"]')).toContainText("Encrypted");
230230

231231
// Take a snapshot of RoomSummaryCard with a verified E2EE icon
232232
await expect(page.locator(".mx_RightPanel")).toMatchScreenshot("RoomSummaryCard-with-verified-e2ee.png");

playwright/plugins/homeserver/synapse/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { randB64Bytes } from "../../utils/rand";
2020
// Docker tag to use for synapse docker image.
2121
// We target a specific digest as every now and then a Synapse update will break our CI.
2222
// This digest is updated by the playwright-image-updates.yaml workflow periodically.
23-
const DOCKER_TAG = "develop@sha256:117a94ee66e4049eb6f40d04cc70d4fc83f7022dacc9871448c141e7756492f9";
23+
const DOCKER_TAG = "develop@sha256:78091e205adcd94ff42a0db688c83289a1d56c17b928f04d11b5b87a52cd2083";
2424

2525
async function cfgDirFromTemplate(opts: StartHomeserverOpts): Promise<Omit<HomeserverConfig, "dockerUrl">> {
2626
const templateDir = path.join(__dirname, "templates", opts.template);
-93 Bytes
-100 Bytes
-47 Bytes
-23 Bytes
-24 Bytes
-108 Bytes
-174 Bytes

0 commit comments

Comments
 (0)