From d0e8701c38390479de154505267bd0831873fe6a Mon Sep 17 00:00:00 2001 From: ffmcgee Date: Tue, 10 Nov 2026 12:29:56 +0100 Subject: [PATCH 1/2] feat(money): load money home behind the FTUE splash --- ui/hooks/useMainNavItems.test.ts | 4 ++-- ui/hooks/useMainNavItems.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ui/hooks/useMainNavItems.test.ts b/ui/hooks/useMainNavItems.test.ts index 12b5bc0b7905..ceed51a9bb39 100644 --- a/ui/hooks/useMainNavItems.test.ts +++ b/ui/hooks/useMainNavItems.test.ts @@ -227,7 +227,7 @@ describe('useMainNavItems', () => { }); }); - it('opens the FTUE splash without navigating on the first Money click', () => { + it('opens the FTUE splash and navigates to Money Home on the first Money click', () => { const { result, store } = renderUseMainNavItems( createState({ moneyFtueSeen: false }), ); @@ -240,7 +240,7 @@ describe('useMainNavItems', () => { pendingDeposit: null, acknowledged: false, }); - expect(mockNavigate).not.toHaveBeenCalled(); + expect(mockNavigate).toHaveBeenCalledWith(MONEY_HOME_ROUTE); expect(mockMoneyAnalytics.trackButtonClicked).toHaveBeenCalledWith({ buttonType: MoneyButtonType.Text, buttonIntent: MoneyButtonIntent.GoToMoneyHome, diff --git a/ui/hooks/useMainNavItems.ts b/ui/hooks/useMainNavItems.ts index 04e9bcf6bef2..9796b362b990 100644 --- a/ui/hooks/useMainNavItems.ts +++ b/ui/hooks/useMainNavItems.ts @@ -88,7 +88,6 @@ export function useMainNavItems(): MainNavItem[] { }); if (!hasSeenMoneyFtue) { dispatch(openMoneyFtue({ source: 'moneyHome' })); - return; } transitionForward(() => navigate(MONEY_HOME_ROUTE)); From 6ecf4b243fe3c3e8908b0d9de75b8e959011592e Mon Sep 17 00:00:00 2001 From: ffmcgee Date: Tue, 10 Nov 2026 12:30:50 +0100 Subject: [PATCH 2/2] test(money): assert route and background load for the FTUE splash --- .../page-objects/flows/money-account-deposit.flow.ts | 2 +- .../page-objects/pages/home/bottom-nav-bar-page.ts | 12 ++---------- test/e2e/tests/money/money-ftue-splash.spec.ts | 9 +++++++-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/test/e2e/page-objects/flows/money-account-deposit.flow.ts b/test/e2e/page-objects/flows/money-account-deposit.flow.ts index f4d50170b198..a55fab8889d8 100644 --- a/test/e2e/page-objects/flows/money-account-deposit.flow.ts +++ b/test/e2e/page-objects/flows/money-account-deposit.flow.ts @@ -37,7 +37,7 @@ export async function openMoneyFtueSplash( ): Promise { const bottomNavBar = new BottomNavBar(driver); await bottomNavBar.checkPageIsLoaded(); - await bottomNavBar.clickMoney({ assertRoute: false }); + await bottomNavBar.clickMoney(); const splash = new MoneyFtueSplashPage(driver); await splash.checkPageIsLoaded(); diff --git a/test/e2e/page-objects/pages/home/bottom-nav-bar-page.ts b/test/e2e/page-objects/pages/home/bottom-nav-bar-page.ts index 2ffb9be0b082..85f9253a7bb1 100644 --- a/test/e2e/page-objects/pages/home/bottom-nav-bar-page.ts +++ b/test/e2e/page-objects/pages/home/bottom-nav-bar-page.ts @@ -48,19 +48,11 @@ class BottomNavBar { /** * Click the Money tab. Only rendered once the Money Account availability * query resolves, so wait for it rather than failing on first paint. - * - * @param options - Click options. - * @param [options.assertRoute] - Whether to assert the Money home route. Set - * to `false` when the first-visit FTUE splash is expected instead. */ - async clickMoney({ - assertRoute = true, - }: { assertRoute?: boolean } = {}): Promise { + async clickMoney(): Promise { console.log('Click bottom nav money tab'); await this.driver.clickElement(this.moneyTab); - if (assertRoute) { - await this.assertOnRoute('/money-home'); - } + await this.assertOnRoute('/money-home'); } } diff --git a/test/e2e/tests/money/money-ftue-splash.spec.ts b/test/e2e/tests/money/money-ftue-splash.spec.ts index cf2dc6f23b52..e56732059671 100644 --- a/test/e2e/tests/money/money-ftue-splash.spec.ts +++ b/test/e2e/tests/money/money-ftue-splash.spec.ts @@ -24,10 +24,13 @@ describe('Money Account FTUE', function (this: Suite) { await login(driver); const splash = await openMoneyFtueSplash(driver); - await splash.clickStartEarning(); + // Money home mounts and loads behind the splash. const moneyHomePage = new MoneyHomePage(driver); await moneyHomePage.checkPageIsLoaded(); + + await splash.clickStartEarning(); + await moneyHomePage.checkPageIsLoaded(); await splash.checkIsNotShown(); // Reload so the persisted seen flag is read back from background @@ -49,10 +52,12 @@ describe('Money Account FTUE', function (this: Suite) { await login(driver); const splash = await openMoneyFtueSplash(driver); - await splash.clickClose(); const moneyHomePage = new MoneyHomePage(driver); await moneyHomePage.checkPageIsLoaded(); + + await splash.clickClose(); + await moneyHomePage.checkPageIsLoaded(); await splash.checkIsNotShown(); }, );