Address tgolen review: inline trivial helper, trim comments, drop stray onboarding change

- Remove the single-line isLookingAroundOnboardingChoice helper and inline
  'choice === CONST.ONBOARDING_CHOICES.LOOKING_AROUND' at every call site.
- Remove the unhelpful what-restating comments in MoneyRequestHeaderSecondaryActions.
- Revert navigateAfterOnboarding.ts fully to main so it's out of this PR's diff — it
  had picked up an unrelated navigateToSubmitWorkspaceAfterOnboarding reroute (Spend to
  Workspace > Categories) that isn't part of this PR.

Co-authored-by: Shawn Borton <shawnborton@users.noreply.github.com>

Author: MelvinBot

src/components/MoneyRequestHeaderSecondaryActions.tsx

@@ -184,16 +184,10 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
     const restrictedActionPolicyID = useRestrictedActionPolicyID(policy);
     const isTrackIntentUser = isTrackOnboardingChoice(introSelected?.choice);
 
-    // Data needed to launch the track-expense "Choose a recipient" flow from the "Send to someone" row (mirrors the
-    // track-expense whisper in ChatActionableButtons).
     const activePolicy = useActivePolicy();
     const {isRestrictedToPreferredPolicy, preferredPolicyID} = usePreferredPolicy();
-    // Memoize the selector factory so useOnyx keeps a stable selector identity across this header's frequent re-renders
-    // (hold/violation/attribute churn) - an inline factory returns a fresh {filteredPoliciesCount, firstPolicyID} each render.
     const filteredPoliciesInfoSelector = useMemo(() => createFilteredPoliciesInfoSelector(currentUserLogin), [currentUserLogin]);
     const [filteredPoliciesInfo] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: filteredPoliciesInfoSelector});
-    // Derive the draft IDs from the existing transactionDrafts subscription instead of subscribing to the same collection twice.
-    // validTransactionDraftsSelector is keyed by transactionID, so its keys are exactly the valid draft transaction IDs.
     const draftTransactionIDs = useMemo(() => Object.keys(transactionDrafts ?? {}), [transactionDrafts]);
 
     // Custom hooks
@@ -207,8 +201,6 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
     const isParentReportArchived = useReportIsArchived(report?.parentReportID);
     const {isBetaEnabled} = usePermissions();
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
-    // A self-DM split expense can only be submitted to a workspace, so the "Send to someone" row is gated on this - mirrors
-    // the track-expense whisper (ChatActionableButtons) and the report-details menu (DynamicReportDetailsPage).
     const isSubmit2026BetaEnabled = isBetaEnabled(CONST.BETAS.SUBMIT_2026);
     const hasWorkspaceToSubmitToSelector = useMemo(() => createHasWorkspaceToSubmitToSelector(currentUserLogin, isSubmit2026BetaEnabled), [currentUserLogin, isSubmit2026BetaEnabled]);
     const [hasWorkspaceToSubmitTo = false] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: hasWorkspaceToSubmitToSelector});
@@ -638,11 +630,6 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
                     return;
                 }
 
-                // Reuse the exact track-expense whisper flow: create a draft from the tracked expense and open the
-                // "Choose a recipient" RHP. Scoped against the self-DM (parentReport), matching the whisper.
-                // Resolve the track-expense actionable whisper the same way the report-details menu does so the
-                // convert flow can mark the original self-DM whisper resolved once the expense is sent - passing
-                // undefined here would leave that whisper stranded and offering to submit an already-sent expense.
                 createDraftTransactionAndNavigateToParticipantSelector({
                     reportID: parentReport?.reportID,
                     actionName: CONST.IOU.ACTION.SUBMIT,

src/libs/IOUAmountSubmission.ts

@@ -46,7 +46,6 @@ import cleanupAfterSkipConfirmSubmit from './Navigation/helpers/cleanupAfterSkip
 import {submitWithDismissFirst} from './Navigation/helpers/submitWithDismissFirst';
 import Navigation from './Navigation/Navigation';
 import {rand64} from './NumberUtils';
-import {isLookingAroundOnboardingChoice} from './OnboardingUtils';
 import {getParticipantsOption, getReportOption} from './OptionsListUtils';
 import Permissions from './Permissions';
 import {getLoginByAccountID} from './PersonalDetailsUtils';
@@ -430,7 +429,7 @@ function submitSkipConfirmationExpense(args: SubmitAmountArgs, ctx: SubmitAmount
             backToReport,
             optimisticChatReportID,
             linkedTrackedExpenseReportAction: transaction?.linkedTrackedExpenseReportAction,
-            isLookingAroundUser: isLookingAroundOnboardingChoice(introSelected?.choice),
+            isLookingAroundUser: introSelected?.choice === CONST.ONBOARDING_CHOICES.LOOKING_AROUND,
             isSelfDMDestination,
         });
     };

