diff --git a/src/apps/onboarding/src/components/FieldAvatar/index.tsx b/src/apps/onboarding/src/components/FieldAvatar/index.tsx index 60abda520..17e44619e 100644 --- a/src/apps/onboarding/src/components/FieldAvatar/index.tsx +++ b/src/apps/onboarding/src/components/FieldAvatar/index.tsx @@ -108,9 +108,10 @@ const FieldAvatar: FC = (props: FieldAvatarProps) => { > {imgUrl ? ( avatar - ) : ( + ) : undefined} + {!imgUrl ? ( avatar - )} + ) : undefined}
diff --git a/src/apps/onboarding/src/components/modal-upload-photo/index.tsx b/src/apps/onboarding/src/components/modal-upload-photo/index.tsx index ea34baf8b..067c21f79 100644 --- a/src/apps/onboarding/src/components/modal-upload-photo/index.tsx +++ b/src/apps/onboarding/src/components/modal-upload-photo/index.tsx @@ -53,8 +53,8 @@ const ModalUploadPhoto: FC = (props: ModalUploadPhotoProp setIsSaving(true) try { - await updateMemberPhotoAsync(props.memberInfo.handle, formData) - props.setMemberPhotoUrl(URL.createObjectURL(myFiles[0])) + const result = await updateMemberPhotoAsync(props.memberInfo.handle, formData) + props.setMemberPhotoUrl(result?.photoURL || URL.createObjectURL(myFiles[0])) setMyFiles([]) props.onClose?.() } catch (error) { diff --git a/src/apps/onboarding/src/pages/onboarding/index.tsx b/src/apps/onboarding/src/pages/onboarding/index.tsx index 3b61e9d42..61a27c64f 100644 --- a/src/apps/onboarding/src/pages/onboarding/index.tsx +++ b/src/apps/onboarding/src/pages/onboarding/index.tsx @@ -14,12 +14,11 @@ import '../../styles/global/_index.scss' import styles from './styles.module.scss' -const OnboardingContent: FC<{ +const OnboardingFooterContent: FC<{ fetchMemberInfo: () => void fetchMemberTraits: () => void reduxMemberInfo: Member | undefined }> = props => { - const { getChildRoutes }: RouterContextData = useContext(routerContext) useEffect(() => { props.fetchMemberInfo() props.fetchMemberTraits() @@ -27,20 +26,11 @@ const OnboardingContent: FC<{ }, []) return ( - <> -
- - - {getChildRoutes(onboardRouteId)} - -
-
- - I will complete this onboarding later, - skip for now - . - - + + I will complete this onboarding later, + skip for now + . + ) } @@ -58,12 +48,30 @@ const mapDispatchToProps: any = { fetchMemberInfo, fetchMemberTraits, } -const Onboarding: any = connect(mapStateToProps, mapDispatchToProps)(OnboardingContent) +const OnboardingFooter: any = connect(mapStateToProps, mapDispatchToProps)(OnboardingFooterContent) + +const OnboardingContent: FC<{ +}> = () => { + const { getChildRoutes }: RouterContextData = useContext(routerContext) + + return ( + <> +
+ + + {getChildRoutes(onboardRouteId)} + +
+
+ + + ) +} export const OnboardingWrapper: FC<{}> = () => (
- +
) diff --git a/src/apps/onboarding/src/redux/reducers/member.ts b/src/apps/onboarding/src/redux/reducers/member.ts index efa2ecb9f..642ccf62f 100644 --- a/src/apps/onboarding/src/redux/reducers/member.ts +++ b/src/apps/onboarding/src/redux/reducers/member.ts @@ -1,5 +1,7 @@ import _ from 'lodash' +import { notifyUniNavi } from '~/apps/profiles/src/lib' + import { ACTIONS } from '../../config' import ConnectInfo from '../../models/ConnectInfo' import EducationInfo from '../../models/EducationInfo' @@ -89,6 +91,9 @@ const memberReducer: any = ( const newMemberInfo = _.cloneDeep(state.memberInfo) newMemberInfo.photoURL = action.payload + if (newMemberInfo) { + notifyUniNavi(newMemberInfo as any) + } return { ...state,