From 307fefcedc4dae5b01e96f5bd09777fed71ea211 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Mon, 3 Apr 2023 14:09:05 +0200
Subject: [PATCH] feat: improved sender disappear after reading time

---
 ts/session/sending/MessageSentHandler.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts
index e12330067..bba995516 100644
--- a/ts/session/sending/MessageSentHandler.ts
+++ b/ts/session/sending/MessageSentHandler.ts
@@ -136,10 +136,13 @@ async function handleMessageSentSuccess(
 
   if (!shouldMarkMessageAsSynced) {
     const expirationType = fetchedMessage.get('expirationType');
-    if (expirationType === 'deleteAfterSend') {
+    if (expirationType) {
       fetchedMessage =
-        setExpirationStartTimestamp(fetchedMessage, expirationType, effectiveTimestamp) ||
-        fetchedMessage;
+        setExpirationStartTimestamp(
+          fetchedMessage,
+          expirationType,
+          expirationType === 'deleteAfterSend' ? effectiveTimestamp : undefined
+        ) || fetchedMessage;
     }
   }