From 8a73dd86cf2b419d5582d01f7a89f409ce3ed3ef Mon Sep 17 00:00:00 2001
From: nessi <sascha@nesterovic.cc>
Date: Fri, 6 Feb 2026 12:22:20 +0100
Subject: [PATCH] Refactor TopBar displayName initialization logic.

Moved the `displayName` variable initialization inside the `TopBar` component and handled null checks consistently. This improves readability and ensures a safer default value handling for `me`.
---
 frontend/src/components/TopBar.jsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/TopBar.jsx b/frontend/src/components/TopBar.jsx
index ea0cb5d..5cb2527 100644
--- a/frontend/src/components/TopBar.jsx
+++ b/frontend/src/components/TopBar.jsx
@@ -2,8 +2,6 @@ import React from "react";
 import { styles } from "../styles/styles";
 import { stylesTokens } from "../styles/theme";
 
-const displayName = (me?.display_name || "").trim() || me.email;
-
 export default function TopBar({
   me,
   userMenuOpen,
@@ -11,8 +9,12 @@ export default function TopBar({
   openPwModal,
   openDesignModal,
   doLogout,
-  onOpenNewGame, // NEW
+  onOpenNewGame,
 }) {
+  const displayName = me
+    ? ((me.display_name || "").trim() || me.email)
+    : "";
+
   return (
     <div style={styles.topBar}>
       <div>
@@ -47,7 +49,7 @@ export default function TopBar({
                   borderBottom: "1px solid rgba(233,216,166,0.12)",
                 }}
               >
-                {me.email}
+                {me?.email || ""}
               </div>
 
               <button onClick={openPwModal} style={styles.userDropdownItem}>