Refactor CreateReportMenuItem selector naming and create report directly after workspace creation in upgrade flow

Author: mukhrr

src/pages/inbox/sidebar/FABPopoverContent/menuItems/CreateReportMenuItem.tsx

@@ -37,9 +37,9 @@ function CreateReportMenuItem() {
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
     const hasViolations = hasViolationsReportUtils(undefined, transactionViolations, session?.accountID ?? CONST.DEFAULT_NUMBER_ID, session?.email ?? '');
 
-    const groupPaidPoliciesWithChatEnabledCb = (policies: Parameters<typeof groupPaidPoliciesWithExpenseChatEnabledSelector>[0]) =>
+    const groupPaidPoliciesWithChatEnabledSelector = (policies: Parameters<typeof groupPaidPoliciesWithExpenseChatEnabledSelector>[0]) =>
         groupPaidPoliciesWithExpenseChatEnabledSelector(policies, session?.email);
-    const [groupPoliciesWithChatEnabled = CONST.EMPTY_ARRAY] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: groupPaidPoliciesWithChatEnabledCb}, [session?.email]);
+    const [groupPoliciesWithChatEnabled = CONST.EMPTY_ARRAY] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: groupPaidPoliciesWithChatEnabledSelector}, [session?.email]);
 
     const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
     const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`);

src/pages/iou/request/step/IOURequestStepUpgrade.tsx

@@ -12,15 +12,19 @@ import useHasActiveAdminPolicies from '@hooks/useHasActiveAdminPolicies';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import usePermissions from '@hooks/usePermissions';
 import usePreferredPolicy from '@hooks/usePreferredPolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {createNewReport} from '@libs/actions/Report';
 import {setTransactionReport} from '@libs/actions/Transaction';
 import type CreateWorkspaceParams from '@libs/API/parameters/CreateWorkspaceParams';
 import getPlatform from '@libs/getPlatform';
+import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {MoneyRequestNavigatorParamList} from '@libs/Navigation/types';
 import {getParticipantsOption} from '@libs/OptionsListUtils';
+import {hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils';
 import UpgradeConfirmation from '@pages/workspace/upgrade/UpgradeConfirmation';
 import UpgradeIntro from '@pages/workspace/upgrade/UpgradeIntro';
 import {setCustomUnitRateID, setMoneyRequestParticipants} from '@userActions/IOU';
@@ -64,14 +68,21 @@ function IOURequestStepUpgrade({
     const [betas] = useOnyx(ONYXKEYS.BETAS);
     const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
+    const [createdPolicyID, setCreatedPolicyID] = useState<string | undefined>();
+    const [createdPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${createdPolicyID}`);
+    const {isBetaEnabled} = usePermissions();
+    const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
+    const hasViolations = hasViolationsReportUtils(undefined, transactionViolations, session?.accountID ?? CONST.DEFAULT_NUMBER_ID, session?.email ?? '');
 
     const feature = Object.values(CONST.UPGRADE_FEATURE_INTRO_MAPPING)
         .filter((value) => value.id !== CONST.UPGRADE_FEATURE_INTRO_MAPPING.policyPreventMemberChangingTitle.id)
         .find((f) => f.alias === upgradePath);
 
     const navigateWithMicrotask = (route: Route) => {
         if (isWeb) {
-            Navigation.setNavigationActionToMicrotaskQueue(() => Navigation.navigate(route));
+        Navigation.setNavigationActionToMicrotaskQueue(() => Navigation.navigate(route));
         } else {
             Navigation.navigate(route);
         }
@@ -114,16 +125,25 @@ function IOURequestStepUpgrade({
                 navigateWithMicrotask(ROUTES.WORKSPACE_CREATE_DISTANCE_RATE_UPGRADE.getRoute(policyID, transactionID, expenseReportID));
                 break;
             }
-            case CONST.UPGRADE_PATHS.REPORTS:
+            case CONST.UPGRADE_PATHS.REPORTS: {
                 Navigation.goBack();
-                if (action === CONST.IOU.ACTION.CREATE) {
-                    // Coming from "Create report" button (no workspace) → go to workspace selection which creates the report
+                if (action === CONST.IOU.ACTION.CREATE && policyID) {
+                    // Create the report directly using the just-created workspace instead of
+                    // navigating to workspace selection (which would redundantly ask the user
+                    // to pick the single workspace they just created).
+                    const {reportID: createdReportID} = createNewReport(currentUserPersonalDetails, hasViolations, isASAPSubmitBetaEnabled, createdPolicy, betas);
+                    navigateWithMicrotask(
+                        isSearchTopmostFullScreenRoute()
+                            ? ROUTES.SEARCH_MONEY_REQUEST_REPORT.getRoute({reportID: createdReportID, backTo: Navigation.getActiveRoute()})
+                            : ROUTES.REPORT_WITH_ID.getRoute(createdReportID, undefined, undefined, Navigation.getActiveRoute()),
+                    );
+                } else if (action === CONST.IOU.ACTION.CREATE) {
                     navigateWithMicrotask(ROUTES.NEW_REPORT_WORKSPACE_SELECTION.getRoute());
                 } else {
                     navigateWithMicrotask(ROUTES.MONEY_REQUEST_STEP_REPORT.getRoute(action, CONST.IOU.TYPE.SUBMIT, transactionID, reportID));
                 }
-
                 break;
+            }
             case CONST.UPGRADE_PATHS.CATEGORIES:
                 Navigation.goBack();
                 navigateWithMicrotask(backTo ?? ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, CONST.IOU.TYPE.SUBMIT, transactionID, reportID));
@@ -172,11 +192,10 @@ function IOURequestStepUpgrade({
             hasActiveAdminPolicies,
         });
         setIsUpgraded(true);
+        setCreatedPolicyID(policyData.policyID);
         policyDataRef.current = policyData;
     };
 
-    const [session] = useOnyx(ONYXKEYS.SESSION);
-
     const handleConfirmUpgradeWarning = () => {
         setIsUpgradeWarningModalOpen(false);
     };
@@ -200,6 +219,7 @@ function IOURequestStepUpgrade({
             hasActiveAdminPolicies,
         });
         policyDataRef.current = policyData;
+        setCreatedPolicyID(policyData.policyID);
         setCreatedPolicyName(params.name);
         setShowConfirmationForm(false);
         setIsUpgraded(true);

tests/unit/useCreateReportActionTest.tsx

@@ -5,6 +5,7 @@ import useCreateReportAction from '@hooks/useCreateReportAction';
 import useOnyx from '@hooks/useOnyx';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Policy} from '@src/types/onyx';
 
