Skip to content

[HOLD] Revert "Onboarding - Signing-up with a + operator email address doesn't imitate the accurate onboarding flow" #67000

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

Closed
chiragsalian wants to merge 1 commit into from
Closed

[HOLD] Revert "Onboarding - Signing-up with a + operator email address doesn't imitate the accurate onboarding flow" #67000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
const isPrivateDomainAndHasAccessiblePolicies = !account?.isFromPublicDomain && !!account?.hasAccessibleDomainPolicies;
const isValidated = isCurrentUserValidated(loginList);

const isVsb = onboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
const isSmb = onboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.SMB;

useEffect(() => {
setOnboardingErrorMessage('');
}, []);
Expand Down Expand Up @@ -93,7 +90,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
clearPersonalDetailsDraft();
setPersonalDetails(firstName, lastName);

if (isPrivateDomainAndHasAccessiblePolicies && (!onboardingPurposeSelected || isVsb || isSmb)) {
if (isPrivateDomainAndHasAccessiblePolicies && !onboardingPurposeSelected) {
const nextRoute = isValidated ? ROUTES.ONBOARDING_WORKSPACES : ROUTES.ONBOARDING_PRIVATE_DOMAIN;
Navigation.navigate(nextRoute.getRoute(route.params?.backTo));
return;
Expand All @@ -107,7 +104,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat

completeOnboarding(firstName, lastName);
},
[isPrivateDomainAndHasAccessiblePolicies, onboardingPurposeSelected, isValidated, route.params?.backTo, completeOnboarding, isVsb, isSmb],
[isPrivateDomainAndHasAccessiblePolicies, onboardingPurposeSelected, isValidated, route.params?.backTo, completeOnboarding],
);

const validate = (values: FormOnyxValues<'onboardingPersonalDetailsForm'>) => {
Expand Down
18 changes: 1 addition & 17 deletions src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import Navigation from '@libs/Navigation/Navigation';
import {isCurrentUserValidated} from '@libs/UserUtils';
import {clearGetAccessiblePoliciesErrors, getAccessiblePolicies} from '@userActions/Policy/Policy';
import {resendValidateCode} from '@userActions/User';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type {BaseOnboardingPrivateDomainProps} from './types';
Expand All @@ -37,10 +36,6 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard

const isValidated = isCurrentUserValidated(loginList);

const [onboardingValues] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {canBeMissing: true});
const isVsb = onboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
const isSmb = onboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.SMB;

const sendValidateCode = useCallback(() => {
if (!email) {
return;
Expand Down Expand Up @@ -97,18 +92,7 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard
validateError={getAccessiblePoliciesAction?.errors}
hasMagicCodeBeenSent={hasMagicCodeBeenSent}
shouldShowSkipButton
handleSkipButtonPress={() => {
if (isVsb) {
Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute(route.params?.backTo));
return;
}

if (isSmb) {
Navigation.navigate(ROUTES.ONBOARDING_EMPLOYEES.getRoute(route.params?.backTo));
return;
}
Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute(route.params?.backTo));
}}
handleSkipButtonPress={() => Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute(route.params?.backTo))}
buttonStyles={[styles.flex2, styles.justifyContentEnd]}
isLoading={getAccessiblePoliciesAction?.loading}
/>
Expand Down
14 changes: 0 additions & 14 deletions src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding

const {isBetaEnabled} = usePermissions();

const [onboardingValues] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {canBeMissing: true});
const isVsb = onboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
const isSmb = onboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.SMB;

const handleJoinWorkspace = useCallback(
(policy: JoinablePolicy) => {
if (policy.automaticJoiningEnabled) {
Expand Down Expand Up @@ -156,17 +152,7 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding
success={false}
large
text={translate('common.skip')}
testID="onboardingWorkSpaceSkipButton"
onPress={() => {
if (isVsb) {
Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute(route.params?.backTo));
return;
}

if (isSmb) {
Navigation.navigate(ROUTES.ONBOARDING_EMPLOYEES.getRoute(route.params?.backTo));
return;
}
Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute(route.params?.backTo));
}}
style={[styles.mt5]}
Expand Down
142 changes: 0 additions & 142 deletions tests/ui/PersonalDetailsOnboarding.tsx
View file
Open in desktop

This file was deleted.

133 changes: 0 additions & 133 deletions tests/ui/WorkspaceOnboarding.tsx
View file
Open in desktop

This file was deleted.

Loading