Fix the people section
This does two things: - Fixes an incorrect import that was causing Direct Chat toggle to not be editable https://github.com/vector-im/riot-web/issues/3355 - Use props.list in RoomSubList when calculating whether to show IncomingCallDialog. Fixes https://github.com/vector-im/riot-web/issues/2956pull/3448/head
parent
1ade7a711c
commit
f8298b2482
|
@ -417,7 +417,7 @@ var RoomSubList = React.createClass({
|
||||||
if (this.props.incomingCall) {
|
if (this.props.incomingCall) {
|
||||||
var self = this;
|
var self = this;
|
||||||
// Check if the incoming call is for this section
|
// Check if the incoming call is for this section
|
||||||
var incomingCallRoom = this.state.sortedList.filter(function(room) {
|
var incomingCallRoom = this.props.list.filter(function(room) {
|
||||||
return self.props.incomingCall.roomId === room.roomId;
|
return self.props.incomingCall.roomId === room.roomId;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ import sdk from 'matrix-react-sdk';
|
||||||
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
|
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
|
||||||
import dis from 'matrix-react-sdk/lib/dispatcher';
|
import dis from 'matrix-react-sdk/lib/dispatcher';
|
||||||
import DMRoomMap from 'matrix-react-sdk/lib/utils/DMRoomMap';
|
import DMRoomMap from 'matrix-react-sdk/lib/utils/DMRoomMap';
|
||||||
import Rooms from 'matrix-react-sdk/lib/Rooms';
|
import * as Rooms from 'matrix-react-sdk/lib/Rooms';
|
||||||
import * as RoomNotifs from 'matrix-react-sdk/lib/RoomNotifs';
|
import * as RoomNotifs from 'matrix-react-sdk/lib/RoomNotifs';
|
||||||
import Modal from 'matrix-react-sdk/lib/Modal';
|
import Modal from 'matrix-react-sdk/lib/Modal';
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue