Merge pull request #714 from topcoder-platform/issues-708-to-712

Author: jmgasper

src/apps/onboarding/src/components/FormField/styles.module.scss

@@ -5,7 +5,7 @@ $green1: #137d60;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
-    margin-bottom: 18px;
+    margin-bottom: 0;
 
     .form-field {
         border: 1px solid #b7b7b7;

src/apps/onboarding/src/components/modal-add-education/styles.module.scss

@@ -14,6 +14,11 @@
         }
     }
 
+    :global(.modal-body) {
+        padding-bottom: 0;
+        margin-bottom: 0;
+    }
+
     hr {
         margin-top: 30px;
     }

src/apps/onboarding/src/components/modal-add-work/index.tsx

@@ -223,17 +223,19 @@ const ModalAddWork: FC<ModalAddWorkProps> = (props: ModalAddWorkProps) => {
                         </FormField>
                     </div>
                 </div>
-                <FormInputCheckboxMiddleware
-                    label='I am currently working in this role'
-                    checked={workInfo.currentlyWorking}
-                    inline
-                    onChange={(e: any) => {
-                        setWorkInfo({
-                            ...workInfo,
-                            currentlyWorking: e.target.checked,
-                        })
-                    }}
-                />
+                <div className='mt-16'>
+                    <FormInputCheckboxMiddleware
+                        label='I am currently working in this role'
+                        checked={workInfo.currentlyWorking}
+                        inline
+                        onChange={(e: any) => {
+                            setWorkInfo({
+                                ...workInfo,
+                                currentlyWorking: e.target.checked,
+                            })
+                        }}
+                    />
+                </div>
             </div>
         </BaseModal>
     )

src/apps/onboarding/src/pages/educations/index.tsx

@@ -60,7 +60,7 @@ export const PageEducationsContent: FC<{
 
     return (
         <div className={classNames('d-flex flex-column', styles.container)}>
-            <h2>Add your education information</h2>
+            <h2>Education</h2>
             <PageDivider />
 
             <div className={classNames('d-flex flex-column align-items-start full-width mt-8', styles.blockContent)}>

src/apps/onboarding/src/pages/personalization/index.tsx

@@ -8,6 +8,7 @@ import { FC, MutableRefObject, useEffect, useRef } from 'react'
 import classNames from 'classnames'
 
 import { Button, PageDivider } from '~/libs/ui'
+import { EnvironmentConfig } from '~/config'
 
 import { ProgressBar } from '../../components/progress-bar'
 import styles from './styles.module.scss'
@@ -54,7 +55,11 @@ const PagePersonalizationContent: FC<{
 
     useEffect(() => {
         if (!loading && !shouldSavingData.current && !!shouldNavigateTo.current) {
-            navigate(shouldNavigateTo.current)
+            if (shouldNavigateTo.current.startsWith('../')) {
+                navigate(shouldNavigateTo.current)
+            } else {
+                window.location.href = shouldNavigateTo.current
+            }
         }
         /* eslint-disable react-hooks/exhaustive-deps */
     }, [loading])
@@ -131,9 +136,11 @@ const PagePersonalizationContent: FC<{
                     iconToLeft
                     onClick={() => {
                         if (loading) {
-                            shouldNavigateTo.current = '../account-details'
+                            shouldNavigateTo.current
+                                = `${EnvironmentConfig.USER_PROFILE_URL}/${props.memberInfo?.handle}`
                         } else {
-                            navigate('../account-details')
+                            window.location.href
+                                = `${EnvironmentConfig.USER_PROFILE_URL}/${props.memberInfo?.handle}`
                         }
                     }}
                 >