interactive map

[alttp.git] / resources / js / components / users / Box.js

diff --git a/resources/js/components/users/Box.js b/resources/js/components/users/Box.js
index 70006cb13f2998df557130cbb0336efd7b49f597..c0d011bc106d4060dcbfd222865b62ed3d1e2fad 100644 (file)
--- a/resources/js/components/users/Box.js
+++ b/resources/js/components/users/Box.js
@@ -4,7 +4,7 @@ import { Button } from 'react-bootstrap';
 import { withTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 
-import { getAvatarUrl } from '../../helpers/User';
+import { getAvatarUrl, getUserName } from '../../helpers/User';
 import i18n from '../../i18n';
 
 const Box = ({ discriminator, noLink, user }) => {
@@ -16,8 +16,8 @@ const Box = ({ discriminator, noLink, user }) => {
 
        const content = <>
                <img alt="" src={getAvatarUrl(user)} />
-               <span>{discriminator || !user.nickname ? user.username : user.nickname}</span>
-               {discriminator ?
+               <span>{discriminator ? user.username : getUserName(user)}</span>
+               {discriminator && user.discriminator && user.discriminator !== '0' ?
                        <span className="text-muted">
                                {'#'}
                                {user.discriminator}