mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 10:27:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #926 from matrix-org/luke/new-guest-access-set-mxid-warm-fuzzy-revert

Browse source 
Remove warm-fuzzy after setting mxid
This commit is contained in:
Luke Barnard 2017-05-25 15:16:52 +01:00 committed by GitHub
commit 1214b01330
1 changed files with 1 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/components/views/dialogs/SetMxIdDialog.js
View file

@ -53,9 +53,6 @@ export default React.createClass({
doingUIAuth: false,
// Indicate error with auth
authError: '',
// Indicate success of setting mxid
success: false,
};
},
@ -98,10 +95,6 @@ export default React.createClass({
});
},
onSuccessContinue: function() {
this.props.onFinished(true, this._registeredCreds);
},
_doUsernameCheck: function() {
// Check if username is available
return this._matrixClient.isUsernameAvailable(this.state.username).then(
@ -169,7 +162,7 @@ export default React.createClass({
// XXX Implement RTS /register here
const teamToken = null;
this._registeredCreds = {
this.props.onFinished(true, {
userId: response.user_id,
deviceId: response.device_id,
homeserverUrl: this._matrixClient.getHomeserverUrl(),
@ -177,11 +170,6 @@ export default React.createClass({
accessToken: response.access_token,
password: this._generatedPassword,
teamToken: teamToken,
};
// Before continuing, show a warm-fuzzy success and only submit onSuccessContinue
this.setState({
success: true,
});
},
@ -231,31 +219,6 @@ export default React.createClass({
!this.state.usernameError &&
!this.state.usernameBusy;
if (this.state.success) {
// XXX BaseDialog needs an onFinished
return (
<BaseDialog className="mx_SetMxIdDialog"
title="You have successfully picked a username!"
>
<div className="mx_Dialog_content">
<p>
You have successfully
picked <b>{ this.state.username }</b> as your
username and you now have access to the full
set of features on Riot.
</p>
</div>
<div className="mx_Dialog_buttons">
<input className="mx_Dialog_primary"
type="submit"
value="Continue"
onClick={this.onSuccessContinue}
/>
</div>
</BaseDialog>
);
}
return (
<BaseDialog className="mx_SetMxIdDialog"
onFinished={this.props.onFinished}