From 218152f7c5d454bffd019eb63e58645cd1f54639 Mon Sep 17 00:00:00 2001
From: Kynan Ware <47394200+BagToad@users.noreply.github.com>
Date: Fri, 9 May 2025 23:26:06 -0600
Subject: [PATCH] fix(issue edit): resolve race condition in actor assignment

---
 pkg/cmd/pr/shared/editable_http.go | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkg/cmd/pr/shared/editable_http.go b/pkg/cmd/pr/shared/editable_http.go
index 2c09f2e69..1475f978c 100644
--- a/pkg/cmd/pr/shared/editable_http.go
+++ b/pkg/cmd/pr/shared/editable_http.go
@@ -61,19 +61,13 @@ func UpdateIssue(httpClient *http.Client, repo ghrepo.Interface, id string, isPR
 	// updateIssue mutation does not support Actors so assignment needs to
 	// be in a separate request when our assignees are Actors.
 	if options.Assignees.Edited && options.Assignees.ActorAssignees {
-		apiClient := api.NewClientFromHTTP(httpClient)
-		assigneeIds, err := options.AssigneeIds(apiClient, repo)
-		if err != nil {
-			return err
-		}
-
-		// Disable the edited flag for assignees so that it doesn't
-		// trigger a second update in the replaceIssueFields function.
-		// It's important that this is done AFTER the call to
-		// options.AssigneeIds() above because otherwise that just exits.
-		options.Assignees.Edited = false
-
 		wg.Go(func() error {
+			apiClient := api.NewClientFromHTTP(httpClient)
+			assigneeIds, err := options.AssigneeIds(apiClient, repo)
+			if err != nil {
+				return err
+			}
+
 			return replaceActorAssigneesForEditable(apiClient, repo, id, assigneeIds)
 		})
 	}
@@ -115,16 +109,20 @@ func replaceActorAssigneesForEditable(apiClient *api.Client, repo ghrepo.Interfa
 
 func replaceIssueFields(httpClient *http.Client, repo ghrepo.Interface, id string, isPR bool, options Editable) error {
 	apiClient := api.NewClientFromHTTP(httpClient)
-	assigneeIds, err := options.AssigneeIds(apiClient, repo)
-	if err != nil {
-		return err
-	}
 
 	projectIds, err := options.ProjectIds()
 	if err != nil {
 		return err
 	}
 
+	var assigneeIds *[]string
+	if !options.Assignees.ActorAssignees {
+		assigneeIds, err = options.AssigneeIds(apiClient, repo)
+		if err != nil {
+			return err
+		}
+	}
+
 	milestoneId, err := options.MilestoneId()
 	if err != nil {
 		return err