From 069d619bc92e26f400ab9087705ecdaa35f72173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=BBerko?= <iot.zerko@gmail.com>
Date: Fri, 22 Dec 2023 10:32:59 +0100
Subject: [PATCH] fix: message item long tap action [WPB-5952] (#2553)

---
 .../ui/home/conversations/MessageItem.kt      | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt
index 8ceea89c4b..a3d3fd579e 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt
@@ -25,7 +25,6 @@ import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -168,24 +167,25 @@ fun MessageItem(
 
         Box(
             backgroundColorModifier
-                .clickable(enabled = isContentClickable, onClick = {
-                    onMessageClick(message.header.messageId)
-                })
+                .combinedClickable(enabled = true, onClick = {
+                    if (isContentClickable) {
+                        onMessageClick(message.header.messageId)
+                    }
+                },
+                    onLongClick = remember(message) {
+                        {
+                            if (!isContentClickable) {
+                                onLongClicked(message)
+                            }
+                        }
+                    }
+                )
         ) {
             // padding needed to have same top padding for avatar and rest composables in message item
             val fullAvatarOuterPadding = dimensions().avatarClickablePadding + dimensions().avatarStatusBorderSize
             Row(
                 Modifier
                     .fillMaxWidth()
-                    .apply {
-                        if (!isContentClickable) {
-                            combinedClickable(
-                                enabled = message.isAvailable,
-                                onClick = { },
-                                onLongClick = remember(message) { { onLongClicked(message) } }
-                            )
-                        }
-                    }
                     .padding(
                         end = dimensions().messageItemHorizontalPadding,
                         top = if (showAuthor) dimensions().spacing0x else dimensions().spacing4x,