From a7c18bfbfae2578e4b88627a4f2ea2b5239fc3fd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 17 Jul 2020 15:27:49 -0600
Subject: [PATCH] RoomList2 -> RoomList

---
 res/css/_components.scss                                   | 2 +-
 res/css/views/rooms/{_RoomList2.scss => _RoomList.scss}    | 4 +---
 src/components/structures/LeftPanel.tsx                    | 5 ++---
 src/components/views/rooms/{RoomList2.tsx => RoomList.tsx} | 6 ++----
 test/components/views/rooms/RoomList-test.js               | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)
 rename res/css/views/rooms/{_RoomList2.scss => _RoomList.scss} (91%)
 rename src/components/views/rooms/{RoomList2.tsx => RoomList.tsx} (98%)

diff --git a/res/css/_components.scss b/res/css/_components.scss
index eabdcd6843..2e9477199d 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -177,7 +177,7 @@
 @import "./views/rooms/_ReplyPreview.scss";
 @import "./views/rooms/_RoomBreadcrumbs2.scss";
 @import "./views/rooms/_RoomHeader.scss";
-@import "./views/rooms/_RoomList2.scss";
+@import "./views/rooms/_RoomList.scss";
 @import "./views/rooms/_RoomPreviewBar.scss";
 @import "./views/rooms/_RoomRecoveryReminder.scss";
 @import "./views/rooms/_RoomSublist2.scss";
diff --git a/res/css/views/rooms/_RoomList2.scss b/res/css/views/rooms/_RoomList.scss
similarity index 91%
rename from res/css/views/rooms/_RoomList2.scss
rename to res/css/views/rooms/_RoomList.scss
index 5b78020626..690ed0646e 100644
--- a/res/css/views/rooms/_RoomList2.scss
+++ b/res/css/views/rooms/_RoomList.scss
@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// TODO: Rename to mx_RoomList during replacement of old component
-
-.mx_RoomList2 {
+.mx_RoomList {
     width: calc(100% - 16px); // 16px of artificial right-side margin (8px is overflowed from the sublists)
 
     // Create a column-based flexbox for the sublists. That's pretty much all we have to
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index a8e763c6ab..c827d8fcee 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -20,12 +20,11 @@ import TagPanel from "./TagPanel";
 import classNames from "classnames";
 import dis from "../../dispatcher/dispatcher";
 import { _t } from "../../languageHandler";
-import RoomList2 from "../views/rooms/RoomList2";
+import RoomList from "../views/rooms/RoomList";
 import { HEADER_HEIGHT } from "../views/rooms/RoomSublist2";
 import { Action } from "../../dispatcher/actions";
 import UserMenu from "./UserMenu";
 import RoomSearch from "./RoomSearch";
-import AccessibleButton from "../views/elements/AccessibleButton";
 import RoomBreadcrumbs2 from "../views/rooms/RoomBreadcrumbs2";
 import { BreadcrumbsStore } from "../../stores/BreadcrumbsStore";
 import { UPDATE_EVENT } from "../../stores/AsyncStore";
@@ -362,7 +361,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
             </div>
         );
 
-        const roomList = <RoomList2
+        const roomList = <RoomList
             onKeyDown={this.onKeyDown}
             resizeNotifier={null}
             collapsed={false}
diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList.tsx
similarity index 98%
rename from src/components/views/rooms/RoomList2.tsx
rename to src/components/views/rooms/RoomList.tsx
index 1ef36c8a1f..62b24fe137 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -42,8 +42,6 @@ import { ViewRoomDeltaPayload } from "../../../dispatcher/payloads/ViewRoomDelta
 import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
 import SettingsStore from "../../../settings/SettingsStore";
 
-// TODO: Rename on launch: https://github.com/vector-im/riot-web/issues/14367
-
 interface IProps {
     onKeyDown: (ev: React.KeyboardEvent) => void;
     onFocus: (ev: React.FocusEvent) => void;
@@ -132,7 +130,7 @@ const TAG_AESTHETICS: {
     },
 };
 
-export default class RoomList2 extends React.Component<IProps, IState> {
+export default class RoomList extends React.Component<IProps, IState> {
     private searchFilter: NameFilterCondition = new NameFilterCondition();
     private dispatcherRef;
 
@@ -306,7 +304,7 @@ export default class RoomList2 extends React.Component<IProps, IState> {
                         onFocus={this.props.onFocus}
                         onBlur={this.props.onBlur}
                         onKeyDown={onKeyDownHandler}
-                        className="mx_RoomList2"
+                        className="mx_RoomList"
                         role="tree"
                         aria-label={_t("Rooms")}
                     >{sublists}</div>
diff --git a/test/components/views/rooms/RoomList-test.js b/test/components/views/rooms/RoomList-test.js
index 56a62472fe..14120ec978 100644
--- a/test/components/views/rooms/RoomList-test.js
+++ b/test/components/views/rooms/RoomList-test.js
@@ -65,7 +65,7 @@ describe('RoomList', () => {
         parentDiv = document.createElement('div');
         document.body.appendChild(parentDiv);
 
-        const RoomList = sdk.getComponent('views.rooms.RoomList2');
+        const RoomList = sdk.getComponent('views.rooms.RoomList');
         const WrappedRoomList = TestUtils.wrapInMatrixClientContext(RoomList);
         root = ReactDOM.render(
             <DragDropContext>