Skip to content

fix(tasks): keep conversation modal closable #2693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janburzinski wants to merge 3 commits into
base: main
Choose a base branch
from
+4 −2
Open

fix(tasks): keep conversation modal closable #2693

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd2df0d
fix(tasks): keep conversation modal closable
janburzinski Jun 26, 2026
26e3452
fix(tasks): remove conversation cancel button
janburzinski Jun 26, 2026
88f6f4e
fix(tasks): ignore dismissed conversation create
janburzinski Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions apps/emdash-desktop/src/renderer/features/tasks/conversations/create-conversation-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useTaskSettings } from '@renderer/features/tasks/hooks/useTaskSettings'
import { conversationRegistry } from '@renderer/features/tasks/stores/conversation-registry';
import { AgentSelector } from '@renderer/lib/components/agent-selector/agent-selector';
import { type BaseModalProps } from '@renderer/lib/modal/modal-provider';
import { useCloseGuard } from '@renderer/lib/modal/use-close-guard';
import { modalStore } from '@renderer/lib/modal/modal-store';
import { useAgents } from '@renderer/lib/stores/use-agents';
import { ConfirmButton } from '@renderer/lib/ui/confirm-button';
import {
Expand Down Expand Up @@ -43,7 +43,6 @@ export const CreateConversationModal = observer(function CreateConversationModal
const [error, setError] = useState<string | null>(null);
const [autoApproveOverride, setAutoApproveOverride] = useState<boolean | null>(null);
const [selectedModel, setSelectedModel] = useState<string | null>(null);
useCloseGuard(isSubmitting);

const { data: agents } = useAgents();
const modelsCapability = agents?.find((a) => a.id === providerId)?.capabilities.models;
Expand Down Expand Up @@ -83,9 +82,11 @@ export const CreateConversationModal = observer(function CreateConversationModal
title,
model: selectedModel ?? undefined,
});
if (modalStore.activeModalArgs?.onSuccess !== onSuccess) return;
Comment thread
janburzinski marked this conversation as resolved.
setIsSubmitting(false);
onSuccess({ conversationId: id });
} catch {
if (modalStore.activeModalArgs?.onSuccess !== onSuccess) return;
setError('Failed to create conversation');
setIsSubmitting(false);
}
Expand Down Expand Up @@ -160,6 +161,7 @@ export const CreateConversationModal = observer(function CreateConversationModal
</DialogContentArea>
<DialogFooter>
<ConfirmButton
type="button"
onClick={() => void handleCreateConversation()}
Comment thread
janburzinski marked this conversation as resolved.
disabled={createDisabled || isSubmitting}
>
Expand Down
Loading