From 0f7bf5d2d1f952b03e6e55f50e16ad58de30d5c5 Mon Sep 17 00:00:00 2001
From: warrickct <warrickct@gmail.com>
Date: Wed, 2 Mar 2022 17:35:39 +1100
Subject: [PATCH] Remove unnecessary conditional

---
 ts/receiver/queuedJob.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index e52fd18e3..b413c83a9 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -251,8 +251,6 @@ async function handleRegularMessage(
   if (type === 'incoming') {
     updateReadStatus(message, conversation);
     if (conversation.isPrivate()) {
-      await conversation.setDidApproveMe(true);
-
       const incomingMessageCount = await getMessageCountByType(
         conversation.id,
         MessageDirection.incoming
@@ -267,14 +265,16 @@ async function handleRegularMessage(
       }
 
       // For edge case when messaging a client that's unable to explicitly send request approvals
-      if (!conversation.didApproveMe() && conversation.isPrivate() && conversation.isApproved()) {
-        await conversation.setDidApproveMe(true);
+      if (conversation.isOutgoingRequest()) {
         // Conversation was not approved before so a sync is needed
         await conversation.addIncomingApprovalMessage(
           _.toNumber(message.get('sent_at')) - 1,
           source
         );
       }
+      // should only occur after isOutgoing request as it relies on didApproveMe being false.
+      await conversation.setDidApproveMe(true);
+      // edge case end
     }
   }