matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-12-01 09:58:03 +03:00
Code Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
RiotRobot
2020-06-23 15:18:35 +01:00
parent d61d243284 5256a86545
commit 6161f95434
5 changed files with 196 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/auth/SetupEncryptionBody.js
View File

@@ -28,14 +28,6 @@ import {
PHASE_FINISHED,
} from '../../../stores/SetupEncryptionStore';
function keyHasPassphrase(keyInfo) {
return (
keyInfo.passphrase &&
keyInfo.passphrase.salt &&
keyInfo.passphrase.iterations
);
}
export default class SetupEncryptionBody extends React.Component {
static propTypes = {
onFinished: PropTypes.func.isRequired,