Update room summary card header

cypress/e2e/crypto/crypto.spec.ts

@@ -269,7 +269,7 @@ describe("Cryptography", function () {
         // Assert that verified icon is rendered
         cy.findByRole("button", { name: "Room members" }).click();
         cy.findByRole("button", { name: "Room information" }).click();
-        cy.get(".mx_RoomSummaryCard_e2ee_verified").should("exist");
+        cy.get('.mx_RoomSummaryCard_badges [data-kind="success"]').should("contain.text", "Encrypted");
 
         // Take a snapshot of RoomSummaryCard with a verified E2EE icon
         cy.get(".mx_RightPanel").percySnapshotElement("RoomSummaryCard - with a verified E2EE icon", {

res/css/views/right_panel/_RoomSummaryCard.pcss

@@ -31,68 +31,12 @@ limitations under the License.
 
     .mx_RoomSummaryCard_roomName {
         margin: $spacing-12 0 $spacing-4;
-        font-weight: var(--cpd-font-weight-semibold);
-        font-size: $font-17px;
     }
 
     .mx_RoomSummaryCard_alias {
-        font: var(--cpd-font-body-md-regular);
-        color: $secondary-content;
         text-overflow: ellipsis;
     }
 
-    .mx_RoomSummaryCard_avatar {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-
-        .mx_RoomSummaryCard_e2ee {
-            display: inline-block;
-            position: relative;
-            width: 54px;
-            height: 54px;
-            border-radius: 50%;
-            background-color: #737d8c;
-            margin-left: -10px; /* overlap */
-            border: 3px solid $dark-panel-bg-color;
-
-            &::before {
-                content: "";
-                position: absolute;
-                top: 13px;
-                left: 13px;
-                height: 28px;
-                width: 28px;
-                mask-size: cover;
-                mask-repeat: no-repeat;
-                mask-position: center;
-                mask-image: url("$(res)/img/e2e/disabled.svg");
-                background-color: #ffffff;
-            }
-        }
-
-        .mx_RoomSummaryCard_e2ee_normal {
-            background-color: #424446;
-            &::before {
-                mask-image: url("$(res)/img/e2e/normal.svg");
-            }
-        }
-
-        .mx_RoomSummaryCard_e2ee_verified {
-            background-color: $e2e-verified-color;
-            &::before {
-                mask-image: url("$(res)/img/e2e/verified.svg");
-            }
-        }
-
-        .mx_RoomSummaryCard_e2ee_warning {
-            background-color: $e2e-warning-color;
-            &::before {
-                mask-image: url("$(res)/img/e2e/warning.svg");
-            }
-        }
-    }
-
     .mx_RoomSummaryCard_aboutGroup {
         .mx_RoomSummaryCard_Button {
             padding-left: 44px;
@@ -244,6 +188,10 @@ limitations under the License.
     }
 }
 
+.mx_RoomSummaryCard_badges {
+    margin: var(--cpd-space-4x) 0;
+}
+
 .mx_RoomSummaryCard_header {
     padding: 15px 12px;
 

src/components/views/right_panel/RoomSummaryCard.tsx

@@ -16,9 +16,13 @@ limitations under the License.
 
 import React, { useCallback, useContext, useEffect, useMemo, useState } from "react";
 import classNames from "classnames";
-import { Room } from "matrix-js-sdk/src/matrix";
-import { Tooltip } from "@vector-im/compound-web";
+import { EventType, JoinRule, Room } from "matrix-js-sdk/src/matrix";
+import { Badge, Heading, Text, Tooltip } from "@vector-im/compound-web";
 import { Icon as SearchIcon } from "@vector-im/compound-design-tokens/icons/search.svg";
+import { Icon as LockIcon } from "@vector-im/compound-design-tokens/icons/lock.svg";
+import { Icon as LockOffIcon } from "@vector-im/compound-design-tokens/icons/lock-off.svg";
+import { Icon as PublicIcon } from "@vector-im/compound-design-tokens/icons/public.svg";
+import { Icon as ErrorIcon } from "@vector-im/compound-design-tokens/icons/error.svg";
 
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { useIsEncrypted } from "../../../hooks/useIsEncrypted";
@@ -34,7 +38,6 @@ import { useEventEmitter } from "../../../hooks/useEventEmitter";
 import WidgetUtils from "../../../utils/WidgetUtils";
 import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
 import SettingsStore from "../../../settings/SettingsStore";
-import TextWithTooltip from "../elements/TextWithTooltip";
 import WidgetAvatar from "../avatars/WidgetAvatar";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import WidgetStore, { IApp } from "../../../stores/WidgetStore";
@@ -56,6 +59,8 @@ import PosthogTrackers from "../../../PosthogTrackers";
 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
 import { PollHistoryDialog } from "../dialogs/PollHistoryDialog";
 import { Flex } from "../../utils/Flex";
+import { useAccountData } from "../../../hooks/useAccountData";
+import { useRoomState } from "../../../hooks/useRoomState";
 
 interface IProps {
     room: Room;
@@ -307,31 +312,74 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, permalinkCreator, onClose, on
     const isVideoRoom =
         videoRoomsEnabled && (room.isElementVideoRoom() || (elementCallVideoRoomsEnabled && room.isCallRoom()));
 
+    const roomState = useRoomState(room);
+    const directRoomsList = useAccountData<Record<string, string[]>>(room.client, EventType.Direct);
+    const [isDirectMessage, setDirectMessage] = useState(false);
+    useEffect(() => {
+        for (const [, dmRoomList] of Object.entries(directRoomsList)) {
+            if (dmRoomList.includes(room?.roomId ?? "")) {
+                setDirectMessage(true);
+                break;
+            }
+        }
+    }, [room, directRoomsList]);
+
     const alias = room.getCanonicalAlias() || room.getAltAliases()[0] || "";
     const header = (
         <header className="mx_RoomSummaryCard_container">
-            <div className="mx_RoomSummaryCard_avatar" role="presentation">
-                <RoomAvatar room={room} size="54px" viewAvatarOnClick />
-                <TextWithTooltip
-                    tooltip={isRoomEncrypted ? _t("common|encrypted") : _t("common|unencrypted")}
-                    class={classNames("mx_RoomSummaryCard_e2ee", {
-                        mx_RoomSummaryCard_e2ee_normal: isRoomEncrypted,
-                        mx_RoomSummaryCard_e2ee_warning: isRoomEncrypted && e2eStatus === E2EStatus.Warning,
-                        mx_RoomSummaryCard_e2ee_verified: isRoomEncrypted && e2eStatus === E2EStatus.Verified,
-                    })}
-                />
-            </div>
-
+            <RoomAvatar room={room} size="80px" viewAvatarOnClick />
             <RoomName room={room}>
                 {(name) => (
-                    <h1 className="mx_RoomSummaryCard_roomName" title={name}>
+                    <Heading
+                        as="h1"
+                        size="md"
+                        weight="semibold"
+                        className="mx_RoomSummaryCard_roomName text-primary"
+                        title={name}
+                    >
                         {name}
-                    </h1>
+                    </Heading>
                 )}
             </RoomName>
-            <div className="mx_RoomSummaryCard_alias" title={alias}>
+            <Text
+                as="div"
+                size="sm"
+                weight="semibold"
+                className="mx_RoomSummaryCard_alias text-secondary"
+                title={alias}
+            >
                 {alias}
-            </div>
+            </Text>
+
+            <Flex as="section" justify="center" gap="var(--cpd-space-2x)" className="mx_RoomSummaryCard_badges">
+                {!isDirectMessage && roomState.getJoinRule() === JoinRule.Public && (
+                    <Badge kind="default">
+                        <PublicIcon width="1em" />
+                        {_t("common|public_room")}
+                    </Badge>
+                )}
+
+                {isRoomEncrypted && e2eStatus !== E2EStatus.Warning && (
+                    <Badge kind="success">
+                        <LockIcon width="1em" />
+                        {_t("common|encrypted")}
+                    </Badge>
+                )}
+
+                {!e2eStatus && (
+                    <Badge kind="default">
+                        <LockOffIcon width="1em" />
+                        {_t("common|unencrypted")}
+                    </Badge>
+                )}
+
+                {e2eStatus === E2EStatus.Warning && (
+                    <Badge kind="critical">
+                        <ErrorIcon width="1em" />
+                        {_t("common|not_trusted")}
+                    </Badge>
+                )}
+            </Flex>
         </header>
     );