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

2018-06-22 10:41:20 +00:00 · 2018-06-22 10:41:20 +00:00 · 6583befa76
commit 6583befa76
parent 8eeff746d3 3aee0b56ae
1 changed files with 1 additions and 3 deletions
--- a/src/components/views/groups/GroupInviteTile.js
+++ b/src/components/views/groups/GroupInviteTile.js
@ -125,9 +125,7 @@ export default React.createClass({

        const av = <BaseAvatar name={groupName} width={24} height={24} url={httpAvatarUrl} />;

-        const nameClasses = classNames({
-            'mx_RoomTile_name': true,
-            'mx_RoomTile_invite': this.props.isInvite,
+        const nameClasses = classNames('mx_RoomTile_name mx_RoomTile_invite mx_RoomTile_badgeShown', {
            'mx_RoomTile_badgeShown': this.state.badgeHover || this.state.menuDisplayed,
        });