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.

feat(sidebar): show user name in bottom settings button (#4766)

Evan Hutnikae0f7964a3f7
diff --git a/apps/web/src/components/app/app-sidebar/sidebar.tsx b/apps/web/src/components/app/app-sidebar/sidebar.tsx
index 367f854f52..a346c25e46 100644
--- a/apps/web/src/components/app/app-sidebar/sidebar.tsx
+++ b/apps/web/src/components/app/app-sidebar/sidebar.tsx
@@ -54,7 +54,7 @@ import {
getSettingsTabItem,
useSettingsTabAvailable,
} from '@core/constant/settingsTabsConfig';
-import { useAuthor, useEmail, useUserId } from '@core/context/user';
+import { useEmail, useUserId } from '@core/context/user';
import { registerHotkey } from '@core/hotkey/hotkeys';
import { clearPressedKeys } from '@core/hotkey/state';
import { type HotkeyToken, TOKENS } from '@core/hotkey/tokens';
@@ -81,6 +81,7 @@ import SignOutIcon from '@phosphor/sign-out.svg';
import UsersThreeIcon from '@phosphor/users-three.svg';
import { useEmailLinksQuery } from '@queries/email/link';
import { useCurrentTeamQuery } from '@queries/team/teams';
+import { authServiceClient } from '@service-auth/client';
import { createElementSize } from '@solid-primitives/resize-observer';
import { debounce } from '@solid-primitives/scheduled';
import { makePersisted } from '@solid-primitives/storage';
@@ -91,6 +92,7 @@ import {
type ComponentProps,
createEffect,
createMemo,
+ createResource,
createSignal,
For,
type JSX,
@@ -787,10 +789,23 @@ type SidebarSettingsWidgetProps = {
const SidebarSettingsWidget = (props: SidebarSettingsWidgetProps) => {
const userId = useUserId();
- const author = useAuthor();
const email = useEmail();
const logout = useLogout();
+ const [userName] = createResource(async () => {
+ const response = await authServiceClient.getUserName();
+ return response.isOk() ? response.value : null;
+ });
+
+ // Prefer the user's real name (first/last); fall back to their email.
+ const displayName = createMemo(() => {
+ const name = userName();
+ const parts = [name?.first_name, name?.last_name]
+ .map((part) => part?.trim())
+ .filter((part): part is string => Boolean(part) && part !== 'N/A');
+ return parts.length > 0 ? parts.join(' ') : (email() ?? 'Macro User');
+ });
+
return (
<Dropdown
placement="top-start"
@@ -801,9 +816,9 @@ const SidebarSettingsWidget = (props: SidebarSettingsWidgetProps) => {
variant="ghost"
class={cn(
'flex items-center rounded-md cursor-default text-ink-extra-muted not-disabled:hover:bg-ink/3 h-9',
- 'justify-start gap-2 px-1.5 py-1'
+ 'justify-start gap-3 px-1.5 py-1'
)}
- label="Settings"
+ label={displayName()}
fullWidth
tooltipDisabled={!props.isSlim()}
tooltipPlacement="right"
@@ -828,7 +843,7 @@ const SidebarSettingsWidget = (props: SidebarSettingsWidgetProps) => {
)}
</Show>
<span class="flex-1 min-w-0 text-left whitespace-nowrap text-sm truncate group-data-[slim=true]/sidebar:hidden">
- Settings
+ {displayName()}
</span>
<CaretUpIcon class="size-3 text-ink-extra-muted shrink-0 group-data-[slim=true]/sidebar:hidden" />
</Dropdown.Trigger>
@@ -852,7 +867,7 @@ const SidebarSettingsWidget = (props: SidebarSettingsWidgetProps) => {
</Show>
<div class="min-w-0">
<div class="truncate text-sm font-semibold text-ink">
- {author()}
+ {displayName()}
</div>
<div class="truncate text-sm text-ink-muted">{email()}</div>
</div>