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

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.3

Browse source 
 Conflicts:
	src/components/structures/RoomView.tsx
This commit is contained in:
Michael Telatynski 2020-09-09 15:16:19 +01:00
commit a1f1334250
81 changed files with 3611 additions and 805 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,6 +56,7 @@ import MatrixClientContext from "../../contexts/MatrixClientContext";
import {E2EStatus, shieldStatusForRoom} from '../../utils/ShieldUtils';
import {Action} from "../../dispatcher/actions";
import {SettingLevel} from "../../settings/SettingLevel";
import {RightPanelPhases} from "../../stores/RightPanelStorePhases";
import {IMatrixClientCreds} from "../../MatrixClientPeg";
import ScrollPanel from "./ScrollPanel";
import TimelinePanel from "./TimelinePanel";
@ -1424,7 +1425,10 @@ export default class RoomView extends React.Component<IProps, IState> {
};
private onSettingsClick = () => {
dis.dispatch({ action: 'open_room_settings' });
dis.dispatch({
action: Action.SetRightPanelPhase,
phase: RightPanelPhases.RoomSummary,
});
};
private onCancelClick = () => {