Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update onboarding flow #41593

Merged
merged 10 commits into from
May 3, 2024
Merged

Update onboarding flow #41593

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cd19f31
update onboarding flow
DylanDylann May 3, 2024
99357f6
only go to business page if the selected purpose is manage team
DylanDylann May 3, 2024
3363534
should create ws before navigating
DylanDylann May 3, 2024
47d4ad8
remove redundant
DylanDylann May 3, 2024
86cf7a2
lint fix
DylanDylann May 3, 2024
6d22d28
lint fix
DylanDylann May 3, 2024
0eaa2ba
lin fix
DylanDylann May 3, 2024
25c9858
add new ONYX field
DylanDylann May 3, 2024
7d4d045
TS error
DylanDylann May 3, 2024
7bb2cff
fix lint
DylanDylann May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import ROUTES from '@src/ROUTES';
import INPUT_IDS from '@src/types/form/DisplayNameForm';
import type {BaseOnboardingPersonalDetailsOnyxProps, BaseOnboardingPersonalDetailsProps} from './types';

const OPEN_WORK_PAGE_PURPOSES = [CONST.ONBOARDING_CHOICES.MANAGE_TEAM];

function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNativeStyles, onboardingPurposeSelected}: BaseOnboardingPersonalDetailsProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();
Expand All @@ -51,12 +49,6 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
return;
}

if (OPEN_WORK_PAGE_PURPOSES.includes(onboardingPurposeSelected)) {
Navigation.navigate(ROUTES.ONBOARDING_WORK);

return;
}

Report.completeOnboarding(onboardingPurposeSelected, CONST.ONBOARDING_MESSAGES[onboardingPurposeSelected], {
login: currentUserPersonalDetails.login ?? '',
firstName,
Expand Down Expand Up @@ -121,7 +113,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
<View style={[styles.h100, styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}>
<HeaderWithBackButton
shouldShowBackButton
progressBarPercentage={OPEN_WORK_PAGE_PURPOSES.includes(onboardingPurposeSelected ?? '') ? 50 : 75}
progressBarPercentage={75}
onBackButtonPress={Navigation.goBack}
/>
<KeyboardAvoidingView
Expand Down
5 changes: 5 additions & 0 deletions src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, on
return;
}

if (selectedPurpose === CONST.ONBOARDING_CHOICES.MANAGE_TEAM) {
Navigation.navigate(ROUTES.ONBOARDING_WORK);
return;
}

Navigation.navigate(ROUTES.ONBOARDING_PERSONAL_DETAILS);
}, [selectedPurpose]);

Expand Down
10 changes: 9 additions & 1 deletion src/pages/OnboardingWork/BaseOnboardingWork.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import ROUTES from '@src/ROUTES';
import INPUT_IDS from '@src/types/form/WorkForm';
import type {BaseOnboardingWorkOnyxProps, BaseOnboardingWorkProps} from './types';

const OPEN_WORK_PAGE_PURPOSES = [CONST.ONBOARDING_CHOICES.MANAGE_TEAM];

function BaseOnboardingWork({currentUserPersonalDetails, shouldUseNativeStyles, onboardingPurposeSelected}: BaseOnboardingWorkProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();
Expand All @@ -41,6 +43,12 @@ function BaseOnboardingWork({currentUserPersonalDetails, shouldUseNativeStyles,
return;
}

if (OPEN_WORK_PAGE_PURPOSES.includes(onboardingPurposeSelected)) {
Navigation.navigate(ROUTES.ONBOARDING_PERSONAL_DETAILS);

return;
DylanDylann marked this conversation as resolved.
Show resolved Hide resolved
}

const work = values.work.trim();

const {adminsChatReportID} = Policy.createWorkspace(undefined, true, work);
Expand Down Expand Up @@ -96,7 +104,7 @@ function BaseOnboardingWork({currentUserPersonalDetails, shouldUseNativeStyles,
<View style={[styles.h100, styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}>
<HeaderWithBackButton
shouldShowBackButton
progressBarPercentage={75}
progressBarPercentage={OPEN_WORK_PAGE_PURPOSES.includes(onboardingPurposeSelected ?? '') ? 50 : 75}
onBackButtonPress={Navigation.goBack}
/>
<KeyboardAvoidingView
Expand Down
Loading