Skip to content

armgit / meet

Public Imported from GitHub
0

Open source video conferencing app powered by LiveKit. Built with Django and React.

🚸(frontend) display email with username to clarify logged-in account

ericboucherf7268c507bac
diff --git a/src/frontend/src/features/settings/components/SettingsDialog.tsx b/src/frontend/src/features/settings/components/SettingsDialog.tsx
index c690a227..cb3ab5f4 100644
--- a/src/frontend/src/features/settings/components/SettingsDialog.tsx
+++ b/src/frontend/src/features/settings/components/SettingsDialog.tsx
@@ -10,6 +10,10 @@ export const SettingsDialog = (props: SettingsDialogProps) => {
const { t, i18n } = useTranslation('settings')
const { user, isLoggedIn, logout } = useUser()
const { languagesList, currentLanguage } = useLanguageLabels()
+ const userDisplay =
+ user?.full_name && user?.email
+ ? `${user.full_name} (${user.email})`
+ : user?.email
return (
<Dialog title={t('dialog.heading')} {...props}>
<H lvl={2}>{t('account.heading')}</H>
@@ -18,7 +22,7 @@ export const SettingsDialog = (props: SettingsDialogProps) => {
<P>
<Trans
i18nKey="settings:account.currentlyLoggedAs"
- values={{ user: user?.full_name ?? user?.email }}
+ values={{ user: userDisplay }}
components={[<Badge />]}
/>
</P>
diff --git a/src/frontend/src/features/settings/components/tabs/AccountTab.tsx b/src/frontend/src/features/settings/components/tabs/AccountTab.tsx
index a8bb2d19..2bfd73d5 100644
--- a/src/frontend/src/features/settings/components/tabs/AccountTab.tsx
+++ b/src/frontend/src/features/settings/components/tabs/AccountTab.tsx
@@ -18,6 +18,10 @@ export const AccountTab = ({ id, onOpenChange }: AccountTabProps) => {
const room = useRoomContext()
const { user, isLoggedIn, logout } = useUser()
const [name, setName] = useState(room?.localParticipant.name ?? '')
+ const userDisplay =
+ user?.full_name && user?.email
+ ? `${user.full_name} (${user.email})`
+ : user?.email
const handleOnSubmit = () => {
if (room) room.localParticipant.setName(name)
@@ -46,7 +50,7 @@ export const AccountTab = ({ id, onOpenChange }: AccountTabProps) => {
<P>
<Trans
i18nKey="settings:account.currentlyLoggedAs"
- values={{ user: user?.full_name || user?.email }}
+ values={{ user: userDisplay }}
components={[<Badge />]}
/>
</P>