Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(email-compose): show draft sync failures alongside the inbox banner (#8609)
Peter Chinmana1c9843e1573
diff --git a/apps/web/src/features/email-compose/views/email-compose.test.tsx b/apps/web/src/features/email-compose/views/email-compose.test.tsxindex e8233514d2..5f6c53c60f 100644--- a/apps/web/src/features/email-compose/views/email-compose.test.tsx+++ b/apps/web/src/features/email-compose/views/email-compose.test.tsx@@ -5,7 +5,12 @@ import {screen,waitFor,} from '@solidjs/testing-library';-import { type ComponentProps, type ParentProps, Show } from 'solid-js';+import {+ type ComponentProps,+ type JSX,+ type ParentProps,+ Show,+} from 'solid-js';import { afterEach, expect, it, vi } from 'vitest';import type { EmailDraftStorage } from '../context/compose-capabilities';import { useCompose } from '../context/compose-context';@@ -21,7 +26,7 @@ vi.mock('@components/app/split-layout/components/SplitLabel', () => ({StaticSplitLabel: () => null,}));vi.mock('@core/component/EmailPermissionsBanner', () => ({- EmailPermissionsBanner: () => null,+ EmailPermissionsBanner: () => <p>No email account connected.</p>,}));vi.mock('@core/mobile/WrapUnlessMobile', () => ({WrapUnlessMobile: (props: ParentProps) => props.children,@@ -36,7 +41,9 @@ vi.mock('../components/email-schedule-summary', () => ({EmailScheduleBar: () => null,}));vi.mock('../components/draft-sync-status', () => ({- DraftSyncStatus: () => null,+ DraftSyncStatus: (props: { state?: { message: string } }) => (+ <Show when={props.state}>{(state) => <p>{state().message}</p>}</Show>+ ),}));vi.mock('./compose-toolbar', () => ({ EmailComposeToolbar: () => null }));vi.mock('@components/app/mobile/MobileDrawer', () => {@@ -58,24 +65,37 @@ vi.mock('@components/app/mobile/MobileDrawer', () => {};});vi.mock('./compose-layout', () => ({- ComposeLayout: () => {+ ComposeLayout: (props: { notice?: JSX.Element }) => {const state = useCompose();const editor = createEmailEditor();state.captureEditor(editor);state.onContentChange('');return (- <input- aria-label="Message"- onInput={(event) => {- setEmailEditorText(editor, event.currentTarget.value);- state.onContentChange(event.currentTarget.value);- }}- />+ <>+ {props.notice}+ <input+ aria-label="Message"+ onInput={(event) => {+ setEmailEditorText(editor, event.currentTarget.value);+ state.onContentChange(event.currentTarget.value);+ }}+ />+ </>);},}));afterEach(cleanup);+it('keeps a draft sync failure visible without a connected inbox', () => {+ const context = createComposeContext();+ context.accounts.inboxes = () => [];+ context.drafts.saveLocalDraft = vi.fn();+ context.drafts.syncAvailability = () => 'unavailable';+ render(() => <EmailComposeView context={context} draftId="draft" />);+ expect(screen.getByText('No email account connected.')).toBeDefined();+ expect(screen.getByText('Draft synchronization unavailable')).toBeDefined();+});+it.each([false, true])('leaves only after local saving succeeds (failure=%s)',async (fails) => {diff --git a/apps/web/src/features/email-compose/views/email-compose.tsx b/apps/web/src/features/email-compose/views/email-compose.tsxindex 9826549c7a..960513c25f 100644--- a/apps/web/src/features/email-compose/views/email-compose.tsx+++ b/apps/web/src/features/email-compose/views/email-compose.tsx@@ -299,10 +299,15 @@ function LoadedEmailComposeView(<ComposeLayouttoolbar={<EmailComposeToolbar editor={editor} />}notice={- hasInboxError() ? (- <EmailPermissionsBanner />- ) : sync.state() ? (- <SyncStatus />+ // A missing inbox must not hide a draft that only this+ // device holds, so both notices can show together.+ hasInboxError() || sync.state() ? (+ <div class="flex flex-col gap-2">+ <Show when={hasInboxError()}>+ <EmailPermissionsBanner />+ </Show>+ <SyncStatus />+ </div>) : undefined}// Full-frame mobile/tablet: the surface runs under the floating