matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility

Browse Source 
Add checkbox to GroupAddressPicker for determining visibility of group rooms
This commit is contained in:
Luke Barnard
2017-11-08 10:04:41 +00:00
committed by GitHub
parent ce6957a288 edc744067f
commit 4c47f75918
5 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -591,7 +591,7 @@ export default React.createClass({
_onAcceptInviteClick: function() {
this.setState({membershipBusy: true});
MatrixClientPeg.get().acceptGroupInvite(this.props.groupId).then(() => {
this._groupStore.acceptGroupInvite().then(() => {
// don't reset membershipBusy here: wait for the membership change to come down the sync
}).catch((e) => {
this.setState({membershipBusy: false});