1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate
2018-08-23 13:05:49 +00:00

View File

@@ -284,8 +284,8 @@ class RoomListStore extends Store {
if (optimisticRequest && roomB === optimisticRequest.room) metaB = optimisticRequest.metaData; if (optimisticRequest && roomB === optimisticRequest.room) metaB = optimisticRequest.metaData;
// Make sure the room tag has an order element, if not set it to be the bottom // Make sure the room tag has an order element, if not set it to be the bottom
const a = metaA.order; const a = metaA ? metaA.order : undefined;
const b = metaB.order; const b = metaB ? metaB.order : undefined;
// Order undefined room tag orders to the bottom // Order undefined room tag orders to the bottom
if (a === undefined && b !== undefined) { if (a === undefined && b !== undefined) {