matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases

Browse Source
This commit is contained in:
David Baker
2020-06-02 18:53:54 +01:00
parent 0046e204a0 b50046f1ab
commit b83ecb1781
102 changed files with 2240 additions and 1410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
View File

@@ -199,7 +199,8 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
type: 'm.id.user',
user: MatrixClientPeg.get().getUserId(),
},
// https://github.com/matrix-org/synapse/issues/5665
// TODO: Remove `user` once servers support proper UIA
// See https://github.com/matrix-org/synapse/issues/5665
user: MatrixClientPeg.get().getUserId(),
password: this.state.accountPassword,
});