From b14d05e0b235b73032b021c7b20e314e86aa1556 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Thu, 31 Aug 2023 17:02:16 +1000
Subject: [PATCH] feat: fix missing update for private conversations

---
 ts/receiver/configMessage.ts | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 67039b719..7657db36a 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -380,18 +380,22 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise<Incomin
         await contactConvo.setDidApproveMe(Boolean(wrapperConvo.approvedMe), false);
         changes = true;
       }
-      // FIXME Will unsure
-      // if (wrapperConvo.expirationTimerSeconds !== contactConvo.get('expireTimer')) {
-      //   await contactConvo.updateExpireTimer({
-      //     providedExpireTimer: wrapperConvo.expirationTimerSeconds,
-      //     fromSync: true,
-      //     providedExpirationType: wrapperConvo.expirationMode,
-      //     shouldCommit: false,
-      //     providedChangeTimestamp: result.latestEnvelopeTimestamp,
-      //     fromConfigMessage: true,
-      //   });
-      //   changes = true;
-      // }
+
+      if (
+        wrapperConvo.expirationTimerSeconds !== contactConvo.get('expireTimer') ||
+        wrapperConvo.expirationMode !== contactConvo.get('expirationType')
+      ) {
+        await contactConvo.updateExpireTimer({
+          providedExpirationType: wrapperConvo.expirationMode || 'off',
+          providedExpireTimer: wrapperConvo.expirationTimerSeconds || 0,
+          providedChangeTimestamp: result.latestEnvelopeTimestamp,
+          providedSource: wrapperConvo.id,
+          shouldCommit: false,
+          fromConfigMessage: true,
+          fromSync: true,
+        });
+        changes = true;
+      }
 
       // we want to set the active_at to the created_at timestamp if active_at is unset, so that it shows up in our list.
       if (!contactConvo.get('active_at') && wrapperConvo.createdAtSeconds) {