diff --git a/src/renderer/utils/api/graphql/discussion.graphql b/src/renderer/utils/api/graphql/discussion.graphql
index cafa06621..63a70304d 100644
--- a/src/renderer/utils/api/graphql/discussion.graphql
+++ b/src/renderer/utils/api/graphql/discussion.graphql
@@ -9,26 +9,30 @@ query FetchDiscussionByNumber(
 ) {
   repository(owner: $owner, name: $name) {
     discussion(number: $number) {
-      __typename
-      number
-      title
-      stateReason
-      isAnswered @include(if: $includeIsAnswered)
-      url
-      author {
-        ...AuthorFields
-      }
-      comments(last: $lastComments) {
-        totalCount
-        nodes {
-          ...DiscussionCommentFields
-        }
-      }
-      labels(first: $firstLabels) {
-        nodes {
-          name
-        }
-      }
+      ...DiscussionDetails
+    }
+  }
+}
+
+fragment DiscussionDetails on Discussion {
+  __typename
+  number
+  title
+  stateReason
+  isAnswered @include(if: $includeIsAnswered)
+  url
+  author {
+    ...AuthorFields
+  }
+  comments(last: $lastComments) {
+    totalCount
+    nodes {
+      ...DiscussionCommentFields
+    }
+  }
+  labels(first: $firstLabels) {
+    nodes {
+      name
     }
   }
 }
