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): drop the Experimental badge from the Focus tab (#9275)

teo6d7091f455d5
diff --git a/apps/web/src/features/email-view/components/EmailHeader.tsx b/apps/web/src/features/email-view/components/EmailHeader.tsx
index 395042e0a0..2d956dbbc6 100644
--- a/apps/web/src/features/email-view/components/EmailHeader.tsx
+++ b/apps/web/src/features/email-view/components/EmailHeader.tsx
@@ -12,12 +12,11 @@ import { useSplitLayout } from '@components/app/split-layout/layout';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { registerHotkey } from '@core/hotkey/hotkeys';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
-import { Badge, Tabs } from '@ui';
+import { Tabs } from '@ui';
import { tourTarget } from '@ui/components/Tour';
import { createSignal, Show } from 'solid-js';
import { composeEmail } from '../compose-email';
import {
- EMAIL_FOCUS_TAB,
EMAIL_INBOX_TAB_IDS,
EMAIL_TAB_LABELS,
EMAIL_TABS,
@@ -166,11 +165,6 @@ export function EmailHeader(props: EmailHeaderProps) {
onChange={setTab}
/>
</Show>
- <Show when={state.tab === 'focus'}>
- <Badge variant="outline" size="xs" class="shrink-0">
- {EMAIL_FOCUS_TAB.badge}
- </Badge>
- </Show>
</div>
}
>
diff --git a/apps/web/src/features/email-view/components/EmailSidebar.tsx b/apps/web/src/features/email-view/components/EmailSidebar.tsx
index f4acd01651..93156857dc 100644
--- a/apps/web/src/features/email-view/components/EmailSidebar.tsx
+++ b/apps/web/src/features/email-view/components/EmailSidebar.tsx
@@ -22,13 +22,12 @@ import SignalIcon from '@icon/system/regular/wave-sine.svg';
import NoiseIcon from '@icon/system/regular/waveform.svg';
import { SidebarTagsSection } from '@property/tags/SidebarTagsSection';
import type { TagScope } from '@service-properties/generated/schemas/tagScope';
-import { Badge, pressHandlers } from '@ui';
+import { pressHandlers } from '@ui';
import { tourTarget } from '@ui/components/Tour';
import { type Component, For, Show } from 'solid-js';
import { Dynamic } from 'solid-js/web';
import { composeEmail } from '../compose-email';
import {
- EMAIL_FOCUS_TAB,
EMAIL_INBOX_TAB_IDS,
EMAIL_TAB_IDS,
EMAIL_TAB_LABELS,
@@ -76,12 +75,7 @@ const TAB_ICONS: Record<EmailTab, Component<{ class?: string }>> = {
focus: FocusIcon,
};
-function Tab(props: {
- id: EmailTab;
- label?: string;
- badge?: string;
- onNavigate?: () => void;
-}) {
+function Tab(props: { id: EmailTab; label?: string; onNavigate?: () => void }) {
const { state, setTab } = useEmailView();
return (
@@ -96,13 +90,6 @@ function Tab(props: {
<Dynamic component={TAB_ICONS[props.id]} class="size-4" />
</ViewSidebar.Icon>
<span class="truncate">{props.label ?? EMAIL_TAB_LABELS[props.id]}</span>
- <Show when={props.badge}>
- {(badge) => (
- <Badge variant="outline" size="xs" class="ml-auto">
- {badge()}
- </Badge>
- )}
- </Show>
</ViewSidebar.Item>
);
}
@@ -116,11 +103,7 @@ export function EmailNavigation(props: { onNavigate?: () => void }) {
fallback={
<ViewSidebar.Nav aria-label="Email tabs">
<Show when={isVisible('focus')}>
- <Tab
- id="focus"
- badge={EMAIL_FOCUS_TAB.badge}
- onNavigate={props.onNavigate}
- />
+ <Tab id="focus" onNavigate={props.onNavigate} />
</Show>
<div
ref={tourTarget(EMAIL_TOUR.signalNoise)}
diff --git a/apps/web/src/features/email-view/constants.ts b/apps/web/src/features/email-view/constants.ts
index 45857bd904..a56880f16e 100644
--- a/apps/web/src/features/email-view/constants.ts
+++ b/apps/web/src/features/email-view/constants.ts
@@ -39,8 +39,6 @@ export const EMAIL_TAB_LABELS = {
export type EmailTabItem = {
id: EmailTab;
label: string;
- /** A short status beside the label, e.g. for an experimental tab. */
- badge?: string;
};
export const EMAIL_TABS: readonly EmailTabItem[] = EMAIL_TAB_IDS.map((id) => ({
@@ -60,13 +58,6 @@ export const EMAIL_INBOX_TAB_IDS = [
export const isEmailInboxTab = (tab: EmailTab) =>
(EMAIL_INBOX_TAB_IDS as readonly EmailTab[]).includes(tab);
-/** Leads the mobile pills and the touch sidebar, above the Signal/Noise pair. */
-export const EMAIL_FOCUS_TAB: EmailTabItem = {
- id: 'focus',
- label: EMAIL_TAB_LABELS.focus,
- badge: 'Experimental',
-};
-
/** How the Focus tab orders its threads. */
export const EMAIL_FOCUS_SORT_IDS = [
'priority',
diff --git a/apps/web/src/features/email-view/email-view.tsx b/apps/web/src/features/email-view/email-view.tsx
index b77f18710b..c4f9a8e556 100644
--- a/apps/web/src/features/email-view/email-view.tsx
+++ b/apps/web/src/features/email-view/email-view.tsx
@@ -27,7 +27,7 @@ import { EmailHeader, EmailViewBreadcrumbItem } from './components/EmailHeader';
import { EmailList } from './components/EmailList';
import { EmailReader } from './components/EmailReader';
import { EmailSidebar } from './components/EmailSidebar';
-import { EMAIL_FOCUS_TAB, EMAIL_TABS } from './constants';
+import { EMAIL_TABS } from './constants';
import { EmailViewProvider, useEmailView } from './email-view-context';
import type { EmailListPane } from './reader-pane';
import { emailTour } from './tour';
@@ -171,12 +171,9 @@ function EmailDesktopLayout(props: {
// Focus leads, as it does in the desktop Inbox tabs.
const MOBILE_EMAIL_TABS: PillTabItem<EmailTab>[] = [
- EMAIL_FOCUS_TAB,
- ...EMAIL_TABS.filter((tab) => tab.id !== EMAIL_FOCUS_TAB.id),
-].map((tab) => ({
- value: tab.id,
- label: tab.badge ? `${tab.label} · ${tab.badge}` : tab.label,
-}));
+ ...EMAIL_TABS.filter((tab) => tab.id === 'focus'),
+ ...EMAIL_TABS.filter((tab) => tab.id !== 'focus'),
+].map((tab) => ({ value: tab.id, label: tab.label }));
function EmailMobileLayout(props: ParentProps) {
const isVisible = useVisibleEmailTab();
diff --git a/docs/agent-guide/email.md b/docs/agent-guide/email.md
index 4c9f4ac8c7..9e408502fe 100644
--- a/docs/agent-guide/email.md
+++ b/docs/agent-guide/email.md
@@ -149,8 +149,7 @@ changing the list query. Text search still resolves favorite IDs for the search
service. An empty favorites list shows `No favorite emails`.
With `enable-email-focus` and `enable-graphql-soup` on, a `Focus` tab leads the
-desktop Inbox tabs (with an `Experimental` badge beside them while it is open)
-and the mobile pills (`Focus · Experimental`). It lists signal
+desktop Inbox tabs and the mobile pills. It lists signal
threads from the last 30 days that the email focus worker
(`services/email_focus_worker`) classified as worth attention, including inboxes
linked to the account, by priority: the importance score halved for every 2 days