diff --git a/src/components/views/rooms/RoomHeader.tsx b/src/components/views/rooms/RoomHeader.tsx index 847f966d429..b61f8fc620b 100644 --- a/src/components/views/rooms/RoomHeader.tsx +++ b/src/components/views/rooms/RoomHeader.tsx @@ -46,9 +46,6 @@ import { useIsVideoRoom } from "../../../utils/video-rooms"; import { notificationLevelToIndicator } from "../../../utils/notifications"; import { CallGuestLinkButton } from "./RoomHeader/CallGuestLinkButton"; import { ButtonEvent } from "../elements/AccessibleButton"; -import { ReleaseAnnouncement } from "../../structures/ReleaseAnnouncement"; -import { useIsReleaseAnnouncementOpen } from "../../../hooks/useIsReleaseAnnouncementOpen"; -import { ReleaseAnnouncementStore } from "../../../stores/ReleaseAnnouncementStore"; import WithPresenceIndicator, { useDmMember } from "../avatars/WithPresenceIndicator"; import { IOOBData } from "../../../stores/ThreepidInviteStore"; import RoomContext from "../../../contexts/RoomContext"; @@ -225,8 +222,6 @@ export default function RoomHeader({ voiceCallButton = undefined; } - const isReleaseAnnouncementOpen = useIsReleaseAnnouncementOpen("newRoomHeader"); - const roomContext = useContext(RoomContext); const isVideoRoom = useIsVideoRoom(room); const showChatButton = @@ -237,75 +232,62 @@ export default function RoomHeader({ return ( <> - RightPanelStore.instance.showOrHidePanel(RightPanelPhases.RoomSummary)} + className="mx_RoomHeader_infoWrapper" > - - + + + + + + {roomName} + + {!isDirectMessage && joinRule === JoinRule.Public && ( + + + + )} + + {isDirectMessage && e2eStatus === E2EStatus.Verified && ( + + + + )} + + {isDirectMessage && e2eStatus === E2EStatus.Warning && ( + + + + )} + + + {additionalButtons?.map((props) => { const label = props.label(); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index e1e44efc61d..3130de7a764 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1965,8 +1965,6 @@ "one": "Asking to join", "other": "%(count)s people asking to join" }, - "release_announcement_description": "Enjoy a simpler, more accessible room header.", - "release_announcement_header": "New design!", "room_is_public": "This room is public", "show_widgets_button": "Show Widgets", "video_call_button_ec": "Video call (%(brand)s)", diff --git a/src/stores/ReleaseAnnouncementStore.ts b/src/stores/ReleaseAnnouncementStore.ts index 53f132ebf9c..3c36af91aea 100644 --- a/src/stores/ReleaseAnnouncementStore.ts +++ b/src/stores/ReleaseAnnouncementStore.ts @@ -17,7 +17,7 @@ import { Features } from "../settings/Settings"; /** * The features are shown in the array order. */ -const FEATURES = ["threadsActivityCentre", "newRoomHeader"] as const; +const FEATURES = ["threadsActivityCentre"] as const; /** * All the features that can be shown in the release announcements. */ diff --git a/test/components/structures/__snapshots__/RoomView-test.tsx.snap b/test/components/structures/__snapshots__/RoomView-test.tsx.snap index 2419d5f4088..569fe3640c5 100644 --- a/test/components/structures/__snapshots__/RoomView-test.tsx.snap +++ b/test/components/structures/__snapshots__/RoomView-test.tsx.snap @@ -10,8 +10,6 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1 style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: center; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-3x);" >