From fefe18c14120993b58a2fb6a6dbccda180c86bc3 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <evgeny@poberezkin.com>
Date: Thu, 2 Jul 2026 08:06:22 +0100
Subject: [PATCH] combine transactions (build fails, names need to be merged
 first)

---
 src/Simplex/Chat/Library/Internal.hs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Simplex/Chat/Library/Internal.hs b/src/Simplex/Chat/Library/Internal.hs
index adf5d37e32..4f2b1b97a2 100644
--- a/src/Simplex/Chat/Library/Internal.hs
+++ b/src/Simplex/Chat/Library/Internal.hs
@@ -985,10 +985,11 @@ acceptGroupJoinRequestAsync
     subMode <- chatReadVar subscriptionMode
     let chatV = vr cxt `peerConnChatVersion` cReqChatVRange
     (cmdId, acId) <- prepareAgentAccept user True cReqInvId PQSupportOff
-    withStore $ \db ->
+    m <- withStore $ \db -> do
       liftIO $ createJoiningMemberConnection db user uclId (cmdId, acId) chatV cReqChatVRange groupMemberId subMode
+      getGroupMemberById db vr user groupMemberId
     agentAcceptContactAsync user cmdId acId True cReqInvId msg PQSupportOff chatV subMode
-    withStore $ \db -> getGroupMemberById db vr user groupMemberId
+    pure m
 
 acceptGroupJoinSendRejectAsync :: User -> Int64 -> GroupInfo -> InvitationId -> VersionRangeChat -> Profile -> Maybe XContactId -> GroupRejectionReason -> CM GroupMember
 acceptGroupJoinSendRejectAsync
@@ -1016,10 +1017,11 @@ acceptGroupJoinSendRejectAsync
     subMode <- chatReadVar subscriptionMode
     let chatV = vr cxt `peerConnChatVersion` cReqChatVRange
     (cmdId, acId) <- prepareAgentAccept user False cReqInvId PQSupportOff
-    withStore $ \db ->
+    m <- withStore $ \db -> do
       liftIO $ createJoiningMemberConnection db user uclId (cmdId, acId) chatV cReqChatVRange groupMemberId subMode
+      getGroupMemberById db vr user groupMemberId
     agentAcceptContactAsync user cmdId acId False cReqInvId msg PQSupportOff chatV subMode
-    withStore $ \db -> getGroupMemberById db vr user groupMemberId
+    pure m
 
 acceptBusinessJoinRequestAsync :: User -> Int64 -> GroupInfo -> GroupMember -> UserContactRequest -> CM (GroupInfo, GroupMember)
 acceptBusinessJoinRequestAsync