@@ -553,6 +553,12 @@ export function PullRequestDetailPanel({
553553 stackPending : ! nativeStackQuery . isFresh ,
554554 stackError : nativeStackQuery . error ,
555555 } ) ;
556+ const stackOwnsMerge = supportsStackActions && nativeStack !== null ;
557+ const mergeBlockedReason = canMergeSinglePullRequest
558+ ? null
559+ : nativeStackQuery . error
560+ ? "Couldn't check stack membership"
561+ : "Checking stack membership…" ;
556562 const activityPending = activityQuery . isPending && activity === null ;
557563 const activityError = activity === null ? activityQuery . error : null ;
558564 const refreshDetail = ( ) => {
@@ -1143,9 +1149,9 @@ export function PullRequestDetailPanel({
11431149 checksState,
11441150 autoMergeEnabled : detail . autoMergeEnabled ,
11451151 hasMergeMethod : allowedMergeMethods . length > 0 ,
1146- canMerge : canMergeSinglePullRequest && can ( "merge" ) ,
1152+ canMerge : ! stackOwnsMerge && can ( "merge" ) ,
11471153 canMarkReady : can ( "ready" ) ,
1148- canEnableAutoMerge : canMergeSinglePullRequest && can ( "enable-auto-merge" ) ,
1154+ canEnableAutoMerge : ! stackOwnsMerge && can ( "enable-auto-merge" ) ,
11491155 } )
11501156 : null ;
11511157 const showsDraftToggle =
@@ -1291,6 +1297,15 @@ export function PullRequestDetailPanel({
12911297 < div className = "mr-4 flex h-7 shrink-0 select-none items-center justify-end gap-1" >
12921298 { detail ? (
12931299 < TooltipProvider delay = { 150 } closeDelay = { 150 } timeout = { 400 } >
1300+ { context === "page" ? (
1301+ < PullRequestThreadLinks
1302+ display = "count"
1303+ environmentId = { environmentId }
1304+ reference = { reference }
1305+ url = { detail . url }
1306+ threadRef = { null }
1307+ />
1308+ ) : null }
12941309 { ! nativeStack && supportsStackActions && nativeStackQuery . error ? (
12951310 < Button variant = "ghost" size = "xs" onClick = { nativeStackQuery . refresh } >
12961311 Retry stack lookup
@@ -1307,33 +1322,17 @@ export function PullRequestDetailPanel({
13071322 environmentId = { environmentId }
13081323 onSelect = { onSelectPullRequest }
13091324 mergeMethod = { selectedMergeMethod }
1310- canMerge = {
1311- nativeStackQuery . isFresh &&
1312- supportsStackActions &&
1313- can ( "merge" ) &&
1314- allowedMergeMethods . length > 0
1315- }
1316- canRebase = {
1317- nativeStackQuery . isFresh &&
1318- supportsStackActions &&
1319- detail . viewerPermissions . stackRebase === true
1320- }
1325+ stale = { ! nativeStackQuery . isFresh }
1326+ canMerge = { supportsStackActions && can ( "merge" ) && allowedMergeMethods . length > 0 }
1327+ canRebase = { supportsStackActions && detail . viewerPermissions . stackRebase === true }
13211328 onActed = { ( ) => {
13221329 refreshDetail ( ) ;
13231330 onActed ?.( ) ;
13241331 } }
13251332 />
13261333 ) : null }
1327- { context === "page" ? (
1328- < PullRequestThreadLinks
1329- display = "count"
1330- environmentId = { environmentId }
1331- reference = { reference }
1332- url = { detail . url }
1333- threadRef = { null }
1334- />
1335- ) : null }
13361334 < PullRequestPrimaryAction
1335+ mergeBlockedReason = { mergeBlockedReason }
13371336 pullRequestKey = { pullRequestKey }
13381337 primaryAction = { primaryAction }
13391338 autoMergeArmed = { autoMergeArmed }
0 commit comments