Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
ec7eea7
Fix reordered onboarding accounting flow
nabi-ebrahimi Jun 2, 2026
fa34f69
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 3, 2026
b4b87cb
Fix onboarding accounting flow and review feedback
nabi-ebrahimi Jun 3, 2026
551fa1a
Refactor onboarding navigation to use a unified navigate function and…
nabi-ebrahimi Jun 3, 2026
a836466
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 4, 2026
75f9621
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 6, 2026
0ee2d9a
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 9, 2026
d05b397
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 9, 2026
ba3d1fc
update navigation for onboarding steps and adjust test descriptions
nabi-ebrahimi Jun 9, 2026
ecc5b54
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 10, 2026
37e5bb0
Refactor onboarding integration checks and enhance test navigation st…
nabi-ebrahimi Jun 10, 2026
213ce96
fix prettier
nabi-ebrahimi Jun 10, 2026
8cf0455
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 12, 2026
bac9aad
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 13, 2026
9e7f49e
refactor: remove navigateWithOptions function and update navigation c…
nabi-ebrahimi Jun 13, 2026
cb866a9
fix lint
nabi-ebrahimi Jun 13, 2026
c0385ef
remove unused import
nabi-ebrahimi Jun 13, 2026
d19b5eb
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 17, 2026
d8a4ad6
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 18, 2026
5db5ca6
Refactor onboarding navigation to remove unnecessary parameters from …
nabi-ebrahimi Jun 18, 2026
16bdc8d
fix prettier
nabi-ebrahimi Jun 18, 2026
b871a5d
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 22, 2026
38a6cb2
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 23, 2026
6152ffa
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 23, 2026
f37db39
Add isPinned and isOwnPolicyExpenseChat properties to selfDMReport in…
nabi-ebrahimi Jun 23, 2026
c6d916c
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 24, 2026
fc577cc
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 26, 2026
ff5d7a0
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 29, 2026
86ddfdd
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jun 30, 2026
43eb454
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jul 1, 2026
752dc56
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jul 6, 2026
b91b9ff
fix lint
nabi-ebrahimi Jul 6, 2026
789dbb8
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jul 7, 2026
417d8a1
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jul 8, 2026
d912abd
refactor: update onboarding flow to navigate to employees instead of …
nabi-ebrahimi Jul 8, 2026
dde981f
update onboarding flow to use OnboardingFeatureMapItem and improve fe…
nabi-ebrahimi Jul 8, 2026
5735e28
update navigation in onboarding flow to use forceReplace for employee…
nabi-ebrahimi Jul 8, 2026
e30233f
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jul 10, 2026
906dfc7
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jul 11, 2026
668acc1
fix: add padding to fix text field cropp
nabi-ebrahimi Jul 11, 2026
6cf611d
refactor: simplify duplicate logic
nabi-ebrahimi Jul 11, 2026
13669d5
refactor: consolidate VSB and SMB checks in onboarding flow
nabi-ebrahimi Jul 11, 2026
a632032
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jul 16, 2026
76f1614
make other input optional
nabi-ebrahimi Jul 16, 2026
c4be2e6
feat: add onboarding accounting keys to safeOnyxKeys set
nabi-ebrahimi Jul 16, 2026
df96d21
feat: reorder onboarding keys to include ONBOARDING_ADMINS_CHAT_REPOR…
nabi-ebrahimi Jul 16, 2026
91d9578
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jul 16, 2026
9a5c382
fix test failing
nabi-ebrahimi Jul 16, 2026
9bb4708
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jul 20, 2026
df740b2
fix: update navigation calls in handleRHPVariantNavigation to include…
nabi-ebrahimi Jul 20, 2026
5330c0c
Drop Other input from onboarding accounting
nabi-ebrahimi Jul 23, 2026
21f1a96
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jul 23, 2026
16f5faa
Merge branch 'main' into reordered-onboarding-accouting-flow
nabi-ebrahimi Jul 25, 2026
7e6a643
Fix onboarding cleanup when no navigation runs
nabi-ebrahimi Jul 25, 2026
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
4 changes: 1 addition & 3 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,7 @@ const signupQualifiers = {
SMB: 'smb',
} as const;

