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): show shortcut keys in email tooltips (#8234)
teoa175a66c6961
diff --git a/apps/web/src/features/block-email/component/useEmailThreadTools.tsx b/apps/web/src/features/block-email/component/useEmailThreadTools.tsxindex 9b6f52f00a..28ba1459be 100644--- a/apps/web/src/features/block-email/component/useEmailThreadTools.tsx+++ b/apps/web/src/features/block-email/component/useEmailThreadTools.tsx@@ -264,6 +264,7 @@ export function useEmailThreadTools(props: EmailThreadToolsOptions) {icon: TrashIcon,action: trashThread,condition: isOwnThread,+ hotkeyToken: TOKENS.email.trash,},{group: 'sender',diff --git a/apps/web/src/features/email-compose/views/reply-input.tsx b/apps/web/src/features/email-compose/views/reply-input.tsxindex 03e4bc3185..6e888ce5e8 100644--- a/apps/web/src/features/email-compose/views/reply-input.tsx+++ b/apps/web/src/features/email-compose/views/reply-input.tsx@@ -813,6 +813,7 @@ function LoadedReplyInputView(props: ReplyInputViewProps) {hidden={sendActionHidden()}onClick={() => sendEmail()}tooltip={sendUnavailableReason() ?? scheduleActionLabel()}+ shortcut={sendUnavailableReason() ? undefined : 'cmd+enter'}aria-label={scheduleActionLabel()}/></div>diff --git a/apps/web/src/features/email-message/components/message-actions.tsx b/apps/web/src/features/email-message/components/message-actions.tsxindex 3cf6e868bf..b31eaea8b2 100644--- a/apps/web/src/features/email-message/components/message-actions.tsx+++ b/apps/web/src/features/email-message/components/message-actions.tsx@@ -1,4 +1,5 @@import type { EmailMessage } from '@app/features/email-message/core/email-message';+import { TOKENS } from '@core/hotkey/tokens';import ArrowBendUpLeft from '@phosphor/arrow-bend-up-left.svg';import ArrowBendUpRight from '@phosphor/arrow-bend-up-right.svg';import { Button } from '@ui';@@ -38,6 +39,7 @@ export function MessageActions(props: {noTouchResizeonClick={onChangeReplyType('reply-all')}tooltip="Reply"+ hotkey={TOKENS.email.reply}><ArrowBendUpLeft class="size-3.5" /></Button>@@ -50,6 +52,7 @@ export function MessageActions(props: {noTouchResizeonClick={onChangeReplyType('forward')}tooltip="Forward"+ hotkey={TOKENS.email.forward}><ArrowBendUpRight class="size-3.5" /></Button>diff --git a/apps/web/src/features/email-message/views/email-message-body.tsx b/apps/web/src/features/email-message/views/email-message-body.tsxindex f22b5709e5..ef6563b3dc 100644--- a/apps/web/src/features/email-message/views/email-message-body.tsx+++ b/apps/web/src/features/email-message/views/email-message-body.tsx@@ -58,6 +58,7 @@ export function EmailMessageBody(props: EmailMessageBodyProps) {<Buttonvariant="ghost"size="icon-sm"+ label="Show quoted text"onClick={() => setShowFullHTML(true)}class={cn('text-ink-extra-muted hover:text-ink-muted',diff --git a/apps/web/src/features/email-view/components/EmailRowActions.tsx b/apps/web/src/features/email-view/components/EmailRowActions.tsxindex 13e5c590b9..e326c3b9c7 100644--- a/apps/web/src/features/email-view/components/EmailRowActions.tsx+++ b/apps/web/src/features/email-view/components/EmailRowActions.tsx@@ -1,3 +1,4 @@+import { TOKENS } from '@core/hotkey/tokens';import ArrowCounterClockwiseIcon from '@phosphor/arrow-counter-clockwise.svg';import CheckIcon from '@phosphor/check.svg';import LightningIcon from '@phosphor/lightning.svg';@@ -76,6 +77,11 @@ export function EmailRowActions(props: {variant="ghost"size="icon-sm"label={props.archived ? 'Unarchive email' : 'Archive email'}+ hotkey={+ props.archived+ ? TOKENS.entity.action.markNotDone+ : TOKENS.entity.action.markDone+ }class="text-ink-extra-muted"disabled={!props.canArchive || props.pending}onClick={props.onArchive}@@ -88,6 +94,7 @@ export function EmailRowActions(props: {variant="ghost"size="icon-sm"label="Open command menu"+ hotkey={TOKENS.global.commandMenu}class="text-ink-extra-muted"onClick={props.onCommands}>