From a436c46cb2dabcae1e7942b2e21c813828cd9c77 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 18 Apr 2022 09:43:59 -0300
Subject: [PATCH] Remove label from remote deleted story reactions.

---
 .../thoughtcrime/securesms/conversation/ConversationItem.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 5868647d8..7fa43160a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -548,7 +548,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
   }
 
   private int getDefaultTopMarginForRecord(@NonNull MessageRecord messageRecord, int defaultTopMargin, int defaultBottomMargin) {
-    if (isStoryReaction(messageRecord)) {
+    if (isStoryReaction(messageRecord) && !messageRecord.isRemoteDelete()) {
       return defaultBottomMargin;
     } else {
       return defaultTopMargin;
@@ -1560,7 +1560,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
   }
 
   private void setStoryReactionLabel(@NonNull MessageRecord record) {
-    if (isStoryReaction(record)) {
+    if (isStoryReaction(record) && !record.isRemoteDelete()) {
       storyReactionLabelWrapper.setVisibility(View.VISIBLE);
       storyReactionLabel.setTextColor(record.isOutgoing() ? colorizer.getOutgoingBodyTextColor(context) : ContextCompat.getColor(context, R.color.signal_text_primary));
       storyReactionLabel.setText(getStoryReactionLabelText(messageRecord));