From f10a20a2eaddb9c9a058883954139e3cfd49fd32 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 10 Nov 2023 10:52:39 +1100
Subject: [PATCH] fix: legacy group invite do not expire

---
 stylesheets/_modules.scss                  | 4 ----
 ts/session/disappearing_messages/legacy.ts | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 23be75a35..7166870aa 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -23,10 +23,6 @@
 
 .module-contact-name.compact {
   display: block;
-
-  span::after {
-    content: '\00a0';
-  }
 }
 
 // Module: Message
diff --git a/ts/session/disappearing_messages/legacy.ts b/ts/session/disappearing_messages/legacy.ts
index d72382601..95ce3a044 100644
--- a/ts/session/disappearing_messages/legacy.ts
+++ b/ts/session/disappearing_messages/legacy.ts
@@ -1,4 +1,5 @@
 // TODO legacy messages support will be removed in a future release
+import { isEmpty } from 'lodash';
 import { ConversationModel } from '../../models/conversation';
 import { ProtobufUtils, SignalService } from '../../protobuf';
 import { ReleasedFeatures } from '../../util/releaseFeature';
@@ -55,6 +56,7 @@ export function checkShouldDisappearButIsntMessage(
     expirationMode === 'off' &&
     expirationTimer === 0 &&
     convo.getExpirationMode() !== 'off' &&
-    convo.getExpireTimer() !== 0
+    convo.getExpireTimer() !== 0 &&
+    isEmpty(content.dataMessage?.closedGroupControlMessage?.encryptionKeyPair) // group invites do not expire, and have this field set
   );
 }