diff --git a/frontend/src/components/v2/Select/components/index.tsx b/frontend/src/components/v2/Select/components/index.tsx index 520f61a334..75bdfcfb22 100644 --- a/frontend/src/components/v2/Select/components/index.tsx +++ b/frontend/src/components/v2/Select/components/index.tsx @@ -36,10 +36,12 @@ export const MultiValueRemove = (props: MultiValueRemoveProps) => { export const Option = ({ isSelected, children, ...props }: OptionProps) => { return ( - {children} - {isSelected && ( - - )} +
+

{children}

+ {isSelected && ( + + )} +
); }; diff --git a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx index cc5217693d..fece4e40d0 100644 --- a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx +++ b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx @@ -296,7 +296,8 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro status, isActive }) => { - const name = u && u.firstName ? `${u.firstName} ${u.lastName}` : "-"; + const name = + u && u.firstName ? `${u.firstName} ${u.lastName ?? ""}`.trim() : "-"; const email = u?.email || inviteEmail; const username = u?.username ?? inviteEmail ?? "-"; return ( diff --git a/frontend/src/views/Org/UserPage/UserPage.tsx b/frontend/src/views/Org/UserPage/UserPage.tsx index 2b3817bcda..81b5ff058d 100644 --- a/frontend/src/views/Org/UserPage/UserPage.tsx +++ b/frontend/src/views/Org/UserPage/UserPage.tsx @@ -123,7 +123,7 @@ export const UserPage = withPermission(

{membership.user.firstName || membership.user.lastName - ? `${membership.user.firstName} ${membership.user.lastName}` + ? `${membership.user.firstName} ${membership.user.lastName ?? ""}`.trim() : "-"}

{userId !== membership.user.id && ( diff --git a/frontend/src/views/Org/UserPage/components/UserDetailsSection.tsx b/frontend/src/views/Org/UserPage/components/UserDetailsSection.tsx index 6939eca179..863a2745f3 100644 --- a/frontend/src/views/Org/UserPage/components/UserDetailsSection.tsx +++ b/frontend/src/views/Org/UserPage/components/UserDetailsSection.tsx @@ -118,7 +118,7 @@ export const UserDetailsSection = ({ membershipId, handlePopUpOpen }: Props) =>

Name

{membership.user.firstName || membership.user.lastName - ? `${membership.user.firstName} ${membership.user.lastName}` + ? `${membership.user.firstName} ${membership.user.lastName ?? ""}`.trim() : "-"}