makearmy/makearmy-app
1
0
Fork 0
Code Issues 11 Pull requests Projects Releases Packages Wiki Activity Actions

routing fixes

Browse source
This commit is contained in:
makearmy 2025-09-28 11:44:34 -04:00
parent 0cc1069526
commit a490471e4f
5 changed files with 37 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/components/forms/SettingsSubmit.tsx
View file

@ -168,14 +168,14 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
};
}, []);
// Prefer username; then email; then names/display; lastly short id
// Prefer username; then display_name; then full name; then email.
const meLabel =
(me?.username && me.username.trim()) ||
(me?.email && me.email.trim()) ||
([me?.first_name, me?.last_name].filter(Boolean).join(" ").trim()) ||
(me?.display_name && me.display_name.trim()) ||
(me?.id && `User ${shortId(me.id)}`) ||
"Unknown user";
([me?.first_name, me?.last_name].filter(Boolean).join(" ").trim()) ||
(me?.email && me.email.trim()) ||
"";
// Options
const mats = useOptions("material");