tas/Codewalkers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Conflict agent auto-dismiss fails on page load/remount

Browse Source 
prevStateRef was initialized with current state, so when the page loaded
with an already-idle conflict agent, the transition guard was immediately
false and dismiss() never fired. Initialize with null instead.
This commit is contained in:
Lukas May
2026-03-06 14:13:42 +01:00
parent 0f1c578269
commit 30b27f8b4a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/src/components/review/ConflictResolutionPanel.tsx
View File

@@ -13,7 +13,7 @@ interface ConflictResolutionPanelProps {
export function ConflictResolutionPanel({ initiativeId, conflicts, onResolved }: ConflictResolutionPanelProps) { export function ConflictResolutionPanel({ initiativeId, conflicts, onResolved }: ConflictResolutionPanelProps) {
const { state, agent, questions, spawn, resume, stop, dismiss } = useConflictAgent(initiativeId); const { state, agent, questions, spawn, resume, stop, dismiss } = useConflictAgent(initiativeId);
const [showManual, setShowManual] = useState(false); const [showManual, setShowManual] = useState(false);
const prevStateRef = useRef(state); const prevStateRef = useRef<string | null>(null);
// Auto-dismiss and re-check mergeability when conflict agent completes // Auto-dismiss and re-check mergeability when conflict agent completes
useEffect(() => { useEffect(() => {