diff --git a/src/pages/User/content/MemberProfile.tsx b/src/pages/User/content/MemberProfile.tsx index 47d6600a8a..247d26623e 100644 --- a/src/pages/User/content/MemberProfile.tsx +++ b/src/pages/User/content/MemberProfile.tsx @@ -89,7 +89,22 @@ export const MemberProfile = ({ user, adminButton }: IProps) => { ml={3} sx={{ flexGrow: 2, width: '100%', flexDirection: 'column' }} > - {user.userName} + + {userCountryCode && ( + + )} + + {user.userName} + + { color={'black'} style={{ wordWrap: 'break-word' }} > - {userCountryCode && ( - - )} {user.displayName} diff --git a/src/pages/User/content/SpaceProfile.tsx b/src/pages/User/content/SpaceProfile.tsx index c203886acf..fbb810fdb2 100644 --- a/src/pages/User/content/SpaceProfile.tsx +++ b/src/pages/User/content/SpaceProfile.tsx @@ -12,13 +12,11 @@ import Slider from 'react-slick' import 'src/assets/css/slick.min.css' import styled from '@emotion/styled' import Flex from 'src/components/Flex' -import Workspace from 'src/pages/User/workspace/Workspace' import { Text } from 'src/components/Text' import Badge from 'src/components/Badge/Badge' import theme from 'src/themes/styled.theme' -import { replaceDashesWithSpaces } from 'src/utils/helpers' import { Icon, FlagIcon } from 'oa-components' // Plastic types @@ -47,32 +45,6 @@ interface IProps { adminButton?: JSX.Element } -const UserCategory = styled.div` - position: relative; - display: inline-block; - z-index: ${theme.zIndex.default}; - - &:after { - content: ''; - height: 100%; - display: block; - position: absolute; - top: 0; - - z-index: ${theme.zIndex.behind}; - background-repeat: no-repeat; - background-size: contain; - left: 0; - right: 0; - - ${(props: IBackgroundImageProps) => - props.bgImg && - ` - background-image: url(${props.bgImg}); - `} - } -` - const MobileBadge = styled.div` position: relative; max-width: 120px; @@ -249,27 +221,7 @@ function renderMachineBuilderXp(machineBuilderXp: Array) { ) } -function renderProfileTypeName(user: IUserPP) { - const profileTypeNames: { [key in IUserPP['profileType']]: string } = { - 'collection-point': 'Collection Point', - 'community-builder': 'Community Point', - 'machine-builder': 'Machine Builder', - member: 'Member', - workspace: 'Workspace', - } - return ( - - {user.profileType === 'machine-builder' && - `${replaceDashesWithSpaces(user.workspaceType!)} `} - {profileTypeNames[user.profileType]} - - ) -} - export const SpaceProfile = ({ user, adminButton }: IProps) => { - const workspaceHighlightSrc = Workspace.findWordspaceHighlight( - user.profileType, - ) let coverImage = [ { - - {renderProfileTypeName(user)} - - - - - {userCountryCode && ( - - )} + + {userCountryCode && ( + + )} + + {user.userName} + + + + + + {user.displayName}