Skip to content

Commit 997b134

Browse files
authored
Merge pull request #858 from topcoder-platform/MP-330
MP-330 - use name from members API if available -> dev
2 parents 5bdd704 + bf0ff67 commit 997b134

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/apps/learn/src/tca-certificate/user-certification-view/UserCertificationViewBase.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
SetStateAction,
66
useEffect,
77
useLayoutEffect,
8+
useMemo,
89
useRef,
910
useState,
1011
} from 'react'
@@ -44,6 +45,11 @@ const UserCertificationViewBase: FC<UserCertificationViewBaseProps> = (props: Us
4445
const isOwnProfile: boolean = !!props.profile?.email
4546

4647
const isModalView: boolean = queryParams.get('view-style') === 'modal'
48+
const userName = useMemo(() => (
49+
!!(props.profile?.firstName || props.profile?.lastName)
50+
? `${props.profile.firstName} ${props.profile.lastName}`
51+
: props.enrollment?.userName
52+
), [props.profile, props.enrollment])
4753

4854
const [isMemberVerified, setIsMemberVerified]: [boolean, Dispatch<SetStateAction<boolean>>]
4955
= useState<boolean>(false)
@@ -95,7 +101,7 @@ const UserCertificationViewBase: FC<UserCertificationViewBaseProps> = (props: Us
95101
completionUuid={props.enrollment.completionUuid ?? undefined}
96102
isMemberVerified={isMemberVerified}
97103
userProfile={props.profile}
98-
userName={props.enrollment.userName}
104+
userName={userName}
99105
isOwner={isOwnProfile}
100106
validationUrl={validationUrl}
101107
isPreview={props.isPreview}

0 commit comments

Comments
 (0)