From 2258c6da4c9e800a7a2dd7a44c6c97b496ac688c Mon Sep 17 00:00:00 2001
From: warrickct <warrickct@gmail.com>
Date: Tue, 22 Feb 2022 12:41:15 +1100
Subject: [PATCH] Fixing linting errors.

---
 .../conversation/ConversationRequestButtons.tsx     |  3 ++-
 .../conversation/ConversationRequestInfo.tsx        |  1 +
 .../leftpane/overlay/OverlayMessageRequest.tsx      |  2 +-
 ts/data/data.ts                                     |  1 -
 ts/models/conversation.ts                           | 13 ++++---------
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ts/components/conversation/ConversationRequestButtons.tsx b/ts/components/conversation/ConversationRequestButtons.tsx
index 6ac070867..fae87bda0 100644
--- a/ts/components/conversation/ConversationRequestButtons.tsx
+++ b/ts/components/conversation/ConversationRequestButtons.tsx
@@ -32,6 +32,7 @@ export const ConversationMessageRequestButtons = () => {
         }
       }
     }
+    // tslint:disable-next-line: no-floating-promises
     getIncomingMessages();
   });
 
@@ -68,7 +69,7 @@ export const ConversationMessageRequestButtons = () => {
 
   const handleAcceptConversationRequest = async () => {
     const { id } = selectedConversation;
-    const convo = await getConversationController().get(selectedConversation.id);
+    const convo = getConversationController().get(selectedConversation.id);
     await convo.setDidApproveMe(true);
     await approveConvoAndSendResponse(id, true);
   };
diff --git a/ts/components/conversation/ConversationRequestInfo.tsx b/ts/components/conversation/ConversationRequestInfo.tsx
index a83b74940..e1a71c2e6 100644
--- a/ts/components/conversation/ConversationRequestInfo.tsx
+++ b/ts/components/conversation/ConversationRequestInfo.tsx
@@ -25,6 +25,7 @@ export const ConversationRequestinfo = () => {
         }
       }
     }
+    // tslint:disable-next-line: no-floating-promises
     getIncomingMessages();
   });
 
diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
index a98705737..7a499ca1e 100644
--- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
+++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx
@@ -33,7 +33,7 @@ async function handleBlockAllRequestsClick(convoRequests: Array<ReduxConversatio
       const convoModel = convoController.get(id);
       if (!convoModel.isBlocked()) {
         await BlockedNumberController.block(id);
-        convoModel.commit();
+        await convoModel.commit();
       }
       await convoModel.setIsApproved(false);
 
diff --git a/ts/data/data.ts b/ts/data/data.ts
index 7721827fa..d48d8e68c 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -766,7 +766,6 @@ export async function getUnreadCountByConversation(conversationId: string): Prom
  * Gets the count of messages for a direction
  * @param conversationId Conversation for messages to retrieve from
  * @param type outgoing/incoming
- * @returns
  */
 export async function getMessageCountByType(
   conversationId: string,
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 197b579ba..3aa2ac956 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -12,14 +12,14 @@ import { MessageModel } from './message';
 import { MessageAttributesOptionals, MessageDirection } from './messageType';
 import autoBind from 'auto-bind';
 import {
-  getMessageCountByType,
   getLastMessagesByConversation,
+  getMessageCountByType,
+  getMessagesByConversation,
   getUnreadByConversation,
   getUnreadCountByConversation,
   removeMessage as dataRemoveMessage,
   saveMessages,
   updateConversation,
-  getMessagesByConversation,
 } from '../../ts/data/data';
 import { toHex } from '../session/utils/String';
 import {
@@ -638,11 +638,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
         }
       }
 
-      if (uploads.body?.includes('unapprove')) {
-        this.setIsApproved(false);
-        this.setDidApproveMe(false);
-      }
-
       if (this.isOpenGroupV2()) {
         const chatMessageOpenGroupV2 = new OpenGroupVisibleMessage(chatMessageParams);
         const roomInfos = this.toOpenGroupV2();
@@ -949,7 +944,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   ) {
     // if there's a message by the other user, they've replied to us which we consider an accepted convo
     if (!this.didApproveMe() && this.isPrivate()) {
-      this.setDidApproveMe(true);
+      await this.setDidApproveMe(true);
     }
 
     return this.addSingleMessage({
@@ -1396,7 +1391,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
             );
           }).length === 1;
       const isFirstMessageOfConvo =
-        (await (await getMessagesByConversation(this.id, { messageId: null })).length) === 1;
+        (await getMessagesByConversation(this.id, { messageId: null })).length === 1;
       if (hadNoRequestsPrior && isFirstMessageOfConvo) {
         friendRequestText = window.i18n('youHaveANewFriendRequest');
       } else {