mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-05-29 20:06:00 +00:00
Merge branch 'master' into dc/android-desktop-time-msg-grouping
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user