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 }) => {
const content = <>
<img alt="" src={getAvatarUrl(user)} />
- <span>{discriminator || !user.nickname ? user.username : user.nickname}</span>
- {discriminator && user.discriminator ?
+ <span>{discriminator ? user.username : getUserName(user)}</span>
+ {discriminator && user.discriminator && user.discriminator !== '0' ?
<span className="text-muted">
{'#'}
{user.discriminator}