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
feat(email): mark Outlook as beta wherever it is offered or listed (#9382)
teo39dbe87e0256
diff --git a/apps/web/src/features/settings/Email.tsx b/apps/web/src/features/settings/Email.tsxindex 50e3dc0444..b7303b7cb8 100644--- a/apps/web/src/features/settings/Email.tsx+++ b/apps/web/src/features/settings/Email.tsx@@ -20,6 +20,7 @@ import {calendarConsentScopes,reconnectScopes,} from '@core/email-link/consent';+import { OutlookBetaBadge } from '@core/email-link/OutlookBetaBadge';import type { EmailProvider } from '@core/email-link/ProviderDialog';import { fireAndForget } from '@core/util/fireAndForget';import GmailIcon from '@icon/gmail-color.svg';@@ -287,6 +288,7 @@ export function EmailCard(props: { class?: string } = {}) {<IntegrationRowicon={<OutlookIcon />}title="Connect an Outlook account"+ badge={<OutlookBetaBadge />}description="Sync an Outlook.com or Microsoft 365 inbox into Macro Email."><ConnectAction@@ -495,11 +497,15 @@ function InboxRow(props: {<Chip label="Shared" /></Show></div>- <span class="text-xs text-ink-muted">- {props.link.provider === 'OUTLOOK'- ? 'Outlook / Microsoft 365'- : 'Gmail'}- </span>+ <Show+ when={props.link.provider === 'OUTLOOK'}+ fallback={<span class="text-xs text-ink-muted">Gmail</span>}+ >+ <span class="flex items-center gap-2 text-xs text-ink-muted">+ Outlook / Microsoft 365+ <OutlookBetaBadge />+ </span>+ </Show><Show when={ENABLE_INBOX_SYNC_STATUS}><Switchfallback={diff --git a/apps/web/src/features/settings/connections/integration-items.tsx b/apps/web/src/features/settings/connections/integration-items.tsxindex 408cadcdf3..d7d718a93e 100644--- a/apps/web/src/features/settings/connections/integration-items.tsx+++ b/apps/web/src/features/settings/connections/integration-items.tsx@@ -6,6 +6,7 @@ import {enableSlackArchiveImport,} from '@core/constant/featureFlags';import { useEmailLinks } from '@core/email-link';+import { OutlookBetaBadge } from '@core/email-link/OutlookBetaBadge';import { PipedreamConnectorIcon } from '@core/pipedream/ConnectorIcon';import { fireAndForget } from '@core/util/fireAndForget';import { openExternalUrl } from '@core/util/url';@@ -74,6 +75,7 @@ function emailItem(return {id: outlook ? 'outlook' : 'gmail',name: outlook ? 'Outlook' : 'Gmail',+ badge: outlook ? <OutlookBetaBadge /> : undefined,kind: 'native',icon: outlook ? <OutlookIcon /> : <GmailIcon />,get description() {diff --git a/apps/web/src/features/settings/connections/integrations-list.tsx b/apps/web/src/features/settings/connections/integrations-list.tsxindex bcb6cd5a4c..47bc75a554 100644--- a/apps/web/src/features/settings/connections/integrations-list.tsx+++ b/apps/web/src/features/settings/connections/integrations-list.tsx@@ -19,6 +19,8 @@ export type IntegrationKind = 'native' | 'mcp';export type IntegrationItem = {id: string;name: string;+ /** Shown right after the name, e.g. a Beta badge. */+ badge?: JSX.Element;kind: IntegrationKind;icon: JSX.Element;/** What it does in Macro, or which accounts are connected. */@@ -143,6 +145,8 @@ export function IntegrationsListHeader() {export function IntegrationListRow(props: {icon: JSX.Element;name: string;+ /** Shown right after the name, e.g. a Beta badge. */+ badge?: JSX.Element;kind: IntegrationKind;description: string;categories: string[];@@ -172,7 +176,13 @@ export function IntegrationListRow(props: {{props.icon}</span><div class="flex min-w-0 flex-1 flex-col gap-0.5">- <div class="flex min-w-0 items-center gap-2">+ {/* With a badge, narrow rows wrap instead of truncating the name away. */}+ <div+ class={cn(+ 'flex min-w-0 items-center gap-2',+ props.badge && 'flex-wrap gap-y-1'+ )}+ ><spanclass={cn('min-w-0 truncate font-medium',@@ -181,6 +191,7 @@ export function IntegrationListRow(props: {>{props.name}</span>+ {props.badge}<Badgevariant="outline"size="xs"@@ -234,6 +245,7 @@ export function IntegrationItemRow(props: { item: IntegrationItem }) {<IntegrationListRowicon={props.item.icon}name={props.item.name}+ badge={props.item.badge}kind={props.item.kind}description={props.item.description}categories={props.item.categories}diff --git a/apps/web/src/features/settings/primitives.tsx b/apps/web/src/features/settings/primitives.tsxindex ec5994ddcc..23204103ca 100644--- a/apps/web/src/features/settings/primitives.tsx+++ b/apps/web/src/features/settings/primitives.tsx@@ -358,6 +358,8 @@ export function IntegrationRow(props: {/** The brand icon, rendered at its native size inside a fixed slot. */icon?: JSX.Element;title: JSX.Element;+ /** Shown right after the title, e.g. a Beta badge. */+ badge?: JSX.Element;description?: JSX.Element;/** Proven facts under the description (e.g. connected accounts). Wraps. */facts?: JSX.Element;@@ -382,7 +384,13 @@ export function IntegrationRow(props: {</Show>{/* The basis wraps actions below the text on narrow screens. */}<div class="flex-1 basis-48 min-w-0 flex flex-col gap-0.5">- <div class="flex items-center gap-2 min-w-0">+ {/* With a badge, narrow rows wrap instead of truncating the title. */}+ <div+ class={cn(+ 'flex items-center gap-2 min-w-0',+ props.badge && 'flex-wrap gap-y-1'+ )}+ ><divclass={cn('text-sm font-medium truncate',@@ -391,6 +399,7 @@ export function IntegrationRow(props: {>{props.title}</div>+ {props.badge}<Show when={props.status}>{props.status}</Show></div><Show when={props.description}>diff --git a/apps/web/src/lib/core/email-link/OutlookBetaBadge.tsx b/apps/web/src/lib/core/email-link/OutlookBetaBadge.tsxnew file mode 100644index 0000000000..d21522a54f--- /dev/null+++ b/apps/web/src/lib/core/email-link/OutlookBetaBadge.tsx@@ -0,0 +1,10 @@+import { Badge } from '@ui';++/** Marks Outlook as a beta provider wherever it is offered or listed. */+export function OutlookBetaBadge() {+ return (+ <Badge variant="outline" size="xs">+ Beta+ </Badge>+ );+}diff --git a/apps/web/src/lib/core/email-link/ProviderDialog.tsx b/apps/web/src/lib/core/email-link/ProviderDialog.tsxindex 3810093044..151217f523 100644--- a/apps/web/src/lib/core/email-link/ProviderDialog.tsx+++ b/apps/web/src/lib/core/email-link/ProviderDialog.tsx@@ -7,6 +7,7 @@ import {Panel,} from '@ui';import { type Owner, onCleanup, runWithOwner, Show } from 'solid-js';+import { OutlookBetaBadge } from './OutlookBetaBadge';export type EmailProvider = 'GMAIL' | 'OUTLOOK';@@ -62,6 +63,7 @@ export function EmailProviderDialog(onClick={() => props.onSelect('OUTLOOK')}>Outlook / Microsoft 365+ <OutlookBetaBadge /></Button></Show><Buttondiff --git a/docs/agent-guide/settings.md b/docs/agent-guide/settings.mdindex 1781866db9..c3854cda19 100644--- a/docs/agent-guide/settings.md+++ b/docs/agent-guide/settings.md@@ -85,6 +85,9 @@ same rows. Outlook appears only once `/link/email/providers` offers it to theaccount (the `enable-outlook` flag); Integrations keeps an Outlook row withManage alone for an account that already has an Outlook inbox. Its **Email settings**gear opens the dedicated page, and Email links to Notifications and Calendar.+Outlook is in beta: the Connect email chooser's Outlook option, each Outlook+inbox row, **Connect an Outlook account**, and the Integrations Outlook row+carry a **Beta** badge (`OutlookBetaBadge`).With a composer open, save a changed signature or reply-signature preference andverify its preview updates. Once the account refresh completes, reopen a composeroffline and confirm it uses the saved settings.