fix: disable swiping hint for self-deleting and deleted messages

wireapp · May 7, 2024 · d349ef0 · d349ef0
1 parent 9477034
commit d349ef0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/...rc/main/kotlin/com/wire/android/ui/home/conversations/messages/item/RegularMessageItem.kt b/...rc/main/kotlin/com/wire/android/ui/home/conversations/messages/item/RegularMessageItem.kt
@@ -258,12 +258,9 @@ fun RegularMessageItem(
             }
         )
     }
-    if (swipableMessageConfiguration is SwipableMessageConfiguration.SwipableToReply) {
+    if (swipableMessageConfiguration is SwipableMessageConfiguration.SwipableToReply && isReplyable) {
         val onSwipe = remember(message) { { swipableMessageConfiguration.onSwipedToReply(message) } }
-        SwipableToReplyBox(
-            isSwipable = isReplyable,
-            onSwipedToReply = onSwipe
-        ) {
+        SwipableToReplyBox(onSwipedToReply = onSwipe) {
             messageContent()
         }
     } else {
@@ -280,7 +277,6 @@ sealed interface SwipableMessageConfiguration {
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun SwipableToReplyBox(
-    isSwipable: Boolean,
     modifier: Modifier = Modifier,
     onSwipedToReply: () -> Unit = {},
     content: @Composable RowScope.() -> Unit
@@ -316,7 +312,6 @@ private fun SwipableToReplyBox(
     SwipeToDismissBox(
         state = dismissState,
         modifier = modifier,
-        enableDismissFromStartToEnd = isSwipable,
         content = content,
         enableDismissFromEndToStart = false,
         backgroundContent = {

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt
@@ -99,6 +99,7 @@ sealed interface UIMessage {
         val isReplyable: Boolean
             get() = isReplyableContent &&
                     isTheMessageAvailableToOtherUsers &&
+                    !isDeleted &&
                     header.messageStatus.expirationStatus is ExpirationStatus.NotExpirable
 
         val isTextContentWithoutQuote = messageContent is UIMessageContent.TextMessage && messageContent.messageBody.quotedMessage == null