refactor(onboarding): share auto-create workspace state between Submit and Track hooks

abzokhattab · abzokhattab · commit 30946800f711 · 2026-05-05T03:06:50.000+03:00
Extract the duplicated Onyx subscriptions and helper-hook wiring from
useAutoCreateSubmitWorkspace and useAutoCreateTrackWorkspace into a new
useOnboardingWorkspaceCreationState hook. Each hook keeps its own selector
for "should create?", navigation target, and sync/async completion.
diff --git a/src/hooks/useAutoCreateSubmitWorkspace.ts b/src/hooks/useAutoCreateSubmitWorkspace.ts
@@ -1,4 +1,3 @@
-import {hasSeenTourSelector} from '@selectors/Onboarding';
 import {useCallback, useMemo} from 'react';
 import type {OnyxCollection} from 'react-native-onyx';
 import {navigateToSubmitWorkspaceAfterOnboardingWithMicrotaskQueue} from '@libs/navigateAfterOnboarding';
@@ -9,16 +8,9 @@ import {completeOnboarding} from '@userActions/Report';
 import {setOnboardingAdminsChatReportID, setOnboardingPolicyID} from '@userActions/Welcome';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {lastWorkspaceNumberSelector} from '@src/selectors/Policy';
 import type {Policy} from '@src/types/onyx';
-import useActivePolicy from './useActivePolicy';
-import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
-import useHasActiveAdminPolicies from './useHasActiveAdminPolicies';
-import useLocalize from './useLocalize';
-import useOnboardingMessages from './useOnboardingMessages';
+import useOnboardingWorkspaceCreationState from './useOnboardingWorkspaceCreationState';
 import useOnyx from './useOnyx';
-import usePreferredPolicy from './usePreferredPolicy';
-import useResponsiveLayout from './useResponsiveLayout';
 
 /**
  * Hook that provides a function to auto-create a Submit workspace for EMPLOYER
@@ -27,33 +19,30 @@ import useResponsiveLayout from './useResponsiveLayout';
  * Shared by BaseOnboardingPersonalDetails, BaseOnboardingPurpose, and BaseOnboardingWorkspaces.
  */
 function useAutoCreateSubmitWorkspace() {
-    const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID);
-    const [onboardingAdminsChatReportID] = useOnyx(ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID);
-    const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
-    const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const currentUserEmail = currentUserPersonalDetails.login ?? '';
-    const currentUserAccountID = currentUserPersonalDetails.accountID;
+    const {
+        onboardingPolicyID,
+        onboardingAdminsChatReportID,
+        introSelected,
+        isSelfTourViewed,
+        betas,
+        currentUserEmail,
+        currentUserAccountID,
+        localCurrencyCode,
+        activePolicy,
+        translate,
+        formatPhoneNumber,
+        isRestrictedPolicyCreation,
+        hasActiveAdminPolicies,
+        onboardingMessages,
+        lastWorkspaceNumber,
+        isSmallScreenWidth,
+    } = useOnboardingWorkspaceCreationState();
+
     const groupPolicySelector = useMemo(
         () => (policies: OnyxCollection<Policy>) => Object.values(policies ?? {}).some((policy) => isGroupPolicy(policy) && canEditWorkspaceSettings(policy)),
         [],
     );
-    const lastWorkspaceNumberWithEmailSelector = useCallback(
-        (policies: OnyxCollection<Policy>) => {
-            return lastWorkspaceNumberSelector(policies, currentUserEmail);
-        },
-        [currentUserEmail],
-    );
     const [hasEditableGroupPolicy] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: groupPolicySelector});
