From 753f7aa5b8d63c7fee85d127fd39b98f3969cebd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 27 Jun 2020 22:48:54 -0600
Subject: [PATCH 1/2] Remove the DM button from new room tiles
Fixes https://github.com/vector-im/riot-web/issues/14221
---
res/css/views/rooms/_RoomTile2.scss | 4 ----
src/components/views/rooms/RoomTile2.tsx | 13 ++-----------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/res/css/views/rooms/_RoomTile2.scss b/res/css/views/rooms/_RoomTile2.scss
index a97d1fd5b9..2b659a0c8e 100644
--- a/res/css/views/rooms/_RoomTile2.scss
+++ b/res/css/views/rooms/_RoomTile2.scss
@@ -193,10 +193,6 @@ limitations under the License.
mask-image: url('$(res)/img/feather-customised/arrow-down.svg');
}
- .mx_RoomTile2_iconUser::before {
- mask-image: url('$(res)/img/feather-customised/user.svg');
- }
-
.mx_RoomTile2_iconSettings::before {
mask-image: url('$(res)/img/feather-customised/settings.svg');
}
diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 3d0a555877..2791bd9730 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -135,11 +135,8 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
ev.preventDefault();
ev.stopPropagation();
- if (tagId === DefaultTagID.DM) {
- // TODO: DM Flagging
- } else {
- // TODO: XOR favourites and low priority
- }
+ // TODO: Support tagging: https://github.com/vector-im/riot-web/issues/14211
+ // TODO: XOR favourites and low priority: https://github.com/vector-im/riot-web/issues/14210
};
private onLeaveRoomClick = (ev: ButtonEvent) => {
@@ -196,12 +193,6 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
<span>{_t("Low Priority")}</span>
</AccessibleButton>
</li>
- <li>
- <AccessibleButton onClick={(e) => this.onTagRoom(e, DefaultTagID.DM)}>
- <span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconUser" />
- <span>{_t("Direct Chat")}</span>
- </AccessibleButton>
- </li>
<li>
<AccessibleButton onClick={this.onOpenRoomSettings}>
<span className="mx_IconizedContextMenu_icon mx_RoomTile2_iconSettings" />
From 62467144ba48ac256f0c849a98f8f3c799d8ed1e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 28 Jun 2020 20:03:55 -0600
Subject: [PATCH 2/2] Update i18n
---
src/i18n/strings/en_EN.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d721979329..17943a61c7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1220,7 +1220,6 @@
"Unread messages.": "Unread messages.",
"Favourite": "Favourite",
"Low Priority": "Low Priority",
- "Direct Chat": "Direct Chat",
"Leave Room": "Leave Room",
"Room options": "Room options",
"Add a topic": "Add a topic",
@@ -1898,6 +1897,7 @@
"Mentions only": "Mentions only",
"Leave": "Leave",
"Forget": "Forget",
+ "Direct Chat": "Direct Chat",
"Clear status": "Clear status",
"Update status": "Update status",
"Set status": "Set status",