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): hide Gmail signature import for Outlook inboxes (#8883)

gbirmanfd6e3a16da9e
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.md
index bed55537e0..9006103e1c 100644
--- a/apps/web/AGENTS.md
+++ b/apps/web/AGENTS.md
@@ -245,7 +245,9 @@ resolved session ID; keep the existing `AgentSessionProvider` subscription to
renderer. Phone settings show the preview with desktop-only editing. See the
[signature walkthrough](../../docs/agent-guide/settings.md#email-signatures)
for browser coverage. Keep signature commit callbacks on the mutation hook
- so account-list remounts cannot leave an already-cleared draft behind.
+ so account-list remounts cannot leave an already-cleared draft behind. Offer
+ Gmail signature import only when the inbox provider is `GMAIL`, regardless of
+ its email domain; keep shared signature instructions provider-neutral.
- Keep personal accounts and agent tool connections together in Settings → Integrations;
preserve `agent-connections` as an alias for existing links.
- Keep bot setup focused on the token-and-SDK workflow; Agent and Ownership
diff --git a/apps/web/src/features/settings/SignatureSection.tsx b/apps/web/src/features/settings/SignatureSection.tsx
index 29d5bad0bf..67f7609719 100644
--- a/apps/web/src/features/settings/SignatureSection.tsx
+++ b/apps/web/src/features/settings/SignatureSection.tsx
@@ -154,6 +154,7 @@ export function SignatureSection(props: { link: EmailLink }) {
// The backend fetches the Gmail signature and saves it, so on success the
// editor shows the persisted value and any unsaved draft is discarded.
const importFromGmail = () => {
+ if (props.link.provider !== 'GMAIL') return;
setSaveError(null);
fireAndForget(
traceSignatureMutation('import', props.link.id, (span) =>
@@ -183,7 +184,7 @@ export function SignatureSection(props: { link: EmailLink }) {
}}
onSave={saveSignature}
onClear={removeSignature}
- onImport={importFromGmail}
+ onImport={props.link.provider === 'GMAIL' ? importFromGmail : undefined}
importing={importGmailSignature.isPending}
dirty={isDirty()}
hasContent={hasContent()}
diff --git a/apps/web/src/features/settings/browser-test/signatures/fixture.tsx b/apps/web/src/features/settings/browser-test/signatures/fixture.tsx
index 18692321a1..9d114d504e 100644
--- a/apps/web/src/features/settings/browser-test/signatures/fixture.tsx
+++ b/apps/web/src/features/settings/browser-test/signatures/fixture.tsx
@@ -44,7 +44,7 @@ function Fixture() {
>
<SettingsSection
title="Signatures"
- description="Create a signature for each email account, import from Gmail, or paste your HTML. Preview it before sending."
+ description="Create a signature for each email account and preview it before sending."
>
<Show when={mounted()}>
<For each={links.isSuccess ? links.data.links : []}>
diff --git a/apps/web/src/features/settings/components/signature-workspace.tsx b/apps/web/src/features/settings/components/signature-workspace.tsx
index 0cd459eada..5b044bbfdc 100644
--- a/apps/web/src/features/settings/components/signature-workspace.tsx
+++ b/apps/web/src/features/settings/components/signature-workspace.tsx
@@ -50,7 +50,7 @@ export function SignatureWorkspace(props: {
<p class="px-4 py-8 text-center text-sm text-ink-muted">
{props.mobile
? 'No signature saved.'
- : 'Import from Gmail, write in Rich text, or paste your HTML.'}
+ : 'Write in Rich text or paste your HTML.'}
</p>
}
>
diff --git a/apps/web/src/features/settings/email-settings.tsx b/apps/web/src/features/settings/email-settings.tsx
index 55a2b9ee4d..ebffdc8166 100644
--- a/apps/web/src/features/settings/email-settings.tsx
+++ b/apps/web/src/features/settings/email-settings.tsx
@@ -27,7 +27,7 @@ export function EmailSettings() {
>
<SettingsSection
title="Accounts"
- description="Connect Gmail accounts and manage their sync with Macro."
+ description="Connect email accounts and manage their sync with Macro."
>
<Suspense
fallback={
@@ -42,7 +42,7 @@ export function EmailSettings() {
<Show when={signatures().enabled}>
<SettingsSection
title="Signatures"
- description="Create a signature for each email account, import from Gmail, or paste your HTML. Preview it before sending."
+ description="Create a signature for each email account and preview it before sending."
>
<Suspense
fallback={
diff --git a/docs/agent-guide/settings.md b/docs/agent-guide/settings.md
index 1976e8a3a3..aa596f535b 100644
--- a/docs/agent-guide/settings.md
+++ b/docs/agent-guide/settings.md
@@ -72,9 +72,11 @@ Choose **Save signature** to save edits and return to the canonical preview.
after clearing, reopening Rich text starts empty. It leaves the inbox connected, while
**Remove inbox** in Accounts uses the existing inbox removal confirmation.
**Add to replies & forwards** saves that preference immediately. On desktop,
-**Import from Gmail** in each inbox's header fetches that account's Gmail
+**Import from Gmail** in each Gmail inbox's header fetches that account's Gmail
signature and saves it right away, replacing any unsaved draft; a toast reports
-when Gmail has no signature. Unsaved drafts
+when Gmail has no signature. Outlook inboxes offer Rich text and HTML editing
+without a Gmail import action. The import action uses the inbox's provider,
+not its email domain. Unsaved drafts
survive switching settings pages. On phones, the signature preview, replies/forwards
toggle, and clear action are available; editing and import remain desktop-only.
Email accounts can also be managed from **Integrations**. Its **Email settings**
@@ -90,6 +92,9 @@ conversion and verify the saved HTML is unchanged. Check the preview on a phone
and ensure a wide signature scrolls inside its own preview instead of the page.
Save a signature created in Rich text, reopen settings, and confirm Rich text
editing resumes without a conversion prompt.
+With Gmail and Outlook inboxes connected, confirm only Gmail offers import
+(including Gmail accounts on a custom domain), while both support HTML and Rich
+text editing. Empty Outlook signatures must not suggest Gmail import.
Type an unsaved Rich text draft and clear it, both with and without an existing
saved signature. Reopen settings and confirm the editor stays empty and the
composer no longer includes a signature. A delayed clear must preserve a newer