Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(email-compose): stop toasting "this email was already sent" (#8588)

Peter Chinmand7394dfb5421
diff --git a/apps/web/src/features/email-compose/browser-test/draft-recovery-fixture.tsx b/apps/web/src/features/email-compose/browser-test/draft-recovery-fixture.tsx
index dfbb0aa601..e9237213e8 100644
--- a/apps/web/src/features/email-compose/browser-test/draft-recovery-fixture.tsx
+++ b/apps/web/src/features/email-compose/browser-test/draft-recovery-fixture.tsx
@@ -142,6 +142,9 @@ function RecoveryEditor() {
Show transient notice
</button>
<output data-testid="save-count">{saved().length}</output>
+ <output data-testid="has-draft">
+ {String(state.context.hasDraft())}
+ </output>
<output data-testid="saved-draft-ids">
{JSON.stringify(saved().map((input) => input.clientHandles?.draftId))}
</output>
diff --git a/apps/web/src/features/email-compose/browser-test/draft-recovery.browser.e2e.ts b/apps/web/src/features/email-compose/browser-test/draft-recovery.browser.e2e.ts
index 27ad107c61..b65bd39d52 100644
--- a/apps/web/src/features/email-compose/browser-test/draft-recovery.browser.e2e.ts
+++ b/apps/web/src/features/email-compose/browser-test/draft-recovery.browser.e2e.ts
@@ -64,10 +64,9 @@ test('an already-sent background save clears the draft without offering recovery
.getByRole('textbox', { name: 'Message' })
.fill('Already delivered');
await expect(page.getByTestId('save-count')).toHaveText('1');
+ await expect(page.getByTestId('has-draft')).toHaveText('true');
await page.getByRole('button', { name: 'Report already sent' }).click();
- await expect(
- page.getByRole('status').filter({ hasText: 'This email was already sent' })
- ).toBeVisible();
+ await expect(page.getByTestId('has-draft')).toHaveText('false');
await expect(
page.getByRole('button', { name: 'Save as new draft' })
).toHaveCount(0);
diff --git a/apps/web/src/features/email-compose/primitives/compose-persistence.test.ts b/apps/web/src/features/email-compose/primitives/compose-persistence.test.ts
index 218beddb11..f62180421c 100644
--- a/apps/web/src/features/email-compose/primitives/compose-persistence.test.ts
+++ b/apps/web/src/features/email-compose/primitives/compose-persistence.test.ts
@@ -1145,11 +1145,7 @@ it.each(['standalone', 'reply'] as const)(
code: 'DRAFT_ALREADY_SENT',
});
await vi.advanceTimersByTimeAsync(1000);
- expect(context.notices.feedback.alert).toHaveBeenCalledExactlyOnceWith(
- surface === 'standalone'
- ? 'This email was already sent'
- : 'This reply was already sent'
- );
+ expect(context.notices.feedback.alert).not.toHaveBeenCalled();
expect(context.notices.feedback.failure).not.toHaveBeenCalled();
expect(context.drafts.saveDraft).toHaveBeenCalledOnce();
expect(context.delivery.sendMessage).not.toHaveBeenCalled();
diff --git a/apps/web/src/features/email-compose/primitives/draft-persistence.ts b/apps/web/src/features/email-compose/primitives/draft-persistence.ts
index 4f35b8ca2f..3bc41643b0 100644
--- a/apps/web/src/features/email-compose/primitives/draft-persistence.ts
+++ b/apps/web/src/features/email-compose/primitives/draft-persistence.ts
@@ -3,7 +3,6 @@ import {
type DeleteEmailDraft,
DraftPersistRejected,
type DraftSaveResult,
- type EmailComposeFeedback,
type EmailDraftStorage,
} from '../context/compose-capabilities';
import type { EmailDraft } from '../core/email-draft';
@@ -18,19 +17,16 @@ export const isAlreadySentRejection = (error: unknown) =>
/**
* A discard's delete. An already-sent verdict is not a failure: the reset
* the caller performs next is exactly what that verdict asks for, so it is
- * announced and swallowed. Every other rejection propagates.
+ * swallowed. Every other rejection propagates.
*/
export async function deleteDraftForDiscard(
drafts: Pick<EmailDraftStorage, 'deleteDraft'>,
- input: DeleteEmailDraft,
- notices: Pick<EmailComposeFeedback, 'feedback'>,
- alreadySentMessage: string
+ input: DeleteEmailDraft
): Promise<void> {
try {
await drafts.deleteDraft(input);
} catch (error) {
if (!isAlreadySentRejection(error)) throw error;
- notices.feedback.alert(alreadySentMessage);
}
}
diff --git a/apps/web/src/features/email-compose/primitives/draft-session-scenarios.test.ts b/apps/web/src/features/email-compose/primitives/draft-session-scenarios.test.ts
index 5474cb0ea3..44d49d98ef 100644
--- a/apps/web/src/features/email-compose/primitives/draft-session-scenarios.test.ts
+++ b/apps/web/src/features/email-compose/primitives/draft-session-scenarios.test.ts
@@ -223,9 +223,7 @@ describe('draft session: reply composer', () => {
await state.sendEmail();
await vi.advanceTimersByTimeAsync(0);
expect(context.delivery.sendMessage).not.toHaveBeenCalled();
- expect(context.notices.feedback.alert).toHaveBeenCalledWith(
- 'This reply was already sent'
- );
+ expect(context.notices.feedback.alert).not.toHaveBeenCalled();
expect(state.savedDraftId()).toBeUndefined();
// A fresh draft afterwards saves under new handles, not the sent id.
state.edit('A new reply');
diff --git a/apps/web/src/features/email-compose/primitives/email-composer.ts b/apps/web/src/features/email-compose/primitives/email-composer.ts
index 8baa7e35f0..4c43007f3d 100644
--- a/apps/web/src/features/email-compose/primitives/email-composer.ts
+++ b/apps/web/src/features/email-compose/primitives/email-composer.ts
@@ -411,7 +411,6 @@ export function createEmailComposer(props: EmailComposerOptions) {
function handleAlreadySent() {
identityVersion += 1;
autosave.cancel();
- props.notices.feedback.alert('This email was already sent');
resetState();
}
@@ -1118,17 +1117,12 @@ export function createEmailComposer(props: EmailComposerOptions) {
const draftId = currentDraftId();
if (draftId) {
try {
- await deleteDraftForDiscard(
- props.drafts,
- {
- draftId,
- draftGeneration: draftGeneration(),
- threadId: currentThreadId(),
- inboxId: activeInboxId(),
- },
- props.notices,
- 'This email was already sent'
- );
+ await deleteDraftForDiscard(props.drafts, {
+ draftId,
+ draftGeneration: draftGeneration(),
+ threadId: currentThreadId(),
+ inboxId: activeInboxId(),
+ });
} catch (error) {
await reportPersistenceFailure(error, 'delete');
setDiscarding(false);
@@ -1266,7 +1260,6 @@ export function createEmailComposer(props: EmailComposerOptions) {
if (state.type === 'sent') {
if (wasScheduled)
props.notices.feedback.success('Scheduled email sent');
- else props.notices.feedback.alert('This email was already sent');
props.host?.showThread?.(state.threadId);
} else {
props.notices.feedback.alert('This draft is no longer available.');
diff --git a/apps/web/src/features/email-compose/primitives/reply-composer.ts b/apps/web/src/features/email-compose/primitives/reply-composer.ts
index fdf38de686..6106dcd39d 100644
--- a/apps/web/src/features/email-compose/primitives/reply-composer.ts
+++ b/apps/web/src/features/email-compose/primitives/reply-composer.ts
@@ -669,7 +669,6 @@ export function createReplyComposer(
};
function handleAlreadySent() {
identityVersion += 1;
- props.notices.feedback.alert('This reply was already sent');
fireAndForget(
withDeletionGuard(() => {
resetState();
@@ -1451,17 +1450,12 @@ export function createReplyComposer(
const draftId = savedDraftId();
if (draftId) {
try {
- await deleteDraftForDiscard(
- props.drafts,
- {
- draftId,
- draftGeneration: draftGeneration(),
- threadId: savedDraftThreadId(),
- inboxId: activeInboxId(),
- },
- props.notices,
- 'This reply was already sent'
- );
+ await deleteDraftForDiscard(props.drafts, {
+ draftId,
+ draftGeneration: draftGeneration(),
+ threadId: savedDraftThreadId(),
+ inboxId: activeInboxId(),
+ });
} catch (error) {
await reportPersistenceFailure(error, 'delete');
setPendingDeletion(false);
@@ -1665,7 +1659,6 @@ export function createReplyComposer(
if (state.type === 'sent') {
if (wasScheduled)
props.notices.feedback.success('Scheduled email sent');
- else props.notices.feedback.alert('This email was already sent');
} else {
props.notices.feedback.alert('This draft is no longer available.');
}
diff --git a/apps/web/src/features/email-compose/primitives/send-schedule.test.ts b/apps/web/src/features/email-compose/primitives/send-schedule.test.ts
index 871c8acbf4..b1be20e5d6 100644
--- a/apps/web/src/features/email-compose/primitives/send-schedule.test.ts
+++ b/apps/web/src/features/email-compose/primitives/send-schedule.test.ts
@@ -173,9 +173,7 @@ describe('send and schedule ordering', () => {
expect(context.notices.feedback.success).not.toHaveBeenCalledWith(
'Scheduled email sent'
);
- expect(context.notices.feedback.alert).toHaveBeenCalledWith(
- 'This email was already sent'
- );
+ expect(context.notices.feedback.alert).not.toHaveBeenCalled();
pending.resolve({
draftId: 'draft',
threadId: 'thread',