Allow reactions/replies after setting removalStage

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
signalapp · Dec 8, 2023 · 5d30f54 · 5d30f54
1 parent 1754b99
commit 5d30f54
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/ts/components/CompositionArea.tsx b/ts/components/CompositionArea.tsx
@@ -781,7 +781,7 @@ export function CompositionArea({
   // If no message request, but we haven't shared profile yet, we show profile-sharing UI
   if (
     !left &&
-    ((conversationType === 'direct' && removalStage !== 'justNotification') ||
+    (conversationType === 'direct' ||
       (conversationType === 'group' && groupVersion === 1)) &&
     isMissingMandatoryProfileSharing
   ) {

diff --git a/ts/reactions/enqueueReactionForSend.ts b/ts/reactions/enqueueReactionForSend.ts
@@ -55,6 +55,21 @@ export async function enqueueReactionForSend({
   );
 
   const isMessageAStory = isStory(message.attributes);
+
+  if (
+    !isMessageAStory ||
+    isDirectConversation(messageConversation.attributes)
+  ) {
+    log.info('Enabling profile sharing for reaction send');
+    if (!messageConversation.get('profileSharing')) {
+      messageConversation.set('profileSharing', true);
+      await window.Signal.Data.updateConversation(
+        messageConversation.attributes
+      );
+    }
+    await messageConversation.restoreContact();
+  }
+
   const targetConversation =
     isMessageAStory && isDirectConversation(messageConversation.attributes)
       ? window.ConversationController.get(targetAuthorAci)

diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
@@ -1049,6 +1049,7 @@ export function isMissingRequiredProfileSharing(
   const doesConversationRequireIt =
     !conversation.isMe &&
     !conversation.left &&
+    !conversation.removalStage &&
     (isGroupV1(conversation) || isDirectConversation(conversation));
 
   return Boolean(

diff --git a/ts/state/selectors/message.ts b/ts/state/selectors/message.ts
@@ -1766,7 +1766,10 @@ function canReplyOrReact(
     return false;
   }
 
-  if (!conversation.acceptedMessageRequest) {
+  if (
+    !conversation.acceptedMessageRequest &&
+    conversation.removalStage !== 'justNotification'
+  ) {
     return false;
   }