From 8c2491712e73270e8ce83a730c1f9c0cd2a5cca6 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <>
Date: Thu, 7 Dec 2023 17:01:25 +1100
Subject: [PATCH] fix an issue where non-admin can change disappearing messages
 settings in legacy group

---
 .../ThreadDisappearingMessagesSettingsViewModel.swift        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
index 0834a1f58..f0ac0be5d 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
@@ -391,7 +391,7 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
                                             ),
                                             isEnabled: (
                                                 isNoteToSelf ||
-                                                currentUserIsClosedGroupMember == true
+                                                currentUserIsClosedGroupAdmin == true
                                             ),
                                             accessibility: Accessibility(
                                                 identifier: "Disable disappearing messages (Off option)",
@@ -427,7 +427,8 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
                                                 ),
                                                 isEnabled: (
                                                     isNoteToSelf ||
-                                                    currentUserIsClosedGroupMember == true
+                                                    (currentUserIsClosedGroupMember == true && !Features.useNewDisappearingMessagesConfig) ||
+                                                    currentUserIsClosedGroupAdmin == true
                                                 ),
                                                 accessibility: Accessibility(
                                                     identifier: "Time option",