mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-10-31 16:21:46 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
		
						commit
						31a812724c
					
				| @ -284,8 +284,8 @@ class RoomListStore extends Store { | ||||
|             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
 | ||||
|             const a = metaA.order; | ||||
|             const b = metaB.order; | ||||
|             const a = metaA ? metaA.order : undefined; | ||||
|             const b = metaB ? metaB.order : undefined; | ||||
| 
 | ||||
|             // Order undefined room tag orders to the bottom
 | ||||
|             if (a === undefined && b !== undefined) { | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user