diff --git a/src/renderer/utils/api/graphql/generated/gql.ts b/src/renderer/utils/api/graphql/generated/gql.ts
index e0b799c7e..9fbfe2750 100644
--- a/src/renderer/utils/api/graphql/generated/gql.ts
+++ b/src/renderer/utils/api/graphql/generated/gql.ts
@@ -16,15 +16,15 @@ import * as types from './graphql';
  */
 type Documents = {
     "fragment AuthorFields on Actor {\n  login\n  html_url: url\n  avatar_url: avatarUrl\n  type: __typename\n}\n\nfragment MilestoneFields on Milestone {\n  state\n  title\n}": typeof types.AuthorFieldsFragmentDoc,
-    "query FetchDiscussionByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $lastReplies: Int, $firstLabels: Int, $includeIsAnswered: Boolean!) {\n  repository(owner: $owner, name: $name) {\n    discussion(number: $number) {\n      __typename\n      number\n      title\n      stateReason\n      isAnswered @include(if: $includeIsAnswered)\n      url\n      author {\n        ...AuthorFields\n      }\n      comments(last: $lastComments) {\n        totalCount\n        nodes {\n          ...DiscussionCommentFields\n        }\n      }\n      labels(first: $firstLabels) {\n        nodes {\n          name\n        }\n      }\n    }\n  }\n}\n\nfragment CommentFields on DiscussionComment {\n  databaseId\n  createdAt\n  author {\n    ...AuthorFields\n  }\n  url\n}\n\nfragment DiscussionCommentFields on DiscussionComment {\n  ...CommentFields\n  replies(last: $lastReplies) {\n    totalCount\n    nodes {\n      ...CommentFields\n    }\n  }\n}": typeof types.FetchDiscussionByNumberDocument,
-    "query FetchIssueByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $firstLabels: Int) {\n  repository(owner: $owner, name: $name) {\n    issue(number: $number) {\n      __typename\n      number\n      title\n      url\n      state\n      stateReason\n      milestone {\n        ...MilestoneFields\n      }\n      author {\n        ...AuthorFields\n      }\n      comments(last: $lastComments) {\n        totalCount\n        nodes {\n          url\n          author {\n            ...AuthorFields\n          }\n        }\n      }\n      labels(first: $firstLabels) {\n        nodes {\n          name\n        }\n      }\n    }\n  }\n}": typeof types.FetchIssueByNumberDocument,
-    "query FetchPullRequestByNumber($owner: String!, $name: String!, $number: Int!, $firstLabels: Int, $lastComments: Int, $lastReviews: Int, $firstClosingIssues: Int) {\n  repository(owner: $owner, name: $name) {\n    pullRequest(number: $number) {\n      __typename\n      number\n      title\n      url\n      state\n      merged\n      isDraft\n      isInMergeQueue\n      milestone {\n        ...MilestoneFields\n      }\n      author {\n        ...AuthorFields\n      }\n      comments(last: $lastComments) {\n        totalCount\n        nodes {\n          url\n          author {\n            ...AuthorFields\n          }\n        }\n      }\n      reviews(last: $lastReviews) {\n        totalCount\n        nodes {\n          ...PullRequestReviewFields\n        }\n      }\n      labels(first: $firstLabels) {\n        nodes {\n          name\n        }\n      }\n      closingIssuesReferences(first: $firstClosingIssues) {\n        nodes {\n          number\n        }\n      }\n    }\n  }\n}\n\nfragment PullRequestReviewFields on PullRequestReview {\n  state\n  author {\n    login\n  }\n}": typeof types.FetchPullRequestByNumberDocument,
+    "query FetchDiscussionByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $lastReplies: Int, $firstLabels: Int, $includeIsAnswered: Boolean!) {\n  repository(owner: $owner, name: $name) {\n    discussion(number: $number) {\n      ...DiscussionDetails\n    }\n  }\n}\n\nfragment DiscussionDetails on Discussion {\n  __typename\n  number\n  title\n  stateReason\n  isAnswered @include(if: $includeIsAnswered)\n  url\n  author {\n    ...AuthorFields\n  }\n  comments(last: $lastComments) {\n    totalCount\n    nodes {\n      ...DiscussionCommentFields\n    }\n  }\n  labels(first: $firstLabels) {\n    nodes {\n      name\n    }\n  }\n}\n\nfragment CommentFields on DiscussionComment {\n  databaseId\n  createdAt\n  author {\n    ...AuthorFields\n  }\n  url\n}\n\nfragment DiscussionCommentFields on DiscussionComment {\n  ...CommentFields\n  replies(last: $lastReplies) {\n    totalCount\n    nodes {\n      ...CommentFields\n    }\n  }\n}": typeof types.FetchDiscussionByNumberDocument,
+    "query FetchIssueByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $firstLabels: Int) {\n  repository(owner: $owner, name: $name) {\n    issue(number: $number) {\n      ...IssueDetails\n    }\n  }\n}\n\nfragment IssueDetails on Issue {\n  __typename\n  number\n  title\n  url\n  state\n  stateReason\n  milestone {\n    ...MilestoneFields\n  }\n  author {\n    ...AuthorFields\n  }\n  comments(last: $lastComments) {\n    totalCount\n    nodes {\n      url\n      author {\n        ...AuthorFields\n      }\n    }\n  }\n  labels(first: $firstLabels) {\n    nodes {\n      name\n    }\n  }\n}": typeof types.FetchIssueByNumberDocument,
+    "query FetchPullRequestByNumber($owner: String!, $name: String!, $number: Int!, $firstLabels: Int, $lastComments: Int, $lastReviews: Int, $firstClosingIssues: Int) {\n  repository(owner: $owner, name: $name) {\n    pullRequest(number: $number) {\n      ...PullRequestDetails\n    }\n  }\n}\n\nfragment PullRequestDetails on PullRequest {\n  __typename\n  number\n  title\n  url\n  state\n  merged\n  isDraft\n  isInMergeQueue\n  milestone {\n    ...MilestoneFields\n  }\n  author {\n    ...AuthorFields\n  }\n  comments(last: $lastComments) {\n    totalCount\n    nodes {\n      url\n      author {\n        ...AuthorFields\n      }\n    }\n  }\n  reviews(last: $lastReviews) {\n    totalCount\n    nodes {\n      ...PullRequestReviewFields\n    }\n  }\n  labels(first: $firstLabels) {\n    nodes {\n      name\n    }\n  }\n  closingIssuesReferences(first: $firstClosingIssues) {\n    nodes {\n      number\n    }\n  }\n}\n\nfragment PullRequestReviewFields on PullRequestReview {\n  state\n  author {\n    login\n  }\n}": typeof types.FetchPullRequestByNumberDocument,
 };
 const documents: Documents = {
     "fragment AuthorFields on Actor {\n  login\n  html_url: url\n  avatar_url: avatarUrl\n  type: __typename\n}\n\nfragment MilestoneFields on Milestone {\n  state\n  title\n}": types.AuthorFieldsFragmentDoc,
-    "query FetchDiscussionByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $lastReplies: Int, $firstLabels: Int, $includeIsAnswered: Boolean!) {\n  repository(owner: $owner, name: $name) {\n    discussion(number: $number) {\n      __typename\n      number\n      title\n      stateReason\n      isAnswered @include(if: $includeIsAnswered)\n      url\n      author {\n        ...AuthorFields\n      }\n      comments(last: $lastComments) {\n        totalCount\n        nodes {\n          ...DiscussionCommentFields\n        }\n      }\n      labels(first: $firstLabels) {\n        nodes {\n          name\n        }\n      }\n    }\n  }\n}\n\nfragment CommentFields on DiscussionComment {\n  databaseId\n  createdAt\n  author {\n    ...AuthorFields\n  }\n  url\n}\n\nfragment DiscussionCommentFields on DiscussionComment {\n  ...CommentFields\n  replies(last: $lastReplies) {\n    totalCount\n    nodes {\n      ...CommentFields\n    }\n  }\n}": types.FetchDiscussionByNumberDocument,
-    "query FetchIssueByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $firstLabels: Int) {\n  repository(owner: $owner, name: $name) {\n    issue(number: $number) {\n      __typename\n      number\n      title\n      url\n      state\n      stateReason\n      milestone {\n        ...MilestoneFields\n      }\n      author {\n        ...AuthorFields\n      }\n      comments(last: $lastComments) {\n        totalCount\n        nodes {\n          url\n          author {\n            ...AuthorFields\n          }\n        }\n      }\n      labels(first: $firstLabels) {\n        nodes {\n          name\n        }\n      }\n    }\n  }\n}": types.FetchIssueByNumberDocument,
-    "query FetchPullRequestByNumber($owner: String!, $name: String!, $number: Int!, $firstLabels: Int, $lastComments: Int, $lastReviews: Int, $firstClosingIssues: Int) {\n  repository(owner: $owner, name: $name) {\n    pullRequest(number: $number) {\n      __typename\n      number\n      title\n      url\n      state\n      merged\n      isDraft\n      isInMergeQueue\n      milestone {\n        ...MilestoneFields\n      }\n      author {\n        ...AuthorFields\n      }\n      comments(last: $lastComments) {\n        totalCount\n        nodes {\n          url\n          author {\n            ...AuthorFields\n          }\n        }\n      }\n      reviews(last: $lastReviews) {\n        totalCount\n        nodes {\n          ...PullRequestReviewFields\n        }\n      }\n      labels(first: $firstLabels) {\n        nodes {\n          name\n        }\n      }\n      closingIssuesReferences(first: $firstClosingIssues) {\n        nodes {\n          number\n        }\n      }\n    }\n  }\n}\n\nfragment PullRequestReviewFields on PullRequestReview {\n  state\n  author {\n    login\n  }\n}": types.FetchPullRequestByNumberDocument,
+    "query FetchDiscussionByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $lastReplies: Int, $firstLabels: Int, $includeIsAnswered: Boolean!) {\n  repository(owner: $owner, name: $name) {\n    discussion(number: $number) {\n      ...DiscussionDetails\n    }\n  }\n}\n\nfragment DiscussionDetails on Discussion {\n  __typename\n  number\n  title\n  stateReason\n  isAnswered @include(if: $includeIsAnswered)\n  url\n  author {\n    ...AuthorFields\n  }\n  comments(last: $lastComments) {\n    totalCount\n    nodes {\n      ...DiscussionCommentFields\n    }\n  }\n  labels(first: $firstLabels) {\n    nodes {\n      name\n    }\n  }\n}\n\nfragment CommentFields on DiscussionComment {\n  databaseId\n  createdAt\n  author {\n    ...AuthorFields\n  }\n  url\n}\n\nfragment DiscussionCommentFields on DiscussionComment {\n  ...CommentFields\n  replies(last: $lastReplies) {\n    totalCount\n    nodes {\n      ...CommentFields\n    }\n  }\n}": types.FetchDiscussionByNumberDocument,
+    "query FetchIssueByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $firstLabels: Int) {\n  repository(owner: $owner, name: $name) {\n    issue(number: $number) {\n      ...IssueDetails\n    }\n  }\n}\n\nfragment IssueDetails on Issue {\n  __typename\n  number\n  title\n  url\n  state\n  stateReason\n  milestone {\n    ...MilestoneFields\n  }\n  author {\n    ...AuthorFields\n  }\n  comments(last: $lastComments) {\n    totalCount\n    nodes {\n      url\n      author {\n        ...AuthorFields\n      }\n    }\n  }\n  labels(first: $firstLabels) {\n    nodes {\n      name\n    }\n  }\n}": types.FetchIssueByNumberDocument,
+    "query FetchPullRequestByNumber($owner: String!, $name: String!, $number: Int!, $firstLabels: Int, $lastComments: Int, $lastReviews: Int, $firstClosingIssues: Int) {\n  repository(owner: $owner, name: $name) {\n    pullRequest(number: $number) {\n      ...PullRequestDetails\n    }\n  }\n}\n\nfragment PullRequestDetails on PullRequest {\n  __typename\n  number\n  title\n  url\n  state\n  merged\n  isDraft\n  isInMergeQueue\n  milestone {\n    ...MilestoneFields\n  }\n  author {\n    ...AuthorFields\n  }\n  comments(last: $lastComments) {\n    totalCount\n    nodes {\n      url\n      author {\n        ...AuthorFields\n      }\n    }\n  }\n  reviews(last: $lastReviews) {\n    totalCount\n    nodes {\n      ...PullRequestReviewFields\n    }\n  }\n  labels(first: $firstLabels) {\n    nodes {\n      name\n    }\n  }\n  closingIssuesReferences(first: $firstClosingIssues) {\n    nodes {\n      number\n    }\n  }\n}\n\nfragment PullRequestReviewFields on PullRequestReview {\n  state\n  author {\n    login\n  }\n}": types.FetchPullRequestByNumberDocument,
 };
 
 /**
@@ -34,15 +34,15 @@ export function graphql(source: "fragment AuthorFields on Actor {\n  login\n  ht
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "query FetchDiscussionByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $lastReplies: Int, $firstLabels: Int, $includeIsAnswered: Boolean!) {\n  repository(owner: $owner, name: $name) {\n    discussion(number: $number) {\n      __typename\n      number\n      title\n      stateReason\n      isAnswered @include(if: $includeIsAnswered)\n      url\n      author {\n        ...AuthorFields\n      }\n      comments(last: $lastComments) {\n        totalCount\n        nodes {\n          ...DiscussionCommentFields\n        }\n      }\n      labels(first: $firstLabels) {\n        nodes {\n          name\n        }\n      }\n    }\n  }\n}\n\nfragment CommentFields on DiscussionComment {\n  databaseId\n  createdAt\n  author {\n    ...AuthorFields\n  }\n  url\n}\n\nfragment DiscussionCommentFields on DiscussionComment {\n  ...CommentFields\n  replies(last: $lastReplies) {\n    totalCount\n    nodes {\n      ...CommentFields\n    }\n  }\n}"): typeof import('./graphql').FetchDiscussionByNumberDocument;
+export function graphql(source: "query FetchDiscussionByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $lastReplies: Int, $firstLabels: Int, $includeIsAnswered: Boolean!) {\n  repository(owner: $owner, name: $name) {\n    discussion(number: $number) {\n      ...DiscussionDetails\n    }\n  }\n}\n\nfragment DiscussionDetails on Discussion {\n  __typename\n  number\n  title\n  stateReason\n  isAnswered @include(if: $includeIsAnswered)\n  url\n  author {\n    ...AuthorFields\n  }\n  comments(last: $lastComments) {\n    totalCount\n    nodes {\n      ...DiscussionCommentFields\n    }\n  }\n  labels(first: $firstLabels) {\n    nodes {\n      name\n    }\n  }\n}\n\nfragment CommentFields on DiscussionComment {\n  databaseId\n  createdAt\n  author {\n    ...AuthorFields\n  }\n  url\n}\n\nfragment DiscussionCommentFields on DiscussionComment {\n  ...CommentFields\n  replies(last: $lastReplies) {\n    totalCount\n    nodes {\n      ...CommentFields\n    }\n  }\n}"): typeof import('./graphql').FetchDiscussionByNumberDocument;
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "query FetchIssueByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $firstLabels: Int) {\n  repository(owner: $owner, name: $name) {\n    issue(number: $number) {\n      __typename\n      number\n      title\n      url\n      state\n      stateReason\n      milestone {\n        ...MilestoneFields\n      }\n      author {\n        ...AuthorFields\n      }\n      comments(last: $lastComments) {\n        totalCount\n        nodes {\n          url\n          author {\n            ...AuthorFields\n          }\n        }\n      }\n      labels(first: $firstLabels) {\n        nodes {\n          name\n        }\n      }\n    }\n  }\n}"): typeof import('./graphql').FetchIssueByNumberDocument;
+export function graphql(source: "query FetchIssueByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $firstLabels: Int) {\n  repository(owner: $owner, name: $name) {\n    issue(number: $number) {\n      ...IssueDetails\n    }\n  }\n}\n\nfragment IssueDetails on Issue {\n  __typename\n  number\n  title\n  url\n  state\n  stateReason\n  milestone {\n    ...MilestoneFields\n  }\n  author {\n    ...AuthorFields\n  }\n  comments(last: $lastComments) {\n    totalCount\n    nodes {\n      url\n      author {\n        ...AuthorFields\n      }\n    }\n  }\n  labels(first: $firstLabels) {\n    nodes {\n      name\n    }\n  }\n}"): typeof import('./graphql').FetchIssueByNumberDocument;
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "query FetchPullRequestByNumber($owner: String!, $name: String!, $number: Int!, $firstLabels: Int, $lastComments: Int, $lastReviews: Int, $firstClosingIssues: Int) {\n  repository(owner: $owner, name: $name) {\n    pullRequest(number: $number) {\n      __typename\n      number\n      title\n      url\n      state\n      merged\n      isDraft\n      isInMergeQueue\n      milestone {\n        ...MilestoneFields\n      }\n      author {\n        ...AuthorFields\n      }\n      comments(last: $lastComments) {\n        totalCount\n        nodes {\n          url\n          author {\n            ...AuthorFields\n          }\n        }\n      }\n      reviews(last: $lastReviews) {\n        totalCount\n        nodes {\n          ...PullRequestReviewFields\n        }\n      }\n      labels(first: $firstLabels) {\n        nodes {\n          name\n        }\n      }\n      closingIssuesReferences(first: $firstClosingIssues) {\n        nodes {\n          number\n        }\n      }\n    }\n  }\n}\n\nfragment PullRequestReviewFields on PullRequestReview {\n  state\n  author {\n    login\n  }\n}"): typeof import('./graphql').FetchPullRequestByNumberDocument;
+export function graphql(source: "query FetchPullRequestByNumber($owner: String!, $name: String!, $number: Int!, $firstLabels: Int, $lastComments: Int, $lastReviews: Int, $firstClosingIssues: Int) {\n  repository(owner: $owner, name: $name) {\n    pullRequest(number: $number) {\n      ...PullRequestDetails\n    }\n  }\n}\n\nfragment PullRequestDetails on PullRequest {\n  __typename\n  number\n  title\n  url\n  state\n  merged\n  isDraft\n  isInMergeQueue\n  milestone {\n    ...MilestoneFields\n  }\n  author {\n    ...AuthorFields\n  }\n  comments(last: $lastComments) {\n    totalCount\n    nodes {\n      url\n      author {\n        ...AuthorFields\n      }\n    }\n  }\n  reviews(last: $lastReviews) {\n    totalCount\n    nodes {\n      ...PullRequestReviewFields\n    }\n  }\n  labels(first: $firstLabels) {\n    nodes {\n      name\n    }\n  }\n  closingIssuesReferences(first: $firstClosingIssues) {\n    nodes {\n      number\n    }\n  }\n}\n\nfragment PullRequestReviewFields on PullRequestReview {\n  state\n  author {\n    login\n  }\n}"): typeof import('./graphql').FetchPullRequestByNumberDocument;
 
 
 export function graphql(source: string) {
diff --git a/src/renderer/utils/api/graphql/generated/graphql.ts b/src/renderer/utils/api/graphql/generated/graphql.ts
index 7509dba6b..180658259 100644
--- a/src/renderer/utils/api/graphql/generated/graphql.ts
+++ b/src/renderer/utils/api/graphql/generated/graphql.ts
@@ -35945,6 +35945,26 @@ export type FetchDiscussionByNumberQuery = { __typename?: 'Query', repository?:
             | { __typename?: 'User', login: string, html_url: any, avatar_url: any, type: 'User' }
            | null } | null> | null }, labels?: { __typename?: 'LabelConnection', nodes?: Array<{ __typename?: 'Label', name: string } | null> | null } | null } | null } | null };
 
+export type DiscussionDetailsFragment = { __typename: 'Discussion', number: number, title: string, stateReason?: DiscussionStateReason | null, isAnswered?: boolean | null, url: any, author?:
+    | { __typename?: 'Bot', login: string, html_url: any, avatar_url: any, type: 'Bot' }
+    | { __typename?: 'EnterpriseUserAccount', login: string, html_url: any, avatar_url: any, type: 'EnterpriseUserAccount' }
+    | { __typename?: 'Mannequin', login: string, html_url: any, avatar_url: any, type: 'Mannequin' }
+    | { __typename?: 'Organization', login: string, html_url: any, avatar_url: any, type: 'Organization' }
+    | { __typename?: 'User', login: string, html_url: any, avatar_url: any, type: 'User' }
+   | null, comments: { __typename?: 'DiscussionCommentConnection', totalCount: number, nodes?: Array<{ __typename?: 'DiscussionComment', databaseId?: number | null, createdAt: any, url: any, replies: { __typename?: 'DiscussionCommentConnection', totalCount: number, nodes?: Array<{ __typename?: 'DiscussionComment', databaseId?: number | null, createdAt: any, url: any, author?:
+            | { __typename?: 'Bot', login: string, html_url: any, avatar_url: any, type: 'Bot' }
+            | { __typename?: 'EnterpriseUserAccount', login: string, html_url: any, avatar_url: any, type: 'EnterpriseUserAccount' }
+            | { __typename?: 'Mannequin', login: string, html_url: any, avatar_url: any, type: 'Mannequin' }
+            | { __typename?: 'Organization', login: string, html_url: any, avatar_url: any, type: 'Organization' }
+            | { __typename?: 'User', login: string, html_url: any, avatar_url: any, type: 'User' }
+           | null } | null> | null }, author?:
+        | { __typename?: 'Bot', login: string, html_url: any, avatar_url: any, type: 'Bot' }
+        | { __typename?: 'EnterpriseUserAccount', login: string, html_url: any, avatar_url: any, type: 'EnterpriseUserAccount' }
+        | { __typename?: 'Mannequin', login: string, html_url: any, avatar_url: any, type: 'Mannequin' }
+        | { __typename?: 'Organization', login: string, html_url: any, avatar_url: any, type: 'Organization' }
+        | { __typename?: 'User', login: string, html_url: any, avatar_url: any, type: 'User' }
+       | null } | null> | null }, labels?: { __typename?: 'LabelConnection', nodes?: Array<{ __typename?: 'Label', name: string } | null> | null } | null };
+
 export type CommentFieldsFragment = { __typename?: 'DiscussionComment', databaseId?: number | null, createdAt: any, url: any, author?:
     | { __typename?: 'Bot', login: string, html_url: any, avatar_url: any, type: 'Bot' }
     | { __typename?: 'EnterpriseUserAccount', login: string, html_url: any, avatar_url: any, type: 'EnterpriseUserAccount' }
@@ -35990,6 +36010,20 @@ export type FetchIssueByNumberQuery = { __typename?: 'Query', repository?: { __t
             | { __typename?: 'User', login: string, html_url: any, avatar_url: any, type: 'User' }
            | null } | null> | null }, labels?: { __typename?: 'LabelConnection', nodes?: Array<{ __typename?: 'Label', name: string } | null> | null } | null } | null } | null };
 
+export type IssueDetailsFragment = { __typename: 'Issue', number: number, title: string, url: any, state: IssueState, stateReason?: IssueStateReason | null, milestone?: { __typename?: 'Milestone', state: MilestoneState, title: string } | null, author?:
+    | { __typename?: 'Bot', login: string, html_url: any, avatar_url: any, type: 'Bot' }
+    | { __typename?: 'EnterpriseUserAccount', login: string, html_url: any, avatar_url: any, type: 'EnterpriseUserAccount' }
+    | { __typename?: 'Mannequin', login: string, html_url: any, avatar_url: any, type: 'Mannequin' }
+    | { __typename?: 'Organization', login: string, html_url: any, avatar_url: any, type: 'Organization' }
+    | { __typename?: 'User', login: string, html_url: any, avatar_url: any, type: 'User' }
+   | null, comments: { __typename?: 'IssueCommentConnection', totalCount: number, nodes?: Array<{ __typename?: 'IssueComment', url: any, author?:
+        | { __typename?: 'Bot', login: string, html_url: any, avatar_url: any, type: 'Bot' }
+        | { __typename?: 'EnterpriseUserAccount', login: string, html_url: any, avatar_url: any, type: 'EnterpriseUserAccount' }
+        | { __typename?: 'Mannequin', login: string, html_url: any, avatar_url: any, type: 'Mannequin' }
+        | { __typename?: 'Organization', login: string, html_url: any, avatar_url: any, type: 'Organization' }
+        | { __typename?: 'User', login: string, html_url: any, avatar_url: any, type: 'User' }
+       | null } | null> | null }, labels?: { __typename?: 'LabelConnection', nodes?: Array<{ __typename?: 'Label', name: string } | null> | null } | null };
+
 export type FetchPullRequestByNumberQueryVariables = Exact<{
   owner: Scalars['String']['input'];
   name: Scalars['String']['input'];
@@ -36021,6 +36055,26 @@ export type FetchPullRequestByNumberQuery = { __typename?: 'Query', repository?:
             | { __typename?: 'User', login: string }
            | null } | null> | null } | null, labels?: { __typename?: 'LabelConnection', nodes?: Array<{ __typename?: 'Label', name: string } | null> | null } | null, closingIssuesReferences?: { __typename?: 'IssueConnection', nodes?: Array<{ __typename?: 'Issue', number: number } | null> | null } | null } | null } | null };
 
+export type PullRequestDetailsFragment = { __typename: 'PullRequest', number: number, title: string, url: any, state: PullRequestState, merged: boolean, isDraft: boolean, isInMergeQueue: boolean, milestone?: { __typename?: 'Milestone', state: MilestoneState, title: string } | null, author?:
+    | { __typename?: 'Bot', login: string, html_url: any, avatar_url: any, type: 'Bot' }
+    | { __typename?: 'EnterpriseUserAccount', login: string, html_url: any, avatar_url: any, type: 'EnterpriseUserAccount' }
+    | { __typename?: 'Mannequin', login: string, html_url: any, avatar_url: any, type: 'Mannequin' }
+    | { __typename?: 'Organization', login: string, html_url: any, avatar_url: any, type: 'Organization' }
+    | { __typename?: 'User', login: string, html_url: any, avatar_url: any, type: 'User' }
+   | null, comments: { __typename?: 'IssueCommentConnection', totalCount: number, nodes?: Array<{ __typename?: 'IssueComment', url: any, author?:
+        | { __typename?: 'Bot', login: string, html_url: any, avatar_url: any, type: 'Bot' }
+        | { __typename?: 'EnterpriseUserAccount', login: string, html_url: any, avatar_url: any, type: 'EnterpriseUserAccount' }
+        | { __typename?: 'Mannequin', login: string, html_url: any, avatar_url: any, type: 'Mannequin' }
+        | { __typename?: 'Organization', login: string, html_url: any, avatar_url: any, type: 'Organization' }
+        | { __typename?: 'User', login: string, html_url: any, avatar_url: any, type: 'User' }
+       | null } | null> | null }, reviews?: { __typename?: 'PullRequestReviewConnection', totalCount: number, nodes?: Array<{ __typename?: 'PullRequestReview', state: PullRequestReviewState, author?:
+        | { __typename?: 'Bot', login: string }
+        | { __typename?: 'EnterpriseUserAccount', login: string }
+        | { __typename?: 'Mannequin', login: string }
+        | { __typename?: 'Organization', login: string }
+        | { __typename?: 'User', login: string }
+       | null } | null> | null } | null, labels?: { __typename?: 'LabelConnection', nodes?: Array<{ __typename?: 'Label', name: string } | null> | null } | null, closingIssuesReferences?: { __typename?: 'IssueConnection', nodes?: Array<{ __typename?: 'Issue', number: number } | null> | null } | null };
+
 export type PullRequestReviewFieldsFragment = { __typename?: 'PullRequestReview', state: PullRequestReviewState, author?:
     | { __typename?: 'Bot', login: string }
     | { __typename?: 'EnterpriseUserAccount', login: string }
@@ -36047,12 +36101,6 @@ export class TypedDocumentString<TResult, TVariables>
     return this.value;
   }
 }
-export const MilestoneFieldsFragmentDoc = new TypedDocumentString(`
-    fragment MilestoneFields on Milestone {
-  state
-  title
-}
-    `, {"fragmentName":"MilestoneFields"}) as unknown as TypedDocumentString<MilestoneFieldsFragment, unknown>;
 export const AuthorFieldsFragmentDoc = new TypedDocumentString(`
     fragment AuthorFields on Actor {
   login
@@ -36100,6 +36148,97 @@ fragment CommentFields on DiscussionComment {
   }
   url
 }`, {"fragmentName":"DiscussionCommentFields"}) as unknown as TypedDocumentString<DiscussionCommentFieldsFragment, unknown>;
+export const DiscussionDetailsFragmentDoc = new TypedDocumentString(`
+    fragment DiscussionDetails on Discussion {
+  __typename
+  number
+  title
+  stateReason
+  isAnswered @include(if: $includeIsAnswered)
+  url
+  author {
+    ...AuthorFields
+  }
+  comments(last: $lastComments) {
+    totalCount
+    nodes {
+      ...DiscussionCommentFields
+    }
+  }
+  labels(first: $firstLabels) {
+    nodes {
+      name
+    }
+  }
+}
+    fragment AuthorFields on Actor {
+  login
+  html_url: url
+  avatar_url: avatarUrl
+  type: __typename
+}
+fragment CommentFields on DiscussionComment {
+  databaseId
+  createdAt
+  author {
+    ...AuthorFields
+  }
+  url
+}
+fragment DiscussionCommentFields on DiscussionComment {
+  ...CommentFields
+  replies(last: $lastReplies) {
+    totalCount
+    nodes {
+      ...CommentFields
+    }
+  }
+}`, {"fragmentName":"DiscussionDetails"}) as unknown as TypedDocumentString<DiscussionDetailsFragment, unknown>;
+export const MilestoneFieldsFragmentDoc = new TypedDocumentString(`
+    fragment MilestoneFields on Milestone {
+  state
+  title
+}
+    `, {"fragmentName":"MilestoneFields"}) as unknown as TypedDocumentString<MilestoneFieldsFragment, unknown>;
+export const IssueDetailsFragmentDoc = new TypedDocumentString(`
+    fragment IssueDetails on Issue {
+  __typename
+  number
+  title
+  url
+  state
+  stateReason
+  milestone {
+    ...MilestoneFields
+  }
+  author {
+    ...AuthorFields
+  }
+  comments(last: $lastComments) {
+    totalCount
+    nodes {
+      url
+      author {
+        ...AuthorFields
+      }
+    }
+  }
+  labels(first: $firstLabels) {
+    nodes {
+      name
+    }
+  }
+}
+    fragment AuthorFields on Actor {
+  login
+  html_url: url
+  avatar_url: avatarUrl
+  type: __typename
+}
+fragment MilestoneFields on Milestone {
+  state
+  title
+}`, {"fragmentName":"IssueDetails"}) as unknown as TypedDocumentString<IssueDetailsFragment, unknown>;
 export const PullRequestReviewFieldsFragmentDoc = new TypedDocumentString(`
     fragment PullRequestReviewFields on PullRequestReview {
   state
@@ -36108,30 +36247,69 @@ export const PullRequestReviewFieldsFragmentDoc = new TypedDocumentString(`
   }
 }
     `, {"fragmentName":"PullRequestReviewFields"}) as unknown as TypedDocumentString<PullRequestReviewFieldsFragment, unknown>;
-export const FetchDiscussionByNumberDocument = new TypedDocumentString(`
-    query FetchDiscussionByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $lastReplies: Int, $firstLabels: Int, $includeIsAnswered: Boolean!) {
-  repository(owner: $owner, name: $name) {
-    discussion(number: $number) {
-      __typename
-      number
-      title
-      stateReason
-      isAnswered @include(if: $includeIsAnswered)
+export const PullRequestDetailsFragmentDoc = new TypedDocumentString(`
+    fragment PullRequestDetails on PullRequest {
+  __typename
+  number
+  title
+  url
+  state
+  merged
+  isDraft
+  isInMergeQueue
+  milestone {
+    ...MilestoneFields
+  }
+  author {
+    ...AuthorFields
+  }
+  comments(last: $lastComments) {
+    totalCount
+    nodes {
       url
       author {
         ...AuthorFields
       }
-      comments(last: $lastComments) {
-        totalCount
-        nodes {
-          ...DiscussionCommentFields
-        }
-      }
-      labels(first: $firstLabels) {
-        nodes {
-          name
-        }
-      }
+    }
+  }
+  reviews(last: $lastReviews) {
+    totalCount
+    nodes {
+      ...PullRequestReviewFields
+    }
+  }
+  labels(first: $firstLabels) {
+    nodes {
+      name
+    }
+  }
+  closingIssuesReferences(first: $firstClosingIssues) {
+    nodes {
+      number
+    }
+  }
+}
+    fragment AuthorFields on Actor {
+  login
+  html_url: url
+  avatar_url: avatarUrl
+  type: __typename
+}
+fragment MilestoneFields on Milestone {
+  state
+  title
+}
+fragment PullRequestReviewFields on PullRequestReview {
+  state
+  author {
+    login
+  }
+}`, {"fragmentName":"PullRequestDetails"}) as unknown as TypedDocumentString<PullRequestDetailsFragment, unknown>;
+export const FetchDiscussionByNumberDocument = new TypedDocumentString(`
+    query FetchDiscussionByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $lastReplies: Int, $firstLabels: Int, $includeIsAnswered: Boolean!) {
+  repository(owner: $owner, name: $name) {
+    discussion(number: $number) {
+      ...DiscussionDetails
     }
   }
 }
@@ -36141,6 +36319,28 @@ export const FetchDiscussionByNumberDocument = new TypedDocumentString(`
   avatar_url: avatarUrl
   type: __typename
 }
+fragment DiscussionDetails on Discussion {
+  __typename
+  number
+  title
+  stateReason
+  isAnswered @include(if: $includeIsAnswered)
+  url
+  author {
+    ...AuthorFields
+  }
+  comments(last: $lastComments) {
+    totalCount
+    nodes {
+      ...DiscussionCommentFields
+    }
+  }
+  labels(first: $firstLabels) {
+    nodes {
+      name
+    }
+  }
+}
 fragment CommentFields on DiscussionComment {
   databaseId
   createdAt
@@ -36162,32 +36362,7 @@ export const FetchIssueByNumberDocument = new TypedDocumentString(`
     query FetchIssueByNumber($owner: String!, $name: String!, $number: Int!, $lastComments: Int, $firstLabels: Int) {
   repository(owner: $owner, name: $name) {
     issue(number: $number) {
-      __typename
-      number
-      title
-      url
-      state
-      stateReason
-      milestone {
-        ...MilestoneFields
-      }
-      author {
-        ...AuthorFields
-      }
-      comments(last: $lastComments) {
-        totalCount
-        nodes {
-          url
-          author {
-            ...AuthorFields
-          }
-        }
-      }
-      labels(first: $firstLabels) {
-        nodes {
-          name
-        }
-      }
+      ...IssueDetails
     }
   }
 }
@@ -36200,50 +36375,40 @@ export const FetchIssueByNumberDocument = new TypedDocumentString(`
 fragment MilestoneFields on Milestone {
   state
   title
+}
+fragment IssueDetails on Issue {
+  __typename
+  number
+  title
+  url
+  state
+  stateReason
+  milestone {
+    ...MilestoneFields
+  }
+  author {
+    ...AuthorFields
+  }
+  comments(last: $lastComments) {
+    totalCount
+    nodes {
+      url
+      author {
+        ...AuthorFields
+      }
+    }
+  }
+  labels(first: $firstLabels) {
+    nodes {
+      name
+    }
+  }
 }`) as unknown as TypedDocumentString<FetchIssueByNumberQuery, FetchIssueByNumberQueryVariables>;
 export const FetchPullRequestByNumberDocument = new TypedDocumentString(`
     query FetchPullRequestByNumber($owner: String!, $name: String!, $number: Int!, $firstLabels: Int, $lastComments: Int, $lastReviews: Int, $firstClosingIssues: Int) {
   repository(owner: $owner, name: $name) {
     pullRequest(number: $number) {
-      __typename
-      number
-      title
-      url
-      state
-      merged
-      isDraft
-      isInMergeQueue
-      milestone {
-        ...MilestoneFields
-      }
-      author {
-        ...AuthorFields
-      }
-      comments(last: $lastComments) {
-        totalCount
-        nodes {
-          url
-          author {
-            ...AuthorFields
-          }
-        }
-      }
-      reviews(last: $lastReviews) {
-        totalCount
-        nodes {
-          ...PullRequestReviewFields
-        }
-      }
-      labels(first: $firstLabels) {
-        nodes {
-          name
-        }
-      }
-      closingIssuesReferences(first: $firstClosingIssues) {
-        nodes {
-          number
-        }
-      }
+      ...PullRequestDetails
     }
   }
 }
@@ -36257,6 +36422,47 @@ fragment MilestoneFields on Milestone {
   state
   title
 }
+fragment PullRequestDetails on PullRequest {
+  __typename
+  number
+  title
+  url
+  state
+  merged
+  isDraft
+  isInMergeQueue
+  milestone {
+    ...MilestoneFields
+  }
+  author {
+    ...AuthorFields
+  }
+  comments(last: $lastComments) {
+    totalCount
+    nodes {
+      url
+      author {
+        ...AuthorFields
+      }
+    }
+  }
+  reviews(last: $lastReviews) {
+    totalCount
+    nodes {
+      ...PullRequestReviewFields
+    }
+  }
+  labels(first: $firstLabels) {
+    nodes {
+      name
+    }
+  }
+  closingIssuesReferences(first: $firstClosingIssues) {
+    nodes {
+      number
+    }
+  }
+}
 fragment PullRequestReviewFields on PullRequestReview {
   state
   author {
diff --git a/src/renderer/utils/api/graphql/issue.graphql b/src/renderer/utils/api/graphql/issue.graphql
index 4a6cfdc72..091a6543e 100644
--- a/src/renderer/utils/api/graphql/issue.graphql
+++ b/src/renderer/utils/api/graphql/issue.graphql
@@ -7,32 +7,36 @@ query FetchIssueByNumber(
 ) {
   repository(owner: $owner, name: $name) {
     issue(number: $number) {
-      __typename
-      number
-      title
+      ...IssueDetails
+    }
+  }
+}
+
+fragment IssueDetails on Issue {
+  __typename
+  number
+  title
+  url
+  state
+  stateReason
+  milestone {
+    ...MilestoneFields
+  }
+  author {
+    ...AuthorFields
+  }
+  comments(last: $lastComments) {
+    totalCount
+    nodes {
       url
-      state
-      stateReason
-      milestone {
-        ...MilestoneFields
-      }
       author {
         ...AuthorFields
       }
-      comments(last: $lastComments) {
-        totalCount
-        nodes {
-          url
-          author {
-            ...AuthorFields
-          }
-        }
-      }
-      labels(first: $firstLabels) {
-        nodes {
-          name
-        }
-      }
+    }
+  }
+  labels(first: $firstLabels) {
+    nodes {
+      name
     }
   }
 }
diff --git a/src/renderer/utils/api/graphql/pull.graphql b/src/renderer/utils/api/graphql/pull.graphql
index 1e663911e..9d5862cb6 100644
--- a/src/renderer/utils/api/graphql/pull.graphql
+++ b/src/renderer/utils/api/graphql/pull.graphql
@@ -9,45 +9,49 @@ query FetchPullRequestByNumber(
 ) {
   repository(owner: $owner, name: $name) {
     pullRequest(number: $number) {
-      __typename
-      number
-      title
+      ...PullRequestDetails
+    }
+  }
+}
+
+fragment PullRequestDetails on PullRequest {
+  __typename
+  number
+  title
+  url
+  state
+  merged
+  isDraft
+  isInMergeQueue
+  milestone {
+    ...MilestoneFields
+  }
+  author {
+    ...AuthorFields
+  }
+  comments(last: $lastComments) {
+    totalCount
+    nodes {
       url
-      state
-      merged
-      isDraft
-      isInMergeQueue
-      milestone {
-        ...MilestoneFields
-      }
       author {
         ...AuthorFields
       }
-      comments(last: $lastComments) {
-        totalCount
-        nodes {
-          url
-          author {
-            ...AuthorFields
-          }
-        }
-      }
-      reviews(last: $lastReviews) {
-        totalCount
-        nodes {
-          ...PullRequestReviewFields
-        }
-      }
-      labels(first: $firstLabels) {
-        nodes {
-          name
-        }
-      }
-      closingIssuesReferences(first: $firstClosingIssues) {
-        nodes {
-          number
-        }
-      }
+    }
+  }
+  reviews(last: $lastReviews) {
+    totalCount
+    nodes {
+      ...PullRequestReviewFields
+    }
+  }
+  labels(first: $firstLabels) {
+    nodes {
+      name
+    }
+  }
+  closingIssuesReferences(first: $firstClosingIssues) {
+    nodes {
+      number
     }
   }
 }
diff --git a/src/renderer/utils/notifications/handlers/discussion.test.ts b/src/renderer/utils/notifications/handlers/discussion.test.ts
index 69ab51b9c..743f5373a 100644
--- a/src/renderer/utils/notifications/handlers/discussion.test.ts
+++ b/src/renderer/utils/notifications/handlers/discussion.test.ts
@@ -15,14 +15,11 @@ import {
 } from '../../../types';
 import type { Notification } from '../../../typesGitHub';
 import type {
+  DiscussionDetailsFragment,
   DiscussionStateReason,
-  FetchDiscussionByNumberQuery,
 } from '../../api/graphql/generated/graphql';
 import { discussionHandler } from './discussion';
 
-type DiscussionResponse =
-  FetchDiscussionByNumberQuery['repository']['discussion'];
-
 const mockAuthor = createPartialMockUser('discussion-author');
 const mockCommenter = createPartialMockUser('discussion-commenter');
 const mockReplier = createPartialMockUser('discussion-replier');
@@ -351,7 +348,7 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
 function mockDiscussionResponseNode(mocks: {
   stateReason?: DiscussionStateReason;
   isAnswered: boolean;
-}): DiscussionResponse {
+}): DiscussionDetailsFragment {
   return {
     __typename: 'Discussion',
     number: 123,
diff --git a/src/renderer/utils/notifications/handlers/issue.test.ts b/src/renderer/utils/notifications/handlers/issue.test.ts
index e9bb70804..af700653f 100644
--- a/src/renderer/utils/notifications/handlers/issue.test.ts
+++ b/src/renderer/utils/notifications/handlers/issue.test.ts
@@ -15,14 +15,12 @@ import {
 } from '../../../types';
 import type { Notification } from '../../../typesGitHub';
 import type {
-  FetchIssueByNumberQuery,
+  IssueDetailsFragment,
   IssueState,
   IssueStateReason,
 } from '../../api/graphql/generated/graphql';
 import { issueHandler } from './issue';
 
-type IssueResponse = FetchIssueByNumberQuery['repository']['issue'];
-
 const mockAuthor = createPartialMockUser('issue-author');
 const mockCommenter = createPartialMockUser('issue-commenter');
 
@@ -290,7 +288,7 @@ describe('renderer/utils/notifications/handlers/issue.ts', () => {
 function mockIssueResponseNode(mocks: {
   state: IssueState;
   stateReason?: IssueStateReason;
-}): IssueResponse {
+}): IssueDetailsFragment {
   return {
     __typename: 'Issue',
     number: 123,
diff --git a/src/renderer/utils/notifications/handlers/pullRequest.test.ts b/src/renderer/utils/notifications/handlers/pullRequest.test.ts
index 2670c4683..ce1485be3 100644
--- a/src/renderer/utils/notifications/handlers/pullRequest.test.ts
+++ b/src/renderer/utils/notifications/handlers/pullRequest.test.ts
@@ -15,15 +15,12 @@ import {
 } from '../../../types';
 import type { Notification } from '../../../typesGitHub';
 import type {
-  FetchPullRequestByNumberQuery,
+  PullRequestDetailsFragment,
   PullRequestReviewState,
   PullRequestState,
 } from '../../api/graphql/generated/graphql';
 import { getLatestReviewForReviewers, pullRequestHandler } from './pullRequest';
 
-type PullRequestResponse =
-  FetchPullRequestByNumberQuery['repository']['pullRequest'];
-
 const mockAuthor = createPartialMockUser('some-author');
 const mockCommenter = createPartialMockUser('some-commenter');
 
@@ -487,7 +484,7 @@ function mockPullRequestResponseNode(mocks: {
   isDraft?: boolean;
   merged?: boolean;
   isInMergeQueue?: boolean;
-}): PullRequestResponse {
+}): PullRequestDetailsFragment {
   return {
     __typename: 'PullRequest',
     number: 123,