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

src/async-components/views/dialogs/keybackup/NewRecoveryMethodDialog.js

@@ -32,7 +32,7 @@ export default class NewRecoveryMethodDialog extends React.PureComponent {
         dis.dispatch({ action: 'view_user_settings' });
     }
 
-    onSetupClick = async() => {
+    onSetupClick = async () => {
         // TODO: Should change to a restore key backup flow that checks 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

src/autocomplete/CommunityProvider.js

@@ -61,7 +61,7 @@ export default class CommunityProvider extends AutocompleteProvider {
         if (command) {
             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 {
                     return FlairStore.getGroupProfileCached(cli, groupId);
                 } catch (e) { // if FlairStore failed, fall back to just groupId

src/components/structures/GroupView.js

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

src/components/views/context_menus/GroupInviteTileContextMenu.js

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

src/components/views/context_menus/StatusMessageContextMenu.js

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