test: add handling for discarding drafts during save operations

- Implemented a test to verify that discarding a draft while a save is in progress waits for the save to complete before discarding.
- Updated the `handleDraftDiscard` function to resolve the draft ID before attempting to discard, ensuring proper draft management.

Author: jzunigax2

src/components/compose-message/hooks/useDraftMessage.test.ts

@@ -244,6 +244,31 @@ describe('Draft Message', () => {
     expect(resolvedId).toBe('new-draft-1');
   });
 
+  test('When discarding while a save is in flight, then it waits for the save to resolve and discards the fresh draft id', async () => {
+    vi.spyOn(MailEncryptionService.instance, 'buildEncryptionBlock').mockResolvedValue(mockEncryptionBlock);
+
+    let resolveCreate!: (value: { id: string; receivedAt: string }) => void;
+    mocks.createDraft.mockReturnValue({
+      unwrap: () =>
+        new Promise((resolve) => {
+          resolveCreate = resolve;
+        }),
+    });
+    mocks.discardDraft.mockReturnValue({ unwrap: () => Promise.resolve(undefined) });
+
+    const { result } = renderDraft({ subject: 'Discard race', toRecipients: [recipient('bob@inxt.me')] });
+
+    await act(async () => {
+      const save = result.current.saveDraft();
+      await vi.advanceTimersByTimeAsync(0);
+      const discard = result.current.handleDraftDiscard();
+      resolveCreate({ id: 'new-draft-1', receivedAt: '2026-06-22T13:42:30Z' });
+      await Promise.all([save, discard]);
+    });
+
+    expect(mocks.discardDraft).toHaveBeenCalledWith({ draftId: 'new-draft-1' });
+  });
+
   test('When the body is edited, then autosave re-arms from the editor update event', async () => {
     vi.spyOn(MailEncryptionService.instance, 'buildEncryptionBlock').mockResolvedValue(mockEncryptionBlock);
 

src/components/compose-message/hooks/useDraftMessage.ts

@@ -165,10 +165,10 @@ export const useDraftMessage = ({
   }, [clearAutosaveTimer]);
 
   const handleDraftDiscard = useCallback(async () => {
-    clearAutosaveTimer();
-    if (!draftIdRef.current) return;
-    await discardDraft({ draftId: draftIdRef.current }).unwrap();
-  }, [discardDraft, clearAutosaveTimer]);
+    const draftId = await resolveDraftId();
+    if (!draftId) return;
+    await discardDraft({ draftId }).unwrap();
+  }, [discardDraft, resolveDraftId]);
 
   const clearDraftRef = useCallback(() => {
     clearAutosaveTimer();