Merge pull request #13737 from gitbutlerapp/mg-branch-64

Fix stuck UI after unapply failure

Author: mtsgrd

apps/desktop/src/components/branch/BranchHeaderContextMenu.svelte

@@ -342,8 +342,11 @@
 					testId={TestId.BranchHeaderContextMenu_UnapplyBranch}
 					disabled={isReadOnly}
 					onclick={async () => {
-						await stackService.unapply({ projectId, stackId });
-						close();
+						try {
+							await stackService.unapply({ projectId, stackId });
+						} finally {
+							close();
+						}
 					}}
 				/>
 			</ContextMenuSection>

apps/desktop/src/components/stack/StackDragHandle.svelte

@@ -88,13 +88,16 @@
 	async function unapplyStack() {
 		if (!stackId) return;
 
-		await stackService.unapply({
-			projectId,
-			stackId,
-		});
-
-		// Refetch to update the UI
-		await stacksQuery.result.refetch();
+		try {
+			await stackService.unapply({
+				projectId,
+				stackId,
+			});
+		} finally {
+			// Always refetch to clear stale stacks from the UI,
+			// even if the unapply failed (e.g. branch already removed).
+			await stacksQuery.result.refetch();
+		}
 	}
 </script>