diff --git a/apps/meteor/client/components/UserCard/UserCardRoles.tsx b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
index 9cd22ebdff35..f7a977d4a4dc 100644
--- a/apps/meteor/client/components/UserCard/UserCardRoles.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
@@ -6,7 +6,7 @@ import UserCardInfo from './UserCardInfo';
const UserCardRoles = ({ children }: { children: ReactNode }): ReactElement => (
-
+
{children}
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index 8a42f1b87026..0e04a55b105e 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -54,7 +54,7 @@ const UserInfo = ({
email,
verified,
createdAt,
- status,
+ // status,
statusText,
customFields,
canViewAllInfo,
@@ -78,7 +78,7 @@ const UserInfo = ({
{actions && {actions}}
- {userDisplayName && }
+ {userDisplayName && }
{statusText && (
@@ -94,17 +94,26 @@ const UserInfo = ({
)}
- {roles.length !== 0 && (
+ {username && username !== name && (
+
+ {t('Username')}
+ {username}
+
+ )}
+
+ {roles.length !== 0 && (
{t('Roles')}
{roles}
)}
- {username && username !== name && (
+ {bio && (
- {t('Username')}
- {username}
+ {t('Bio')}
+
+
+
)}
@@ -131,12 +140,12 @@ const UserInfo = ({
)}
- {name && (
+ {/* {name && (
{t('Full_Name')}
{name}
- )}
+ )} */}
{phone && (
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index e0e88bedcd90..c8cb7f3dc931 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -13,7 +13,7 @@ import AdminUserFormWithData from './AdminUserFormWithData';
import AdminUserInfoWithData from './AdminUserInfoWithData';
import UsersTable from './UsersTable';
-const UsersPage = (): ReactElement => {
+const UsersPage = async (): Promise => {
const t = useTranslation();
const seatsCap = useSeatsCap();
const reload = useRef(() => null);
@@ -25,7 +25,8 @@ const UsersPage = (): ReactElement => {
const canCreateUser = usePermission('create-user');
const canBulkCreateUser = usePermission('bulk-register-user');
- const [tab, setTab] = useState<'all' | 'invited' | 'new' | 'active' | 'deactivated'>('all');
+ const [tab, setTab] = useState<'all' | 'invited' | 'pending' | 'new' | 'active' | 'deactivated'>('all');
+ const [pendingActionsCount, setPendingActionsCount] = useState(0);
useEffect(() => {
if (!context || !seatsCap) {
@@ -51,7 +52,7 @@ const UsersPage = (): ReactElement => {
) : (
{canCreateUser && (
-