type NoneAccountingKey = 'none';

type OnboardingAccounting = keyof typeof CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY | NoneAccountingKey | null;
type OnboardingAccounting = keyof typeof CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY | (string & Record<never, never>) | null;

const onboardingInviteTypes = {
IOU: 'iou',
Expand Down
9 changes: 9 additions & 0 deletions src/ONYXKEYS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type {ValueOf} from 'type-fest';
import type CONST from './CONST';
import type {OnboardingAccounting} from './CONST';
import type {TranslationPaths} from './languages/types';
import type {OnboardingFeatureMapItem} from './libs/actions/Welcome/OnboardingFeatures';
import type {OnboardingCompanySize} from './libs/actions/Welcome/OnboardingFlow';
import type Platform from './libs/getPlatform/types';
import type {TransactionThreadNavigationDescriptor} from './libs/TransactionThreadNavigationUtils';
Expand Down Expand Up @@ -531,6 +532,12 @@ const ONYXKEYS = {
/** Onboarding user reported integration selected by the user during Onboarding flow */
ONBOARDING_USER_REPORTED_INTEGRATION: 'onboardingUserReportedIntegration',

/** Whether the user kept Accounting enabled during Onboarding feature selection */
ONBOARDING_ACCOUNTING_ENABLED: 'onboardingAccountingEnabled',

/** Onboarding interested features persisted before navigating to the Accounting step */
ONBOARDING_INTERESTED_FEATURES_MAP: 'onboardingInterestedFeaturesMap',

/** Onboarding Purpose selected by the user during Onboarding flow */
ONBOARDING_ADMINS_CHAT_REPORT_ID: 'onboardingAdminsChatReportID',

Expand Down Expand Up @@ -1750,6 +1757,8 @@ type OnyxValuesMapping = {
[ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS]: Record<string, TransactionThreadNavigationDescriptor>;
[ONYXKEYS.NVP_INTEGRATION_SERVER_EXPORT_TEMPLATES]: OnyxTypes.ExportTemplate[];
[ONYXKEYS.ONBOARDING_USER_REPORTED_INTEGRATION]: OnboardingAccounting;
[ONYXKEYS.ONBOARDING_ACCOUNTING_ENABLED]: boolean;
[ONYXKEYS.ONBOARDING_INTERESTED_FEATURES_MAP]: OnboardingFeatureMapItem[];
[ONYXKEYS.HYBRID_APP]: OnyxTypes.HybridApp;
[ONYXKEYS.NVP_CSV_EXPORT_LAYOUTS]: Record<string, OnyxTypes.ExportTemplate>;
[ONYXKEYS.NVP_EXPENSE_RULES]: OnyxTypes.ExpenseRule[];
Expand Down
2 changes: 1 addition & 1 deletion src/components/OnboardingMergingAccountBlockedView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function OnboardingMergingAccountBlockedView({workEmail, isVsb}: OnboardingMergi
onPress={() => {
setOnboardingErrorMessage(null);
if (isVsb) {
Navigation.navigate(ROUTES.ONBOARDING_EMPLOYEES.getRoute());
Navigation.navigate(ROUTES.ONBOARDING_EMPLOYEES.getRoute(), {forceReplace: true});
return;
}
Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute());
Expand Down
8 changes: 4 additions & 4 deletions src/components/SidePanel/RHPVariantTest/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ const shouldOpenRHPVariant: ShouldOpenRHPVariant = (variantOverride) => {
* All variants open the side panel without overlay.
* The control variant is handled separately in navigateAfterOnboarding.
*/
const handleRHPVariantNavigation: HandleRHPVariantNavigation = (onboardingPolicyID, variantOverride) => {
const handleRHPVariantNavigation: HandleRHPVariantNavigation = (onboardingPolicyID, variantOverride, navigationOptions) => {
const variant = variantOverride ?? onboardingRHPVariant;
if (variant === CONST.ONBOARDING_RHP_VARIANT.TRACK_EXPENSES_WITH_CONCIERGE) {
const shouldPreserveRevealedReport = isReportTopmostSplitNavigator();
if (!shouldPreserveRevealedReport) {
Navigation.navigate(ROUTES.HOME);
Navigation.navigate(ROUTES.HOME, navigationOptions);
}
SidePanelActions.openSidePanel(true);
return;
Expand All @@ -80,10 +80,10 @@ const handleRHPVariantNavigation: HandleRHPVariantNavigation = (onboardingPolicy
if (isRHPHomePage) {
const shouldPreserveRevealedReport = isReportTopmostSplitNavigator();
if (!shouldPreserveRevealedReport) {
Navigation.navigate(ROUTES.HOME);
Navigation.navigate(ROUTES.HOME, navigationOptions);
}
} else {
Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW.getRoute(onboardingPolicyID));
Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW.getRoute(onboardingPolicyID), navigationOptions);
}
SidePanelActions.openSidePanel(true);
};
Expand Down
4 changes: 3 additions & 1 deletion src/components/SidePanel/RHPVariantTest/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type {LinkToOptions} from '@libs/Navigation/helpers/linkTo/types';

import type {OnboardingRHPVariant} from '@src/types/onyx';

type ShouldOpenRHPVariant = (variantOverride?: OnboardingRHPVariant | null) => boolean;
type HandleRHPVariantNavigation = (onboardingPolicyID?: string, variantOverride?: OnboardingRHPVariant | null) => void;
type HandleRHPVariantNavigation = (onboardingPolicyID: string | undefined, variantOverride?: OnboardingRHPVariant | null, navigationOptions?: LinkToOptions) => void;

export type {ShouldOpenRHPVariant, HandleRHPVariantNavigation};
2 changes: 1 addition & 1 deletion src/hooks/useAutoCreateTrackWorkspace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ function useAutoCreateTrackWorkspace() {
newPolicyID,
mergedAccountConciergeReportID,
false,
rhpVariant,
{variantOverride: rhpVariant},
);
}
},
Expand Down
155 changes: 155 additions & 0 deletions src/hooks/useCompleteOnboarding.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
import isSidePanelReportSupported from '@components/SidePanel/isSidePanelReportSupported';

import {createWorkspace, generateDefaultWorkspaceName, generatePolicyID} from '@libs/actions/Policy/Policy';
import {completeOnboarding, extractRHPVariantFromResponse} from '@libs/actions/Report';
import {setOnboardingAdminsChatReportID, setOnboardingPolicyID} from '@libs/actions/Welcome';
import type {OnboardingFeatureMapItem} from '@libs/actions/Welcome/OnboardingFeatures';
import Log from '@libs/Log';
import {navigateAfterOnboardingWithMicrotaskQueue} from '@libs/navigateAfterOnboarding';
import TransitionTracker from '@libs/Navigation/TransitionTracker';
import {isGroupPolicy, isPolicyAdmin} from '@libs/PolicyUtils';

import CONST from '@src/CONST';
import type {OnboardingAccounting} from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';

import {hasSeenTourSelector} from '@selectors/Onboarding';
import {useState} from 'react';

import useActivePolicy from './useActivePolicy';
import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
import useHasActiveAdminPolicies from './useHasActiveAdminPolicies';
import useLastWorkspaceNumber from './useLastWorkspaceNumber';
import useLocalize from './useLocalize';
import useOnboardingMessages from './useOnboardingMessages';
import useOnyx from './useOnyx';
import usePermissions from './usePermissions';
import useResponsiveLayout from './useResponsiveLayout';

type CompleteOnboardingParams = {
featuresMap: OnboardingFeatureMapItem[];
userReportedIntegration?: OnboardingAccounting;
};

function useCompleteOnboarding() {
// We need to use isSmallScreenWidth, see navigateAfterOnboarding function comment
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
const {isSmallScreenWidth} = useResponsiveLayout();
const {translate} = useLocalize();
const {onboardingMessages} = useOnboardingMessages();
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const {isBetaEnabled} = usePermissions();
const activePolicy = useActivePolicy();
const hasActiveAdminPolicies = useHasActiveAdminPolicies();
const lastWorkspaceNumber = useLastWorkspaceNumber();

const [onboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED);
const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID);
const [onboardingAdminsChatReportID] = useOnyx(ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID);
const [onboardingCompanySize] = useOnyx(ONYXKEYS.ONBOARDING_COMPANY_SIZE);
const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
const [betas] = useOnyx(ONYXKEYS.BETAS);
const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
const [session] = useOnyx(ONYXKEYS.SESSION);
const [conciergeReportID = ''] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
const [adminsChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${onboardingAdminsChatReportID}`);
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS);
const [isLoading, setIsLoading] = useState(false);

const groupPolicy = Object.values(allPolicies ?? {}).find((policy) => isGroupPolicy(policy) && isPolicyAdmin(policy, session?.email));

const completeOnboardingFlow = async ({featuresMap, userReportedIntegration}: CompleteOnboardingParams) => {
if (!onboardingPurposeSelected || !onboardingCompanySize) {
return;
}

try {
setIsLoading(true);

const shouldCreateWorkspace = !onboardingPolicyID && !groupPolicy;
const isAccountingEnabled = featuresMap.some((feature) => feature.id === CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED && feature.enabled);
const resolvedIntegration = isAccountingEnabled ? userReportedIntegration : undefined;
const email = currentUserPersonalDetails.email ?? '';

const {adminsChatReportID, policyID} = shouldCreateWorkspace
? createWorkspace({
policyOwnerEmail: undefined,
makeMeAdmin: true,
policyName: generateDefaultWorkspaceName(email, lastWorkspaceNumber, translate),
policyID: generatePolicyID(),
engagementChoice: CONST.ONBOARDING_CHOICES.MANAGE_TEAM,
currency: currentUserPersonalDetails?.localCurrencyCode ?? '',
file: undefined,
shouldAddOnboardingTasks: false,
companySize: onboardingCompanySize,
userReportedIntegration: resolvedIntegration,
featuresMap,
introSelected,
activePolicy,
currentUserAccountIDParam: currentUserPersonalDetails.accountID,
currentUserEmailParam: email,
shouldAddGuideWelcomeMessage: false,
betas,
isSelfTourViewed,
hasActiveAdminPolicies,
})
: {adminsChatReportID: onboardingAdminsChatReportID, policyID: onboardingPolicyID};

if (shouldCreateWorkspace) {
setOnboardingAdminsChatReportID(adminsChatReportID);
setOnboardingPolicyID(policyID);
}

const response = await completeOnboarding({
engagementChoice: onboardingPurposeSelected,
onboardingMessage: onboardingMessages[onboardingPurposeSelected],
adminsChatReportID,
onboardingPolicyID: policyID,
companySize: onboardingCompanySize,
userReportedIntegration: resolvedIntegration,
firstName: currentUserPersonalDetails?.firstName,
lastName: currentUserPersonalDetails?.lastName,
selectedInterestedFeatures: featuresMap.filter((feature) => feature.enabled).map((feature) => feature.id),
shouldWaitForRHPVariantInitialization: isSidePanelReportSupported,
introSelected,
isSelfTourViewed,
conciergeChat,
adminsChatReport,
});
const rhpVariant = isSidePanelReportSupported ? extractRHPVariantFromResponse(response) : undefined;

TransitionTracker.runAfterTransitions({
callback: () => {
setOnboardingAdminsChatReportID();
setOnboardingPolicyID();
},
waitForUpcomingTransition: true,
});

navigateAfterOnboardingWithMicrotaskQueue(
isSmallScreenWidth,
isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
conciergeReportID,
reportNameValuePairs,
policyID,
adminsChatReportID,
(session?.email ?? '').includes('+'),
{
variantOverride: rhpVariant,
},
);
} catch (error) {
Log.warn('[useCompleteOnboarding] Error completing onboarding', {error});
setIsLoading(false);
return;
}

setIsLoading(false);
};

return {completeOnboardingFlow, isLoading};
}

export default useCompleteOnboarding;
6 changes: 4 additions & 2 deletions src/hooks/useOnboardingStepCounter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {getOnboardingStepCounter} from '@libs/getOnboardingStepCounter';
import type {OnboardingScreen, OnboardingStepResult} from '@libs/getOnboardingStepCounter';
import type {OnboardingFlowContext, OnboardingScreen, OnboardingStepResult} from '@libs/getOnboardingStepCounter';
import {getVisibleJoinablePoliciesCount} from '@libs/OnboardingUtils';
import {expensifyLoginsSelector, isCurrentUserValidated} from '@libs/UserUtils';

Expand All @@ -9,10 +9,11 @@ import ONYXKEYS from '@src/ONYXKEYS';
import useOnyx from './useOnyx';
import usePermissions from './usePermissions';

function useOnboardingStepCounter(page: OnboardingScreen): OnboardingStepResult | undefined {
function useOnboardingStepCounter(page: OnboardingScreen, overrides: Partial<Pick<OnboardingFlowContext, 'isAccountingEnabled'>> = {}): OnboardingStepResult | undefined {
const [onboarding] = useOnyx(ONYXKEYS.NVP_ONBOARDING);
const [purposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED);
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const [isAccountingEnabled] = useOnyx(ONYXKEYS.ONBOARDING_ACCOUNTING_ENABLED);
const [joinablePolicies] = useOnyx(ONYXKEYS.JOINABLE_POLICIES);
const [loginList] = useOnyx(ONYXKEYS.LOGINS, {selector: expensifyLoginsSelector});
const [session] = useOnyx(ONYXKEYS.SESSION);
Expand All @@ -24,6 +25,7 @@ function useOnboardingStepCounter(page: OnboardingScreen): OnboardingStepResult
hasAccessibleDomainPolicies: account?.hasAccessibleDomainPolicies,
purposeSelected: purposeSelected ?? undefined,
isMergeAccountStepSkipped: onboarding?.isMergeAccountStepSkipped,
isAccountingEnabled: overrides.isAccountingEnabled ?? isAccountingEnabled ?? undefined,
isAccountValidated: isCurrentUserValidated(loginList, session?.email),
hasJoinablePolicies: getVisibleJoinablePoliciesCount(joinablePolicies, isBetaEnabled(CONST.BETAS.SUBMIT_2026)) > 0,
});
Expand Down
2 changes: 2 additions & 0 deletions src/libs/ExportOnyxState/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,12 @@ const safeOnyxKeys = new Set<string>([
ONYXKEYS.NVP_SUBMIT_MIGRATION_MODAL_SHOWN,
ONYXKEYS.NVP_TRY_FOCUS_MODE,
ONYXKEYS.NVP_TRY_NEW_DOT,
ONYXKEYS.ONBOARDING_ACCOUNTING_ENABLED,
ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID,
ONYXKEYS.ONBOARDING_COMPANY_SIZE,
ONYXKEYS.ONBOARDING_CUSTOM_CHOICES,
ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY,
ONYXKEYS.ONBOARDING_INTERESTED_FEATURES_MAP,
ONYXKEYS.ONBOARDING_POLICY_ID,
ONYXKEYS.ONBOARDING_PURPOSE_SELECTED,
ONYXKEYS.ONBOARDING_USER_REPORTED_INTEGRATION,
Expand Down
4 changes: 3 additions & 1 deletion src/libs/ReportUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12107,7 +12107,9 @@ function prepareOnboardingOnyxData({
return;
}

const integrationName = userReportedIntegration ? CONST.ONBOARDING_ACCOUNTING_MAPPING[userReportedIntegration as keyof typeof CONST.ONBOARDING_ACCOUNTING_MAPPING] : '';
const integrationName = userReportedIntegration
? (CONST.ONBOARDING_ACCOUNTING_MAPPING[userReportedIntegration as keyof typeof CONST.ONBOARDING_ACCOUNTING_MAPPING] ?? userReportedIntegration)
: '';
const assignedGuideEmail = getPolicy(targetChatPolicyID)?.assignedGuide?.email ?? CONST.EMAIL.QA_GUIDE;
const assignedGuidePersonalDetail = getPersonalDetailByEmail(assignedGuideEmail);
let assignedGuideAccountID: number;
Expand Down
35 changes: 35 additions & 0 deletions src/libs/actions/Welcome/OnboardingFeatures.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import CONST from '@src/CONST';

type OnboardingFeatureConfig = {
id: string;
enabledByDefault?: boolean;
requiresUpdate?: boolean;
};

type OnboardingFeatureMapItem = OnboardingFeatureConfig & {
enabled: boolean;
};

const ONBOARDING_FEATURES: OnboardingFeatureConfig[] = [
{id: CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED, enabledByDefault: true},
{id: CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED, enabledByDefault: true},
{id: CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED, enabledByDefault: true},
{id: CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED, enabledByDefault: true},
{id: CONST.POLICY.MORE_FEATURES.IS_TRAVEL_ENABLED},
{id: CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED, requiresUpdate: true},
{id: CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED},
{id: CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED},
{id: CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED},
{id: CONST.POLICY.MORE_FEATURES.ARE_PER_DIEM_RATES_ENABLED, requiresUpdate: true},
{id: CONST.POLICY.MORE_FEATURES.IS_TIME_TRACKING_ENABLED},
];

function getDefaultOnboardingFeaturesMap(): OnboardingFeatureMapItem[] {
return ONBOARDING_FEATURES.map((feature) => ({
...feature,
enabled: !!feature.enabledByDefault,
}));
}

export {getDefaultOnboardingFeaturesMap, ONBOARDING_FEATURES};
export type {OnboardingFeatureMapItem};
18 changes: 5 additions & 13 deletions src/libs/actions/Welcome/OnboardingFlow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,11 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
const currentOnboardingValues = onboardingValuesParam ?? onboardingValues;
const isVsb = currentOnboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
const isSmb = currentOnboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.SMB;
const isVsbOrSmb = isVsb || isSmb;
const isIndividual = currentOnboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.INDIVIDUAL;
const isCurrentOnboardingPurposeManageTeam = currentOnboardingPurposeSelected === CONST.ONBOARDING_CHOICES.MANAGE_TEAM;

if (isVsb) {
Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.MANAGE_TEAM);
}
if (isSmb) {
if (isVsbOrSmb) {
Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.MANAGE_TEAM);
}

Expand All @@ -140,10 +138,7 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
// PRIVATE_DOMAIN ("People you may know are already here") only makes sense for users on a private domain. Only redirect
// validated accounts; unvalidated users mid-AddWorkEmail can legitimately land here while isFromPublicDomain is stale.
if (isUserFromPublicDomain && isAccountValidated && initialPath.includes(ROUTES.ONBOARDING_PRIVATE_DOMAIN.route)) {
if (isVsb) {
return `/${ROUTES.ONBOARDING_ACCOUNTING.route}`;
}
if (isSmb) {
if (isVsbOrSmb) {
return `/${ROUTES.ONBOARDING_EMPLOYEES.route}`;
}
return `/${ROUTES.ONBOARDING_PURPOSE.route}`;
Expand All @@ -156,10 +151,7 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
return `/${ROUTES.ONBOARDING_PERSONAL_DETAILS.route}`;
}

if (isVsb) {
return `/${ROUTES.ONBOARDING_EMPLOYEES.route}`;
}
if (isSmb) {
if (isVsbOrSmb) {
return `/${ROUTES.ONBOARDING_EMPLOYEES.route}`;
}

Expand All @@ -172,7 +164,7 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
}

if (
initialPath.includes(ROUTES.ONBOARDING_ACCOUNTING.route) &&
(initialPath.includes(ROUTES.ONBOARDING_ACCOUNTING.route) || initialPath.includes(ROUTES.ONBOARDING_INTERESTED_FEATURES.route)) &&
((currentOnboardingPurposeSelected !== null && !isCurrentOnboardingPurposeManageTeam) || (currentOnboardingCompanySize === null && currentOnboardingPurposeSelected !== null))
) {
return `/${ROUTES.ONBOARDING_PURPOSE.route}`;
Expand Down
Loading
Loading