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

Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign

pull/21833/head
Michael Telatynski 2020-05-07 17:10:21 +01:00
parent 4d6cd3c050 0fd06300be
commit dc65c87752
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/auth/RegistrationForm.js
View File

@ -76,7 +76,7 @@ export default createReactClass({
email: this.props.defaultEmail || "", email: this.props.defaultEmail || "",
phoneNumber: this.props.defaultPhoneNumber || "", phoneNumber: this.props.defaultPhoneNumber || "",
password: this.props.defaultPassword || "", password: this.props.defaultPassword || "",
passwordConfirm: "", passwordConfirm: this.props.defaultPassword || "",
passwordComplexity: null, passwordComplexity: null,
passwordSafe: false, passwordSafe: false,
}; };

2
src/stores/RightPanelStore.js
View File

@ -139,7 +139,7 @@ export default class RightPanelStore extends Store {
let targetPhase = payload.phase; let targetPhase = payload.phase;
let refireParams = payload.refireParams; let refireParams = payload.refireParams;
// redirect to EncryptionPanel if there is an ongoing verification request // redirect to EncryptionPanel if there is an ongoing verification request
if (targetPhase === RIGHT_PANEL_PHASES.RoomMemberInfo) { if (targetPhase === RIGHT_PANEL_PHASES.RoomMemberInfo && payload.refireParams) {
const {member} = payload.refireParams; const {member} = payload.refireParams;
const pendingRequest = pendingVerificationRequestForUser(member); const pendingRequest = pendingVerificationRequestForUser(member);
if (pendingRequest) { if (pendingRequest) {