From 3643a96918481c6c5bdf8568c0faa0ce084a6e5e Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Mon, 5 Dec 2022 13:30:57 +1100
Subject: [PATCH] clean

---
 Session/Conversations/ConversationVC.swift                  | 3 +++
 .../Sending & Receiving/MessageReceiver.swift               | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index 0b6ecc0ea..b1d173d16 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -1255,6 +1255,9 @@ final class ConversationVC: BaseVC, ConversationSearchControllerDelegate, UITabl
     // MARK: - General
     
     func addOrRemoveOutdatedClientBanner(contactIsUsingOutdatedClient: Bool) {
+        // Do not show the banner until the new disappearing messages is enabled
+        guard DisappearingMessagesConfiguration.isNewConfigurationEnabled else { return }
+        
         guard contactIsUsingOutdatedClient else {
             UIView.animate(
                 withDuration: 0.25,
diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
index e4a2a95bd..f02f821e8 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift	
@@ -336,11 +336,7 @@ public enum MessageReceiver {
         
         // Check the contact's client version based on this received message
         let contact: Contact = Contact.fetchOrCreate(db, id: sender)
-        let lastKnowClientVersion: SessionVersion.FeatureVersion = (
-            !proto.hasExpirationType &&
-            !proto.hasExpirationTimer &&
-            !proto.hasLastDisappearingMessageChangeTimestamp
-        ) ? .legacyDisappearingMessages : .newDisappearingMessages
+        let lastKnowClientVersion: SessionVersion.FeatureVersion = !proto.hasExpirationTimer ? .legacyDisappearingMessages : .newDisappearingMessages
         _ = try? contact
             .with(lastKnownClientVersion: lastKnowClientVersion)
             .saved(db)