🍒 Cherry pick PR #89808 to staging 🍒

android/app/build.gradle

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036711
-        versionName "9.3.67-11"
+        versionCode 1009036712
+        versionName "9.3.67-12"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

ios/NewExpensify/Info.plist

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.67.11</string>
+	<string>9.3.67.12</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.67</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.67.11</string>
+	<string>9.3.67.12</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.67</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.67.11</string>
+	<string>9.3.67.12</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.3.67-11",
+  "version": "9.3.67-12",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/CONST/index.ts

@@ -887,7 +887,6 @@ const CONST = {
         BULK_DUPLICATE_REPORT: 'bulkDuplicateReport',
         BULK_EDIT: 'bulkEdit',
         NEW_MANUAL_EXPENSE_FLOW: 'newManualExpenseFlow',
-        SUBMIT_2026: 'submit2026',
         BULK_SUBMIT_APPROVE_PAY: 'bulkSubmitApprovePay',
     },
     BUTTON_STATES: {
@@ -3517,8 +3516,6 @@ const CONST = {
 
             // Often referred to as "collect" workspaces
             TEAM: 'team',
-
-            SUBMIT: 'submit2026',
         },
         RULE_CONDITIONS: {
             MATCHES: 'matches',
@@ -3537,7 +3534,6 @@ 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 {canEditWorkspaceSettings, shouldShowPolicy} from '@libs/PolicyUtils';
+import {isPolicyAdmin, 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 = canEditWorkspaceSettings(activePolicy);
+    const isUserAdmin = isPolicyAdmin(activePolicy, sessionEmail);
     const isPolicyActive = shouldShowPolicy(activePolicy, false, sessionEmail ?? '');
     const adminsChatReportID = activePolicy?.chatReportIDAdmins?.toString();
 

src/components/WorkspaceMemberRoleList.tsx

@@ -1,15 +1,12 @@
-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, isPolicyAdmin} from '@libs/PolicyUtils';
+import {isControlPolicy} 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';
@@ -35,7 +32,6 @@ 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[] = [
         {
@@ -62,18 +58,7 @@ function WorkspaceMemberRoleList({role, policy, navigateBackTo = undefined, isLo
     ];
 
     const isPolicyControl = isControlPolicy(policy);
-    // 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;
-    });
+    const availableRoleItems: ListItemType[] = workspaceRoles.filter((item) => isPolicyControl || item.value !== CONST.POLICY.ROLE.AUDITOR);
 
     return (
         <>

src/hooks/useAutoCreateTrackWorkspace.ts

@@ -1,3 +1,4 @@
+import {hasSeenTourSelector} from '@selectors/Onboarding';
 import {useCallback, useMemo} from 'react';
 import type {OnyxCollection} from 'react-native-onyx';
 import isSidePanelReportSupported from '@components/SidePanel/isSidePanelReportSupported';
@@ -11,10 +12,17 @@ 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 useOnboardingWorkspaceCreationState from './useOnboardingWorkspaceCreationState';
+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 usePreferredPolicy from './usePreferredPolicy';
+import useResponsiveLayout from './useResponsiveLayout';
 
 /**
  * Hook that provides a function to auto-create a workspace for Track (PERSONAL_SPEND)
@@ -23,57 +31,57 @@ import usePermissions from './usePermissions';
  * Shared by BaseOnboardingPersonalDetails and BaseOnboardingPurpose.
  */
 function useAutoCreateTrackWorkspace() {
-    const {
-        onboardingPolicyID,
-        onboardingAdminsChatReportID,
-        introSelected,
-        isSelfTourViewed,
-        betas,
-        currentUserEmail,
-        currentUserAccountID,
-        localCurrencyCode,
-        activePolicy,
-        translate,
-        formatPhoneNumber,
-        isRestrictedPolicyCreation,
-        hasActiveAdminPolicies,
-        onboardingMessages,
-        lastWorkspaceNumber,
-        isSmallScreenWidth,
-    } = 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 paidGroupPolicySelector = useMemo(
-        () => (policies: OnyxCollection<Policy>) => Object.values(policies ?? {}).some((policy) => isPaidGroupPolicy(policy) && isPolicyAdmin(policy, currentUserEmail)),
-        [currentUserEmail],
+        () => (policies: OnyxCollection<Policy>) => Object.values(policies ?? {}).some((policy) => isPaidGroupPolicy(policy) && isPolicyAdmin(policy, session?.email)),
+        [session?.email],
     );
     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(currentUserEmail, {firstName, lastName}, formatPhoneNumber);
+            const displayName = createDisplayName(session?.email ?? '', {firstName, lastName}, formatPhoneNumber);
 
             const {adminsChatReportID: newAdminsChatReportID, policyID: newPolicyID} = shouldCreateWorkspace
                 ? createWorkspace({
                       policyOwnerEmail: undefined,
                       makeMeAdmin: true,
-                      policyName: generateDefaultWorkspaceName(currentUserEmail, lastWorkspaceNumber, translate, displayName),
+                      policyName: generateDefaultWorkspaceName(session?.email ?? '', lastWorkspaceNumber, translate, displayName),
                       policyID: generatePolicyID(),
                       engagementChoice: CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE,
-                      currency: localCurrencyCode,
+                      currency: currentUserPersonalDetails.localCurrencyCode ?? CONST.CURRENCY.USD,
                       file: undefined,
                       shouldAddOnboardingTasks: false,
                       introSelected,
                       activePolicy,
-                      currentUserAccountIDParam: currentUserAccountID,
-                      currentUserEmailParam: currentUserEmail,
+                      currentUserAccountIDParam: session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
+                      currentUserEmailParam: session?.email ?? '',
                       shouldAddGuideWelcomeMessage: false,
                       onboardingPurposeSelected,
                       betas,
@@ -121,16 +129,16 @@ function useAutoCreateTrackWorkspace() {
             }
         },
         [
-            currentUserEmail,
-            currentUserAccountID,
+            session?.email,
+            session?.accountID,
             lastWorkspaceNumber,
             translate,
             formatPhoneNumber,
             isRestrictedPolicyCreation,
             onboardingPolicyID,
             hasPaidGroupAdminPolicy,
             onboardingAdminsChatReportID,
-            localCurrencyCode,
+            currentUserPersonalDetails.localCurrencyCode,
             introSelected,
             activePolicy,
             isSelfTourViewed,