Skip to content

Commit a36a03b

Browse files
authored
Merge pull request matrix-org#4849 from matrix-org/travis/room-list/remove-dm
Remove the DM button from new room tiles
2 parents b9ce10b + 6246714 commit a36a03b

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed

res/css/views/rooms/_RoomTile2.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,6 @@ limitations under the License.
193193
mask-image: url('$(res)/img/feather-customised/arrow-down.svg');
194194
}
195195

196-
.mx_RoomTile2_iconUser::before {
197-
mask-image: url('$(res)/img/feather-customised/user.svg');
198-
}
199-
200196
.mx_RoomTile2_iconSettings::before {
201197
mask-image: url('$(res)/img/feather-customised/settings.svg');
202198
}

src/components/views/rooms/RoomTile2.tsx

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,8 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
135135
ev.preventDefault();
136136
ev.stopPropagation();
137137

138-
if (tagId === DefaultTagID.DM) {
139-
// TODO: DM Flagging
140-
} else {
141-
// TODO: XOR favourites and low priority
142-
}
138+
// TODO: Support tagging: https://github.com/vector-im/riot-web/issues/14211
139+
// TODO: XOR favourites and low priority: https://github.com/vector-im/riot-web/issues/14210
143140
};
144141

145142
private onLeaveRoomClick = (ev: ButtonEvent) => {
@@ -196,12 +193,6 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
196193
<span>{_t("Low Priority")}</span>
197194
</AccessibleButton>
198195
</li>
199-
<li>
200-
<AccessibleButton onClick={(e) => this.onTagRoom(e, DefaultTagID.DM)}>
201-
<span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconUser" />
202-
<span>{_t("Direct Chat")}</span>
203-
</AccessibleButton>
204-
</li>
205196
<li>
206197
<AccessibleButton onClick={this.onOpenRoomSettings}>
207198
<span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconSettings" />

src/i18n/strings/en_EN.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,6 @@
12201220
"Unread messages.": "Unread messages.",
12211221
"Favourite": "Favourite",
12221222
"Low Priority": "Low Priority",
1223-
"Direct Chat": "Direct Chat",
12241223
"Leave Room": "Leave Room",
12251224
"Room options": "Room options",
12261225
"Add a topic": "Add a topic",
@@ -1898,6 +1897,7 @@
18981897
"Mentions only": "Mentions only",
18991898
"Leave": "Leave",
19001899
"Forget": "Forget",
1900+
"Direct Chat": "Direct Chat",
19011901
"Clear status": "Clear status",
19021902
"Update status": "Update status",
19031903
"Set status": "Set status",

0 commit comments

Comments
 (0)