Resolve merge conflicts 2

Author: kkartunov

src/apps/onboarding/src/models/MemberInfo.ts

@@ -1,6 +1,5 @@
 import { MemberMaxRating } from '~/apps/talent-search/src/lib/models'
-import { MemberStats } from '~/libs/core'
-import { Skill } from '~/libs/shared'
+import { MemberStats, UserSkill } from '~/libs/core'
 
 import MemberAddress from './MemberAddress'
 
@@ -14,7 +13,7 @@ export default interface MemberInfo {
     email: string
     accountAge: number
     maxRating: MemberMaxRating
-    emsiSkills: Array<Skill>
+    skills: Array<UserSkill>
     stats: Array<MemberStats>
     addresses?: MemberAddress[]
     country: string

src/apps/talent-search/src/components/talent-card/TalentCard.tsx

@@ -5,7 +5,8 @@ import classNames from 'classnames'
 import codes from 'country-calling-code'
 
 import { IconSolid } from '~/libs/ui'
-import { isSkillVerified, ProfilePicture, Skill, SkillPill } from '~/libs/shared'
+import { isSkillVerified, ProfilePicture, SkillPill } from '~/libs/shared'
+import { UserSkill } from '~/libs/core'
 
 import { ProfileMatch } from '../profile-match'
 import { Member, MemberDisplayName } from '../../lib/models'
@@ -30,7 +31,7 @@ function isOverflow(el: HTMLElement): boolean {
 }
 
 interface TalentCardProps {
-    queriedSkills: Skill[]
+    queriedSkills: UserSkill[]
     member: Member
     match?: number
 }
@@ -44,12 +45,12 @@ const TalentCard: FC<TalentCardProps> = props => {
 
     const matchedSkills = useMemo(() => (
         orderBy(
-            props.member.emsiSkills,
+            props.member.skills,
             [isSkillVerified, a => a.name],
             ['desc', 'asc'],
         )
             .filter(isMatchingSkill)
-    ), [isMatchingSkill, props.member.emsiSkills])
+    ), [isMatchingSkill, props.member.skills])
 
     const matchState = useMemo(() => ({
         matchValue: props.match,

src/apps/talent-search/src/lib/models/Member.ts

@@ -1,4 +1,4 @@
-import { Skill } from '~/libs/shared'
+import { UserSkill } from '~/libs/core'
 
 import { MemberDisplayName } from './MemberDisplayName'
 import MemberAddress from './MemberAddress'
@@ -13,7 +13,7 @@ export default interface Member {
     createdAt: number;
     description: string;
     email: string;
-    emsiSkills: Array <Skill>;
+    skills: Array<UserSkill>;
     firstName: string;
     handle: string;
     homeCountryCode: string;
@@ -24,7 +24,7 @@ export default interface Member {
     numberOfChallengesWon: number;
     photoURL: string;
     skillScore: number;
-    stats: Array <MemberStats>;
+    stats: Array<MemberStats>;
     status: string;
     userId: number;
     verified: string;

src/apps/talent-search/src/lib/services/use-fetch-talent-matches.ts

@@ -3,8 +3,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'
 import useSWR, { SWRResponse } from 'swr'
 
 import { EnvironmentConfig } from '~/config'
-import { PaginatedResponse, xhrGetPaginatedAsync } from '~/libs/core'
-import { Skill } from '~/libs/shared'
+import { PaginatedResponse, UserSkill, xhrGetPaginatedAsync } from '~/libs/core'
 import Member from '@talentSearch/lib/models/Member'
 
 export interface TalentMatchesResponse {
@@ -18,7 +17,7 @@ export interface TalentMatchesResponse {
 }
 
 export function useFetchTalentMatches(
-    skills: ReadonlyArray<Skill>,
+    skills: ReadonlyArray<UserSkill>,
     page: number,
     pageSize: number,
 ): TalentMatchesResponse {
@@ -61,7 +60,7 @@ export interface InfiniteTalentMatchesResposne {
 }
 
 export function useInfiniteTalentMatches(
-    skills: ReadonlyArray<Skill>,
+    skills: ReadonlyArray<UserSkill>,
     pageSize: number = 10,
 ): InfiniteTalentMatchesResposne {
     const [matches, setMatches] = useState([] as Member[])