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

username notice fix

Browse source
This commit is contained in:
makearmy 2025-09-28 07:04:42 -04:00
parent db596ad71e
commit ab639edc7a
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ type Target = "settings_fiber" | "settings_co2gan" | "settings_co2gal" | "settin
type Opt = { id: string; label: string };
type Me = {
id: string;
username?: string;
display_name?: string;
first_name?: string;
last_name?: string;
@ -119,12 +120,14 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
return () => { alive = false; };
}, []);
const shortId = (s?: string) => (s ? `${s.slice(0, 8)}…${s.slice(-4)}` : "");
const meLabel =
me?.display_name ||
(me?.username ? `@${me.username}` : "") ||
(me?.display_name || "").trim() ||
[me?.first_name, me?.last_name].filter(Boolean).join(" ").trim() ||
me?.email ||
me?.id ||
"";
(me?.email ? me.email.split("@")[0] : "") ||
(me?.id ? `User ${shortId(me.id)}` : "");
// Generic lists (alphabetical)
const mats = useOptions("material");