From 43c00dcdaeeb11d9f40b646e937100c68a60a038 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Thu, 27 Aug 2026 18:26:11 -0700
Subject: [PATCH] fix review relink guard lifecycle

---
 .../checks-panel/use-checks-panel-review-link-actions.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-review-link-actions.tsx b/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-review-link-actions.tsx
index 1920f0c3a8c..cf0359411ba 100644
--- a/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-review-link-actions.tsx
+++ b/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-review-link-actions.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useRef } from 'react'
+import { useCallback, useLayoutEffect, useRef } from 'react'
 import type { ChecksPanelCheckAndReviewActionsInput } from './check-and-review-action-dependencies'
 
 type RefreshLinkedGitHubPullRequest = (linkedPRNumber: number) => Promise<void>
@@ -39,8 +39,10 @@ export function useChecksPanelReviewLinkActions(
   const linkedGitLabMRRef = useRef(linkedGitLabMR)
   const reviewLinkScopeKeyRef = useRef(reviewLinkScopeKey)
   const reviewLinkActionGenerationRef = useRef(0)
-  linkedGitLabMRRef.current = linkedGitLabMR
-  reviewLinkScopeKeyRef.current = reviewLinkScopeKey
+  useLayoutEffect(() => {
+    linkedGitLabMRRef.current = linkedGitLabMR
+    reviewLinkScopeKeyRef.current = reviewLinkScopeKey
+  }, [linkedGitLabMR, reviewLinkScopeKey])
 
   const handleUnlinkReview = useCallback(() => {
     if (!activeWorktreeId || !activeWorktree || !activeReview) {