OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix RoomUpgradeWarningBar exploding (#7214)

pull/21833/head
Michael Telatynski 2021-11-29 11:06:19 +00:00 committed by GitHub
parent dbd148489d
commit 3ffe752730
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/views/rooms/RoomUpgradeWarningBar.tsx
View File

@ -22,10 +22,10 @@ import { RoomState } from 'matrix-js-sdk/src/models/room-state';
import Modal from '../../../Modal';
import { _t } from '../../../languageHandler';
import { MatrixClientPeg } from "../../../MatrixClientPeg";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import RoomUpgradeDialog from '../dialogs/RoomUpgradeDialog';
import AccessibleButton from '../elements/AccessibleButton';
import MatrixClientContext from "../../../contexts/MatrixClientContext";
interface IProps {
room: Room;
@ -37,18 +37,24 @@ interface IState {
@replaceableComponent("views.rooms.RoomUpgradeWarningBar")
export default class RoomUpgradeWarningBar extends React.PureComponent<IProps, IState> {
public componentDidMount(): void {
const tombstone = this.props.room.currentState.getStateEvents("m.room.tombstone", "");
this.setState({ upgraded: tombstone && tombstone.getContent().replacement_room });
static contextType = MatrixClientContext;
public context!: React.ContextType<typeof MatrixClientContext>;
MatrixClientPeg.get().on("RoomState.events", this.onStateEvents);
constructor(props, context) {
super(props, context);
const tombstone = this.props.room.currentState.getStateEvents("m.room.tombstone", "");
this.state = {
upgraded: tombstone?.getContent().replacement_room,
};
}
public componentDidMount(): void {
this.context.on("RoomState.events", this.onStateEvents);
}
public componentWillUnmount(): void {
const cli = MatrixClientPeg.get();
if (cli) {
cli.removeListener("RoomState.events", this.onStateEvents);
}
this.context.removeListener("RoomState.events", this.onStateEvents);
}
private onStateEvents = (event: MatrixEvent, state: RoomState): void => {