Merge branch 'develop' into feature/fga/pinned_event_feature_flag

This commit is contained in:
ganfra 2024-07-29 12:50:02 +02:00
commit bcfda2e71d
2 changed files with 7 additions and 5 deletions

View file

@ -221,6 +221,7 @@ private fun aRustRoomInfo(
numUnreadMessages: ULong = 0uL,
numUnreadNotifications: ULong = 0uL,
numUnreadMentions: ULong = 0uL,
pinnedEventIds: List<String> = listOf(),
) = RoomInfo(
id = id,
displayName = displayName,
@ -249,7 +250,8 @@ private fun aRustRoomInfo(
isMarkedUnread = isMarkedUnread,
numUnreadMessages = numUnreadMessages,
numUnreadNotifications = numUnreadNotifications,
numUnreadMentions = numUnreadMentions
numUnreadMentions = numUnreadMentions,
pinnedEventIds = pinnedEventIds,
)
class FakeRoomListItem(