From 672cebef629f92c935508ecbc4762990e54c0909 Mon Sep 17 00:00:00 2001
From: DS Boyce <260543580+ds-boyce@users.noreply.github.com>
Date: Thu, 28 May 2026 11:14:08 -0700
Subject: [PATCH] Disable other chat settings when a chat is locked (#10623)

---
 src/screens/Messages/ConversationSettings/index.tsx         | 6 +++---
 .../Messages/components/MessagesListGroupInfoPanel.tsx      | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/screens/Messages/ConversationSettings/index.tsx b/src/screens/Messages/ConversationSettings/index.tsx
index ef1632b822..056afa8b5c 100644
--- a/src/screens/Messages/ConversationSettings/index.tsx
+++ b/src/screens/Messages/ConversationSettings/index.tsx
@@ -217,7 +217,7 @@ function GroupSettings({
       type: 'MEMBERS_AND_REQUESTS',
       key: 'members-and-requests',
     },
-    ...(isOwner
+    ...(isOwner && convo.details.lockStatus === 'unlocked'
       ? [{type: 'ADD_MEMBERS_LINK', key: 'add-members-link'} as const]
       : []),
   ]
@@ -457,7 +457,7 @@ function SettingsHeader({
           ]}>
           <SettingsButton
             color={convo.view.muted ? 'negative_subtle' : 'secondary'}
-            disabled={!isReady || isMuting}
+            disabled={!isReady || isMuting || lockStatus !== 'unlocked'}
             icon={convo.view.muted ? BellOffIcon : BellIcon}
             label={
               convo.view.muted
@@ -469,7 +469,7 @@ function SettingsHeader({
           />
           {isOwner ? (
             <SettingsButton
-              disabled={!isReady || isEditingName}
+              disabled={!isReady || isEditingName || lockStatus !== 'unlocked'}
               icon={EditIcon}
               label={l`Edit this group chat’s name`}
               text={l`Edit name`}
diff --git a/src/screens/Messages/components/MessagesListGroupInfoPanel.tsx b/src/screens/Messages/components/MessagesListGroupInfoPanel.tsx
index 79a016cf69..cb76485af6 100644
--- a/src/screens/Messages/components/MessagesListGroupInfoPanel.tsx
+++ b/src/screens/Messages/components/MessagesListGroupInfoPanel.tsx
@@ -83,7 +83,9 @@ export function MessagesListGroupInfoPanel({
     )
   }
 
-  const showButtons = isOwner || isJoinLinkEnabled
+  const isLocked = convo.details.lockStatus !== 'unlocked'
+
+  const showButtons = !isLocked && (isOwner || isJoinLinkEnabled)
 
   return (
     <>