matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge branch 'develop' into travis/dispatcher-types

Browse Source
This commit is contained in:
Travis Ralston
2020-05-15 09:56:02 -06:00
parent e4835c4b03 07eed94b35
commit 798e7a1f86
38 changed files with 517 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/auth/SoftLogout.js
View File

@@ -244,7 +244,9 @@ export default class SoftLogout extends React.Component {
<p>{introText}</p>
<SSOButton
matrixClient={MatrixClientPeg.get()}
loginType={this.state.loginView === LOGIN_VIEW.CAS ? "cas" : "sso"} />
loginType={this.state.loginView === LOGIN_VIEW.CAS ? "cas" : "sso"}
fragmentAfterLogin={this.props.fragmentAfterLogin}
/>
</div>
);
}