Merge branch 'florianduros/new-room-list/rename-roomlistpanel' into florianduros/new-room-list/basic-list

2025-02-25 15:54:18 +01:00
parent 74c7c1fce1 eb7df98355
commit 3202ff5c00
43 changed files with 1139 additions and 250 deletions
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -52,26 +52,41 @@ jobs:
                  password: ${{ secrets.GITHUB_TOKEN }}

            - name: Build and load
+              id: test-build
              uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6
              with:
                  context: .
                  load: true
-                  tags: ${{ env.TEST_TAG }}

            - name: Test the image
+              env:
+                  IMAGEID: ${{ steps.test-build.outputs.imageid }}
              run: |
+                  set -x
+
                  # Make a fake module to test the image
                  MODULE_PATH="modules/module_name/index.js"
                  mkdir -p $(dirname $MODULE_PATH)
                  echo 'alert("Testing");' > $MODULE_PATH

                  # Spin up a container of the image
-                  CONTAINER_ID=$(docker run --rm -dp 80:80 -v $(pwd)/modules:/tmp/element-web-modules ${{ env.TEST_TAG }})
+                  ELEMENT_WEB_PORT=8181
+                  CONTAINER_ID=$(
+                      docker run \
+                          --rm \
+                          -e "ELEMENT_WEB_PORT=$ELEMENT_WEB_PORT" \
+                          -dp "$ELEMENT_WEB_PORT:$ELEMENT_WEB_PORT" \
+                          -v $(pwd)/modules:/tmp/element-web-modules \
+                          "$IMAGEID" \
+                  )

                  # Run some smoke tests
