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

Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile

pull/21833/head
Šimon Brandner 2021-06-01 12:11:11 +02:00
parent 91288ab525 a8b6094482
commit 14605e49c4
No known key found for this signature in database
GPG Key ID: 9760693FDD98A790
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/MatrixChat.tsx
View File

@ -2091,6 +2091,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
onForgotPasswordClick={showPasswordReset ? this.onForgotPasswordClick : undefined} onForgotPasswordClick={showPasswordReset ? this.onForgotPasswordClick : undefined}
onServerConfigChange={this.onServerConfigChange} onServerConfigChange={this.onServerConfigChange}
fragmentAfterLogin={fragmentAfterLogin} fragmentAfterLogin={fragmentAfterLogin}
defaultUsername={this.props.startingFragmentQueryParams.defaultUsername}
{...this.getServerProperties()} {...this.getServerProperties()}
/> />
); );

3
src/components/structures/auth/Login.tsx
View File

@ -59,6 +59,7 @@ interface IProps {
fallbackHsUrl?: string; fallbackHsUrl?: string;
defaultDeviceDisplayName?: string; defaultDeviceDisplayName?: string;
fragmentAfterLogin?: string; fragmentAfterLogin?: string;
defaultUsername?: string;
// Called when the user has logged in. Params: // Called when the user has logged in. Params:
// - The object returned by the login API // - The object returned by the login API
@ -119,7 +120,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
flows: null, flows: null,
username: "", username: props.defaultUsername? props.defaultUsername: '',
phoneCountry: null, phoneCountry: null,
phoneNumber: "", phoneNumber: "",