OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/21833/head
Weblate 2019-01-16 14:01:21 +00:00
parent 11f1b71cc6 82e043638e
commit fa943aa114
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js
View File

@ -32,7 +32,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
dis.dispatch({ action: 'view_user_settings' }); dis.dispatch({ action: 'view_user_settings' });
} }
onSetupClick = async() => { onSetupClick = async () => {
// TODO: Should change to a restore key backup flow that checks the // TODO: Should change to a restore key backup flow that checks the
// recovery passphrase while at the same time also cross-signing the // recovery passphrase while at the same time also cross-signing the
// device as well in a single flow. Since we don't have that yet, we'll // device as well in a single flow. Since we don't have that yet, we'll

2
src/autocomplete/CommunityProvider.js
View File

@ -61,7 +61,7 @@ export default class CommunityProvider extends AutocompleteProvider {
if (command) { if (command) {
const joinedGroups = cli.getGroups().filter(({myMembership}) => myMembership === 'join'); const joinedGroups = cli.getGroups().filter(({myMembership}) => myMembership === 'join');
const groups = (await Promise.all(joinedGroups.map(async({groupId}) => { const groups = (await Promise.all(joinedGroups.map(async ({groupId}) => {
try { try {
return FlairStore.getGroupProfileCached(cli, groupId); return FlairStore.getGroupProfileCached(cli, groupId);
} catch (e) { // if FlairStore failed, fall back to just groupId } catch (e) { // if FlairStore failed, fall back to just groupId

2
src/components/structures/GroupView.js
View File

@ -778,7 +778,7 @@ export default React.createClass({
), ),
button: _t("Leave"), button: _t("Leave"),
danger: this.state.isUserPrivileged, danger: this.state.isUserPrivileged,
onFinished: async(confirmed) => { onFinished: async (confirmed) => {
if (!confirmed) return; if (!confirmed) return;
this.setState({membershipBusy: true}); this.setState({membershipBusy: true});

2
src/components/views/context_menus/GroupInviteTileContextMenu.js
View File

@ -48,7 +48,7 @@ export default class GroupInviteTileContextMenu extends React.Component {
Modal.createTrackedDialog('Reject community invite', '', QuestionDialog, { Modal.createTrackedDialog('Reject community invite', '', QuestionDialog, {
title: _t('Reject invitation'), title: _t('Reject invitation'),
description: _t('Are you sure you want to reject the invitation?'), description: _t('Are you sure you want to reject the invitation?'),
onFinished: async(shouldLeave) => { onFinished: async (shouldLeave) => {
if (!shouldLeave) return; if (!shouldLeave) return;
// FIXME: controller shouldn't be loading a view :( // FIXME: controller shouldn't be loading a view :(

2
src/components/views/context_menus/StatusMessageContextMenu.js
View File

@ -35,7 +35,7 @@ export default class StatusMessageContextMenu extends React.Component {
}; };
} }
_onClearClick = async(e) => { _onClearClick = async (e) => {
await MatrixClientPeg.get()._unstable_setStatusMessage(""); await MatrixClientPeg.get()._unstable_setStatusMessage("");
this.setState({message: ""}); this.setState({message: ""});
}; };