From 7774368740282b4b1c6f5a366280f89fbd73d52d Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:18:35 +0100
Subject: [PATCH] Fix merge queue support in focus view

---
 src/github/activityBarViewProvider.ts | 6 ++++--
 src/github/pullRequestOverview.ts     | 2 +-
 webviews/components/merge.tsx         | 9 ++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/github/activityBarViewProvider.ts b/src/github/activityBarViewProvider.ts
index 1905c6821c..be1ddf19e8 100644
--- a/src/github/activityBarViewProvider.ts
+++ b/src/github/activityBarViewProvider.ts
@@ -200,10 +200,11 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				pullRequestModel.canEdit(),
 				pullRequestModel.validateDraftMode(),
 				pullRequestModel.getCoAuthors(),
-				ensureEmojis(this._folderRepositoryManager.context)
+				this._folderRepositoryManager.mergeQueueMethodForBranch(pullRequestModel.base.ref, pullRequestModel.remote.owner, pullRequestModel.remote.repositoryName),
+				ensureEmojis(this._folderRepositoryManager.context),
 			]);
 			this._updatingPromise = updatingPromise;
-			const [pullRequest, repositoryAccess, timelineEvents, requestedReviewers, branchInfo, defaultBranch, currentUser, viewerCanEdit, hasReviewDraft, coAuthors] = await updatingPromise;
+			const [pullRequest, repositoryAccess, timelineEvents, requestedReviewers, branchInfo, defaultBranch, currentUser, viewerCanEdit, hasReviewDraft, coAuthors, mergeQueueMethod] = await updatingPromise;
 
 			if (!pullRequest) {
 				throw new Error(
@@ -285,6 +286,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				events: timelineEvents,
 				mergeMethodsAvailability,
 				defaultMergeMethod,
+				mergeQueueMethod,
 				repositoryDefaultBranch: defaultBranch,
 				doneCheckoutBranch,
 				isIssue: false,
diff --git a/src/github/pullRequestOverview.ts b/src/github/pullRequestOverview.ts
index f28d93e289..bc32c492ed 100644
--- a/src/github/pullRequestOverview.ts
+++ b/src/github/pullRequestOverview.ts
@@ -356,7 +356,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				autoMerge: pullRequest.autoMerge,
 				allowAutoMerge: pullRequest.allowAutoMerge,
 				autoMergeMethod: pullRequest.autoMergeMethod,
-				mergeQueueMethod: mergeQueueMethod,
+				mergeQueueMethod,
 				mergeQueueEntry: pullRequest.mergeQueueEntry,
 				mergeCommitMeta: pullRequest.mergeCommitMeta,
 				squashCommitMeta: pullRequest.squashCommitMeta,
diff --git a/webviews/components/merge.tsx b/webviews/components/merge.tsx
index 83c735ba14..286e3c9fa0 100644
--- a/webviews/components/merge.tsx
+++ b/webviews/components/merge.tsx
@@ -427,7 +427,14 @@ export const MergeOnGitHub = () => {
 };
 
 export const MergeSimple = (pr: PullRequest) => {
-	const { merge, updatePR } = useContext(PullRequestContext);
+	const { merge, updatePR, enqueue } = useContext(PullRequestContext);
+
+	if (pr.mergeQueueMethod) {
+		return <div className='button-container'>
+			<button onClick={() => enqueue()}>Add to Merge Queue</button>
+		</div>;
+	}
+
 	async function submitAction(selected: MergeMethod): Promise<void> {
 		const newContext = await merge({
 			title: '',