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

Merge branch 'develop' into t3chguy/ts/4

Browse source
This commit is contained in:
Michael Telatynski 2021-06-29 22:24:47 +01:00 • committed by GitHub
commit 6250d9ba61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
693 changed files with 4996 additions and 5258 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/dialogs/security/CreateCrossSigningDialog.tsx
View file

@ -141,7 +141,7 @@ export default class CreateCrossSigningDialog extends React.PureComponent<IProps
throw new Error("Cross-signing key upload auth canceled");
}
}
}
};
private bootstrapCrossSigning = async (): Promise<void> => {
this.setState({
@ -165,11 +165,11 @@ export default class CreateCrossSigningDialog extends React.PureComponent<IProps
this.setState({ error: e });
console.error("Error bootstrapping cross-signing", e);
}
}
};
private onCancel = (): void => {
this.props.onFinished(false);
}
};
render() {
let content;