From a6dbd0e9b0f97c13cf5a86a38459dd1c145fca64 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <evgeny@poberezkin.com>
Date: Sun, 28 Jun 2026 23:11:13 +0100
Subject: [PATCH] refactor

---
 src/Simplex/Chat/Library/Commands.hs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs
index 2a819e52b1..f37e7bf279 100644
--- a/src/Simplex/Chat/Library/Commands.hs
+++ b/src/Simplex/Chat/Library/Commands.hs
@@ -3134,15 +3134,13 @@ processChatCommand cxt nm = \case
     updateGroupProfileByName gName $ \p -> p {description}
   ShowGroupDescription gName -> withUser $ \user ->
     CRGroupDescription user <$> withFastStore (\db -> getGroupInfoByName db cxt user gName)
-  SetPublicGroupAccess gName access -> withUser $ \user -> do
+  SetPublicGroupAccess gName access@PublicGroupAccess {simplexName} -> withUser $ \user -> do
     gInfo@GroupInfo {groupProfile = p@GroupProfile {publicGroup}} <- withStore $ \db ->
       getGroupIdByName db user gName >>= getGroupInfo db cxt user
     case publicGroup of
       Just pg@PublicGroupProfile {groupLink, publicGroupAccess = existingAccess} -> do
-        let PublicGroupAccess {simplexName} = access
-            newName_ = claimName <$> simplexName
-        when (newName_ /= (claimName <$> (existingAccess >>= publicGroupClaim))) $
-          forM_ newName_ $ \SimplexNameInfo {nameDomain} -> do
+        forM_ (claimName <$> simplexName) $ \newName@SimplexNameInfo {nameDomain} ->
+          when (Just newName /= (claimName <$> (existingAccess >>= publicGroupClaim))) $ do
             NameRecord {nrSimplexChannel} <- withAgent $ \a -> resolveSimplexName a nm (aUserId user) nameDomain
             unless (nameResolvesTo groupLink nrSimplexChannel) $ throwCmdError "name is not registered to this channel"
         runUpdateGroupProfile user gInfo p {publicGroup = Just pg {publicGroupAccess = Just access}}