From e5ecb9c10614fa2b9f40503446c55f6f74234d85 Mon Sep 17 00:00:00 2001
From: warrickct <warrickct@gmail.com>
Date: Tue, 22 Feb 2022 10:08:51 +1100
Subject: [PATCH] Adding checks for potentially undefined fields on config
 messages to prevent false negatives.

---
 ts/receiver/configMessage.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 46763e20e..dbf6ba0bb 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -140,7 +140,7 @@ const handleContactReceived = async (
       contactConvo.set('active_at', _.toNumber(envelope.timestamp));
     }
 
-    if (contactReceived.isApproved) {
+    if (contactReceived.isApproved) { // checking for existence of field on protobuf
       await contactConvo.setIsApproved(Boolean(contactReceived.isApproved));
       // TODO: add message search in convo for pre-existing msgRequestResponse msg only happens once per convo
       await contactConvo.addSingleOutgoingMessage({
@@ -152,10 +152,13 @@ const handleContactReceived = async (
         expireTimer: 0,
       });
       contactConvo.updateLastMessage();
-      await contactConvo.setDidApproveMe(Boolean(contactReceived.didApproveMe));
+
+      if (contactReceived.didApproveMe) { // checking for existence of field on message
+        await contactConvo.setDidApproveMe(Boolean(contactReceived.didApproveMe));
+      }
     }
 
-    if (contactReceived.isBlocked) {
+    if (contactReceived.isBlocked) { // checking for existence of field on protobuf
       await BlockedNumberController.block(contactConvo.id);
     } else {
       await BlockedNumberController.unblock(contactConvo.id);