From b32b7eab3911caf9ee4a90e71d89ce7842a7d37c Mon Sep 17 00:00:00 2001
From: vishnuvv27 <vardhanvishnu520@gmail.com>
Date: Mon, 9 Feb 2026 15:31:55 +0530
Subject: [PATCH] Fix redundant API call in gh issue view --comments (#12606)

---
 .../view/fixtures/issueView_previewSingleComment.json |  8 ++++++--
 pkg/cmd/issue/view/http.go                            | 11 +++++------
 pkg/cmd/issue/view/view.go                            |  2 --
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkg/cmd/issue/view/fixtures/issueView_previewSingleComment.json b/pkg/cmd/issue/view/fixtures/issueView_previewSingleComment.json
index be099c14b1f..8959acec67d 100644
--- a/pkg/cmd/issue/view/fixtures/issueView_previewSingleComment.json
+++ b/pkg/cmd/issue/view/fixtures/issueView_previewSingleComment.json
@@ -138,10 +138,14 @@
               ]
             }
           ],
-          "totalCount": 6
+          "totalCount": 6,
+          "pageInfo": {
+            "hasNextPage": true,
+            "endCursor": "Y3Vyc29yOnYyOjg5"
+          }
         },
         "url": "https://github.com/OWNER/REPO/issues/123"
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/pkg/cmd/issue/view/http.go b/pkg/cmd/issue/view/http.go
index 4adc71802dc..2982fbbe3a2 100644
--- a/pkg/cmd/issue/view/http.go
+++ b/pkg/cmd/issue/view/http.go
@@ -20,14 +20,13 @@ func preloadIssueComments(client *http.Client, repo ghrepo.Interface, issue *api
 		} `graphql:"node(id: $id)"`
 	}
 
+	if !issue.Comments.PageInfo.HasNextPage {
+		return nil
+	}
+
 	variables := map[string]interface{}{
 		"id":        githubv4.ID(issue.ID),
-		"endCursor": (*githubv4.String)(nil),
-	}
-	if issue.Comments.PageInfo.HasNextPage {
-		variables["endCursor"] = githubv4.String(issue.Comments.PageInfo.EndCursor)
-	} else {
-		issue.Comments.Nodes = issue.Comments.Nodes[0:0]
+		"endCursor": githubv4.String(issue.Comments.PageInfo.EndCursor),
 	}
 
 	gql := api.NewClientFromHTTP(client)
diff --git a/pkg/cmd/issue/view/view.go b/pkg/cmd/issue/view/view.go
index 41c01ef40d9..e41ad6acffe 100644
--- a/pkg/cmd/issue/view/view.go
+++ b/pkg/cmd/issue/view/view.go
@@ -144,8 +144,6 @@ func viewRun(opts *ViewOptions) error {
 	}
 
 	if lookupFields.Contains("comments") {
-		// FIXME: this re-fetches the comments connection even though the initial set of 100 were
-		// fetched in the previous request.
 		err := preloadIssueComments(httpClient, baseRepo, issue)
 		if err != nil {
 			return err