make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile #1950
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
Could not have on same branch as dep as there is another PR depending on the same js-sdk PR |
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
| description: _t("Unable to reject invite"), | ||
| }); | ||
| } | ||
| modal.close(); |
There was a problem hiding this comment.
This should be in a finally clause otherwise we'll get stuck with a spinner if an error is thrown in the catch.
| group: this.props.group, | ||
| onFinished: () => { | ||
| this.setState({ menuDisplayed: false }); | ||
| // this.props.refreshSubList(); |
There was a problem hiding this comment.
Commented code needs removal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
@lukebarnard1 sorry added a bit more, filtering of the Group Invite Tiles |
|
Those changes look totally unrelated. I suggest making a new PR in future. |
lukebarnard1
approved these changes
Jun 14, 2018
|
|
||
| const GroupInviteTile = sdk.getComponent('groups.GroupInviteTile'); | ||
| for (const group of MatrixClientPeg.get().getGroups()) { | ||
| if (group.myMembership !== 'invite') continue; | ||
| ret.push(<GroupInviteTile key={group.groupId} group={group} collapsed={this.props.collapsed} />); | ||
| const {groupId: id, name, myMembership: membership} = group; |
There was a problem hiding this comment.
I suggest keeping the variable names here; groupId and myMembership are fine.
There was a problem hiding this comment.
I changed them when trying to squeeze it onto one line :P changed them back now :)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requires matrix-org/matrix-js-sdk#656Fixes element-hq/element-web#6860
Fixes element-hq/element-web#5918
Signed-off-by: Michael Telatynski 7t3chguy@gmail.com