chore: fix rebase issues

wireapp · Oct 13, 2023 · 6d73cb0 · 6d73cb0
1 parent 303cdf5
commit 6d73cb0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
@@ -1255,7 +1255,7 @@ class UserSessionScope internal constructor(
 
     private val typingIndicatorHandler: TypingIndicatorHandler
         get() = TypingIndicatorHandlerImpl(userId, conversations.typingIndicatorIncomingRepository)
-    
+
     private val protocolUpdateEventHandler: ProtocolUpdateEventHandler
         get() = ProtocolUpdateEventHandlerImpl(
             conversationRepository = conversationRepository,

diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestUser.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestUser.kt
@@ -134,7 +134,8 @@ object TestUser {
         expiresAt = null,
         defederated = false,
         isProteusVerified = false,
-        supportedProtocols = setOf(SupportedProtocolEntity.MLS)
+        supportedProtocols = setOf(SupportedProtocolEntity.MLS),
+        activeOneOnOneConversationId = null
     )
 
     val USER_PROFILE_DTO = UserProfileDTO(