@@ -311,6 +312,86 @@ describe('useCreateReportAction', () => {
         });
     });
 
+    describe('policies loaded with valid workspace', () => {
+        it('does not navigate to upgrade path when user has a workspace', () => {
+            const onCreateReport = jest.fn();
+            const policies = [makePaidPolicy()];
+
+            const {result} = renderHook(() =>
+                useCreateReportAction({
+                    onCreateReport,
+                    groupPoliciesWithChatEnabled: policies,
+                }),
+            );
+
+            act(() => {
+                result.current.createReportAction();
+            });
+
+            // Should call onCreateReport directly, not navigate to upgrade
+            expect(onCreateReport).toHaveBeenCalledWith(false);
+            const calls = jest.mocked(Navigation.navigate).mock.calls;
+            const navigatedToUpgrade = calls.some((call) => {
+                const firstArg = call.at(0);
+                return typeof firstArg === 'string' && firstArg.includes('upgrade');
+            });
+            expect(navigatedToUpgrade).toBe(false);
+        });
+    });
+
+    describe('pre-load safety', () => {
+        it('does not call onCreateReport before policies load', () => {
+            const impl = ((_key: string, options?: {selector?: (value: unknown) => unknown}) => {
+                const value = options?.selector ? options.selector(undefined) : undefined;
+                return [value, {status: 'loading'}];
+            }) as typeof useOnyx;
+            mockUseOnyx.mockImplementation(impl);
+
+            const onCreateReport = jest.fn();
+
+            const {result} = renderHook(() =>
+                useCreateReportAction({
+                    onCreateReport,
+                    groupPoliciesWithChatEnabled: [makePaidPolicy()],
+                }),
+            );
+
+            act(() => {
+                result.current.createReportAction();
+            });
+
+            expect(onCreateReport).not.toHaveBeenCalled();
+            expect(Navigation.navigate).not.toHaveBeenCalled();
+            expect(mockShowConfirmModal).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('empty report confirmation dismissed', () => {
+        it('calls onCreateReport directly when confirmation was previously dismissed', () => {
+            mockUseHasEmptyReportsForPolicy.mockReturnValue(true);
+            setupUseOnyx({
+                [ONYXKEYS.NVP_EMPTY_REPORTS_CONFIRMATION_DISMISSED]: true,
+            });
+
+            const onCreateReport = jest.fn();
+            const policies = [makePaidPolicy()];
+
+            const {result} = renderHook(() =>
+                useCreateReportAction({
+                    onCreateReport,
+                    groupPoliciesWithChatEnabled: policies,
+                }),
+            );
+
+            act(() => {
+                result.current.createReportAction();
+            });
+
+            expect(onCreateReport).toHaveBeenCalledWith(false);
+            expect(mockOpenCreateReportConfirmation).not.toHaveBeenCalled();
+        });
+    });
+
     describe('returns', () => {
         it('returns createReportAction function', () => {
             const onCreateReport = jest.fn();