Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

👤 fix: Use `user?.username` if `user?.name` is undefined (#2511)

ilsubyeega667f5f91fe5f
diff --git a/client/src/components/Chat/Messages/Message.tsx b/client/src/components/Chat/Messages/Message.tsx
index 41923138a0..0332b8f0ec 100644
--- a/client/src/components/Chat/Messages/Message.tsx
+++ b/client/src/components/Chat/Messages/Message.tsx
@@ -42,7 +42,7 @@ export default function Message(props: TMessageProps) {
let messageLabel = '';
if (isCreatedByUser) {
- messageLabel = UsernameDisplay ? user?.name : localize('com_user_message');
+ messageLabel = UsernameDisplay ? user?.name || user?.username : localize('com_user_message');
} else {
messageLabel = message.sender;
}
diff --git a/client/src/components/Endpoints/Icon.tsx b/client/src/components/Endpoints/Icon.tsx
index 4d2ec9ae0b..9a0801966a 100644
--- a/client/src/components/Endpoints/Icon.tsx
+++ b/client/src/components/Endpoints/Icon.tsx
@@ -14,6 +14,7 @@ import {
} from '~/components/svg';
import { useAuthContext } from '~/hooks/AuthContext';
import useAvatar from '~/hooks/Messages/useAvatar';
+import useLocalize from '~/hooks/useLocalize';
import { IconProps } from '~/common';
import { cn } from '~/utils';
@@ -31,9 +32,10 @@ const Icon: React.FC<IconProps> = (props) => {
} = props;
const avatarSrc = useAvatar(user);
+ const localize = useLocalize();
if (isCreatedByUser) {
- const username = user?.name || 'User';
+ const username = user?.name || user?.username || localize('com_nav_user');
return (
<div
diff --git a/client/src/components/Nav/NavLinks.tsx b/client/src/components/Nav/NavLinks.tsx
index 54e70a9370..ffd7c8bb3b 100644
--- a/client/src/components/Nav/NavLinks.tsx
+++ b/client/src/components/Nav/NavLinks.tsx
@@ -96,7 +96,7 @@ function NavLinks() {
className="mt-2 grow overflow-hidden text-ellipsis whitespace-nowrap text-left text-black dark:text-white"
style={{ marginTop: '0', marginLeft: '0' }}
>
- {user?.name || localize('com_nav_user')}
+ {user?.name || user?.username || localize('com_nav_user')}
</div>
</Menu.Button>