Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Show the room name in the room header during calls #9942

Merged
merged 1 commit into from
Jan 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion res/css/views/rooms/_RoomHeader.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ limitations under the License.
display: flex;
user-select: none;

&:not(.mx_RoomHeader_name--textonly):hover {
&:hover {
background-color: $quinary-content;
}

Expand Down
18 changes: 8 additions & 10 deletions src/components/views/rooms/RoomHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,13 @@ export default class RoomHeader extends React.Component<IProps, IState> {

const buttons = this.props.showButtons ? this.renderButtons(isVideoRoom) : null;

let oobName = _t("Join Room");
if (this.props.oobData && this.props.oobData.name) {
oobName = this.props.oobData.name;
}

const name = this.renderName(oobName);

if (this.props.viewingCall && !isVideoRoom) {
return (
<header className="mx_RoomHeader light-panel">
Expand All @@ -752,9 +759,7 @@ export default class RoomHeader extends React.Component<IProps, IState> {
>
<div className="mx_RoomHeader_avatar">{roomAvatar}</div>
{icon}
<div className="mx_RoomHeader_name mx_RoomHeader_name--textonly mx_RoomHeader_name--small">
{_t("Video call")}
</div>
{name}
{this.props.activeCall instanceof ElementCall && (
<GroupCallDuration groupCall={this.props.activeCall.groupCall} />
)}
Expand All @@ -779,13 +784,6 @@ export default class RoomHeader extends React.Component<IProps, IState> {
);
}

let oobName = _t("Join Room");
if (this.props.oobData && this.props.oobData.name) {
oobName = this.props.oobData.name;
}

const name = this.renderName(oobName);

const topicElement = <RoomTopic room={this.props.room} className="mx_RoomHeader_topic" />;

const viewLabs = (): void =>
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -1997,9 +1997,9 @@
"Close call": "Close call",
"View chat timeline": "View chat timeline",
"Room options": "Room options",
"Join Room": "Join Room",
"(~%(count)s results)|other": "(~%(count)s results)",
"(~%(count)s results)|one": "(~%(count)s result)",
"Join Room": "Join Room",
"Video rooms are a beta feature": "Video rooms are a beta feature",
"Video room": "Video room",
"Public space": "Public space",
Expand Down