From 501523c4e7c8d3f90295c4e87919faf04465b2ea Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Fri, 17 Jul 2026 03:25:51 +1000
Subject: [PATCH] ConversationDetails: Better handle active request in
 clearRequestError

---
 .../conversation-details/ConversationDetails.dom.tsx  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ts/components/conversation/conversation-details/ConversationDetails.dom.tsx b/ts/components/conversation/conversation-details/ConversationDetails.dom.tsx
index 2d24b19f8a..ac786f5582 100644
--- a/ts/components/conversation/conversation-details/ConversationDetails.dom.tsx
+++ b/ts/components/conversation/conversation-details/ConversationDetails.dom.tsx
@@ -15,7 +15,6 @@ import type {
 import type { PreferredBadgeSelectorType } from '../../../state/selectors/badges.preload.ts';
 import type { SmartChooseGroupMembersModalPropsType } from '../../../state/smart/ChooseGroupMembersModal.preload.tsx';
 import type { SmartConfirmAdditionsModalPropsType } from '../../../state/smart/ConfirmAdditionsModal.dom.tsx';
-import { assertDev } from '../../../util/assert.std.ts';
 import { getMutedUntilText } from '../../../util/getMutedUntilText.std.ts';
 
 import type { LocalizerType, ThemeType } from '../../../types/Util.std.ts';
@@ -321,12 +320,12 @@ export function ConversationDetails({
           renderChooseGroupMembersModal={renderChooseGroupMembersModal}
           renderConfirmAdditionsModal={renderConfirmAdditionsModal}
           clearRequestError={() => {
+            // This is called on close of the dialog, both on 'add member' and 'cancel'
             setAddGroupMembersRequestState(oldRequestState => {
-              assertDev(
-                oldRequestState !== RequestState.Active,
-                'Should not be clearing an active request state'
-              );
-              return RequestState.Inactive;
+              if (oldRequestState === RequestState.InactiveWithError) {
+                return RequestState.Inactive;
+              }
+              return oldRequestState;
             });
           }}
           conversationIdsAlreadyInGroup={