fix: show branch-merged dialog only once, respect cancel - #1016
Open
ittaiz wants to merge 1 commit into
Open
Conversation
Add a module-level Set (shownMergeDialogTasks) shared between App.tsx and useTaskBranchStatus. Both the push-event path and the 15-second polling path check the Set before showing the dialog and mark the task immediately on first show. Cancelling now suppresses the dialog for the rest of the session — re-mounts and duplicate events are silently ignored.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The "branch merged — complete the task?" confirm dialog could appear multiple times for the same task: both the
branchMergedpush event (App.tsx) and the 15-second polling loop (useTaskBranchStatus) could trigger it independently, and the per-hookuseRefguard reset on every re-mount. Clicking Cancel didn't stop it from asking again.Fix
A module-level
Set(shownMergeDialogTasks) shared betweenApp.tsxanduseTaskBranchStatusdeduplicates across both paths. The task is marked before the dialog is shown, so cancelling suppresses the dialog for the rest of the session — re-mounts and duplicate events are silently ignored.Tests
Added App.test.tsx cases: dialog shows on first
rpc:branchMergedevent, is suppressed on a duplicate event, and stays suppressed after the user cancels.bun run lintandbun run testpass (1952 tests).🤖 Generated with Claude Code