From 2b84a5395935ac71d6f82f3384f16311d03e551b Mon Sep 17 00:00:00 2001
From: warrickct <warrickct@gmail.com>
Date: Wed, 23 Feb 2022 12:11:42 +1100
Subject: [PATCH] Fixed conditional stopping sync of convo approval from firing
 due to inferred approval from polled messages with incoming direction.

---
 ts/models/conversation.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 3aa2ac956..e3082c801 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -631,8 +631,11 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       const hasIncomingMessages = incomingMessageCount > 0;
       if (shouldApprove) {
         await this.setIsApproved(true);
-        if (!this.didApproveMe() && hasIncomingMessages) {
-          await this.setDidApproveMe(true);
+        if (hasIncomingMessages) {
+          if (!this.didApproveMe()) {
+            await this.setDidApproveMe(true);
+          }
+          // should only send once
           await this.sendMessageRequestResponse(true);
           void forceSyncConfigurationNowIfNeeded();
         }