-                  wget --retry-connrefused --tries=5 -q --wait=3 --spider http://localhost:80/modules/module_name/index.js
-                  MODULE_1=$(curl http://localhost:80/config.json | jq -r .modules[0])
-                  test "$MODULE_1" = "/${MODULE_PATH}"
+                  wget --retry-connrefused --tries=5 -q --wait=3 --spider "http://localhost:$ELEMENT_WEB_PORT/modules/module_name/index.js"
+                  MODULE_0=$(curl "http://localhost:$ELEMENT_WEB_PORT/config.json" | jq -r .modules[0])
+                  test "$MODULE_0" = "/${MODULE_PATH}"
+
+                  # Check healthcheck
+                  test "$(docker inspect -f {{.State.Running}} $CONTAINER_ID)" == "true"

                  # Clean up
                  docker stop "$CONTAINER_ID"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,6 +19,7 @@ jobs:
            contents: write
            issues: write
            pull-requests: read
+            id-token: write
        secrets:
            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
            GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+Changes in [1.11.93](https://github.com/element-hq/element-web/releases/tag/v1.11.93) (2025-02-25)
+==================================================================================================
+## ✨ Features
+
+* [backport] Dynamically load Element Web modules in Docker entrypoint ([#29358](https://github.com/element-hq/element-web/pull/29358)). Contributed by @t3chguy.
+* ChangeRecoveryKey: error handling ([#29262](https://github.com/element-hq/element-web/pull/29262)). Contributed by @richvdh.
+* Dehydration: enable dehydrated device on "Set up recovery" ([#29265](https://github.com/element-hq/element-web/pull/29265)). Contributed by @richvdh.
+* Render reason for invite rejection. ([#29257](https://github.com/element-hq/element-web/pull/29257)). Contributed by @Half-Shot.
+* New room list: add search section ([#29251](https://github.com/element-hq/element-web/pull/29251)). Contributed by @florianduros.
+* New room list: hide favourites and people meta spaces ([#29241](https://github.com/element-hq/element-web/pull/29241)). Contributed by @florianduros.
+* New Room List: Create new labs flag ([#29239](https://github.com/element-hq/element-web/pull/29239)). Contributed by @MidhunSureshR.
+* Stop URl preview from covering message box ([#29215](https://github.com/element-hq/element-web/pull/29215)). Contributed by @edent.
+* Rename "security key" into "recovery key" ([#29217](https://github.com/element-hq/element-web/pull/29217)). Contributed by @florianduros.
+* Add new verification section to user profile ([#29200](https://github.com/element-hq/element-web/pull/29200)). Contributed by @MidhunSureshR.
+* Initial support for runtime modules ([#29104](https://github.com/element-hq/element-web/pull/29104)). Contributed by @t3chguy.
+* Add `Forgot recovery key?` button to encryption tab ([#29202](https://github.com/element-hq/element-web/pull/29202)). Contributed by @florianduros.
+* Add KeyIcon to key storage out of sync toast ([#29201](https://github.com/element-hq/element-web/pull/29201)). Contributed by @florianduros.
+* Improve rendering of empty topics in the timeline  ([#29152](https://github.com/element-hq/element-web/pull/29152)). Contributed by @Half-Shot.
+
+## 🐛 Bug Fixes
+
+* Fix font scaling in member list ([#29285](https://github.com/element-hq/element-web/pull/29285)). Contributed by @florianduros.
+* Grow member list search field when resizing the right panel ([#29267](https://github.com/element-hq/element-web/pull/29267)). Contributed by @langleyd.
+* Don't reload roomview on offline connectivity check ([#29243](https://github.com/element-hq/element-web/pull/29243)). Contributed by @dbkr.
+* Respect user's 12/24 hour preference consistently ([#29237](https://github.com/element-hq/element-web/pull/29237)). Contributed by @t3chguy.
+* Restore the accessibility role on call views ([#29225](https://github.com/element-hq/element-web/pull/29225)). Contributed by @robintown.
+* Revert `GoToHome` keyboard shortcut to `Ctrl`–`Shift`–`H` on macOS ([#28577](https://github.com/element-hq/element-web/pull/28577)). Contributed by @gy-mate.
+* Encryption tab: display correct encryption panel when user cancels the reset identity flow ([#29216](https://github.com/element-hq/element-web/pull/29216)). Contributed by @florianduros.
+
+
 Changes in [1.11.92](https://github.com/element-hq/element-web/releases/tag/v1.11.92) (2025-02-11)
 ==================================================================================================
 ## ✨ Features
--- a/2
+++ b/2
@@ -46,3 +46,5 @@ USER nginx

 # HTTP listen port
 ENV ELEMENT_WEB_PORT=80
+
+HEALTHCHECK --start-period=5s CMD wget --retry-connrefused --tries=5 -q --wait=3 --spider http://localhost:$ELEMENT_WEB_PORT/config.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "element-web",
-    "version": "1.11.91",
+    "version": "1.11.93",
    "description": "Element: the future of secure communication",
    "author": "New Vector Ltd.",
    "repository": {
--- a/playwright/e2e/crypto/dehydration.spec.ts
+++ b/playwright/e2e/crypto/dehydration.spec.ts
@@ -116,6 +116,40 @@ test.describe("Dehydration", () => {
        expect(dehydratedDeviceIds.length).toBe(1);
        expect(dehydratedDeviceIds[0]).not.toEqual(initialDehydratedDeviceIds[0]);
    });
+
+    test("'Reset cryptographic identity' removes dehydrated device", async ({ page, homeserver, app, credentials }) => {
+        await logIntoElement(page, credentials);
+
+        // Create a dehydrated device by setting up recovery (see "'Set up
+        // recovery' creates dehydrated device" test above)
+        const settingsDialogLocator = await app.settings.openUserSettings("Encryption");
+        await settingsDialogLocator.getByRole("button", { name: "Set up recovery" }).click();
+
+        // First it displays an informative panel about the recovery key
+        await expect(settingsDialogLocator.getByRole("heading", { name: "Set up recovery" })).toBeVisible();
+        await settingsDialogLocator.getByRole("button", { name: "Continue" }).click();
+
+        // Next, it displays the new recovery key. We click on the copy button.
+        await expect(settingsDialogLocator.getByText("Save your recovery key somewhere safe")).toBeVisible();
+        await settingsDialogLocator.getByRole("button", { name: "Copy" }).click();
+        const recoveryKey = await app.getClipboard();
+        await settingsDialogLocator.getByRole("button", { name: "Continue" }).click();
+
+        await expect(
+            settingsDialogLocator.getByText("Enter your recovery key to confirm", { exact: true }),
+        ).toBeVisible();
+        await settingsDialogLocator.getByRole("textbox").fill(recoveryKey);
+        await settingsDialogLocator.getByRole("button", { name: "Finish set up" }).click();
+
+        await expectDehydratedDeviceEnabled(app);
+
+        // After recovery is set up, we reset our cryptographic identity, which
+        // should drop the dehydrated device.
+        await settingsDialogLocator.getByRole("button", { name: "Reset cryptographic identity" }).click();
+        await settingsDialogLocator.getByRole("button", { name: "Continue" }).click();
+
+        await expectDehydratedDeviceDisabled(app);
+    });
 });

 async function getDehydratedDeviceIds(client: Client): Promise<string[]> {
@@ -144,3 +178,16 @@ async function expectDehydratedDeviceEnabled(app: ElementAppPage): Promise<void>
        })
        .toEqual(1);
 }
+
+/** Wait for our user to not have a dehydrated device */
+async function expectDehydratedDeviceDisabled(app: ElementAppPage): Promise<void> {
+    // It might be nice to do this via the UI, but currently this info is not exposed via the UI.
+    //
+    // Note we might have to wait for the device list to be refreshed, so we wrap in `expect.poll`.
+    await expect
+        .poll(async () => {
+            const dehydratedDeviceIds = await getDehydratedDeviceIds(app.client);
+            return dehydratedDeviceIds.length;
+        })
+        .toEqual(0);
+}
--- a/playwright/e2e/crypto/device-verification.spec.ts
+++ b/playwright/e2e/crypto/device-verification.spec.ts
@@ -21,6 +21,7 @@ import {
    waitForVerificationRequest,
 } from "./utils";
 import { type Bot } from "../../pages/bot";
+import { Toasts } from "../../pages/toasts.ts";

 test.describe("Device verification", { tag: "@no-webkit" }, () => {
    let aliceBotClient: Bot;
@@ -72,6 +73,51 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
        await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, false);
    });

+    // Regression test for https://github.com/element-hq/element-web/issues/29110
+    test("No toast after verification, even if the secrets take a while to arrive", async ({ page, credentials }) => {
+        // Before we log in, the bot creates an encrypted room, so that we can test the toast behaviour that only happens
+        // when we are in an encrypted room.
+        await aliceBotClient.createRoom({
+            initial_state: [
+                {
+                    type: "m.room.encryption",
+                    state_key: "",
+                    content: { algorithm: "m.megolm.v1.aes-sha2" },
+                },
+            ],
+        });
+
+        // In order to simulate a real environment more accurately, we need to slow down the arrival of the
+        // `m.secret.send` to-device messages. That's slightly tricky to do directly, so instead we delay the *outgoing*
+        // `m.secret.request` messages.
+        await page.route("**/_matrix/client/v3/sendToDevice/m.secret.request/**", async (route) => {
+            await route.fulfill({ json: {} });
+            await new Promise((f) => setTimeout(f, 1000));
+            await route.fetch();
+        });
+
+        await logIntoElement(page, credentials);
+
+        // Launch the verification request between alice and the bot
+        const verificationRequest = await initiateAliceVerificationRequest(page);
+
+        // Handle emoji SAS verification
+        const infoDialog = page.locator(".mx_InfoDialog");
+        // the bot chooses to do an emoji verification
+        const verifier = await verificationRequest.evaluateHandle((request) => request.startVerification("m.sas.v1"));
+
+        // Handle emoji request and check that emojis are matching
+        await doTwoWaySasVerification(page, verifier);
+
+        await infoDialog.getByRole("button", { name: "They match" }).click();
+        await infoDialog.getByRole("button", { name: "Got it" }).click();
+
+        // There should be no toast (other than the notifications one)
+        const toasts = new Toasts(page);
+        await toasts.rejectToast("Notifications");
+        await toasts.assertNoToasts();
+    });
+
    test("Verify device with QR code during login", async ({ page, app, credentials, homeserver }) => {
        // A mode 0x02 verification: "self-verifying in which the current device does not yet trust the master key"
        await logIntoElement(page, credentials);
--- a/playwright/e2e/left-panel/room-list-panel/room-list-header.spec.ts
+++ b/playwright/e2e/left-panel/room-list-panel/room-list-header.spec.ts
@@ -47,12 +47,41 @@ test.describe("Header section of the room list", () => {
        await app.closeDialog();
    });

-    test("should render the header section for a space", async ({ page, app, user }) => {
+    test("should render the header section for a space", { tag: "@screenshot" }, async ({ page, app, user }) => {
        await app.client.createSpace({ name: "MySpace" });
        await page.getByRole("button", { name: "MySpace" }).click();

        const roomListHeader = getHeaderSection(page);
+        await expect(roomListHeader).toMatchScreenshot("room-list-space-header.png");
+
        await expect(roomListHeader.getByRole("heading", { name: "MySpace" })).toBeVisible();
        await expect(roomListHeader.getByRole("button", { name: "Add" })).toBeVisible();
+
+        const spaceMenu = roomListHeader.getByRole("button", { name: "Open space menu" });
+        await spaceMenu.click();
+
+        await expect(page.getByRole("menu")).toMatchScreenshot("room-list-header-space-menu.png");
+
+        // It should open the space home
+        await page.getByRole("menuitem", { name: "Space home" }).click();
+        await expect(page.getByRole("main").getByRole("heading", { name: "MySpace" })).toBeVisible();
+
+        // It should open the invite dialog
+        await spaceMenu.click();
+        await page.getByRole("menuitem", { name: "Invite" }).click();
+        await expect(page.getByRole("heading", { name: "Invite to MySpace" })).toBeVisible();
+        await app.closeDialog();
+
+        // It should open the space preferences
+        await spaceMenu.click();
+        await page.getByRole("menuitem", { name: "Preferences" }).click();
+        await expect(page.getByRole("heading", { name: "Preferences" })).toBeVisible();
+        await app.closeDialog();
+
+        // It should open the space settings
+        await spaceMenu.click();
+        await page.getByRole("menuitem", { name: "Space Settings" }).click();
+        await expect(page.getByRole("heading", { name: "Settings" })).toBeVisible();
+        await app.closeDialog();
    });
 });
--- a/playwright/e2e/left-panel/room-list-panel/room-list-panel.spec.ts
+++ b/playwright/e2e/left-panel/room-list-panel/room-list-panel.spec.ts
@@ -9,7 +9,7 @@ import { type Page } from "@playwright/test";

 import { test, expect } from "../../../element-web-test";

-test.describe("Search section of the room list", () => {
+test.describe("Room list panel", () => {
    test.use({
        labsFlags: ["feature_new_room_list"],
    });
@@ -19,7 +19,7 @@ test.describe("Search section of the room list", () => {
     * @param page
     */
    function getRoomListView(page: Page) {
-        return page.getByTestId("room-list-view");
+        return page.getByTestId("room-list-panel");
    }

    test.beforeEach(async ({ page, app, user }) => {
@@ -27,8 +27,8 @@ test.describe("Search section of the room list", () => {
        await app.closeNotificationToast();
    });

-    test("should render the room list view", { tag: "@screenshot" }, async ({ page, app, user }) => {
+    test("should render the room list panel", { tag: "@screenshot" }, async ({ page, app, user }) => {
        const roomListView = getRoomListView(page);
-        await expect(roomListView).toMatchScreenshot("room-list-view.png");
+        await expect(roomListView).toMatchScreenshot("room-list-panel.png");
    });
 });
--- a/playwright/e2e/left-panel/room-list-panel/room-list-search.spec.ts
+++ b/playwright/e2e/left-panel/room-list-panel/room-list-search.spec.ts
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-compose-menu-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-compose-menu-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-space-menu-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-header-space-menu-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-space-header-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-header.spec.ts/room-list-space-header-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-panel.spec.ts/room-list-panel-linux.png
--- a/playwright/snapshots/left-panel/room-list-panel/room-list-search.spec.ts/search-section-linux.png
+++ b/playwright/snapshots/left-panel/room-list-panel/room-list-search.spec.ts/search-section-linux.png
--- a/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-compose-menu-linux.png
+++ b/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-compose-menu-linux.png
--- a/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-linux.png
+++ b/playwright/snapshots/left-panel/room-list-view/room-list-header.spec.ts/room-list-header-linux.png
--- a/playwright/snapshots/left-panel/room-list-view/room-list-search.spec.ts/search-section-linux.png
+++ b/playwright/snapshots/left-panel/room-list-view/room-list-search.spec.ts/search-section-linux.png
--- a/playwright/snapshots/left-panel/room-list-view/room-list-view.spec.ts/room-list-view-linux.png
+++ b/playwright/snapshots/left-panel/room-list-view/room-list-view.spec.ts/room-list-view-linux.png
--- a/res/css/_components.pcss
+++ b/res/css/_components.pcss
@@ -269,9 +269,9 @@
@import "./views/right_panel/_VerificationPanel.pcss";
@import "./views/right_panel/_WidgetCard.pcss";
@import "./views/room_settings/_AliasSettings.pcss";
-@import "./views/rooms/RoomListView/_RoomListHeaderView.pcss";
-@import "./views/rooms/RoomListView/_RoomListSearch.pcss";
-@import "./views/rooms/RoomListView/_RoomListView.pcss";
+@import "./views/rooms/RoomListPanel/_RoomListHeaderView.pcss";
+@import "./views/rooms/RoomListPanel/_RoomListPanel.pcss";
+@import "./views/rooms/RoomListPanel/_RoomListSearch.pcss";
@import "./views/rooms/_AppsDrawer.pcss";
@import "./views/rooms/_Autocomplete.pcss";
@import "./views/rooms/_AuxPanel.pcss";
--- a/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss
+++ b/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss
@@ -17,4 +17,16 @@
    button {
        color: var(--cpd-color-icon-secondary);
    }
+
+    .mx_SpaceMenu_button {
+        svg {
+            transition: transform 0.1s linear;
+        }
+    }
+
+    .mx_SpaceMenu_button[aria-expanded="true"] {
+        svg {
+            transform: rotate(180deg);
+        }
+    }
 }
--- a/res/css/views/rooms/RoomListPanel/_RoomListPanel.pcss
+++ b/res/css/views/rooms/RoomListPanel/_RoomListPanel.pcss
@@ -5,7 +5,7 @@
 * Please see LICENSE files in the repository root for full details.
 */

-.mx_RoomListView {
+.mx_RoomListPanel {
    background-color: var(--cpd-color-bg-canvas-default);
    height: 100%;
    border-right: 1px solid var(--cpd-color-bg-subtle-primary);
--- a/res/css/views/rooms/RoomListPanel/_RoomListSearch.pcss
+++ b/res/css/views/rooms/RoomListPanel/_RoomListSearch.pcss
@@ -31,7 +31,7 @@
        }
    }

-    .mx_RoomListSearch_explore:hover {
+    .mx_RoomListSearch_button:hover {
        svg {
            fill: var(--cpd-color-icon-primary);
        }
--- a/src/DeviceListener.ts
+++ b/src/DeviceListener.ts
@@ -15,9 +15,10 @@ import {
    type SyncState,
    ClientStoppedError,
 } from "matrix-js-sdk/src/matrix";
-import { logger as baseLogger } from "matrix-js-sdk/src/logger";
+import { logger as baseLogger, LogSpan } from "matrix-js-sdk/src/logger";
 import { CryptoEvent, type KeyBackupInfo } from "matrix-js-sdk/src/crypto-api";
 import { type CryptoSessionStateChange } from "@matrix-org/analytics-events/types/typescript/CryptoSessionStateChange";
+import { secureRandomString } from "matrix-js-sdk/src/randomstring";

 import { PosthogAnalytics } from "./PosthogAnalytics";
 import dis from "./dispatcher/dispatcher";
@@ -96,6 +97,7 @@ export default class DeviceListener {
        this.client.on(ClientEvent.AccountData, this.onAccountData);
        this.client.on(ClientEvent.Sync, this.onSync);
        this.client.on(RoomStateEvent.Events, this.onRoomStateEvents);
+        this.client.on(ClientEvent.ToDeviceEvent, this.onToDeviceEvent);
        this.shouldRecordClientInformation = SettingsStore.getValue("deviceClientInformationOptIn");
        // only configurable in config, so we don't need to watch the value
        this.enableBulkUnverifiedSessionsReminder = SettingsStore.getValue(UIFeature.BulkUnverifiedSessionsReminder);
@@ -118,6 +120,7 @@ export default class DeviceListener {
            this.client.removeListener(ClientEvent.AccountData, this.onAccountData);
            this.client.removeListener(ClientEvent.Sync, this.onSync);
            this.client.removeListener(RoomStateEvent.Events, this.onRoomStateEvents);
+            this.client.removeListener(ClientEvent.ToDeviceEvent, this.onToDeviceEvent);
        }
        SettingsStore.unwatchSetting(this.deviceClientInformationSettingWatcherRef);
        dis.unregister(this.dispatcherRef);
@@ -225,6 +228,11 @@ export default class DeviceListener {
        this.updateClientInformation();
    };

+    private onToDeviceEvent = (event: MatrixEvent): void => {
+        // Receiving a 4S secret can mean we are in sync where we were not before.
+        if (event.getType() === EventType.SecretSend) this.recheck();
+    };
+
    /**
     * Fetch the key backup information from the server.
     *
@@ -273,18 +281,29 @@ export default class DeviceListener {

    private async doRecheck(): Promise<void> {
        if (!this.running || !this.client) return; // we have been stopped
+        const logSpan = new LogSpan(logger, "check_" + secureRandomString(4));
+
        const cli = this.client;

        // cross-signing support was added to Matrix in MSC1756, which landed in spec v1.1
-        if (!(await cli.isVersionSupported("v1.1"))) return;
+        if (!(await cli.isVersionSupported("v1.1"))) {
+            logSpan.debug("cross-signing not supported");
+            return;
+        }

        const crypto = cli.getCrypto();
-        if (!crypto) return;
+        if (!crypto) {
+            logSpan.debug("crypto not enabled");
+            return;
+        }

        // don't recheck until the initial sync is complete: lots of account data events will fire
        // while the initial sync is processing and we don't need to recheck on each one of them
        // (we add a listener on sync to do once check after the initial sync is done)
-        if (!cli.isInitialSyncComplete()) return;
+        if (!cli.isInitialSyncComplete()) {
+            logSpan.debug("initial sync not yet complete");
+            return;
+        }

        const crossSigningReady = await crypto.isCrossSigningReady();
        const secretStorageReady = await crypto.isSecretStorageReady();
@@ -306,6 +325,7 @@ export default class DeviceListener {
        await this.reportCryptoSessionStateToAnalytics(cli);

        if (this.dismissedThisDeviceToast || allSystemsReady) {
+            logSpan.info("No toast needed");
            hideSetupEncryptionToast();

            this.checkKeyBackupStatus();
@@ -316,27 +336,33 @@ export default class DeviceListener {
            if (!crossSigningReady) {
                // This account is legacy and doesn't have cross-signing set up at all.
                // Prompt the user to set it up.
-                logger.info("Cross-signing not ready: showing SET_UP_ENCRYPTION toast");
+                logSpan.info("Cross-signing not ready: showing SET_UP_ENCRYPTION toast");
                showSetupEncryptionToast(SetupKind.SET_UP_ENCRYPTION);
            } else if (!isCurrentDeviceTrusted) {
                // cross signing is ready but the current device is not trusted: prompt the user to verify
-                logger.info("Current device not verified: showing VERIFY_THIS_SESSION toast");
+                logSpan.info("Current device not verified: showing VERIFY_THIS_SESSION toast");
                showSetupEncryptionToast(SetupKind.VERIFY_THIS_SESSION);
            } else if (!allCrossSigningSecretsCached) {
                // cross signing ready & device trusted, but we are missing secrets from our local cache.
                // prompt the user to enter their recovery key.
-                logger.info("Some secrets not cached: showing KEY_STORAGE_OUT_OF_SYNC toast");
+                logSpan.info(
+                    "Some secrets not cached: showing KEY_STORAGE_OUT_OF_SYNC toast",
+                    crossSigningStatus.privateKeysCachedLocally,
+                );
                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 (unless they've explicitly said no to key storage)
                const disabledEvent = cli.getAccountData(BACKUP_DISABLED_ACCOUNT_DATA_KEY);
                if (!disabledEvent?.getContent().disabled) {
+                    logSpan.info("No default 4S key: showing SET_UP_RECOVERY toast");
                    showSetupEncryptionToast(SetupKind.SET_UP_RECOVERY);
+                } else {
+                    logSpan.info("No default 4S key but backup disabled: no toast needed");
                }
            } 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?
-                logger.warn("Couldn't match encryption state to a known case: showing 'setup encryption' prompt", {
+                logSpan.warn("Couldn't match encryption state to a known case: showing 'setup encryption' prompt", {
                    crossSigningReady,
                    secretStorageReady,
                    allCrossSigningSecretsCached,
@@ -345,6 +371,8 @@ export default class DeviceListener {
                });
                showSetupEncryptionToast(SetupKind.SET_UP_ENCRYPTION);
            }
+        } else {
+            logSpan.info("Not yet ready, but shouldShowSetupEncryptionToast==false");
        }

        // This needs to be done after awaiting on getUserDeviceInfo() above, so
@@ -377,9 +405,9 @@ export default class DeviceListener {
            }
        }

-        logger.debug("Old unverified sessions: " + Array.from(oldUnverifiedDeviceIds).join(","));
-        logger.debug("New unverified sessions: " + Array.from(newUnverifiedDeviceIds).join(","));
-        logger.debug("Currently showing toasts for: " + Array.from(this.displayingToastsForDeviceIds).join(","));
+        logSpan.debug("Old unverified sessions: " + Array.from(oldUnverifiedDeviceIds).join(","));
+        logSpan.debug("New unverified sessions: " + Array.from(newUnverifiedDeviceIds).join(","));
+        logSpan.debug("Currently showing toasts for: " + Array.from(this.displayingToastsForDeviceIds).join(","));

        const isBulkUnverifiedSessionsReminderSnoozed = isBulkUnverifiedDeviceReminderSnoozed();

@@ -404,7 +432,7 @@ export default class DeviceListener {
        // ...and hide any we don't need any more
        for (const deviceId of this.displayingToastsForDeviceIds) {
            if (!newUnverifiedDeviceIds.has(deviceId)) {
-                logger.debug("Hiding unverified session toast for " + deviceId);
+                logSpan.debug("Hiding unverified session toast for " + deviceId);
                hideUnverifiedSessionsToast(deviceId);
            }
        }
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -37,7 +37,7 @@ import PosthogTrackers from "../../PosthogTrackers";
 import type PageType from "../../PageTypes";
 import { Landmark, LandmarkNavigation } from "../../accessibility/LandmarkNavigation";
 import SettingsStore from "../../settings/SettingsStore";
-import { RoomListView } from "../views/rooms/RoomListView";
+import { RoomListPanel } from "../views/rooms/RoomListPanel";

 interface IProps {
    isMinimized: boolean;
@@ -390,7 +390,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
            return (
                <div className={containerClasses}>
                    <div className="mx_LeftPanel_roomListContainer">
-                        <RoomListView activeSpace={this.state.activeSpace} />
+                        <RoomListPanel activeSpace={this.state.activeSpace} />
                    </div>
                </div>
            );
--- a/src/components/viewmodels/roomlist/RoomListHeaderViewModel.tsx
+++ b/src/components/viewmodels/roomlist/RoomListHeaderViewModel.tsx
@@ -6,7 +6,7 @@
 */

 import { useCallback } from "react";
-import { type Room, RoomEvent, RoomType } from "matrix-js-sdk/src/matrix";
+import { JoinRule, type Room, RoomEvent, RoomType } from "matrix-js-sdk/src/matrix";

 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../../settings/UIFeature";
@@ -23,7 +23,15 @@ import {
    UPDATE_SELECTED_SPACE,
 } from "../../../stores/spaces";
 import SpaceStore from "../../../stores/spaces/SpaceStore";
-import { showCreateNewRoom } from "../../../utils/space";
+import {
+    shouldShowSpaceSettings,
+    showCreateNewRoom,
+    showSpaceInvite,
+    showSpacePreferences,
+    showSpaceSettings,
+} from "../../../utils/space";
+import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
+import type { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";

 /**
 * Hook to get the active space and its title.
@@ -59,6 +67,11 @@ export interface RoomListHeaderViewState {
     * True if the user can create rooms
     */
    displayComposeMenu: boolean;
+    /**
+     * Whether to display the space menu
+     * True if there is an active space
+     */
+    displaySpaceMenu: boolean;
    /**
     * Whether the user can create rooms
     */
@@ -67,6 +80,14 @@ export interface RoomListHeaderViewState {
     * Whether the user can create video rooms
     */
    canCreateVideoRoom: boolean;
+    /**
+     * Whether the user can invite in the active space
+     */
+    canInviteInSpace: boolean;
+    /**
+     * Whether the user can access space settings
+     */
+    canAccessSpaceSettings: boolean;
    /**
     * Create a chat room
     * @param e - The click event
@@ -81,17 +102,39 @@ export interface RoomListHeaderViewState {
     * Create a video room
     */
    createVideoRoom: () => void;
+    /**
+     * Open the active space home
+     */
+    openSpaceHome: () => void;
+    /**
+     * Display the space invite dialog
+     */
+    inviteInSpace: () => void;
+    /**
+     * Open the space preferences
+     */
+    openSpacePreferences: () => void;
+    /**
+     * Open the space settings
+     */
+    openSpaceSettings: () => void;
 }

 /**
 * View model for the RoomListHeader.
 */
 export function useRoomListHeaderViewModel(): RoomListHeaderViewState {
+    const matrixClient = useMatrixClientContext();
    const { activeSpace, title } = useSpace();

    const canCreateRoom = shouldShowComponent(UIComponent.CreateRooms);
    const canCreateVideoRoom = useFeatureEnabled("feature_video_rooms");
    const displayComposeMenu = canCreateRoom;
+    const displaySpaceMenu = Boolean(activeSpace);
+    const canInviteInSpace = Boolean(
+        activeSpace?.getJoinRule() === JoinRule.Public || activeSpace?.canInvite(matrixClient.getSafeUserId()),
+    );
+    const canAccessSpaceSettings = Boolean(activeSpace && shouldShowSpaceSettings(activeSpace));

    /* Actions */

@@ -125,13 +168,48 @@ export function useRoomListHeaderViewModel(): RoomListHeaderViewState {
        }
    }, [activeSpace, elementCallVideoRoomsEnabled]);

+    const openSpaceHome = useCallback(() => {
+        // openSpaceHome is only available when there is an active space
+        if (!activeSpace) return;
+        defaultDispatcher.dispatch<ViewRoomPayload>({
+            action: Action.ViewRoom,
+            room_id: activeSpace.roomId,
+            metricsTrigger: undefined,
+        });
+    }, [activeSpace]);
+
+    const inviteInSpace = useCallback(() => {
+        // inviteInSpace is only available when there is an active space
+        if (!activeSpace) return;
+        showSpaceInvite(activeSpace);
+    }, [activeSpace]);
+
+    const openSpacePreferences = useCallback(() => {
+        // openSpacePreferences is only available when there is an active space
+        if (!activeSpace) return;
+        showSpacePreferences(activeSpace);
+    }, [activeSpace]);
+
+    const openSpaceSettings = useCallback(() => {
+        // openSpaceSettings is only available when there is an active space
+        if (!activeSpace) return;
+        showSpaceSettings(activeSpace);
+    }, [activeSpace]);
+
    return {
        title,
        displayComposeMenu,
+        displaySpaceMenu,
        canCreateRoom,
        canCreateVideoRoom,
+        canInviteInSpace,
+        canAccessSpaceSettings,
        createChatRoom,
        createRoom,
        createVideoRoom,
+        openSpaceHome,
+        inviteInSpace,
+        openSpacePreferences,
+        openSpaceSettings,
    };
 }
--- a/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx
@@ -8,7 +8,11 @@ import React, { type JSX, useState } from "react";
 import { IconButton, Menu, MenuItem } from "@vector-im/compound-web";
 import ComposeIcon from "@vector-im/compound-design-tokens/assets/web/icons/compose";
 import UserAddIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-add";
+import ChevronDownIcon from "@vector-im/compound-design-tokens/assets/web/icons/chevron-down";
 import RoomIcon from "@vector-im/compound-design-tokens/assets/web/icons/room";
+import HomeIcon from "@vector-im/compound-design-tokens/assets/web/icons/home";
+import PreferencesIcon from "@vector-im/compound-design-tokens/assets/web/icons/preferences";
+import SettingsIcon from "@vector-im/compound-design-tokens/assets/web/icons/settings";
 import VideoCallIcon from "@vector-im/compound-design-tokens/assets/web/icons/video-call";

 import { _t } from "../../../../languageHandler";
@@ -34,12 +38,57 @@ export function RoomListHeaderView(): JSX.Element {
            align="center"
            data-testid="room-list-header"
        >
-            <h1>{vm.title}</h1>
+            <Flex align="center" gap="var(--cpd-space-1x)">
+                <h1>{vm.title}</h1>
+                {vm.displaySpaceMenu && <SpaceMenu vm={vm} />}
+            </Flex>
            {vm.displayComposeMenu && <ComposeMenu vm={vm} />}
        </Flex>
    );
 }

+interface SpaceMenuProps {
+    /**
+     * The view model for the room list header
+     */
+    vm: RoomListHeaderViewState;
+}
+
+/**
+ * The space menu for the room list header
+ */
+function SpaceMenu({ vm }: SpaceMenuProps): JSX.Element {
+    const [open, setOpen] = useState(false);
+
+    return (
+        <Menu
+            open={open}
+            onOpenChange={setOpen}
+            title={vm.title}
+            side="right"
+            align="start"
+            trigger={
+                <IconButton className="mx_SpaceMenu_button" aria-label={_t("room_list|open_space_menu")} size="20px">
+                    <ChevronDownIcon />
+                </IconButton>
+            }
+        >
+            <MenuItem Icon={HomeIcon} label={_t("room_list|space_menu|home")} onSelect={vm.openSpaceHome} />
+            {vm.canInviteInSpace && (
+                <MenuItem Icon={UserAddIcon} label={_t("action|invite")} onSelect={vm.inviteInSpace} />
+            )}
+            <MenuItem Icon={PreferencesIcon} label={_t("common|preferences")} onSelect={vm.openSpacePreferences} />
+            {vm.canAccessSpaceSettings && (
+                <MenuItem
+                    Icon={SettingsIcon}
+                    label={_t("room_list|space_menu|space_settings")}
+                    onSelect={vm.openSpaceSettings}
+                />
+            )}
+        </Menu>
+    );
+}
+
 interface ComposeMenuProps {
    /**
     * The view model for the room list header
--- a/src/components/views/rooms/RoomListPanel/RoomListPanel.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListPanel.tsx
@@ -15,7 +15,7 @@ import { RoomListSearch } from "./RoomListSearch";
 import { RoomListHeaderView } from "./RoomListHeaderView";
 import { useRoomListViewModel } from "../../../viewmodels/roomlist/RoomListViewModel";

-type RoomListViewProps = {
+type RoomListPanelProps = {
    /**
     * Current active space
     * See {@link RoomListSearch}
@@ -24,9 +24,9 @@ type RoomListViewProps = {
 };

 /**
- * A view component for the room list.
+ * The panel of the room list
 */
-export const RoomListView: React.FC<RoomListViewProps> = ({ activeSpace }) => {
+export const RoomListPanel: React.FC<RoomListPanelProps> = ({ activeSpace }) => {
    const displayRoomSearch = shouldShowComponent(UIComponent.FilterContainer);
    const { rooms } = useRoomListViewModel();

@@ -39,7 +39,7 @@ export const RoomListView: React.FC<RoomListViewProps> = ({ activeSpace }) => {
    };

    return (
-        <section className="mx_RoomListView" data-testid="room-list-view">
+        <section className="mx_RoomListPanel" data-testid="room-list-panel">
            {displayRoomSearch && <RoomListSearch activeSpace={activeSpace} />}
            <RoomListHeaderView />
            <AutoSizer>
--- a/src/components/views/rooms/RoomListPanel/RoomListSearch.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListSearch.tsx
@@ -9,6 +9,7 @@ import React, { type JSX } from "react";
 import { Button } from "@vector-im/compound-web";
 import ExploreIcon from "@vector-im/compound-design-tokens/assets/web/icons/explore";
 import SearchIcon from "@vector-im/compound-design-tokens/assets/web/icons/search";
+import DialPadIcon from "@vector-im/compound-design-tokens/assets/web/icons/dial-pad";

 import { IS_MAC, Key } from "../../../../Keyboard";
 import { _t } from "../../../../languageHandler";
@@ -20,6 +21,8 @@ import { Action } from "../../../../dispatcher/actions";
 import PosthogTrackers from "../../../../PosthogTrackers";
 import defaultDispatcher from "../../../../dispatcher/dispatcher";
 import { Flex } from "../../../utils/Flex";
+import { useTypedEventEmitterState } from "../../../../hooks/useEventEmitter";
+import LegacyCallHandler, { LegacyCallHandlerEvent } from "../../../../LegacyCallHandler";

 type RoomListSearchProps = {
    /**
@@ -35,6 +38,12 @@ type RoomListSearchProps = {
 */
 export function RoomListSearch({ activeSpace }: RoomListSearchProps): JSX.Element {
    const displayExploreButton = activeSpace === MetaSpace.Home && shouldShowComponent(UIComponent.ExploreRooms);
+    // We only display the dial button if the user is can make PSTN calls
+    const displayDialButton = useTypedEventEmitterState(
+        LegacyCallHandler.instance,
+        LegacyCallHandlerEvent.ProtocolSupport,
+        () => LegacyCallHandler.instance.getSupportsPstnProtocol(),
+    );

    return (
        <Flex className="mx_RoomListSearch" role="search" gap="var(--cpd-space-2x)" align="center">
@@ -50,9 +59,22 @@ export function RoomListSearch({ activeSpace }: RoomListSearchProps): JSX.Elemen
                    <kbd>{IS_MAC ? "⌘ K" : _t(ALTERNATE_KEY_NAME[Key.CONTROL]) + " K"}</kbd>
                </Flex>
            </Button>
+            {displayDialButton && (
+                <Button
+                    className="mx_RoomListSearch_button"
+                    kind="secondary"
+                    size="sm"
+                    Icon={DialPadIcon}
+                    iconOnly={true}
+                    aria-label={_t("left_panel|open_dial_pad")}
+                    onClick={(ev) => {
+                        defaultDispatcher.fire(Action.OpenDialPad);
+                    }}
+                />
+            )}
            {displayExploreButton && (
                <Button
-                    className="mx_RoomListSearch_explore"
+                    className="mx_RoomListSearch_button"
                    kind="secondary"
                    size="sm"
                    Icon={ExploreIcon}
--- a/src/components/views/rooms/RoomListPanel/index.ts
+++ b/src/components/views/rooms/RoomListPanel/index.ts
@@ -5,4 +5,4 @@
 * Please see LICENSE files in the repository root for full details.
 */

-export { RoomListView } from "./RoomListView";
+export { RoomListPanel } from "./RoomListPanel";
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2098,6 +2098,7 @@
            "other": "Currently joining %(count)s rooms"
        },
        "notification_options": "Notification options",
+        "open_space_menu": "Open space menu",
        "redacting_messages_status": {
            "one": "Currently removing messages in %(count)s room",
            "other": "Currently removing messages in %(count)s rooms"
@@ -2112,6 +2113,10 @@
        "sort_by_activity": "Activity",
        "sort_by_alphabet": "A-Z",
        "sort_unread_first": "Show rooms with unread messages first",
+        "space_menu": {
+            "home": "Space home",
+            "space_settings": "Space Settings"
+        },
        "space_menu_label": "%(spaceName)s menu",
        "sublist_options": "List options",
        "suggested_rooms_heading": "Suggested Rooms"
--- a/test/unit-tests/DeviceListener-test.ts
+++ b/test/unit-tests/DeviceListener-test.ts
@@ -7,7 +7,14 @@ Please see LICENSE files in the repository root for full details.
 */

 import { type Mocked, mocked } from "jest-mock";
-import { MatrixEvent, type Room, type MatrixClient, Device, ClientStoppedError } from "matrix-js-sdk/src/matrix";
+import {
+    MatrixEvent,
+    type Room,
+    type MatrixClient,
+    Device,
+    ClientStoppedError,
+    ClientEvent,
+} from "matrix-js-sdk/src/matrix";
 import {
    CryptoEvent,
    type CrossSigningStatus,
@@ -81,7 +88,6 @@ describe("DeviceListener", () => {
            getDeviceVerificationStatus: jest.fn().mockResolvedValue({
                crossSigningVerified: false,
            }),
-            getCrossSigningKeyId: jest.fn(),
            getUserDeviceInfo: jest.fn().mockResolvedValue(new Map()),
            isCrossSigningReady: jest.fn().mockResolvedValue(true),
            isSecretStorageReady: jest.fn().mockResolvedValue(true),
@@ -328,26 +334,21 @@ describe("DeviceListener", () => {
                expect(SetupEncryptionToast.showToast).not.toHaveBeenCalled();
            });

-            describe("when user does not have a cross signing id on this device", () => {
-                beforeEach(() => {
-                    mockCrypto!.getCrossSigningKeyId.mockResolvedValue(null);
-                });
+            it("shows verify session toast when account has cross signing", async () => {
+                mockCrypto!.isCrossSigningReady.mockResolvedValue(true);
+                await createAndStart();

-                it("shows verify session toast when account has cross signing", async () => {
-                    mockCrypto!.isCrossSigningReady.mockResolvedValue(true);
-                    await createAndStart();
-
-                    expect(mockCrypto!.getUserDeviceInfo).toHaveBeenCalled();
-                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
-                        SetupEncryptionToast.Kind.VERIFY_THIS_SESSION,
-                    );
-                });
+                expect(mockCrypto!.getUserDeviceInfo).toHaveBeenCalled();
+                expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
+                    SetupEncryptionToast.Kind.VERIFY_THIS_SESSION,
+                );
            });

-            describe("when user does have a cross signing id on this device", () => {
+            describe("when current device is verified", () => {
                beforeEach(() => {
                    mockCrypto!.isCrossSigningReady.mockResolvedValue(true);
-                    mockCrypto!.getCrossSigningKeyId.mockResolvedValue("abc");
+
+                    // current device is verified
                    mockCrypto!.getDeviceVerificationStatus.mockResolvedValue(
                        new DeviceVerificationStatus({
                            trustCrossSignedDevices: true,
@@ -356,6 +357,60 @@ describe("DeviceListener", () => {
                    );
                });

+                it("shows an out-of-sync toast when one of the secrets is missing", async () => {
+                    mockCrypto!.getCrossSigningStatus.mockResolvedValue({
+                        publicKeysOnDevice: true,
+                        privateKeysInSecretStorage: true,
+                        privateKeysCachedLocally: {
+                            masterKey: false,
+                            selfSigningKey: true,
+                            userSigningKey: true,
+                        },
+                    });
+
+                    await createAndStart();
+
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
+                        SetupEncryptionToast.Kind.KEY_STORAGE_OUT_OF_SYNC,
+                    );
+                });
+
+                it("hides the out-of-sync toast when one of the secrets is missing", async () => {
+                    mockCrypto!.isSecretStorageReady.mockResolvedValue(true);
+
+                    // First show the toast
+                    mockCrypto!.getCrossSigningStatus.mockResolvedValue({
+                        publicKeysOnDevice: true,
+                        privateKeysInSecretStorage: true,
+                        privateKeysCachedLocally: {
+                            masterKey: false,
+                            selfSigningKey: true,
+                            userSigningKey: true,
+                        },
+                    });
+
+                    await createAndStart();
+
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
+                        SetupEncryptionToast.Kind.KEY_STORAGE_OUT_OF_SYNC,
+                    );
+
+                    // Then, when we receive the secret, it should be hidden.
+                    mockCrypto!.getCrossSigningStatus.mockResolvedValue({
+                        publicKeysOnDevice: true,
+                        privateKeysInSecretStorage: true,
+                        privateKeysCachedLocally: {
+                            masterKey: true,
+                            selfSigningKey: true,
+                            userSigningKey: true,
+                        },
+                    });
+
+                    mockClient.emit(ClientEvent.ToDeviceEvent, new MatrixEvent({ type: "m.secret.send" }));
+                    await flushPromises();
+                    expect(SetupEncryptionToast.hideToast).toHaveBeenCalled();
+                });
+
                it("shows set up recovery toast when user has a key backup available", async () => {
                    // non falsy response
                    mockCrypto.getKeyBackupInfo.mockResolvedValue({} as unknown as KeyBackupInfo);
--- a/test/unit-tests/components/viewmodels/roomlist/RoomListHeaderViewModel-test.tsx
+++ b/test/unit-tests/components/viewmodels/roomlist/RoomListHeaderViewModel-test.tsx
@@ -6,24 +6,34 @@
 */

 import { renderHook } from "jest-matrix-react";
-import { type MatrixClient, type Room, RoomType } from "matrix-js-sdk/src/matrix";
+import { JoinRule, type MatrixClient, type Room, RoomType } from "matrix-js-sdk/src/matrix";
 import { mocked } from "jest-mock";

 import { useRoomListHeaderViewModel } from "../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel";
 import SpaceStore from "../../../../../src/stores/spaces/SpaceStore";
-import { mkStubRoom, stubClient } from "../../../../test-utils";
+import { mkStubRoom, stubClient, withClientContextRenderOptions } from "../../../../test-utils";
 import { shouldShowComponent } from "../../../../../src/customisations/helpers/UIComponents";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
 import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
 import { Action } from "../../../../../src/dispatcher/actions";
-import { showCreateNewRoom } from "../../../../../src/utils/space";
+import {
+    shouldShowSpaceSettings,
+    showCreateNewRoom,
+    showSpaceInvite,
+    showSpacePreferences,
+    showSpaceSettings,
+} from "../../../../../src/utils/space";

 jest.mock("../../../../../src/customisations/helpers/UIComponents", () => ({
    shouldShowComponent: jest.fn(),
 }));

 jest.mock("../../../../../src/utils/space", () => ({
+    shouldShowSpaceSettings: jest.fn(),
    showCreateNewRoom: jest.fn(),
+    showSpaceInvite: jest.fn(),
+    showSpacePreferences: jest.fn(),
+    showSpaceSettings: jest.fn(),
 }));

 describe("useRoomListHeaderViewModel", () => {
@@ -39,15 +49,19 @@ describe("useRoomListHeaderViewModel", () => {
        jest.resetAllMocks();
    });

+    function render() {
+        return renderHook(() => useRoomListHeaderViewModel(), withClientContextRenderOptions(matrixClient));
+    }
+
    describe("title", () => {
        it("should return Home as title", () => {
-            const { result } = renderHook(() => useRoomListHeaderViewModel());
+            const { result } = render();
            expect(result.current.title).toStrictEqual("Home");
        });

        it("should return the current space name as title", () => {
            jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
-            const { result } = renderHook(() => useRoomListHeaderViewModel());
+            const { result } = render();

            expect(result.current.title).toStrictEqual("spaceName");
        });
@@ -55,7 +69,7 @@ describe("useRoomListHeaderViewModel", () => {

    it("should be displayComposeMenu=true and canCreateRoom=true if the user can creates room", () => {
        mocked(shouldShowComponent).mockReturnValue(false);
-        const { result, rerender } = renderHook(() => useRoomListHeaderViewModel());
+        const { result, rerender } = render();
        expect(result.current.displayComposeMenu).toBe(false);
        expect(result.current.canCreateRoom).toBe(false);

@@ -65,15 +79,45 @@ describe("useRoomListHeaderViewModel", () => {
        expect(result.current.canCreateRoom).toBe(true);
    });

+    it("should be displaySpaceMenu=true if the user is in a space", () => {
+        jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
+        const { result } = render();
+        expect(result.current.displaySpaceMenu).toBe(true);
+    });
+
+    it("should be canInviteInSpace=true if the space join rule is public", () => {
+        jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
+        jest.spyOn(space, "getJoinRule").mockReturnValue(JoinRule.Public);
+
+        const { result } = render();
+        expect(result.current.displaySpaceMenu).toBe(true);
+    });
+
+    it("should be canInviteInSpace=true if the user has the right", () => {
+        jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
+        jest.spyOn(space, "canInvite").mockReturnValue(true);
+
+        const { result } = render();
+        expect(result.current.displaySpaceMenu).toBe(true);
+    });
+
+    it("should be canAccessSpaceSettings=true if the user has the right", () => {
+        jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
+        mocked(shouldShowSpaceSettings).mockReturnValue(true);
+
+        const { result } = render();
+        expect(result.current.canAccessSpaceSettings).toBe(true);
+    });
+
    it("should be canCreateVideoRoom=true if feature_video_rooms is enabled", () => {
        jest.spyOn(SettingsStore, "getValue").mockReturnValue(true);
-        const { result } = renderHook(() => useRoomListHeaderViewModel());
+        const { result } = render();
        expect(result.current.canCreateVideoRoom).toBe(true);
    });

    it("should fire Action.CreateChat when createChatRoom is called", () => {
        const spy = jest.spyOn(defaultDispatcher, "fire");
-        const { result } = renderHook(() => useRoomListHeaderViewModel());
+        const { result } = render();
        result.current.createChatRoom(new Event("click"));

        expect(spy).toHaveBeenCalledWith(Action.CreateChat);
@@ -81,7 +125,7 @@ describe("useRoomListHeaderViewModel", () => {

    it("should fire Action.CreateRoom when createRoom is called", () => {
        const spy = jest.spyOn(defaultDispatcher, "fire");
-        const { result } = renderHook(() => useRoomListHeaderViewModel());
+        const { result } = render();
        result.current.createRoom(new Event("click"));

        expect(spy).toHaveBeenCalledWith(Action.CreateRoom);
@@ -89,7 +133,7 @@ describe("useRoomListHeaderViewModel", () => {

    it("should call showCreateNewRoom when createRoom is called in a space", () => {
        jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
-        const { result } = renderHook(() => useRoomListHeaderViewModel());
+        const { result } = render();
        result.current.createRoom(new Event("click"));

        expect(showCreateNewRoom).toHaveBeenCalledWith(space);
@@ -98,7 +142,7 @@ describe("useRoomListHeaderViewModel", () => {
    it("should fire Action.CreateRoom with RoomType.UnstableCall when createVideoRoom is called and feature_element_call_video_rooms is enabled", () => {
        jest.spyOn(SettingsStore, "getValue").mockReturnValue(true);
        const spy = jest.spyOn(defaultDispatcher, "dispatch");
-        const { result } = renderHook(() => useRoomListHeaderViewModel());
+        const { result } = render();
        result.current.createVideoRoom();

        expect(spy).toHaveBeenCalledWith({ action: Action.CreateRoom, type: RoomType.UnstableCall });
@@ -107,7 +151,7 @@ describe("useRoomListHeaderViewModel", () => {
    it("should fire Action.CreateRoom with RoomType.ElementVideo when createVideoRoom is called and feature_element_call_video_rooms is disabled", () => {
        jest.spyOn(SettingsStore, "getValue").mockReturnValue(false);
        const spy = jest.spyOn(defaultDispatcher, "dispatch");
-        const { result } = renderHook(() => useRoomListHeaderViewModel());
+        const { result } = render();
        result.current.createVideoRoom();

        expect(spy).toHaveBeenCalledWith({ action: Action.CreateRoom, type: RoomType.ElementVideo });
@@ -115,9 +159,42 @@ describe("useRoomListHeaderViewModel", () => {

    it("should call showCreateNewRoom when createVideoRoom is called in a space", () => {
        jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
-        const { result } = renderHook(() => useRoomListHeaderViewModel());
+        const { result } = render();
        result.current.createVideoRoom();

        expect(showCreateNewRoom).toHaveBeenCalledWith(space, RoomType.ElementVideo);
    });
+
+    it("should fire Action.ViewRoom when openSpaceHome is called in a space", () => {
+        jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
+        const spy = jest.spyOn(defaultDispatcher, "dispatch");
+        const { result } = render();
+        result.current.openSpaceHome();
+
+        expect(spy).toHaveBeenCalledWith({ action: Action.ViewRoom, room_id: space.roomId, metricsTrigger: undefined });
+    });
+
+    it("should call showSpaceInvite when inviteInSpace is called in a space", () => {
+        jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
+        const { result } = render();
+        result.current.inviteInSpace();
+
+        expect(showSpaceInvite).toHaveBeenCalledWith(space);
+    });
+
+    it("should call showSpacePreferences when openSpacePreferences is called in a space", () => {
+        jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
+        const { result } = render();
+        result.current.openSpacePreferences();
+
+        expect(showSpacePreferences).toHaveBeenCalledWith(space);
+    });
+
+    it("should call showSpaceSettings when openSpaceSettings is called in a space", () => {
+        jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
+        const { result } = render();
+        result.current.openSpaceSettings();
+
+        expect(showSpaceSettings).toHaveBeenCalledWith(space);
+    });
 });
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListHeaderView-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListHeaderView-test.tsx
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import React from "react";
+import { mocked } from "jest-mock";
+import { render, screen } from "jest-matrix-react";
+import userEvent from "@testing-library/user-event";
+
+import {
+    type RoomListHeaderViewState,
+    useRoomListHeaderViewModel,
+} from "../../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel";
+import { RoomListHeaderView } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomListHeaderView";
+
+jest.mock("../../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel", () => ({
+    useRoomListHeaderViewModel: jest.fn(),
+}));
+
+describe("<RoomListHeaderView />", () => {
+    const defaultValue: RoomListHeaderViewState = {
+        title: "title",
+        displayComposeMenu: true,
+        displaySpaceMenu: true,
+        canCreateRoom: true,
+        canCreateVideoRoom: true,
+        canInviteInSpace: true,
+        canAccessSpaceSettings: true,
+        createRoom: jest.fn(),
+        createVideoRoom: jest.fn(),
+        createChatRoom: jest.fn(),
+        openSpaceHome: jest.fn(),
+        inviteInSpace: jest.fn(),
+        openSpacePreferences: jest.fn(),
+        openSpaceSettings: jest.fn(),
+    };
+
+    afterEach(() => {
+        jest.resetAllMocks();
+    });
+
+    describe("compose menu", () => {
+        it("should display the compose menu", () => {
+            mocked(useRoomListHeaderViewModel).mockReturnValue(defaultValue);
+
+            const { asFragment } = render(<RoomListHeaderView />);
+            expect(screen.queryByRole("button", { name: "Add" })).toBeInTheDocument();
+            expect(asFragment()).toMatchSnapshot();
+        });
+
+        it("should not display the compose menu", () => {
+            mocked(useRoomListHeaderViewModel).mockReturnValue({ ...defaultValue, displayComposeMenu: false });
+
+            const { asFragment } = render(<RoomListHeaderView />);
+            expect(screen.queryByRole("button", { name: "Add" })).toBeNull();
+            expect(asFragment()).toMatchSnapshot();
+        });
+
+        it("should display all the buttons when the menu is opened", async () => {
+            const user = userEvent.setup();
+            mocked(useRoomListHeaderViewModel).mockReturnValue(defaultValue);
+            render(<RoomListHeaderView />);
+            const openMenu = screen.getByRole("button", { name: "Add" });
+            await user.click(openMenu);
+
+            await user.click(screen.getByRole("menuitem", { name: "New message" }));
+            expect(defaultValue.createChatRoom).toHaveBeenCalled();
+
+            await user.click(openMenu);
+            await user.click(screen.getByRole("menuitem", { name: "New room" }));
+            expect(defaultValue.createRoom).toHaveBeenCalled();
+
+            await user.click(openMenu);
+            await user.click(screen.getByRole("menuitem", { name: "New video room" }));
+            expect(defaultValue.createVideoRoom).toHaveBeenCalled();
+        });
+
+        it("should display only the new message button", async () => {
+            const user = userEvent.setup();
+            mocked(useRoomListHeaderViewModel).mockReturnValue({
+                ...defaultValue,
+                canCreateRoom: false,
+                canCreateVideoRoom: false,
+            });
+
+            render(<RoomListHeaderView />);
+            await user.click(screen.getByRole("button", { name: "Add" }));
+
+            expect(screen.queryByRole("menuitem", { name: "New room" })).toBeNull();
+            expect(screen.queryByRole("menuitem", { name: "New video room" })).toBeNull();
+        });
+    });
+
+    describe("space menu", () => {
+        it("should display the space menu", () => {
+            mocked(useRoomListHeaderViewModel).mockReturnValue(defaultValue);
+
+            const { asFragment } = render(<RoomListHeaderView />);
+            expect(screen.queryByRole("button", { name: "Open space menu" })).toBeInTheDocument();
+            expect(asFragment()).toMatchSnapshot();
+        });
+
+        it("should not display the space menu", () => {
+            mocked(useRoomListHeaderViewModel).mockReturnValue({ ...defaultValue, displaySpaceMenu: false });
+
+            const { asFragment } = render(<RoomListHeaderView />);
+            expect(screen.queryByRole("button", { name: "Open space menu" })).toBeNull();
+            expect(asFragment()).toMatchSnapshot();
+        });
+
+        it("should display all the buttons when the space menu is opened", async () => {
+            const user = userEvent.setup();
+            mocked(useRoomListHeaderViewModel).mockReturnValue(defaultValue);
+            render(<RoomListHeaderView />);
+            const openMenu = screen.getByRole("button", { name: "Open space menu" });
+            await user.click(openMenu);
+
+            await user.click(screen.getByRole("menuitem", { name: "Space home" }));
+            expect(defaultValue.openSpaceHome).toHaveBeenCalled();
+
+            await user.click(openMenu);
+            await user.click(screen.getByRole("menuitem", { name: "Invite" }));
+            expect(defaultValue.inviteInSpace).toHaveBeenCalled();
+
+            await user.click(openMenu);
+            await user.click(screen.getByRole("menuitem", { name: "Preferences" }));
+            expect(defaultValue.openSpacePreferences).toHaveBeenCalled();
+
+            await user.click(openMenu);
+            await user.click(screen.getByRole("menuitem", { name: "Space Settings" }));
+            expect(defaultValue.openSpaceSettings).toHaveBeenCalled();
+        });
+
+        it("should display only the home and preference buttons", async () => {
+            const user = userEvent.setup();
+            mocked(useRoomListHeaderViewModel).mockReturnValue({
+                ...defaultValue,
+                canInviteInSpace: false,
+                canAccessSpaceSettings: false,
+            });
+
+            render(<RoomListHeaderView />);
+            await user.click(screen.getByRole("button", { name: "Add" }));
+
+            expect(screen.queryByRole("menuitem", { name: "Invite" })).toBeNull();
+            expect(screen.queryByRole("menuitem", { name: "Space Setting" })).toBeNull();
+        });
+    });
+});
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPanel-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPanel-test.tsx
@@ -9,7 +9,7 @@ import React from "react";
 import { render, screen } from "jest-matrix-react";
 import { mocked } from "jest-mock";

-import { RoomListView } from "../../../../../../src/components/views/rooms/RoomListView";
+import { RoomListPanel } from "../../../../../../src/components/views/rooms/RoomListPanel";
 import { shouldShowComponent } from "../../../../../../src/customisations/helpers/UIComponents";
 import { MetaSpace } from "../../../../../../src/stores/spaces";

@@ -17,9 +17,9 @@ jest.mock("../../../../../../src/customisations/helpers/UIComponents", () => ({
    shouldShowComponent: jest.fn(),
 }));

-describe("<RoomListView />", () => {
+describe("<RoomListPanel />", () => {
    function renderComponent() {
-        return render(<RoomListView activeSpace={MetaSpace.Home} />);
+        return render(<RoomListPanel activeSpace={MetaSpace.Home} />);
    }

    beforeEach(() => {
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListSearch-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListSearch-test.tsx
@@ -10,11 +10,12 @@ import { render, screen } from "jest-matrix-react";
 import { mocked } from "jest-mock";
 import userEvent from "@testing-library/user-event";

-import { RoomListSearch } from "../../../../../../src/components/views/rooms/RoomListView/RoomListSearch";
+import { RoomListSearch } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomListSearch";
 import { MetaSpace } from "../../../../../../src/stores/spaces";
 import { shouldShowComponent } from "../../../../../../src/customisations/helpers/UIComponents";
 import defaultDispatcher from "../../../../../../src/dispatcher/dispatcher";
 import { Action } from "../../../../../../src/dispatcher/actions";
+import LegacyCallHandler from "../../../../../../src/LegacyCallHandler";

 jest.mock("../../../../../../src/customisations/helpers/UIComponents", () => ({
    shouldShowComponent: jest.fn(),
@@ -28,14 +29,17 @@ describe("<RoomListSearch />", () => {
    beforeEach(() => {
        // By default, we consider shouldShowComponent(UIComponent.ExploreRooms) should return true
        mocked(shouldShowComponent).mockReturnValue(true);
+        jest.spyOn(LegacyCallHandler.instance, "getSupportsPstnProtocol").mockReturnValue(false);
    });

-    it("should display all the buttons", () => {
+    it("should display search and explore buttons", () => {
        const { asFragment } = renderComponent();

        // The search and explore buttons should be displayed
        expect(screen.getByRole("button", { name: "Search Ctrl K" })).toBeInTheDocument();
        expect(screen.getByRole("button", { name: "Explore rooms" })).toBeInTheDocument();
+        // The dial button should not be displayed
+        expect(screen.queryByRole("button", { name: "Open dial pad" })).not.toBeInTheDocument();
        expect(asFragment()).toMatchSnapshot();
    });

@@ -58,6 +62,15 @@ describe("<RoomListSearch />", () => {
        expect(asFragment()).toMatchSnapshot();
    });

+    it("should display the dial button when the PTSN protocol is not supported", () => {
+        jest.spyOn(LegacyCallHandler.instance, "getSupportsPstnProtocol").mockReturnValue(true);
+        const { asFragment } = renderComponent();
+
+        // The dial button should be displayed
+        expect(screen.getByRole("button", { name: "Open dial pad" })).toBeInTheDocument();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
    it("should open the spotlight when the search button is clicked", async () => {
        const fireSpy = jest.spyOn(defaultDispatcher, "fire");
        const user = userEvent.setup();
@@ -81,4 +94,17 @@ describe("<RoomListSearch />", () => {
        // The spotlight should be opened
        expect(fireSpy).toHaveBeenCalledWith(Action.ViewRoomDirectory);
    });
+
+    it("should open the dial pad when the dial button is clicked", async () => {
+        jest.spyOn(LegacyCallHandler.instance, "getSupportsPstnProtocol").mockReturnValue(true);
+        const fireSpy = jest.spyOn(defaultDispatcher, "fire");
+        const user = userEvent.setup();
+        renderComponent();
+
+        // Click on the search button
+        await user.click(screen.getByRole("button", { name: "Open dial pad" }));
+
+        // The spotlight should be opened
+        expect(fireSpy).toHaveBeenCalledWith(Action.OpenDialPad);
+    });
 });
--- a/test/unit-tests/components/views/rooms/RoomListPanel/snapshots/RoomListHeaderView-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/snapshots/RoomListHeaderView-test.tsx.snap
@@ -0,0 +1,276 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<RoomListHeaderView /> compose menu should display the compose menu 1`] = `
+<DocumentFragment>
+  <header
+    aria-label="Room options"
+    class="mx_Flex mx_RoomListHeaderView"
+    data-testid="room-list-header"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0;"
+  >
+    <div
+      class="mx_Flex"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x);"
+    >
+      <h1>
+        title
+      </h1>
+      <button
+        aria-disabled="false"
+        aria-expanded="false"
+        aria-haspopup="menu"
+        aria-label="Open space menu"
+        class="_icon-button_m2erp_8 mx_SpaceMenu_button"
+        data-state="closed"
+        id="radix-:r0:"
+        role="button"
+        style="--cpd-icon-button-size: 20px;"
+        tabindex="0"
+        type="button"
+      >
+        <div
+          class="_indicator-icon_zr2a0_17"
+          style="--cpd-icon-button-size: 100%;"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+            />
+          </svg>
+        </div>
+      </button>
+    </div>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Add"
+      class="_icon-button_m2erp_8"
+      data-state="closed"
+      id="radix-:r2:"
+      role="button"
+      style="--cpd-icon-button-size: 32px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_zr2a0_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
+            fill-rule="evenodd"
+          />
+          <path
+            d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
+          />
+        </svg>
+      </div>
+    </button>
+  </header>
+</DocumentFragment>
+`;
+
+exports[`<RoomListHeaderView /> compose menu should not display the compose menu 1`] = `
+<DocumentFragment>
+  <header
+    aria-label="Room options"
+    class="mx_Flex mx_RoomListHeaderView"
+    data-testid="room-list-header"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0;"
+  >
+    <div
+      class="mx_Flex"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x);"
+    >
+      <h1>
+        title
+      </h1>
+      <button
+        aria-disabled="false"
+        aria-expanded="false"
+        aria-haspopup="menu"
+        aria-label="Open space menu"
+        class="_icon-button_m2erp_8 mx_SpaceMenu_button"
+        data-state="closed"
+        id="radix-:r4:"
+        role="button"
+        style="--cpd-icon-button-size: 20px;"
+        tabindex="0"
+        type="button"
+      >
+        <div
+          class="_indicator-icon_zr2a0_17"
+          style="--cpd-icon-button-size: 100%;"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+            />
+          </svg>
+        </div>
+      </button>
+    </div>
+  </header>
+</DocumentFragment>
+`;
+
+exports[`<RoomListHeaderView /> space menu should display the space menu 1`] = `
+<DocumentFragment>
+  <header
+    aria-label="Room options"
+    class="mx_Flex mx_RoomListHeaderView"
+    data-testid="room-list-header"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0;"
+  >
+    <div
+      class="mx_Flex"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x);"
+    >
+      <h1>
+        title
+      </h1>
+      <button
+        aria-disabled="false"
+        aria-expanded="false"
+        aria-haspopup="menu"
+        aria-label="Open space menu"
+        class="_icon-button_m2erp_8 mx_SpaceMenu_button"
+        data-state="closed"
+        id="radix-:rs:"
+        role="button"
+        style="--cpd-icon-button-size: 20px;"
+        tabindex="0"
+        type="button"
+      >
+        <div
+          class="_indicator-icon_zr2a0_17"
+          style="--cpd-icon-button-size: 100%;"
+        >
+          <svg
+            fill="currentColor"
+            height="1em"
+            viewBox="0 0 24 24"
+            width="1em"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M12 14.95q-.2 0-.375-.062a.9.9 0 0 1-.325-.213l-4.6-4.6a.95.95 0 0 1-.275-.7q0-.425.275-.7a.95.95 0 0 1 .7-.275q.425 0 .7.275l3.9 3.9 3.9-3.9a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7l-4.6 4.6q-.15.15-.325.212a1.1 1.1 0 0 1-.375.063"
+            />
+          </svg>
+        </div>
+      </button>
+    </div>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Add"
+      class="_icon-button_m2erp_8"
+      data-state="closed"
+      id="radix-:ru:"
+      role="button"
+      style="--cpd-icon-button-size: 32px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_zr2a0_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
+            fill-rule="evenodd"
+          />
+          <path
+            d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
+          />
+        </svg>
+      </div>
+    </button>
+  </header>
+</DocumentFragment>
+`;
+
+exports[`<RoomListHeaderView /> space menu should not display the space menu 1`] = `
+<DocumentFragment>
+  <header
+    aria-label="Room options"
+    class="mx_Flex mx_RoomListHeaderView"
+    data-testid="room-list-header"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0;"
+  >
+    <div
+      class="mx_Flex"
+      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x);"
+    >
+      <h1>
+        title
+      </h1>
+    </div>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Add"
+      class="_icon-button_m2erp_8"
+      data-state="closed"
+      id="radix-:r10:"
+      role="button"
+      style="--cpd-icon-button-size: 32px;"
+      tabindex="0"
+      type="button"
+    >
+      <div
+        class="_indicator-icon_zr2a0_17"
+        style="--cpd-icon-button-size: 100%;"
+      >
+        <svg
+          fill="currentColor"
+          height="1em"
+          viewBox="0 0 24 24"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            clip-rule="evenodd"
+            d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
+            fill-rule="evenodd"
+          />
+          <path
+            d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
+          />
+        </svg>
+      </div>
+    </button>
+  </header>
+</DocumentFragment>
+`;
--- a/test/unit-tests/components/views/rooms/RoomListPanel/snapshots/RoomListPanel-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/snapshots/RoomListPanel-test.tsx.snap
@@ -1,10 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`<RoomListView /> should not render the RoomListSearch component when UIComponent.FilterContainer is at false 1`] = `
+exports[`<RoomListPanel /> should not render the RoomListSearch component when UIComponent.FilterContainer is at false 1`] = `
 <DocumentFragment>
  <section
-    class="mx_RoomListView"
-    data-testid="room-list-view"
+    class="mx_RoomListPanel"
+    data-testid="room-list-panel"
  >
    <header
      aria-label="Room options"
@@ -12,9 +12,14 @@ exports[`<RoomListView /> should not render the RoomListSearch component when UI
      data-testid="room-list-header"
      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0;"
    >
-      <h1>
-        Home
-      </h1>
+      <div
+        class="mx_Flex"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x);"
+      >
+        <h1>
+          Home
+        </h1>
+      </div>
    </header>
    <div
      style="overflow: visible; height: 0px; width: 0px;"
@@ -46,11 +51,11 @@ exports[`<RoomListView /> should not render the RoomListSearch component when UI
 </DocumentFragment>
 `;

-exports[`<RoomListView /> should render the RoomListSearch component when UIComponent.FilterContainer is at true 1`] = `
+exports[`<RoomListPanel /> should render the RoomListSearch component when UIComponent.FilterContainer is at true 1`] = `
 <DocumentFragment>
  <section
-    class="mx_RoomListView"
-    data-testid="room-list-view"
+    class="mx_RoomListPanel"
+    data-testid="room-list-panel"
  >
    <div
      class="mx_Flex mx_RoomListSearch"
@@ -88,7 +93,7 @@ exports[`<RoomListView /> should render the RoomListSearch component when UIComp
      </button>
      <button
        aria-label="Explore rooms"
-        class="_button_vczzf_8 mx_RoomListSearch_explore _has-icon_vczzf_57 _icon-only_vczzf_50"
+        class="_button_vczzf_8 mx_RoomListSearch_button _has-icon_vczzf_57 _icon-only_vczzf_50"
        data-kind="secondary"
        data-size="sm"
        role="button"
@@ -114,9 +119,14 @@ exports[`<RoomListView /> should render the RoomListSearch component when UIComp
      data-testid="room-list-header"
      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0;"
    >
-      <h1>
-        Home
-      </h1>
+      <div
+        class="mx_Flex"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-1x);"
+      >
+        <h1>
+          Home
+        </h1>
+      </div>
      <button
        aria-disabled="false"
        aria-expanded="false"
--- a/test/unit-tests/components/views/rooms/RoomListPanel/snapshots/RoomListSearch-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/snapshots/RoomListSearch-test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`<RoomListSearch /> should display all the buttons 1`] = `
+exports[`<RoomListSearch /> should display search and explore buttons 1`] = `
 <DocumentFragment>
  <div
    class="mx_Flex mx_RoomListSearch"
@@ -38,7 +38,89 @@ exports[`<RoomListSearch /> should display all the buttons 1`] = `
    </button>
    <button
      aria-label="Explore rooms"
-      class="_button_vczzf_8 mx_RoomListSearch_explore _has-icon_vczzf_57 _icon-only_vczzf_50"
+      class="_button_vczzf_8 mx_RoomListSearch_button _has-icon_vczzf_57 _icon-only_vczzf_50"
+      data-kind="secondary"
+      data-size="sm"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 13a.97.97 0 0 1-.713-.287A.97.97 0 0 1 11 12q0-.424.287-.713A.97.97 0 0 1 12 11q.424 0 .713.287.287.288.287.713 0 .424-.287.713A.97.97 0 0 1 12 13m0 9a9.7 9.7 0 0 1-3.9-.788 10.1 10.1 0 0 1-3.175-2.137q-1.35-1.35-2.137-3.175A9.7 9.7 0 0 1 2 12q0-2.075.788-3.9a10.1 10.1 0 0 1 2.137-3.175q1.35-1.35 3.175-2.137A9.7 9.7 0 0 1 12 2q2.075 0 3.9.788a10.1 10.1 0 0 1 3.175 2.137q1.35 1.35 2.137 3.175A9.7 9.7 0 0 1 22 12a9.7 9.7 0 0 1-.788 3.9 10.1 10.1 0 0 1-2.137 3.175q-1.35 1.35-3.175 2.137A9.7 9.7 0 0 1 12 22m0-2q3.35 0 5.675-2.325T20 12t-2.325-5.675T12 4 6.325 6.325 4 12t2.325 5.675T12 20m0 0q-3.35 0-5.675-2.325T4 12t2.325-5.675T12 4t5.675 2.325T20 12t-2.325 5.675T12 20m1.675-5.85q.15-.075.275-.2t.2-.275l2.925-6.25q.125-.25-.062-.437-.188-.188-.438-.063l-6.25 2.925q-.15.075-.275.2t-.2.275l-2.925 6.25q-.125.25.063.438.186.186.437.062z"
+        />
+      </svg>
+    </button>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<RoomListSearch /> should display the dial button when the PTSN protocol is not supported 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_Flex mx_RoomListSearch"
+    role="search"
+    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-2x);"
+  >
+    <button
+      class="_button_vczzf_8 mx_RoomListSearch_search _has-icon_vczzf_57"
+      data-kind="secondary"
+      data-size="sm"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M15.05 16.463a7.5 7.5 0 1 1 1.414-1.414l3.243 3.244a1 1 0 0 1-1.414 1.414zM16 10.5a5.5 5.5 0 1 0-11 0 5.5 5.5 0 0 0 11 0"
+        />
+      </svg>
+      <span
+        class="mx_Flex"
+        style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: space-between; --mx-flex-gap: 0;"
+      >
+        Search
+        <kbd>
+          Ctrl K
+        </kbd>
+      </span>
+    </button>
+    <button
+      aria-label="Open dial pad"
+      class="_button_vczzf_8 mx_RoomListSearch_button _has-icon_vczzf_57 _icon-only_vczzf_50"
+      data-kind="secondary"
+      data-size="sm"
+      role="button"
+      tabindex="0"
+    >
+      <svg
+        aria-hidden="true"
+        fill="currentColor"
+        height="20"
+        viewBox="0 0 24 24"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M12 18.6c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8M6.6 2.4c-.99 0-1.8.81-1.8 1.8S5.61 6 6.6 6s1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0 5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0 5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8M17.4 6c.99 0 1.8-.81 1.8-1.8s-.81-1.8-1.8-1.8-1.8.81-1.8 1.8.81 1.8 1.8 1.8M12 13.2c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m5.4 0c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0-5.4c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m-5.4 0c-.99 0-1.8.81-1.8 1.8s.81 1.8 1.8 1.8 1.8-.81 1.8-1.8-.81-1.8-1.8-1.8m0-5.4c-.99 0-1.8.81-1.8 1.8S11.01 6 12 6s1.8-.81 1.8-1.8-.81-1.8-1.8-1.8"
+        />
+      </svg>
+    </button>
+    <button
+      aria-label="Explore rooms"
+      class="_button_vczzf_8 mx_RoomListSearch_button _has-icon_vczzf_57 _icon-only_vczzf_50"
      data-kind="secondary"
      data-size="sm"
      role="button"
--- a/test/unit-tests/components/views/rooms/RoomListView/RoomListHeaderView-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListView/RoomListHeaderView-test.tsx
@@ -1,87 +0,0 @@
-/*
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-import React from "react";
-import { mocked } from "jest-mock";
-import { render, screen } from "jest-matrix-react";
-import userEvent from "@testing-library/user-event";
-
-import {
-    type RoomListHeaderViewState,
-    useRoomListHeaderViewModel,
-} from "../../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel";
-import { RoomListHeaderView } from "../../../../../../src/components/views/rooms/RoomListView/RoomListHeaderView";
-
-jest.mock("../../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel", () => ({
-    useRoomListHeaderViewModel: jest.fn(),
-}));
-
-describe("<RoomListHeaderView />", () => {
-    const defaultValue: RoomListHeaderViewState = {
-        title: "title",
-        displayComposeMenu: true,
-        canCreateRoom: true,
-        canCreateVideoRoom: true,
-        createRoom: jest.fn(),
-        createVideoRoom: jest.fn(),
-        createChatRoom: jest.fn(),
-    };
-
-    afterEach(() => {
-        jest.resetAllMocks();
-    });
-
-    it("should display the compose menu", () => {
-        mocked(useRoomListHeaderViewModel).mockReturnValue(defaultValue);
-
-        const { asFragment } = render(<RoomListHeaderView />);
-        expect(screen.queryByRole("button", { name: "Add" })).toBeInTheDocument();
-        expect(asFragment()).toMatchSnapshot();
-    });
-
-    it("should not display the compose menu", () => {
-        mocked(useRoomListHeaderViewModel).mockReturnValue({ ...defaultValue, displayComposeMenu: false });
-
-        const { asFragment } = render(<RoomListHeaderView />);
-        expect(screen.queryByRole("button", { name: "Add" })).toBeNull();
-        expect(asFragment()).toMatchSnapshot();
-    });
-
-    it("should display all the buttons when the menu is opened", async () => {
-        const user = userEvent.setup();
-        mocked(useRoomListHeaderViewModel).mockReturnValue(defaultValue);
-        render(<RoomListHeaderView />);
-        const openMenu = screen.getByRole("button", { name: "Add" });
-        await user.click(openMenu);
-
-        await user.click(screen.getByRole("menuitem", { name: "New message" }));
-        expect(defaultValue.createChatRoom).toHaveBeenCalled();
-
-        await user.click(openMenu);
-        await user.click(screen.getByRole("menuitem", { name: "New room" }));
-        expect(defaultValue.createRoom).toHaveBeenCalled();
-
-        await user.click(openMenu);
-        await user.click(screen.getByRole("menuitem", { name: "New video room" }));
-        expect(defaultValue.createVideoRoom).toHaveBeenCalled();
-    });
-
-    it("should display only the new message button", async () => {
-        const user = userEvent.setup();
-        mocked(useRoomListHeaderViewModel).mockReturnValue({
-            ...defaultValue,
-            canCreateRoom: false,
-            canCreateVideoRoom: false,
-        });
-
-        render(<RoomListHeaderView />);
-        await user.click(screen.getByRole("button", { name: "Add" }));
-
-        expect(screen.queryByRole("menuitem", { name: "New room" })).toBeNull();
-        expect(screen.queryByRole("menuitem", { name: "New video room" })).toBeNull();
-    });
-});
--- a/test/unit-tests/components/views/rooms/RoomListView/snapshots/RoomListHeaderView-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/RoomListView/snapshots/RoomListHeaderView-test.tsx.snap
@@ -1,66 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<RoomListHeaderView /> should display the compose menu 1`] = `
-<DocumentFragment>
-  <header
-    aria-label="Room options"
-    class="mx_Flex mx_RoomListHeaderView"
-    data-testid="room-list-header"
-    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0;"
-  >
-    <h1>
-      title
-    </h1>
-    <button
-      aria-disabled="false"
-      aria-expanded="false"
-      aria-haspopup="menu"
-      aria-label="Add"
-      class="_icon-button_m2erp_8"
-      data-state="closed"
-      id="radix-:r0:"
-      role="button"
-      style="--cpd-icon-button-size: 32px;"
-      tabindex="0"
-      type="button"
-    >
-      <div
-        class="_indicator-icon_zr2a0_17"
-        style="--cpd-icon-button-size: 100%;"
-      >
-        <svg
-          fill="currentColor"
-          height="1em"
-          viewBox="0 0 24 24"
-          width="1em"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            clip-rule="evenodd"
-            d="M16.937 2.82a2 2 0 0 1 2.828 0l1.415 1.414a2 2 0 0 1 0 2.829l-7.071 7.07c-.195.196-.42.342-.66.44a1 1 0 0 1-.168.072l-3.993 1.331a1 1 0 0 1-1.265-1.265l1.331-3.992q.03-.09.073-.168m10.338-4.903-6.717 6.718-1.414-1.414 6.717-6.718z"
-            fill-rule="evenodd"
-          />
-          <path
-            d="M3 5a2 2 0 0 1 2-2h6a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"
-          />
-        </svg>
-      </div>
-    </button>
-  </header>
-</DocumentFragment>
-`;
-
-exports[`<RoomListHeaderView /> should not display the compose menu 1`] = `
-<DocumentFragment>
-  <header
-    aria-label="Room options"
-    class="mx_Flex mx_RoomListHeaderView"
-    data-testid="room-list-header"
-    style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: space-between; --mx-flex-gap: 0;"
-  >
-    <h1>
-      title
-    </h1>
-  </header>
-</DocumentFragment>
-`;
--- a/yarn.lock
+++ b/yarn.lock
@@ -2048,10 +2048,10 @@
    emojibase "^15.3.1"
    emojibase-data "^15.3.1"

-"@matrix-org/matrix-sdk-crypto-wasm@^13.0.0":
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-13.0.0.tgz#658bed951e4c8a06a6dd545575a79cf32022d4ba"
-  integrity sha512-2gtpjnxL42sdJAgkwitpMMI4cw7Gcjf5sW0MXoe+OAlXPlxIzyM+06F5JJ8ENvBeHkuV2RqtFIRrh8i90HLsMw==
+"@matrix-org/matrix-sdk-crypto-wasm@^14.0.1":
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-14.0.1.tgz#e258ef84bcc7889f0e7eb3a7dbecf0830a6dd606"
+  integrity sha512-CgLpHs6nTw5pjSsMBi9xbQnBXf2l8YhImQP9cv8nbGSCYdYjFI0FilMXffzjWV5HThpNHri/3pF20ahZtuS3VA==

 "@matrix-org/olm@3.2.15":
  version "3.2.15"
@@ -3529,7 +3529,7 @@
    classnames "^2.5.1"
    vaul "^1.0.0"

-"@vector-im/matrix-wysiwyg-wasm@link:../../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.38.0-af862ffd231dc0a6b8d6f2cb3601e68456c0ff24-integrity/node_modules/bindings/wysiwyg-wasm":
+"@vector-im/matrix-wysiwyg-wasm@link:../../Library/Caches/Yarn/v6/npm-@vector-im-matrix-wysiwyg-2.38.0-af862ffd231dc0a6b8d6f2cb3601e68456c0ff24-integrity/node_modules/bindings/wysiwyg-wasm":
  version "0.0.0"
  uid ""

@@ -8736,11 +8736,11 @@ matrix-events-sdk@0.0.1:
  integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==

 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "36.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b584f818f51c899cc81bc83bf1499a2ed374c6c7"
+  version "37.0.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d81929de4c9526e7d68ab7226804726cdef6387f"
  dependencies:
    "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-wasm" "^13.0.0"
+    "@matrix-org/matrix-sdk-crypto-wasm" "^14.0.1"
    "@matrix-org/olm" "3.2.15"
    another-json "^0.2.0"
    bs58 "^6.0.0"