diff --git a/web/components/buttons/more-options-user-button.tsx b/web/components/buttons/more-options-user-button.tsx
index b9c4730a..81186887 100644
--- a/web/components/buttons/more-options-user-button.tsx
+++ b/web/components/buttons/more-options-user-button.tsx
@@ -12,7 +12,8 @@ import {Modal} from 'web/components/layout/modal'
import {UncontrolledTabs} from 'web/components/layout/tabs'
import {BlockUser} from 'web/components/profile/block-user'
import {ReportUser} from 'web/components/profile/report-user'
-import {Title} from 'web/components/widgets/title'
+import {Avatar} from 'web/components/widgets/avatar'
+import {Subtitle} from 'web/components/widgets/subtitle'
import {Tooltip} from 'web/components/widgets/tooltip'
import {useAdmin, useTrusted} from 'web/hooks/use-admin'
import {usePrivateUser} from 'web/hooks/use-user'
@@ -37,8 +38,6 @@ export function MoreOptionsUserButton(props: {user: User}) {
month: 'short',
})
- // const isYou = currentPrivateUser.id === userId
-
return (
<>
@@ -51,83 +50,101 @@ export function MoreOptionsUserButton(props: {user: User}) {
-
-
-
-
{name}
- {(isAdmin || isTrusted) && (
-
-
-
+
+
+ {/* Header */}
+
+
+
+ {name}
+
+
+ {t('more_options_user.joined', 'Joined')} {createdTime}
+
+ {isAdmin && (
+
+ )}
- )}
-
-
-
- {t('more_options_user.joined', 'Joined')} {createdTime}
-
- {isAdmin && (
-
- )}
+
- setIsModalOpen(false)}
- />
- ),
- },
- {
- title: t('more_options_user.report', 'Report'),
- content: setIsModalOpen(false)} />,
- },
- ],
- ])}
- />
+
+ {/* Tabs */}
+
+ setIsModalOpen(false)}
+ />
+ ),
+ },
+ {
+ title: t('more_options_user.report', 'Report'),
+ content: setIsModalOpen(false)} />,
+ },
+ ],
+ ])}
+ />
+
+
+ {/* Admin actions */}
+ {(isAdmin || isTrusted) && (
+ <>
+
+
+
+ {t('more_options_user.admin', 'Admin')}
+
+
+
+
+
+
+ >
+ )}
>
diff --git a/web/components/profile/block-user.tsx b/web/components/profile/block-user.tsx
index 9ecc25c1..45c5ba2b 100644
--- a/web/components/profile/block-user.tsx
+++ b/web/components/profile/block-user.tsx
@@ -12,7 +12,7 @@ export const BlockUser = (props: {
currentUser: PrivateUser
closeModal: () => void
}) => {
- const {user, currentUser, closeModal} = props
+ const {user, currentUser} = props
const {id: userId} = user
const t = useT()
@@ -30,9 +30,9 @@ export const BlockUser = (props: {
return (
-
+ {/**/}
{isBlocked ? (