🍒 Cherry pick PR #85849 to staging 🍒

android/app/build.gradle

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009034010
-        versionName "9.3.40-10"
+        versionCode 1009034011
+        versionName "9.3.40-11"
         // 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.40.10</string>
+	<string>9.3.40.11</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.40</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.40.10</string>
+	<string>9.3.40.11</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.40</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.40.10</string>
+	<string>9.3.40.11</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.3.40-10",
+  "version": "9.3.40-11",
   "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

@@ -6417,7 +6417,6 @@ const CONST = {
     ONBOARDING_RHP_VARIANT: {
         RHP_CONCIERGE_DM: 'rhpConciergeDm',
         RHP_ADMINS_ROOM: 'rhpAdminsRoom',
-        RHP_HOME_PAGE: 'rhpHomePage',
         CONTROL: 'control',
     },
     ACTIONABLE_TRACK_EXPENSE_WHISPER_MESSAGE: 'What would you like to do with this expense?',

src/components/SidePanel/RHPVariantTest/index.native.ts

@@ -3,13 +3,11 @@ import type {HandleRHPVariantNavigation, ShouldOpenRHPVariant} from './types';
 /**
  * Side Panel is not supported on native platforms, so we always return false.
  */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const shouldOpenRHPVariant: ShouldOpenRHPVariant = (_variantOverride) => false;
+const shouldOpenRHPVariant: ShouldOpenRHPVariant = () => false;
 
 /**
  * No-op on native platforms since Side Panel is not supported.
  */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const handleRHPVariantNavigation: HandleRHPVariantNavigation = (_onboardingPolicyID, _variantOverride) => {};
+const handleRHPVariantNavigation: HandleRHPVariantNavigation = () => {};
 
 export {shouldOpenRHPVariant, handleRHPVariantNavigation};

src/components/SidePanel/RHPVariantTest/index.ts

@@ -29,38 +29,22 @@ Onyx.connectWithoutView({
 /**
  * Determines if the user should be navigated to the RHP variant side panel after onboarding.
  * The RHP variant is only shown to micro companies that are part of the RHP experiment.
- *
- * Accepts an optional variantOverride to bypass the module-level Onyx variable, avoiding a race
- * condition where the Onyx callback hasn't fired yet when this is called immediately after the
- * CompleteGuidedSetup API response.
  */
-const shouldOpenRHPVariant: ShouldOpenRHPVariant = (variantOverride) => {
-    const variant = variantOverride ?? onboardingRHPVariant;
+const shouldOpenRHPVariant: ShouldOpenRHPVariant = () => {
     const isMicroCompany = onboardingCompanySize === CONST.ONBOARDING_COMPANY_SIZE.MICRO;
-    const isRHPConciergeDM = variant === CONST.ONBOARDING_RHP_VARIANT.RHP_CONCIERGE_DM;
-    const isRHPAdminsRoom = variant === CONST.ONBOARDING_RHP_VARIANT.RHP_ADMINS_ROOM;
-    const isRHPHomePage = variant === CONST.ONBOARDING_RHP_VARIANT.RHP_HOME_PAGE;
+    const isRHPConciergeDM = onboardingRHPVariant === CONST.ONBOARDING_RHP_VARIANT.RHP_CONCIERGE_DM;
+    const isRHPAdminsRoom = onboardingRHPVariant === CONST.ONBOARDING_RHP_VARIANT.RHP_ADMINS_ROOM;
 
-    return isMicroCompany && (isRHPConciergeDM || isRHPAdminsRoom || isRHPHomePage);
+    return isMicroCompany && (isRHPConciergeDM || isRHPAdminsRoom);
 };
 
 /**
  * Handles navigation for RHP experiment:
  * - Control: navigate to the last accessed report on small screens, do not open side panel
  * - RHP Concierge DM: navigate to the workspace overview and open the side panel with the Concierge DM
  * - RHP Admins Room: navigate to the workspace overview and open the side panel with the Admins Room
- * - RHP Home Page: navigate to the Home page and open the side panel with the Concierge DM
- *
- * Accepts an optional variantOverride for the same race-condition reason as shouldOpenRHPVariant.
  */
-const handleRHPVariantNavigation: HandleRHPVariantNavigation = (onboardingPolicyID, variantOverride) => {
-    const variant = variantOverride ?? onboardingRHPVariant;
-    if (variant === CONST.ONBOARDING_RHP_VARIANT.RHP_HOME_PAGE) {
-        Navigation.navigate(ROUTES.HOME);
-        SidePanelActions.openSidePanel(true);
-        return;
-    }
-
+const handleRHPVariantNavigation: HandleRHPVariantNavigation = (onboardingPolicyID) => {
     Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW.getRoute(onboardingPolicyID));
     SidePanelActions.openSidePanel(true);
 };

src/components/SidePanel/RHPVariantTest/types.ts

@@ -1,6 +1,4 @@
-import type {OnboardingRHPVariant} from '@src/types/onyx';
-
-type ShouldOpenRHPVariant = (variantOverride?: OnboardingRHPVariant | null) => boolean;
-type HandleRHPVariantNavigation = (onboardingPolicyID?: string, variantOverride?: OnboardingRHPVariant | null) => void;
+type ShouldOpenRHPVariant = () => boolean;
+type HandleRHPVariantNavigation = (onboardingPolicyID?: string) => void;
 
 export type {ShouldOpenRHPVariant, HandleRHPVariantNavigation};

src/libs/navigateAfterOnboarding.ts

@@ -1,6 +1,5 @@
 import {handleRHPVariantNavigation, shouldOpenRHPVariant} from '@components/SidePanel/RHPVariantTest';
 import ROUTES from '@src/ROUTES';
-import type {OnboardingRHPVariant} from '@src/types/onyx';
 import {setDisableDismissOnEscape} from './actions/Modal';
 import shouldOpenOnAdminRoom from './Navigation/helpers/shouldOpenOnAdminRoom';
 import Navigation from './Navigation/Navigation';
@@ -51,12 +50,11 @@ function navigateAfterOnboarding(
     onboardingPolicyID?: string,
     onboardingAdminsChatReportID?: string,
     shouldPreventOpenAdminRoom = false,
-    onboardingRHPVariant?: OnboardingRHPVariant | null,
 ) {
     setDisableDismissOnEscape(false);
 
-    if (shouldOpenRHPVariant(onboardingRHPVariant)) {
-        handleRHPVariantNavigation(onboardingPolicyID, onboardingRHPVariant);
+    if (shouldOpenRHPVariant()) {
+        handleRHPVariantNavigation(onboardingPolicyID);
         return;
     }
 
@@ -85,7 +83,6 @@ function navigateAfterOnboardingWithMicrotaskQueue(
     onboardingPolicyID?: string,
     onboardingAdminsChatReportID?: string,
     shouldPreventOpenAdminRoom = false,
-    onboardingRHPVariant?: OnboardingRHPVariant | null,
 ) {
     Navigation.dismissModal();
     Navigation.setNavigationActionToMicrotaskQueue(() => {
@@ -97,7 +94,6 @@ function navigateAfterOnboardingWithMicrotaskQueue(
             onboardingPolicyID,
             onboardingAdminsChatReportID,
             shouldPreventOpenAdminRoom,
-            onboardingRHPVariant,
         );
     });
 }

src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx

@@ -33,7 +33,6 @@ import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {OnboardingRHPVariant} from '@src/types/onyx';
 import type {BaseOnboardingInterestedFeaturesProps, Feature, SectionObject} from './types';
 
 function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardingInterestedFeaturesProps) {
@@ -214,7 +213,7 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
                 setOnboardingPolicyID(policyID);
             }
 
-            const response = await completeOnboarding({
+            await completeOnboarding({
                 engagementChoice: onboardingPurposeSelected,
                 onboardingMessage: onboardingMessages[onboardingPurposeSelected],
                 adminsChatReportID,
@@ -230,11 +229,6 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
                 betas,
             });
 
-            // Extract the RHP variant directly from the API response to avoid a race condition
-            // where the Onyx callback hasn't fired yet when navigateAfterOnboarding is called.
-            const rhpVariantUpdate = (response?.onyxData as Array<{key: string; value: unknown}> | undefined)?.find((update) => update.key === ONYXKEYS.NVP_ONBOARDING_RHP_VARIANT);
-            const rhpVariant = rhpVariantUpdate?.value as OnboardingRHPVariant | undefined;
-
             // Avoid creating new WS because onboardingPolicyID is cleared before unmounting
             // eslint-disable-next-line @typescript-eslint/no-deprecated
             InteractionManager.runAfterInteractions(() => {
@@ -253,7 +247,6 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
                 // Onboarding tasks would show in Concierge instead of admins room for testing accounts, we should open where onboarding tasks are located
                 // See https://github.com/Expensify/App/issues/57167 for more details
                 (session?.email ?? '').includes('+'),
-                rhpVariant,
             );
         } catch (error) {
             Log.warn('[BaseOnboardingInterestedFeatures] Error completing onboarding', {error});

src/types/onyx/OnboardingRHPVariant.ts

@@ -1,10 +1,9 @@
 /**
- * The variant of the onboarding RHP for A/B/C/D testing
+ * The variant of the onboarding RHP for A/B/C testing
  * @description 'control' - The variant with the Concierge DM
  * @description 'rhpConciergeDm' - Admin of workspace with Concierge DM
  * @description 'rhpAdminsRoom' - Admin of workspace with the admins room
- * @description 'rhpHomePage' - Navigate to Home page with Concierge Anywhere accessible in #admins room
  */
-type OnboardingRHPVariant = 'rhpConciergeDm' | 'rhpAdminsRoom' | 'rhpHomePage' | 'control';
+type OnboardingRHPVariant = 'rhpConciergeDm' | 'rhpAdminsRoom' | 'control';
 
 export default OnboardingRHPVariant;