From 8d28cf47818d6a4414a4d3519516027e0c5ac678 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Wed, 1 Jul 2026 11:51:38 +0200
Subject: [PATCH] Fix "Add Attestation" in focus view

---
 webviews/activityBarView/index.css | 10 ++++++----
 webviews/components/comment.tsx    | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/webviews/activityBarView/index.css b/webviews/activityBarView/index.css
index 7bea2ede9d..94330d9f20 100644
--- a/webviews/activityBarView/index.css
+++ b/webviews/activityBarView/index.css
@@ -242,10 +242,12 @@ button .icon svg {
 	align-items: center;
 }
 
-.attestation-checkbox-overlay {
-	position: absolute;
-	right: calc(50% + 130px + 8px);
-	margin-right: 0;
+.attestation-checkbox-row {
+	margin-top: 6px;
+	margin-right: auto;
+	margin-left: auto;
+	margin-bottom: 12px;
+	width: fit-content;
 }
 
 .dropdown-container {
diff --git a/webviews/components/comment.tsx b/webviews/components/comment.tsx
index 8482a70427..0c2d6583c3 100644
--- a/webviews/components/comment.tsx
+++ b/webviews/components/comment.tsx
@@ -790,20 +790,20 @@ export const AddCommentSimple = (pr: PullRequest) => {
 					{cloudUploadIcon}
 				</button>
 			</div>
+			{showAttestationCheckbox ? (
+				<div className="attestation-checkbox-wrapper checkbox-wrapper attestation-checkbox-row" title="Add a signed attestation commit to the head of the pull request branch when approving.">
+					<input
+						id="attestation-checkbox-simple"
+						type="checkbox"
+						name="add-attestation"
+						checked={addAttestation}
+						disabled={isBusy || pr.busy}
+						onChange={(e) => setAddAttestation(e.currentTarget.checked)}
+					/>
+					<label htmlFor="attestation-checkbox-simple" className="attestation-checkbox-label">Add attestation</label>
+				</div>
+			) : null}
 			<div className='comment-button'>
-				{showAttestationCheckbox ? (
-					<div className="attestation-checkbox-wrapper checkbox-wrapper attestation-checkbox-overlay" title="Add a signed attestation commit to the head of the pull request branch when approving.">
-						<input
-							id="attestation-checkbox-simple"
-							type="checkbox"
-							name="add-attestation"
-							checked={addAttestation}
-							disabled={isBusy || pr.busy}
-							onChange={(e) => setAddAttestation(e.currentTarget.checked)}
-						/>
-						<label htmlFor="attestation-checkbox-simple" className="attestation-checkbox-label">Add attestation</label>
-					</div>
-				) : null}
 				<ContextDropdown
 					optionsContext={() => makeCommentMenuContext(pr.owner, pr.repo, pr.number, availableActions, pr.pendingCommentText, shouldDisableNonApproveButtons)}
 					defaultAction={defaultSubmitAction}