From 701117aa159aa79d1161a083518eddad7d9b856b Mon Sep 17 00:00:00 2001
From: Phil Oliver <3497406+poliver@users.noreply.github.com>
Date: Mon, 3 Nov 2025 22:17:10 -0500
Subject: [PATCH] Move combined clickable to Card contents so ripple is clipped

---
 .../meshtastic/feature/messaging/component/MessageItem.kt  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/component/MessageItem.kt b/feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/component/MessageItem.kt
index 1f4deec94..24f557b79 100644
--- a/feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/component/MessageItem.kt
+++ b/feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/component/MessageItem.kt
@@ -145,11 +145,14 @@ internal fun MessageItem(
                     start = if (!message.fromLocal) 0.dp else 16.dp,
                     end = if (message.fromLocal) 0.dp else 16.dp,
                 )
-                .combinedClickable(onClick = onClick, onLongClick = { showMessageActionsDialog = true })
                 .then(messageModifier),
             colors = cardColors,
         ) {
-            Column(modifier = Modifier.fillMaxWidth()) {
+            Column(
+                modifier =
+                Modifier.fillMaxWidth()
+                    .combinedClickable(onClick = onClick, onLongClick = { showMessageActionsDialog = true }),
+            ) {
                 OriginalMessageSnippet(
                     message = message,
                     ourNode = ourNode,