nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into travis/room-list/scrolling-resize

Browse Source
This commit is contained in:
Travis Ralston
2020-06-04 09:19:54 -06:00
parent 83df79aab9 3c73930e9a
commit cdf2d70aea
7 changed files with 221 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
View File

@@ -227,8 +227,10 @@ export default class RestoreKeyBackupDialog extends React.PureComponent {
loadError: null,
});
try {
const backupInfo = await MatrixClientPeg.get().getKeyBackupVersion();
const backupKeyStored = await MatrixClientPeg.get().isKeyBackupKeyStored();
const cli = MatrixClientPeg.get();
const backupInfo = await cli.getKeyBackupVersion();
const has4S = await cli.hasSecretStorageKey();
const backupKeyStored = has4S && await cli.isKeyBackupKeyStored();
this.setState({
backupInfo,
backupKeyStored,

4
src/components/views/settings/ProfileSettings.js
View File

@@ -40,8 +40,8 @@ export default class ProfileSettings extends React.Component {
if (avatarUrl) avatarUrl = client.mxcUrlToHttp(avatarUrl, 96, 96, 'crop', false);
this.state = {
userId: user.userId,
originalDisplayName: user.displayName,
displayName: user.displayName,
originalDisplayName: user.rawDisplayName,
displayName: user.rawDisplayName,
originalAvatarUrl: avatarUrl,
avatarUrl: avatarUrl,
avatarFile: null,