Fix mobile Home section order for Getting started

Author: adamgrzybowski

src/pages/home/HomePage.tsx

@@ -10,12 +10,10 @@ import ScrollView from '@components/ScrollView';
 import useConfirmReadyToOpenApp from '@hooks/useConfirmReadyToOpenApp';
 import useDocumentTitle from '@hooks/useDocumentTitle';
 import useLocalize from '@hooks/useLocalize';
-import useOnboardingIntent from '@hooks/useOnboardingIntent';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import variables from '@styles/variables';
-import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import AnnouncementSection from './AnnouncementSection';
 import AssignedCardsSection from './AssignedCardsSection';
@@ -34,8 +32,6 @@ function HomePage() {
     useDocumentTitle(translate('common.home'));
     const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP);
     const [isLoadingReportData = false] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA);
-    const intent = useOnboardingIntent();
-    const shouldSwapForYouAndGettingStarted = intent === CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE;
     const isForYouLoading = !!(isLoadingApp || isLoadingReportData);
     const receiptDropTargetRef = useRef<View>(null);
 
@@ -73,17 +69,8 @@ function HomePage() {
                                 <>
                                     <FreeTrialSection />
                                     <TimeSensitiveSection />
-                                    {shouldSwapForYouAndGettingStarted ? (
-                                        <>
-                                            <ForYouSection />
-                                            <GettingStartedSection />
-                                        </>
-                                    ) : (
-                                        <>
-                                            <GettingStartedSection />
-                                            <ForYouSection />
-                                        </>
-                                    )}
+                                    <GettingStartedSection />
+                                    <ForYouSection />
                                     <UpcomingTravelSection />
                                     <AssignedCardsSection />
                                     <SpendOverTimeSection />

tests/unit/pages/HomePage.test.tsx

@@ -141,6 +141,8 @@ function getSectionOrder() {
     };
 }
 
+// Locks in the canonical mobile ordering from https://github.com/Expensify/App/issues/85075:
+// Getting started must always sit above For you on narrow layouts, regardless of the onboarding intent.
 describe('HomePage mobile ordering', () => {
     beforeAll(() => {
         Onyx.init({keys: ONYXKEYS});
@@ -152,36 +154,14 @@ describe('HomePage mobile ordering', () => {
         await waitForBatchedUpdates();
     });
 
-    it('renders ForYouSection before GettingStartedSection when introSelected.choice is TRACK_WORKSPACE on narrow layout', async () => {
-        await Onyx.set(ONYXKEYS.NVP_INTRO_SELECTED, {
-            choice: CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE,
-        });
-        await waitForBatchedUpdates();
-
-        renderHomePage();
-
-        const {forYouIndex, gettingStartedIndex} = getSectionOrder();
-        expect(forYouIndex).toBeGreaterThanOrEqual(0);
-        expect(gettingStartedIndex).toBeGreaterThanOrEqual(0);
-        expect(forYouIndex).toBeLessThan(gettingStartedIndex);
-    });
-
-    it('renders ForYouSection before GettingStartedSection when introSelected.choice is undefined but onboardingPurpose is TRACK_WORKSPACE on narrow layout', async () => {
-        await Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE as never);
-        await waitForBatchedUpdates();
-
-        renderHomePage();
-
-        const {forYouIndex, gettingStartedIndex} = getSectionOrder();
-        expect(forYouIndex).toBeGreaterThanOrEqual(0);
-        expect(gettingStartedIndex).toBeGreaterThanOrEqual(0);
-        expect(forYouIndex).toBeLessThan(gettingStartedIndex);
-    });
-
-    it('keeps GettingStartedSection before ForYouSection when intent is MANAGE_TEAM on narrow layout', async () => {
-        await Onyx.set(ONYXKEYS.NVP_INTRO_SELECTED, {
-            choice: CONST.ONBOARDING_CHOICES.MANAGE_TEAM,
-        });
+    it.each([
+        ['no onboarding intent set', undefined],
+        ['MANAGE_TEAM intent', CONST.ONBOARDING_CHOICES.MANAGE_TEAM],
+        ['TRACK_WORKSPACE intent', CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE],
+    ])('renders GettingStartedSection before ForYouSection on narrow layout with %s', async (_label, choice) => {
+        if (choice) {
+            await Onyx.set(ONYXKEYS.NVP_INTRO_SELECTED, {choice});
+        }
         await waitForBatchedUpdates();
 
         renderHomePage();