src/libs/OnboardingUtils.ts

@@ -21,15 +21,6 @@ function isTrackOnboardingChoice(choice: OnyxEntry<OnboardingPurpose>): choice i
     return choice === CONST.ONBOARDING_CHOICES.TRACK_BUSINESS || choice === CONST.ONBOARDING_CHOICES.TRACK_PERSONAL || choice === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND;
 }
 
-/**
- * Returns true when the onboarding choice is "Something else" (LOOKING_AROUND). Extracted so callers can read the
- * onboarding choice from Onyx in render context and pass the result into pure navigation helpers, rather than
- * having those helpers subscribe to Onyx themselves.
- */
-function isLookingAroundOnboardingChoice(choice: OnyxEntry<OnboardingPurpose>): boolean {
-    return choice === CONST.ONBOARDING_CHOICES.LOOKING_AROUND;
-}
-
 /**
  * Counts the joinable policies that are actually surfaced during onboarding. SUBMIT-type policies are hidden
  * unless the SUBMIT_2026 beta is enabled, mirroring the filter the Workspaces and PrivateDomain screens use to
@@ -57,4 +48,4 @@ function isSupportedPendingInviteOnboarding(introSelected: OnyxEntry<IntroSelect
 
     return isSupportedInviteOnboardingChoice(introSelected.choice) && !isInviteIOUorInvoice;
 }
-export {getVisibleJoinablePoliciesCount, isLookingAroundOnboardingChoice, isSupportedInviteOnboardingChoice, isSupportedPendingInviteOnboarding, isTrackOnboardingChoice};
+export {getVisibleJoinablePoliciesCount, isSupportedInviteOnboardingChoice, isSupportedPendingInviteOnboarding, isTrackOnboardingChoice};

src/libs/navigateAfterOnboarding.ts

@@ -3,7 +3,6 @@ import {handleRHPVariantNavigation, shouldOpenRHPVariant} from '@components/Side
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Route} from '@src/ROUTES';
 import type {OnboardingRHPVariant, ReportNameValuePairs} from '@src/types/onyx';
 
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
@@ -18,6 +17,7 @@ import {dismissOnboardingModalBeforeExit} from './Navigation/helpers/OnboardingN
 import shouldOpenOnAdminRoom from './Navigation/helpers/shouldOpenOnAdminRoom';
 import Navigation from './Navigation/Navigation';
 import {findLastAccessedReport, isConciergeChatReport, isSelfDM} from './ReportUtils';
+import {buildCannedSearchQuery} from './SearchQueryUtils';
 
 let onboardingRHPVariant: OnyxEntry<OnboardingRHPVariant>;
 Onyx.connectWithoutView({
@@ -140,9 +140,8 @@ function navigateAfterOnboardingWithMicrotaskQueue(
 }
 
 /**
- * After creating or joining a Submit workspace during onboarding,
- * navigate to Workspace > Categories with the side panel open so
- * the #admins room is visible in Concierge Anywhere.
+ * After creating or joining a Submit workspace during onboarding, navigate to Spend > Expenses
+ * with the side panel open so the #admins room is visible in Concierge Anywhere.
  */
 function navigateToSubmitWorkspaceAfterOnboarding(policyID?: string, shouldUseNarrowLayout = false) {
     setDisableDismissOnEscape(false);
@@ -153,11 +152,7 @@ function navigateToSubmitWorkspaceAfterOnboarding(policyID?: string, shouldUseNa
     }
 
     setOnboardingRHPVariant(CONST.ONBOARDING_RHP_VARIANT.RHP_ADMINS_ROOM);
-
-    const categoriesRoute = ROUTES.WORKSPACE_CATEGORIES.getRoute(policyID);
-    const backToRoute = shouldUseNarrowLayout ? ROUTES.WORKSPACE_INITIAL.getRoute(policyID) : ROUTES.WORKSPACES_LIST.route;
-    Navigation.navigate(`${categoriesRoute}?backTo=${encodeURIComponent(backToRoute)}` as Route);
-
+    Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.EXPENSE})}));
     SidePanelActions.openSidePanel(!shouldUseNarrowLayout);
 }
 

src/pages/Share/SubmitDetailsPage.tsx

