Merge branch 'master' into develop

2020-06-23 15:18:35 +01:00 · 2020-06-23 15:18:35 +01:00 · 6161f95434
commit 6161f95434
parent d61d243284 5256a86545
5 changed files with 196 additions and 14 deletions
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@ -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,