Merge pull request Expensify#89994 from abzokhattab/revert-89808

feat: Submit workspace creation + onboarding flow ||

Author: carlosmiceli

src/CONST/index.ts

@@ -891,6 +891,7 @@ const CONST = {
         GUSTO: 'gustoNewDot',
         BULK_EDIT: 'bulkEdit',
         NEW_MANUAL_EXPENSE_FLOW: 'newManualExpenseFlow',
+        SUBMIT_2026: 'submit2026',
         BULK_SUBMIT_APPROVE_PAY: 'bulkSubmitApprovePay',
     },
     BUTTON_STATES: {
@@ -3535,6 +3536,8 @@ const CONST = {
 
             // Often referred to as "collect" workspaces
             TEAM: 'team',
+
+            SUBMIT: 'submit2026',
         },
         RULE_CONDITIONS: {
             MATCHES: 'matches',
@@ -3553,6 +3556,7 @@ const CONST = {
             ADMIN: 'admin',
             AUDITOR: 'auditor',
             USER: 'user',
+            EDITOR: 'editor',
         },
         AUTO_REIMBURSEMENT_MAX_LIMIT_CENTS: 2000000,
 

src/components/SidePanel/SidePanelContextProvider.tsx

@@ -10,7 +10,7 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import SidePanelActions from '@libs/actions/SidePanel';
 import DateUtils from '@libs/DateUtils';
 import focusComposerWithDelay from '@libs/focusComposerWithDelay';
-import {isPolicyAdmin, shouldShowPolicy} from '@libs/PolicyUtils';
+import {canEditWorkspaceSettings, shouldShowPolicy} from '@libs/PolicyUtils';
 import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
@@ -82,7 +82,7 @@ function SidePanelContextProvider({children}: PropsWithChildren) {
 
     const isRHPAdminsRoom = onboardingRHPVariant === CONST.ONBOARDING_RHP_VARIANT.RHP_ADMINS_ROOM;
     const isRHPHomePage = onboardingRHPVariant === CONST.ONBOARDING_RHP_VARIANT.RHP_HOME_PAGE;
-    const isUserAdmin = isPolicyAdmin(activePolicy, sessionEmail);
+    const isUserAdmin = canEditWorkspaceSettings(activePolicy);
     const isPolicyActive = shouldShowPolicy(activePolicy, false, sessionEmail ?? '');
     const adminsChatReportID = activePolicy?.chatReportIDAdmins?.toString();
 

src/components/WorkspaceMemberRoleList.tsx

@@ -1,12 +1,15 @@
+import {emailSelector} from '@selectors/Session';
 import React from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
-import {isControlPolicy} from '@libs/PolicyUtils';
+import {isControlPolicy, isPolicyAdmin} from '@libs/PolicyUtils';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import type {Policy} from '@src/types/onyx';
 import HeaderWithBackButton from './HeaderWithBackButton';
@@ -32,6 +35,7 @@ type WorkspaceMemberRoleListProps = {
 function WorkspaceMemberRoleList({role, policy, navigateBackTo = undefined, isLoading = false, onSelectRole = () => {}}: WorkspaceMemberRoleListProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const [currentUserEmail] = useOnyx(ONYXKEYS.SESSION, {selector: emailSelector});
 
     const workspaceRoles: ListItemType[] = [
         {
@@ -58,7 +62,18 @@ function WorkspaceMemberRoleList({role, policy, navigateBackTo = undefined, isLo
     ];
 
     const isPolicyControl = isControlPolicy(policy);
-    const availableRoleItems: ListItemType[] = workspaceRoles.filter((item) => isPolicyControl || item.value !== CONST.POLICY.ROLE.AUDITOR);
+    // Only strict admins can assign the ADMIN role. Editors (e.g. Submit workspace owners) can
+    // invite/manage members but must not be able to escalate anyone to admin.
+    const canAssignAdminRole = isPolicyAdmin(policy, currentUserEmail);
+    const availableRoleItems: ListItemType[] = workspaceRoles.filter((item) => {
+        if (item.value === CONST.POLICY.ROLE.AUDITOR && !isPolicyControl) {
+            return false;
+        }
+        if (item.value === CONST.POLICY.ROLE.ADMIN && !canAssignAdminRole) {
+            return false;
+        }
+        return true;
+    });
 
     return (
         <>

src/hooks/useAutoCreateSubmitWorkspace.ts

@@ -0,0 +1,115 @@
+import {useCallback, useMemo} from 'react';
+import type {OnyxCollection} from 'react-native-onyx';
+import {navigateToSubmitWorkspaceAfterOnboardingWithMicrotaskQueue} from '@libs/navigateAfterOnboarding';
+import {createDisplayName} from '@libs/PersonalDetailsUtils';
+import {canEditWorkspaceSettings, isGroupPolicy} from '@libs/PolicyUtils';
+import {createWorkspace, generateDefaultWorkspaceName, generatePolicyID} from '@userActions/Policy/Policy';
+import {completeOnboarding} from '@userActions/Report';
+import {setOnboardingAdminsChatReportID, setOnboardingPolicyID} from '@userActions/Welcome';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy} from '@src/types/onyx';
+import useOnboardingWorkspaceCreationState from './useOnboardingWorkspaceCreationState';
+import useOnyx from './useOnyx';
+
+/**
+ * Hook that provides a function to auto-create a Submit workspace for EMPLOYER
+ * users during onboarding and complete the onboarding flow.
+ *
+ * Shared by BaseOnboardingPersonalDetails, BaseOnboardingPurpose, and BaseOnboardingWorkspaces.
+ */
+function useAutoCreateSubmitWorkspace() {
+    const {
+        onboardingPolicyID,
+        onboardingAdminsChatReportID,
+        introSelected,
+        isSelfTourViewed,
+        betas,
+        currentUserEmail,
+        currentUserAccountID,
+        localCurrencyCode,
+        activePolicy,
+        translate,
+        formatPhoneNumber,
+        isRestrictedPolicyCreation,
+        hasActiveAdminPolicies,
+        onboardingMessages,
+        lastWorkspaceNumber,
+        shouldUseNarrowLayout,
+    } = useOnboardingWorkspaceCreationState();
+
+    const groupPolicySelector = useMemo(
+        () => (policies: OnyxCollection<Policy>) => Object.values(policies ?? {}).some((policy) => isGroupPolicy(policy) && canEditWorkspaceSettings(policy)),
+        [],
+    );
+    const [hasEditableGroupPolicy] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: groupPolicySelector});
+
+    const autoCreateSubmitWorkspace = useCallback(
+        (firstName: string, lastName: string) => {
+            const shouldCreateWorkspace = !isRestrictedPolicyCreation && !onboardingPolicyID && !hasEditableGroupPolicy;
+            const displayName = createDisplayName(currentUserEmail, {firstName, lastName}, formatPhoneNumber);
+
+            const {adminsChatReportID: newAdminsChatReportID, policyID: newPolicyID} = shouldCreateWorkspace
+                ? createWorkspace({
+                      policyOwnerEmail: undefined,
+                      makeMeAdmin: true,
+                      policyName: generateDefaultWorkspaceName(currentUserEmail, lastWorkspaceNumber, translate, displayName),
+                      policyID: generatePolicyID(),
+                      engagementChoice: CONST.ONBOARDING_CHOICES.EMPLOYER,
+                      currency: localCurrencyCode,
+                      file: undefined,
+                      shouldAddOnboardingTasks: false,
+                      introSelected,
+                      activePolicy,
+                      currentUserAccountIDParam: currentUserAccountID,
+                      currentUserEmailParam: currentUserEmail,
+                      shouldAddGuideWelcomeMessage: false,
+                      type: CONST.POLICY.TYPE.SUBMIT,
+                      betas,
+                      isSelfTourViewed,
+                      hasActiveAdminPolicies,
+                  })
+                : {adminsChatReportID: onboardingAdminsChatReportID, policyID: onboardingPolicyID};
+
+            completeOnboarding({
+                engagementChoice: CONST.ONBOARDING_CHOICES.EMPLOYER,
+                onboardingMessage: onboardingMessages[CONST.ONBOARDING_CHOICES.EMPLOYER],
+                firstName,
+                lastName,
+                adminsChatReportID: newAdminsChatReportID,
+                onboardingPolicyID: newPolicyID,
+                introSelected,
+                isSelfTourViewed,
+                betas,
+            });
+
+            setOnboardingAdminsChatReportID();
+            setOnboardingPolicyID();
+
+            navigateToSubmitWorkspaceAfterOnboardingWithMicrotaskQueue(newPolicyID, shouldUseNarrowLayout);
+        },
+        [
+            currentUserEmail,
+            currentUserAccountID,
+            lastWorkspaceNumber,
+            translate,
+            formatPhoneNumber,
+            isRestrictedPolicyCreation,
+            onboardingPolicyID,
+            hasEditableGroupPolicy,
+            onboardingAdminsChatReportID,
+            localCurrencyCode,
+            introSelected,
+            activePolicy,
+            isSelfTourViewed,
+            onboardingMessages,
+            betas,
+            hasActiveAdminPolicies,
+            shouldUseNarrowLayout,
+        ],
+    );
+
+    return autoCreateSubmitWorkspace;
+}
+
+export default useAutoCreateSubmitWorkspace;

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,42 +23,42 @@ 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,
+        shouldUseNarrowLayout,
+    } = 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 engagementChoice =
                 onboardingPurposeSelected === CONST.ONBOARDING_CHOICES.TRACK_PERSONAL ? CONST.ONBOARDING_CHOICES.TRACK_PERSONAL : CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE;
@@ -75,16 +67,16 @@ function useAutoCreateTrackWorkspace() {
                 ? createWorkspace({
                       policyOwnerEmail: undefined,
                       makeMeAdmin: true,
-                      policyName: generateDefaultWorkspaceName(session?.email ?? '', lastWorkspaceNumber, translate, displayName),
+                      policyName: generateDefaultWorkspaceName(currentUserEmail, lastWorkspaceNumber, translate, displayName),
                       policyID: generatePolicyID(),
                       engagementChoice,
-                      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,
@@ -126,7 +118,7 @@ function useAutoCreateTrackWorkspace() {
                 setOnboardingPolicyID();
 
                 navigateAfterOnboardingWithMicrotaskQueue(
-                    isSmallScreenWidth,
+                    shouldUseNarrowLayout,
                     isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
                     conciergeChatReportID,
                     archivedReportsIdSet,
@@ -138,23 +130,23 @@ function useAutoCreateTrackWorkspace() {
             }
         },
         [
-            session?.email,
-            session?.accountID,
+            currentUserEmail,
+            currentUserAccountID,
             lastWorkspaceNumber,
             translate,
             formatPhoneNumber,
             isRestrictedPolicyCreation,
             onboardingPolicyID,
             hasPaidGroupAdminPolicy,
             onboardingAdminsChatReportID,
-            currentUserPersonalDetails.localCurrencyCode,
+            localCurrencyCode,
             introSelected,
             activePolicy,
             isSelfTourViewed,
             onboardingMessages,
             betas,
             hasActiveAdminPolicies,
-            isSmallScreenWidth,
+            shouldUseNarrowLayout,
             isBetaEnabled,
             conciergeChatReportID,
             archivedReportsIdSet,