diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index 600b418fe0..fa2231328c 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -46,8 +46,6 @@ export default class RoomSubList extends React.PureComponent { tagName: PropTypes.string, addRoomLabel: PropTypes.string, - order: PropTypes.string.isRequired, - // passed through to RoomTile and used to highlight room with `!` regardless of notifications count isInvite: PropTypes.bool, diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index f41400ecfc..ad64ef1a97 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -700,13 +700,11 @@ export default createReactClass({ list: [], extraTiles: this._makeGroupInviteTiles(this.props.searchFilter), label: _t('Community Invites'), - order: "recent", isInvite: true, }, { list: this.state.lists['im.vector.fake.invite'], label: _t('Invites'), - order: "recent", incomingCall: incomingCallIfTaggedAs('im.vector.fake.invite'), isInvite: true, }, @@ -714,14 +712,12 @@ export default createReactClass({ list: this.state.lists['m.favourite'], label: _t('Favourites'), tagName: "m.favourite", - order: "manual", incomingCall: incomingCallIfTaggedAs('m.favourite'), }, { list: this.state.lists['im.vector.fake.direct'], label: _t('Direct Messages'), tagName: "im.vector.fake.direct", - order: "recent", incomingCall: incomingCallIfTaggedAs('im.vector.fake.direct'), onAddRoom: () => {dis.dispatch({action: 'view_create_chat'});}, addRoomLabel: _t("Start chat"), @@ -729,7 +725,6 @@ export default createReactClass({ { list: this.state.lists['im.vector.fake.recent'], label: _t('Rooms'), - order: "recent", incomingCall: incomingCallIfTaggedAs('im.vector.fake.recent'), onAddRoom: () => {dis.dispatch({action: 'view_create_room'});}, }, @@ -744,7 +739,6 @@ export default createReactClass({ key: tagName, label: labelForTagName(tagName), tagName: tagName, - order: "manual", incomingCall: incomingCallIfTaggedAs(tagName), }; }); @@ -754,13 +748,11 @@ export default createReactClass({ list: this.state.lists['m.lowpriority'], label: _t('Low priority'), tagName: "m.lowpriority", - order: "recent", incomingCall: incomingCallIfTaggedAs('m.lowpriority'), }, { list: this.state.lists['im.vector.fake.archived'], label: _t('Historical'), - order: "recent", incomingCall: incomingCallIfTaggedAs('im.vector.fake.archived'), startAsHidden: true, showSpinner: this.state.isLoadingLeftRooms, @@ -770,7 +762,6 @@ export default createReactClass({ list: this.state.lists['m.server_notice'], label: _t('System Alerts'), tagName: "m.lowpriority", - order: "recent", incomingCall: incomingCallIfTaggedAs('m.server_notice'), }, ]);