Merge remote-tracking branch 'origin/master' into dev

Author: vas3a

src-ts/tools/learn/welcome/courses-card/CoursesCard.tsx

@@ -60,13 +60,13 @@ const CoursesCard: FC<CoursesCardProps> = (props: CoursesCardProps) => {
     }
 
     const completionTimeRange: TCACertificationCompletionTimeRange = useHoursEstimateToRange(
-        props.certification.course.estimatedCompletionTimeValue,
+        props.certification.course?.estimatedCompletionTimeValue,
     )
 
     return (
         <div className={classNames(styles.wrap, !courseEnabled && 'soon', isCompleted && styles.completed)}>
             <div className={styles.cardHeader}>
-                <CourseBadge type={props.certification.certificationCategory.track ?? 'DEV'} />
+                <CourseBadge type={props.certification.certificationCategory?.track ?? 'DEV'} />
                 <div className={styles.cardHeaderTitleWrap}>
                     <p className='body-medium-medium'>{clearFCCCertificationTitle(props.certification.title)}</p>
                     <div className={styles.subTitleWrap}>
@@ -97,7 +97,7 @@ const CoursesCard: FC<CoursesCardProps> = (props: CoursesCardProps) => {
                 {(isInProgress || isCompleted) && (
                     <ProgressBar
                         progress={(isCompleted ? 100 : (props.progress?.courseProgressPercentage ?? 0)) / 100}
-                        track={props.certification.certificationCategory.track}
+                        track={props.certification.certificationCategory?.track}
                     />
                 )}
                 {!isInProgress && !isCompleted && <div className={styles.cardHeaderDivider} />}