@@ -44,7 +44,7 @@ import cleanupAndNavigateAfterExpenseCreate from '@libs/Navigation/helpers/clean
 import Navigation from '@libs/Navigation/Navigation';
 import type {ShareNavigatorParamList} from '@libs/Navigation/types';
 import {rand64} from '@libs/NumberUtils';
-import {isLookingAroundOnboardingChoice, isTrackOnboardingChoice} from '@libs/OnboardingUtils';
+import {isTrackOnboardingChoice} from '@libs/OnboardingUtils';
 import {getParticipantsOption, getReportOption} from '@libs/OptionsListUtils';
 import {hasOnlyPersonalPolicies as hasOnlyPersonalPoliciesUtil, isGroupPolicy} from '@libs/PolicyUtils';
 import {shouldValidateFile} from '@libs/ReceiptUtils';
@@ -151,7 +151,7 @@ function SubmitDetailsPage({
     const fileType = shouldUsePreValidatedFile ? (validFilesToUpload?.type ?? CONST.RECEIPT_ALLOWED_FILE_TYPES.JPEG) : (currentAttachment?.mimeType ?? '');
     const [hasOnlyPersonalPolicies = false] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: hasOnlyPersonalPoliciesUtil});
     const isTrackIntentUser = isTrackOnboardingChoice(introSelected?.choice);
