imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make room model mandatory on the RoomHeader (#11355)

Browse source 
* Remove oobData from RoomHeader

It is never used as the RoomHeader is not shown unless a Room model exists

* Make room model mandatory on the RoomHeader
This commit is contained in:
Germain 2023-08-02 16:29:19 +01:00 • committed by GitHub
parent 40442508de
commit d94808a197
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/structures/RoomView.tsx
View file

@ -297,7 +297,7 @@ function LocalRoomView(props: LocalRoomViewProps): ReactElement {
<div className="mx_RoomView mx_RoomView--local">
<ErrorBoundary>
{SettingsStore.getValue("feature_new_room_decoration_ui") ? (
<RoomHeader room={context.room} />
<RoomHeader room={room} />
) : (
<LegacyRoomHeader
room={context.room}
@ -345,16 +345,15 @@ interface ILocalRoomCreateLoaderProps {
* @return {ReactElement}
*/
function LocalRoomCreateLoader(props: ILocalRoomCreateLoaderProps): ReactElement {
const context = useContext(RoomContext);
const text = _t("We're creating a room with %(names)s", { names: props.names });
return (
<div className="mx_RoomView mx_RoomView--local">
<ErrorBoundary>
{SettingsStore.getValue("feature_new_room_decoration_ui") ? (
<RoomHeader room={context.room} />
<RoomHeader room={props.localRoom} />
) : (
<LegacyRoomHeader
room={context.room}
room={props.localRoom}
searchInfo={undefined}
inRoom={true}
onSearchClick={null}
@ -2470,7 +2469,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
)}
<ErrorBoundary>
{SettingsStore.getValue("feature_new_room_decoration_ui") ? (
<RoomHeader room={this.state.room} oobData={this.props.oobData} />
<RoomHeader room={this.state.room} />
) : (
<LegacyRoomHeader
room={this.state.room}