Merge branch 'master' into dc/android-desktop-time-msg-grouping

This commit is contained in:
Diogo
2024-09-21 21:24:30 +01:00
17 changed files with 216 additions and 178 deletions
@@ -806,6 +806,7 @@ data class User(
val profile: LocalProfile,
val fullPreferences: FullChatPreferences,
override val activeUser: Boolean,
val activeOrder: Long,
override val showNtfs: Boolean,
val sendRcptsContacts: Boolean,
val sendRcptsSmallGroups: Boolean,
@@ -833,6 +834,7 @@ data class User(
profile = LocalProfile.sampleData,
fullPreferences = FullChatPreferences.sampleData,
activeUser = true,
activeOrder = 0,
showNtfs = true,
sendRcptsContacts = true,
sendRcptsSmallGroups = false,