fix an issue where non-admin can change disappearing messages settings in legacy group

7 months ago · 8c2491712e
parent 490cde57ce
commit 8c2491712e
1 changed files with 3 additions and 2 deletions
--- 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",