From 11e6d8041914a27c51226b26493a03cf888803bb Mon Sep 17 00:00:00 2001
From: warrickct <warrickct@gmail.com>
Date: Thu, 10 Feb 2022 22:26:55 +1100
Subject: [PATCH] minor renaming.

---
 ts/interactions/conversationInteractions.ts | 10 +++++-----
 ts/receiver/configMessage.ts                |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 3bc2fe318..23d24f12e 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -124,18 +124,18 @@ export async function unblockConvoById(conversationId: string) {
  * marks the conversation's approval fields, sends messageRequestResponse, syncs to linked devices
  */
 export const acceptConversation = async (conversationId: string, syncToDevices: boolean = true) => {
-  const conversationToApprove = getConversationController().get(conversationId);
+  const convoToApprove = getConversationController().get(conversationId);
 
-  if (!conversationToApprove || conversationToApprove.isApproved()) {
+  if (!convoToApprove || convoToApprove.isApproved()) {
     window?.log?.info('Conversation is already approved.');
     return;
   }
 
   Promise.all([
-    await conversationToApprove.setIsApproved(true),
-    await conversationToApprove.setDidApproveMe(true),
+    await convoToApprove.setIsApproved(true),
+    await convoToApprove.setDidApproveMe(true),
   ]);
-  await conversationToApprove.sendMessageRequestResponse(true);
+  await convoToApprove.sendMessageRequestResponse(true);
 
   // Conversation was not approved before so a sync is needed
   if (syncToDevices) {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 0a8acf78d..022c7b229 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -148,8 +148,7 @@ const handleContactReceived = async (
         await contactConvo.setIsApproved(Boolean(contactReceived.isApproved));
 
         if (contactReceived.didApproveMe) {
-          await contactConvo.setDidApproveMe(Boolean(contactReceived.didApproveMe));
-
+          // TODO: add message search in convo for pre-existing msgRequestResponse msg only happens once per convo
           // if source of the sync matches conversationId
           contactConvo.addSingleMessage({
             conversationId: contactConvo.get('id'),
@@ -165,6 +164,7 @@ const handleContactReceived = async (
             expireTimer: 0,
           });
           contactConvo.updateLastMessage();
+          await contactConvo.setDidApproveMe(Boolean(contactReceived.didApproveMe));
         }
       }