chore: remove conversation id from send message viewmodel to make it reausable

app/src/main/kotlin/com/wire/android/mapper/MessageMapper.kt

@@ -98,6 +98,7 @@
         return when (content) {
             is UIMessageContent.Regular ->
                 UIMessage.Regular(
+                    conversationId = message.conversationId,
                     messageContent = content,
                     source = if (sender is SelfUser) MessageSource.Self else MessageSource.OtherUser,
                     header = provideMessageHeader(sender, message),
@@ -107,6 +108,7 @@
 
             is UIMessageContent.SystemMessage ->
                 UIMessage.System(
+                    conversationId = message.conversationId,
                     messageContent = content,
                     source = if (sender is SelfUser) MessageSource.Self else MessageSource.OtherUser,
                     header = provideMessageHeader(sender, message),

app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt

@@ -135,8 +135,8 @@ import com.wire.android.ui.home.conversations.sendmessage.SendMessageViewModel
 import com.wire.android.ui.home.gallery.MediaGalleryActionType
 import com.wire.android.ui.home.gallery.MediaGalleryNavBackArgs
 import com.wire.android.ui.home.messagecomposer.MessageComposer
+import com.wire.android.ui.home.messagecomposer.model.MessageBundle
 import com.wire.android.ui.home.messagecomposer.model.MessageComposition
-import com.wire.android.ui.home.messagecomposer.state.MessageBundle
 import com.wire.android.ui.home.messagecomposer.state.MessageComposerStateHolder
 import com.wire.android.ui.home.messagecomposer.state.rememberMessageComposerStateHolder
 import com.wire.android.ui.legalhold.dialog.subject.LegalHoldSubjectMessageDialog
@@ -643,7 +643,7 @@ private fun ConversationScreen(
     onNewSelfDeletingMessagesStatus: (SelfDeletionTimer) -> Unit,
     tempWritableImageUri: Uri?,
     tempWritableVideoUri: Uri?,
-    onFailedMessageRetryClicked: (String) -> Unit,
+    onFailedMessageRetryClicked: (String, ConversationId) -> Unit,
     requestMentions: (String) -> Unit,
     onClearMentionSearchResult: () -> Unit,
     onPermissionPermanentlyDenied: (type: PermissionDenialType) -> Unit,
@@ -796,7 +796,7 @@ private fun ConversationScreenContent(
     onShowEditingOptions: (UIMessage.Regular) -> Unit,
     onSelfDeletingMessageRead: (UIMessage) -> Unit,
     conversationDetailsData: ConversationDetailsData,
-    onFailedMessageRetryClicked: (String) -> Unit,
+    onFailedMessageRetryClicked: (String, ConversationId) -> Unit,
     onFailedMessageCancelClicked: (String) -> Unit,
     onChangeSelfDeletionClicked: () -> Unit,
     onSearchMentionQueryChanged: (String) -> Unit,
@@ -906,7 +906,7 @@ fun MessageList(
     onShowEditingOption: (UIMessage.Regular) -> Unit,
     onSelfDeletingMessageRead: (UIMessage) -> Unit,
     conversationDetailsData: ConversationDetailsData,
-    onFailedMessageRetryClicked: (String) -> Unit,
+    onFailedMessageRetryClicked: (String, ConversationId) -> Unit,
     onFailedMessageCancelClicked: (String) -> Unit,
     onLinkClick: (String) -> Unit,
     selectedMessageId: String?,
@@ -1105,7 +1105,7 @@ fun PreviewConversationScreen() {
         onNewSelfDeletingMessagesStatus = {},
         tempWritableImageUri = null,
         tempWritableVideoUri = null,
-        onFailedMessageRetryClicked = {},
+        onFailedMessageRetryClicked = { _, _ -> },
         requestMentions = {},
         onClearMentionSearchResult = {},
         onPermissionPermanentlyDenied = {},

app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageComposerViewState.kt

@@ -18,9 +18,10 @@
 
 package com.wire.android.ui.home.conversations
 
-import com.wire.android.ui.home.messagecomposer.state.MessageBundle
+import com.wire.android.ui.home.messagecomposer.model.MessageBundle
 import com.wire.android.ui.home.newconversation.model.Contact
 import com.wire.kalium.logic.data.asset.AttachmentType
+import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.id.MessageId
 import com.wire.kalium.logic.data.message.SelfDeletionTimer
 import com.wire.kalium.logic.feature.conversation.InteractionAvailability
@@ -50,11 +51,16 @@ sealed class InvalidLinkDialogState {
 
 sealed class SureAboutMessagingDialogState {
     data object Hidden : SureAboutMessagingDialogState()
-    sealed class Visible : SureAboutMessagingDialogState() {
-        data class ConversationVerificationDegraded(val messageBundleToSend: MessageBundle) : Visible()
-        sealed class ConversationUnderLegalHold : Visible() {
-            data class BeforeSending(val messageBundleToSend: MessageBundle) : ConversationUnderLegalHold()
-            data class AfterSending(val messageId: MessageId) : ConversationUnderLegalHold()
+    sealed class Visible(open val conversationId: ConversationId) : SureAboutMessagingDialogState() {
+        data class ConversationVerificationDegraded(val messageBundleToSend: MessageBundle) : Visible(messageBundleToSend.conversationId)
+
+        sealed class ConversationUnderLegalHold(override val conversationId: ConversationId) : Visible(conversationId) {
+            data class BeforeSending(
+                val messageBundleToSend: MessageBundle
+            ) : ConversationUnderLegalHold(messageBundleToSend.conversationId)
+
+            data class AfterSending(val messageId: MessageId, override val conversationId: ConversationId) :
+                ConversationUnderLegalHold(conversationId)
         }
     }
 }

app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt

@@ -88,6 +88,7 @@ import com.wire.android.util.launchGeoIntent
 import com.wire.kalium.logic.data.asset.AssetTransferStatus
 import com.wire.kalium.logic.data.asset.isSaved
 import com.wire.android.ui.theme.Accent
+import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.user.UserId
 import kotlinx.collections.immutable.PersistentMap
 
@@ -112,7 +113,7 @@ fun MessageItem(
     onReactionClicked: (String, String) -> Unit,
     onResetSessionClicked: (senderUserId: UserId, clientId: String?) -> Unit,
     onSelfDeletingMessageRead: (UIMessage) -> Unit,
-    onFailedMessageRetryClicked: (String) -> Unit = {},
+    onFailedMessageRetryClicked: (String, ConversationId) -> Unit = { _, _ -> },
     onFailedMessageCancelClicked: (String) -> Unit = {},
     onLinkClick: (String) -> Unit = {},
     isContentClickable: Boolean = false,
@@ -320,7 +321,7 @@ fun MessageItem(
                             MessageSendFailureWarning(
                                 messageStatus = header.messageStatus.flowStatus as MessageFlowStatus.Failure.Send,
                                 isInteractionAvailable = isInteractionAvailable,
-                                onRetryClick = remember { { onFailedMessageRetryClicked(header.messageId) } },
+                                onRetryClick = remember { { onFailedMessageRetryClicked(header.messageId, message.conversationId) } },
                                 onCancelClick = remember { { onFailedMessageCancelClicked(header.messageId) } }
                             )
                         }

app/src/main/kotlin/com/wire/android/ui/home/conversations/SystemMessageItem.kt

@@ -80,6 +80,7 @@ import com.wire.android.util.ui.markdownBold
 import com.wire.android.util.ui.markdownText
 import com.wire.android.util.ui.toUIText
 import com.wire.kalium.logic.data.conversation.Conversation
+import com.wire.kalium.logic.data.id.ConversationId
 import kotlin.math.roundToInt
 
 @Suppress("ComplexMethod")
@@ -88,7 +89,7 @@ fun SystemMessageItem(
     message: UIMessage.System,
     initiallyExpanded: Boolean = false,
     isInteractionAvailable: Boolean = true,
-    onFailedMessageRetryClicked: (String) -> Unit = {},
+    onFailedMessageRetryClicked: (String, ConversationId) -> Unit = { _, _ -> },
     onFailedMessageCancelClicked: (String) -> Unit = {},
     onSelfDeletingMessageRead: (UIMessage) -> Unit = {}
 ) {
@@ -216,7 +217,7 @@ fun SystemMessageItem(
                 MessageSendFailureWarning(
                     messageStatus = message.header.messageStatus.flowStatus as MessageFlowStatus.Failure.Send,
                     isInteractionAvailable = isInteractionAvailable,
-                    onRetryClick = remember { { onFailedMessageRetryClicked(message.header.messageId) } },
+                    onRetryClick = remember { { onFailedMessageRetryClicked(message.header.messageId, message.conversationId) } },
                     onCancelClick = remember { { onFailedMessageCancelClicked(message.header.messageId) } }
                 )
             }

app/src/main/kotlin/com/wire/android/ui/home/conversations/mock/Mock.kt

@@ -72,6 +72,7 @@ val mockHeader = MessageHeader(
 )
 
 val mockMessageWithText = UIMessage.Regular(
+    conversationId = ConversationId("value", "domain"),
     userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
     header = mockHeader,
     messageContent = UIMessageContent.TextMessage(
@@ -89,6 +90,7 @@ val mockMessageWithText = UIMessage.Regular(
 )
 
 val mockMessageWithTextLoremIpsum = UIMessage.Regular(
+    conversationId = ConversationId("value", "domain"),
     userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
     header = mockHeader,
     messageContent = UIMessageContent.TextMessage(
@@ -110,6 +112,7 @@ val mockMessageWithTextLoremIpsum = UIMessage.Regular(
 )
 
 val mockMessageWithMarkdownTextAndLinks = UIMessage.Regular(
+    conversationId = ConversationId("value", "domain"),
     userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
     header = mockHeader,
     messageContent = UIMessageContent.TextMessage(
@@ -157,6 +160,7 @@ Autoconverted link https://github.com/wireapp/kalium/pulls
 )
 
 val mockMessageWithMarkdownListAndImages = UIMessage.Regular(
+    conversationId = ConversationId("value", "domain"),
     userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
     header = mockHeader,
     messageContent = UIMessageContent.TextMessage(
@@ -212,6 +216,7 @@ Png
 )
 
 val mockMessageWithMarkdownTablesAndBlocks = UIMessage.Regular(
+    conversationId = ConversationId("value", "domain"),
     userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
     header = mockHeader,
     messageContent = UIMessageContent.TextMessage(
@@ -256,6 +261,7 @@ Enable typographer option to see result.
 )
 
 val mockMessageWithKnock = UIMessage.System(
+    conversationId = ConversationId("value", "domain"),
     header = mockHeader,
     messageContent = UIMessageContent.SystemMessage.Knock(UIText.DynamicString("John Doe pinged"), true),
     source = MessageSource.Self,
@@ -287,6 +293,7 @@ val mockImageLoader = WireSessionImageLoader(object : ImageLoader {
 )
 
 fun mockAssetMessage() = UIMessage.Regular(
+    conversationId = ConversationId("value", "domain"),
     userAvatarData = UserAvatarData(
         UserAvatarAsset(mockImageLoader, UserAssetId("a", "domain")),
         UserAvailabilityStatus.AVAILABLE
@@ -330,6 +337,7 @@ fun mockedImageUIMessage(
         expirationStatus = ExpirationStatus.NotExpirable
     )
 ) = UIMessage.Regular(
+    conversationId = ConversationId("value", "domain"),
     userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
     header = MessageHeader(
         username = UIText.DynamicString("John Doe"),
@@ -350,6 +358,7 @@ fun mockedImageUIMessage(
 @Suppress("LongMethod", "MagicNumber")
 fun getMockedMessages(): List<UIMessage> = listOf(
     UIMessage.Regular(
+        conversationId = ConversationId("value", "domain"),
         userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
         header = MessageHeader(
             username = UIText.DynamicString("John Doe"),
@@ -379,6 +388,7 @@ fun getMockedMessages(): List<UIMessage> = listOf(
         messageFooter = mockFooter
     ),
     UIMessage.Regular(
+        conversationId = ConversationId("value", "domain"),
         userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
         header = MessageHeader(
             username = UIText.DynamicString("John Doe"),
@@ -399,6 +409,7 @@ fun getMockedMessages(): List<UIMessage> = listOf(
         messageFooter = mockFooter
     ),
     UIMessage.Regular(
+        conversationId = ConversationId("value", "domain"),
         userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
         header = MessageHeader(
             username = UIText.DynamicString("John Doe"),
@@ -420,6 +431,7 @@ fun getMockedMessages(): List<UIMessage> = listOf(
         messageFooter = mockFooter
     ),
     UIMessage.Regular(
+        conversationId = ConversationId("value", "domain"),
         userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
         header = MessageHeader(
             username = UIText.DynamicString("John Doe"),
@@ -441,6 +453,7 @@ fun getMockedMessages(): List<UIMessage> = listOf(
         messageFooter = mockFooter
     ),
     UIMessage.Regular(
+        conversationId = ConversationId("value", "domain"),
         userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
         header = MessageHeader(
             username = UIText.DynamicString("John Doe"),
@@ -471,6 +484,7 @@ fun getMockedMessages(): List<UIMessage> = listOf(
         messageFooter = mockFooter
     ),
     UIMessage.Regular(
+        conversationId = ConversationId("value", "domain"),
         userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
         header = MessageHeader(
             username = UIText.DynamicString("John Doe"),
@@ -492,6 +506,7 @@ fun getMockedMessages(): List<UIMessage> = listOf(
         messageFooter = mockFooter
     ),
     UIMessage.Regular(
+        conversationId = ConversationId("value", "domain"),
         userAvatarData = UserAvatarData(null, UserAvailabilityStatus.AVAILABLE),
         header = MessageHeader(
             username = UIText.DynamicString("John Doe"),

app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt

@@ -37,6 +37,7 @@ import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.message.Message
 import com.wire.kalium.logic.data.message.MessageContent
 import com.wire.android.ui.theme.Accent
+import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.user.AssetId
 import com.wire.kalium.logic.data.user.ConnectionState
 import com.wire.kalium.logic.data.user.UserId
@@ -49,6 +50,7 @@ import kotlinx.collections.immutable.toImmutableList
 import kotlin.time.Duration
 
 sealed interface UIMessage {
+    val conversationId: ConversationId
     val header: MessageHeader
     val source: MessageSource
     val messageContent: UIMessageContent?
@@ -57,6 +59,7 @@ sealed interface UIMessage {
     val isPending: Boolean
 
     data class Regular(
+        override val conversationId: ConversationId,
         override val header: MessageHeader,
         override val source: MessageSource,
         val userAvatarData: UserAvatarData,
@@ -77,6 +80,7 @@ sealed interface UIMessage {
     }
 
     data class System(
+        override val conversationId: ConversationId,
         override val header: MessageHeader,
         override val source: MessageSource,
         override val messageContent: UIMessageContent.SystemMessage