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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798

Browse source 
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
This commit is contained in:
Michael Telatynski 2021-09-09 10:56:21 +01:00
commit 630835961b
18 changed files with 138 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
View file

@ -38,6 +38,7 @@ import ErrorDialog from "../../../dialogs/ErrorDialog";
interface IProps {
roomId: string;
closeSettingsFn: () => void;
}
interface IState {
@ -276,6 +277,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
room={room}
beforeChange={this.onBeforeJoinRuleChange}
onError={this.onJoinRuleChangeError}
closeSettingsFn={this.props.closeSettingsFn}
promptUpgrade={true}
/>
</div>;