Merge branch 'develop' into travis/room-list/todo-cleanup

Author: turt2live

res/css/views/rooms/_RoomTile2.scss

@@ -194,10 +194,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');
     }

src/components/views/rooms/RoomTile2.tsx

@@ -127,11 +127,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) => {
@@ -188,12 +185,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" />

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",