imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785

Browse source 
 Conflicts:
	src/components/structures/ScrollPanel.js
	src/components/views/rooms/AppsDrawer.js
This commit is contained in:
Michael Telatynski 2020-09-07 14:33:57 +01:00
commit 667c129ebc
162 changed files with 4010 additions and 3800 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/utils/DMRoomMap.js
View file

@ -16,7 +16,7 @@ limitations under the License.
*/
import {MatrixClientPeg} from '../MatrixClientPeg';
import _uniq from 'lodash/uniq';
import {uniq} from "lodash";
import {Room} from "matrix-js-sdk/src/matrix";
/**
@ -111,7 +111,7 @@ export default class DMRoomMap {
userToRooms[userId] = [roomId];
} else {
roomIds.push(roomId);
userToRooms[userId] = _uniq(roomIds);
userToRooms[userId] = uniq(roomIds);
}
});
return true;