From eb8f50c29fe115e25d6468f29b2de2057db94d8f Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Tue, 13 Jun 2023 13:23:46 +1000
Subject: [PATCH] minor fix

---
 .../Message Handling/MessageReceiver+ExpirationTimers.swift     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift
index 6e49b6ba7..5cd6c371e 100644
--- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
+++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ExpirationTimers.swift	
@@ -221,7 +221,7 @@ extension MessageReceiver {
                 isPreviousOff: !localConfig.isEnabled
             ),
             timestampMs: protoLastChangeTimestampMs,
-            expiresInSeconds: (remoteConfig.isEnabled ? nil : localConfig.durationSeconds),
+            expiresInSeconds: (remoteConfig.isEnabled ? remoteConfig.durationSeconds : localConfig.durationSeconds),
             expiresStartedAtMs: (!remoteConfig.isEnabled && localConfig.type == .disappearAfterSend ?
                 Double(protoLastChangeTimestampMs) :
                 nil