-    const isLookingAroundUser = isLookingAroundOnboardingChoice(introSelected?.choice);
+    const isLookingAroundUser = introSelected?.choice === CONST.ONBOARDING_CHOICES.LOOKING_AROUND;
 
     const hasEndedOpenSubmitFlowSpan = useRef(false);
     const endOpenSubmitFlowSpan = () => {

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

@@ -57,7 +57,6 @@ import {
 import {submitWithDismissFirst} from '@libs/Navigation/helpers/submitWithDismissFirst';
 import Navigation from '@libs/Navigation/Navigation';
 import type {MoneyRequestNavigatorParamList} from '@libs/Navigation/types';
-import {isLookingAroundOnboardingChoice} from '@libs/OnboardingUtils';
 import {getParticipantsOption, getReportOption} from '@libs/OptionsListUtils';
 import {getDistanceRateCustomUnit} from '@libs/PolicyUtils';
 import {findSelfDMReportID, generateReportID, getReportOrDraftReport, isMoneyRequestReport, isPolicyExpenseChat as isPolicyExpenseChatUtils} from '@libs/ReportUtils';
@@ -277,7 +276,7 @@ function IOURequestStepConfirmation({
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     // "Something else" (LOOKING_AROUND) users have no workspace, so their global-create expense lands in their self-DM.
     // We route them to Spend > Expenses (Search) after creating instead of dropping them into that self-DM report.
-    const isLookingAroundUser = isLookingAroundOnboardingChoice(introSelected?.choice);
+    const isLookingAroundUser = introSelected?.choice === CONST.ONBOARDING_CHOICES.LOOKING_AROUND;
     const privateIsArchivedMap = usePrivateIsArchivedMap();
 
     const receiptFilename = transaction?.receipt?.filename;

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

@@ -40,7 +40,7 @@ import {getWaypointsHasUnsavedChanges} from '@libs/MoneyRequestUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import OnyxTabNavigator, {TabScreenWithFocusTrapWrapper, TopTab} from '@libs/Navigation/OnyxTabNavigator';
 import {roundToTwoDecimalPlaces} from '@libs/NumberUtils';
-import {isLookingAroundOnboardingChoice, isTrackOnboardingChoice} from '@libs/OnboardingUtils';
+import {isTrackOnboardingChoice} from '@libs/OnboardingUtils';
 import {isPolicyExpenseChat as isPolicyExpenseChatUtil, isSelfDM} from '@libs/ReportUtils';
 import {getDistanceInMeters, getRateID, getRequestType, getSelectedRouteKey, hasManualDistanceOverride, haveWaypointAddressesChanged} from '@libs/TransactionUtils';
 
@@ -318,7 +318,7 @@ function IOURequestStepDistance({
     const skipConfirmationPreMountRoute = getSkipConfirmationPreMountDestinationRoute(
         shouldSkipConfirmation,
         report?.reportID,
-        isLookingAroundOnboardingChoice(introSelected?.choice),
+        introSelected?.choice === CONST.ONBOARDING_CHOICES.LOOKING_AROUND,
         isSelfDM(report),
     );
     usePreMountDestination(skipConfirmationPreMountRoute);

src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts

@@ -12,7 +12,6 @@ import cleanupAfterSkipConfirmSubmit from '@libs/Navigation/helpers/cleanupAfter
 import {submitWithDismissFirst} from '@libs/Navigation/helpers/submitWithDismissFirst';
 import Navigation from '@libs/Navigation/Navigation';
 import {roundToTwoDecimalPlaces} from '@libs/NumberUtils';
-import {isLookingAroundOnboardingChoice} from '@libs/OnboardingUtils';
 import {getPolicyExpenseChat, isSelfDM} from '@libs/ReportUtils';
 import type {OptionData} from '@libs/ReportUtils';
 import shouldUseDefaultExpensePolicy from '@libs/shouldUseDefaultExpensePolicy';
@@ -215,7 +214,7 @@ function handleMoneyRequestStepDistanceNavigation({
     const isGPSDistance = gpsDistance !== undefined && gpsCoordinates !== undefined;
     const distanceRequestType = getDistanceRequestType(transaction);
     // Derived here (rather than read from Onyx) from the onboarding choice the calling component/hook already passes in.
-    const isLookingAroundUser = isLookingAroundOnboardingChoice(introSelected?.choice);
+    const isLookingAroundUser = introSelected?.choice === CONST.ONBOARDING_CHOICES.LOOKING_AROUND;
     // Whether this expense's sole destination is the current user's self-DM. Scopes the LOOKING_AROUND
     // "route to Spend > Expenses" behaviour to the self-DM case (matches the confirmation step).
     const isSelfDMDestination = isSelfDMSoleDestination(participants, iouType, currentUserAccountID);

src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx

@@ -27,7 +27,7 @@ import Log from '@libs/Log';
 import cleanupAfterSkipConfirmSubmit from '@libs/Navigation/helpers/cleanupAfterSkipConfirmSubmit';
 import {submitWithDismissFirst} from '@libs/Navigation/helpers/submitWithDismissFirst';
 import {rand64} from '@libs/NumberUtils';
-import {isLookingAroundOnboardingChoice, isTrackOnboardingChoice} from '@libs/OnboardingUtils';
+import {isTrackOnboardingChoice} from '@libs/OnboardingUtils';
 import {isMoneyRequestReport as isMoneyRequestReportReportUtils} from '@libs/ReportUtils';
 import {cancelSpan} from '@libs/telemetry/activeSpans';
 import type {ReceiptCaptureSource} from '@libs/telemetry/ReceiptObservability';
@@ -108,7 +108,7 @@ function ScanSkipConfirmation({report, action, iouType, reportID, transactionID,
         selector: shouldStartLocationPermissionFlowSelector,
     });
     const isTrackIntentUser = isTrackOnboardingChoice(introSelected?.choice);
-    const isLookingAroundUser = isLookingAroundOnboardingChoice(introSelected?.choice);
+    const isLookingAroundUser = introSelected?.choice === CONST.ONBOARDING_CHOICES.LOOKING_AROUND;
 
     const [transactions] = useOptimisticDraftTransactions(transaction);
     const {isMultiScanEnabled} = useMultiScanState();

src/pages/iou/request/step/confirmation/useExpenseSubmission.ts

@@ -27,7 +27,7 @@ import dismissModalAndOpenReportInInboxTabHelper from '@libs/Navigation/helpers/
 import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute';
 import navigateAfterExpenseCreate from '@libs/Navigation/helpers/navigateAfterExpenseCreate';
 import {rand64, roundToTwoDecimalPlaces} from '@libs/NumberUtils';
-import {isLookingAroundOnboardingChoice, isTrackOnboardingChoice} from '@libs/OnboardingUtils';
+import {isTrackOnboardingChoice} from '@libs/OnboardingUtils';
 import {getNewAccountIDsAndLogins} from '@libs/PersonalDetailsUtils';
 import {isTaxTrackingEnabled} from '@libs/PolicyUtils';
 import {
@@ -293,7 +293,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
     const [odometerDraft] = useOnyx(ONYXKEYS.ODOMETER_DRAFT);
     const [delegateEmail] = useOnyx(ONYXKEYS.ACCOUNT, {selector: delegateEmailSelector});
     const isTrackIntentUser = isTrackOnboardingChoice(introSelected?.choice);
-    const isLookingAroundUser = isLookingAroundOnboardingChoice(introSelected?.choice);
+    const isLookingAroundUser = introSelected?.choice === CONST.ONBOARDING_CHOICES.LOOKING_AROUND;
     // Onboarding task data
     const {
         taskReport: viewTourTaskReport,