-    const [lastWorkspaceNumber] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: lastWorkspaceNumberWithEmailSelector});
-    const activePolicy = useActivePolicy();
-    const {translate, formatPhoneNumber} = useLocalize();
-    const {isRestrictedPolicyCreation} = usePreferredPolicy();
-    const hasActiveAdminPolicies = useHasActiveAdminPolicies();
-    const {onboardingMessages} = useOnboardingMessages();
-    // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
-    const {isSmallScreenWidth} = useResponsiveLayout();
 
     const autoCreateSubmitWorkspace = useCallback(
         (firstName: string, lastName: string) => {
@@ -67,12 +56,12 @@ function useAutoCreateSubmitWorkspace() {
                       policyName: generateDefaultWorkspaceName(currentUserEmail, lastWorkspaceNumber, translate, displayName),
                       policyID: generatePolicyID(),
                       engagementChoice: CONST.ONBOARDING_CHOICES.EMPLOYER,
-                      currency: currentUserPersonalDetails.localCurrencyCode ?? CONST.CURRENCY.USD,
+                      currency: localCurrencyCode,
                       file: undefined,
                       shouldAddOnboardingTasks: false,
                       introSelected,
                       activePolicy,
-                      currentUserAccountIDParam: currentUserAccountID ?? CONST.DEFAULT_NUMBER_ID,
+                      currentUserAccountIDParam: currentUserAccountID,
                       currentUserEmailParam: currentUserEmail,
                       shouldAddGuideWelcomeMessage: false,
                       type: CONST.POLICY.TYPE.SUBMIT,
@@ -109,7 +98,7 @@ function useAutoCreateSubmitWorkspace() {
             onboardingPolicyID,
             hasEditableGroupPolicy,
             onboardingAdminsChatReportID,
-            currentUserPersonalDetails.localCurrencyCode,
+            localCurrencyCode,
             introSelected,
             activePolicy,
             isSelfTourViewed,
diff --git a/src/hooks/useAutoCreateTrackWorkspace.ts b/src/hooks/useAutoCreateTrackWorkspace.ts
@@ -1,4 +1,3 @@
-import {hasSeenTourSelector} from '@selectors/Onboarding';
 import {useCallback, useMemo} from 'react';
 import type {OnyxCollection} from 'react-native-onyx';
 import isSidePanelReportSupported from '@components/SidePanel/isSidePanelReportSupported';
@@ -12,17 +11,10 @@ import {setOnboardingAdminsChatReportID, setOnboardingPolicyID} from '@userActio
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {OnboardingPurpose, OnboardingRHPVariant, Policy} from '@src/types/onyx';
-import useActivePolicy from './useActivePolicy';
 import useArchivedReportsIdSet from './useArchivedReportsIdSet';
-import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
-import useHasActiveAdminPolicies from './useHasActiveAdminPolicies';
-import useLastWorkspaceNumber from './useLastWorkspaceNumber';
-import useLocalize from './useLocalize';
-import useOnboardingMessages from './useOnboardingMessages';
+import useOnboardingWorkspaceCreationState from './useOnboardingWorkspaceCreationState';
 import useOnyx from './useOnyx';
 import usePermissions from './usePermissions';
-import usePreferredPolicy from './usePreferredPolicy';
-import useResponsiveLayout from './useResponsiveLayout';
 
 /**
  * Hook that provides a function to auto-create a workspace for Track (PERSONAL_SPEND)
@@ -31,57 +23,57 @@ import useResponsiveLayout from './useResponsiveLayout';
  * Shared by BaseOnboardingPersonalDetails and BaseOnboardingPurpose.
  */
 function useAutoCreateTrackWorkspace() {
-    const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID);
-    const [onboardingAdminsChatReportID] = useOnyx(ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID);
-    const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
-    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
-    const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const {
+        onboardingPolicyID,
+        onboardingAdminsChatReportID,
+        introSelected,
+        isSelfTourViewed,
+        betas,
+        currentUserEmail,
+        currentUserAccountID,
+        localCurrencyCode,
+        activePolicy,
+        translate,
+        formatPhoneNumber,
+        isRestrictedPolicyCreation,
+        hasActiveAdminPolicies,
+        onboardingMessages,
+        lastWorkspaceNumber,
+        isSmallScreenWidth,
+    } = useOnboardingWorkspaceCreationState();
+
     const paidGroupPolicySelector = useMemo(
-        () => (policies: OnyxCollection<Policy>) => Object.values(policies ?? {}).some((policy) => isPaidGroupPolicy(policy) && isPolicyAdmin(policy, session?.email)),
-        [session?.email],
+        () => (policies: OnyxCollection<Policy>) => Object.values(policies ?? {}).some((policy) => isPaidGroupPolicy(policy) && isPolicyAdmin(policy, currentUserEmail)),
+        [currentUserEmail],
     );
     const [hasPaidGroupAdminPolicy] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: paidGroupPolicySelector});
+
     const [conciergeChatReportID = ''] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [onboardingValues] = useOnyx(ONYXKEYS.NVP_ONBOARDING);
-    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const archivedReportsIdSet = useArchivedReportsIdSet();
     const {isBetaEnabled} = usePermissions();
-    const {translate, formatPhoneNumber} = useLocalize();
-    const activePolicy = useActivePolicy();
-    const {isRestrictedPolicyCreation} = usePreferredPolicy();
-    const hasActiveAdminPolicies = useHasActiveAdminPolicies();
-    const lastWorkspaceNumber = useLastWorkspaceNumber();
-    const {onboardingMessages} = useOnboardingMessages();
-
-    // We use isSmallScreenWidth instead of shouldUseNarrowLayout because navigateAfterOnboarding
-    // relies on actual device screen width to handle navigation stack differences: on small screens,
-    // removing OnboardingModalNavigator redirects to HOME, requiring explicit navigation to the last
-    // accessed report. This behavior is tied to screen size, not responsive layout mode.
-    // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
-    const {isSmallScreenWidth} = useResponsiveLayout();
 
     const mergedAccountConciergeReportID = !onboardingValues?.shouldRedirectToClassicAfterMerge && onboardingValues?.shouldValidate ? conciergeChatReportID : undefined;
 
     const autoCreateTrackWorkspace = useCallback(
         async (firstName: string, lastName: string, onboardingPurposeSelected: OnboardingPurpose) => {
             const shouldCreateWorkspace = !isRestrictedPolicyCreation && !onboardingPolicyID && !hasPaidGroupAdminPolicy;
-            const displayName = createDisplayName(session?.email ?? '', {firstName, lastName}, formatPhoneNumber);
+            const displayName = createDisplayName(currentUserEmail, {firstName, lastName}, formatPhoneNumber);
 
             const {adminsChatReportID: newAdminsChatReportID, policyID: newPolicyID} = shouldCreateWorkspace
                 ? createWorkspace({
                       policyOwnerEmail: undefined,
                       makeMeAdmin: true,
-                      policyName: generateDefaultWorkspaceName(session?.email ?? '', lastWorkspaceNumber, translate, displayName),
+                      policyName: generateDefaultWorkspaceName(currentUserEmail, lastWorkspaceNumber, translate, displayName),
                       policyID: generatePolicyID(),
                       engagementChoice: CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE,
-                      currency: currentUserPersonalDetails.localCurrencyCode ?? CONST.CURRENCY.USD,
+                      currency: localCurrencyCode,
                       file: undefined,
                       shouldAddOnboardingTasks: false,
                       introSelected,
                       activePolicy,
-                      currentUserAccountIDParam: session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
-                      currentUserEmailParam: session?.email ?? '',
+                      currentUserAccountIDParam: currentUserAccountID,
+                      currentUserEmailParam: currentUserEmail,
                       shouldAddGuideWelcomeMessage: false,
                       onboardingPurposeSelected,
                       betas,
@@ -129,16 +121,16 @@ function useAutoCreateTrackWorkspace() {
             }
         },
         [
-            session?.email,
-            session?.accountID,
+            currentUserEmail,
+            currentUserAccountID,
             lastWorkspaceNumber,
             translate,
             formatPhoneNumber,
             isRestrictedPolicyCreation,
             onboardingPolicyID,
             hasPaidGroupAdminPolicy,
             onboardingAdminsChatReportID,
-            currentUserPersonalDetails.localCurrencyCode,
+            localCurrencyCode,
             introSelected,
             activePolicy,
             isSelfTourViewed,
diff --git a/src/hooks/useOnboardingWorkspaceCreationState.ts b/src/hooks/useOnboardingWorkspaceCreationState.ts
@@ -0,0 +1,66 @@
+import {hasSeenTourSelector} from '@selectors/Onboarding';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+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 usePreferredPolicy from './usePreferredPolicy';
+import useResponsiveLayout from './useResponsiveLayout';
+
+/**
+ * Shared state for the onboarding workspace auto-creation hooks
+ * (`useAutoCreateSubmitWorkspace`, `useAutoCreateTrackWorkspace`).
+ *
+ * Email and accountID come from `ONYXKEYS.SESSION` because session is hydrated
+ * earlier in onboarding than personal details.
+ */
+function useOnboardingWorkspaceCreationState() {
+    const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID);
+    const [onboardingAdminsChatReportID] = useOnyx(ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID);
+    const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [betas] = useOnyx(ONYXKEYS.BETAS);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+
+    const currentUserEmail = session?.email ?? '';
+    const currentUserAccountID = session?.accountID ?? CONST.DEFAULT_NUMBER_ID;
+
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const localCurrencyCode = currentUserPersonalDetails.localCurrencyCode ?? CONST.CURRENCY.USD;
+
+    const activePolicy = useActivePolicy();
+    const {translate, formatPhoneNumber} = useLocalize();
+    const {isRestrictedPolicyCreation} = usePreferredPolicy();
+    const hasActiveAdminPolicies = useHasActiveAdminPolicies();
+    const {onboardingMessages} = useOnboardingMessages();
+    const lastWorkspaceNumber = useLastWorkspaceNumber();
+
+    // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
+    const {isSmallScreenWidth} = useResponsiveLayout();
+
+    return {
+        onboardingPolicyID,
+        onboardingAdminsChatReportID,
+        introSelected,
+        isSelfTourViewed,
+        betas,
+        currentUserPersonalDetails,
+        currentUserEmail,
+        currentUserAccountID,
+        localCurrencyCode,
+        activePolicy,
+        translate,
+        formatPhoneNumber,
+        isRestrictedPolicyCreation,
+        hasActiveAdminPolicies,
+        onboardingMessages,
+        lastWorkspaceNumber,
+        isSmallScreenWidth,
+    };
+}
+
+export default useOnboardingWorkspaceCreationState;
