diff --git a/src/apps/onboarding/src/pages/account-details/index.tsx b/src/apps/onboarding/src/pages/account-details/index.tsx
index 1912eafdb..bfdb25573 100644
--- a/src/apps/onboarding/src/pages/account-details/index.tsx
+++ b/src/apps/onboarding/src/pages/account-details/index.tsx
@@ -10,6 +10,8 @@ import classNames from 'classnames'
import { Button, InputSelect, PageDivider } from '~/libs/ui'
import { getCountryLookup } from '~/libs/core/lib/profile/profile-functions/profile-store/profile-xhr.store'
+import { EnvironmentConfig } from '~/config'
+import { Member } from '~/apps/talent-search/src/lib/models'
import { ProgressBar } from '../../components/progress-bar'
@@ -30,6 +32,7 @@ const blankConnectInfo: ConnectInfo = emptyConnectInfo()
const PageAccountDetailsContent: FC<{
reduxAddress: MemberAddress | null
reduxConnectInfo: ConnectInfo | null
+ reduxMemberInfo: Member | null
updateMemberConnectInfos: (infos: ConnectInfo[]) => void
createMemberConnectInfos: (infos: ConnectInfo[]) => void
updateMemberHomeAddresss: (infos: MemberAddress[]) => void
@@ -133,7 +136,11 @@ const PageAccountDetailsContent: FC<{
&& !loadingAddress
&& !loadingConnectInfo
&& shouldNavigateTo.current) {
- navigate(shouldNavigateTo.current)
+ if (shouldNavigateTo.current.startsWith('../')) {
+ navigate(shouldNavigateTo.current)
+ } else {
+ window.location.href = shouldNavigateTo.current
+ }
}
/* eslint-disable react-hooks/exhaustive-deps */
}, [loadingAddress, loadingConnectInfo])
@@ -313,8 +320,8 @@ const PageAccountDetailsContent: FC<{
@@ -337,7 +344,16 @@ const PageAccountDetailsContent: FC<{
size='lg'
primary
iconToLeft
- disabled={!_.isEmpty(formErrors)}
+ disabled={!_.isEmpty(formErrors) || !props.reduxMemberInfo}
+ onClick={() => {
+ if (loadingAddress || loadingConnectInfo) {
+ shouldNavigateTo.current
+ = `${EnvironmentConfig.USER_PROFILE_URL}/${props.reduxMemberInfo?.handle}`
+ } else {
+ window.location.href
+ = `${EnvironmentConfig.USER_PROFILE_URL}/${props.reduxMemberInfo?.handle}`
+ }
+ }}
>
next
@@ -352,6 +368,7 @@ const mapStateToProps: any = (state: any) => {
loadingMemberInfo,
address,
connectInfo,
+ memberInfo,
}: any = state.member
return {
@@ -359,6 +376,7 @@ const mapStateToProps: any = (state: any) => {
loadingMemberTraits,
reduxAddress: address,
reduxConnectInfo: connectInfo,
+ reduxMemberInfo: memberInfo,
}
}
diff --git a/src/apps/onboarding/src/pages/educations/index.tsx b/src/apps/onboarding/src/pages/educations/index.tsx
index 7feb275ce..695d55bdc 100644
--- a/src/apps/onboarding/src/pages/educations/index.tsx
+++ b/src/apps/onboarding/src/pages/educations/index.tsx
@@ -118,8 +118,8 @@ export const PageEducationsContent: FC<{
diff --git a/src/apps/onboarding/src/pages/personalization/index.tsx b/src/apps/onboarding/src/pages/personalization/index.tsx
index fdc8e51ad..80724e43c 100644
--- a/src/apps/onboarding/src/pages/personalization/index.tsx
+++ b/src/apps/onboarding/src/pages/personalization/index.tsx
@@ -195,8 +195,8 @@ const PagePersonalizationContent: FC<{
diff --git a/src/apps/onboarding/src/pages/skills/index.tsx b/src/apps/onboarding/src/pages/skills/index.tsx
index f876579fd..5240ec1ba 100644
--- a/src/apps/onboarding/src/pages/skills/index.tsx
+++ b/src/apps/onboarding/src/pages/skills/index.tsx
@@ -34,8 +34,8 @@ export const PageSkills: FC<{}> = () => {
diff --git a/src/apps/onboarding/src/pages/start/index.tsx b/src/apps/onboarding/src/pages/start/index.tsx
index 6c76ae4ae..bb177135a 100644
--- a/src/apps/onboarding/src/pages/start/index.tsx
+++ b/src/apps/onboarding/src/pages/start/index.tsx
@@ -55,8 +55,8 @@ export const PageStart: FC<{}> = () => {
diff --git a/src/apps/onboarding/src/pages/works/index.tsx b/src/apps/onboarding/src/pages/works/index.tsx
index 692cb4b49..e42f9aa74 100644
--- a/src/apps/onboarding/src/pages/works/index.tsx
+++ b/src/apps/onboarding/src/pages/works/index.tsx
@@ -128,8 +128,8 @@ export const PageWorksContent: FC<{
diff --git a/src/config/environments/default.env.ts b/src/config/environments/default.env.ts
index 9e728c9c4..ed9683888 100644
--- a/src/config/environments/default.env.ts
+++ b/src/config/environments/default.env.ts
@@ -13,6 +13,7 @@ export const TC_DOMAIN: string = get({
export const TOPCODER_URL: string = `https://www.${TC_DOMAIN}`
export const PLATFORMUI_URL: string = `https://platform-ui.${TC_DOMAIN}`
+export const USER_PROFILE_URL: string = `https://profiles.${TC_DOMAIN}`
export const API = {
V1: `https://api.${TC_DOMAIN}/v1`,
diff --git a/src/config/environments/global-config.model.ts b/src/config/environments/global-config.model.ts
index db79f75bb..adcc3d426 100644
--- a/src/config/environments/global-config.model.ts
+++ b/src/config/environments/global-config.model.ts
@@ -2,6 +2,7 @@ export interface GlobalConfig {
TC_DOMAIN: string
TOPCODER_URL: string
PLATFORMUI_URL: string
+ USER_PROFILE_URL: string
API: {
V1: string
V3: string