refactor(mobile): unify tab navigation selectors and enhance portfolio screen identification

Author: deepyjr

apps/ledger-live-mobile/src/mvvm/features/Portfolio/screens/Portfolio/index.tsx

@@ -158,7 +158,7 @@ export const PortfolioScreen = ({ navigation }: NavigationProps) => {
     <>
       <CheckLanguageAvailability />
       <CheckTermOfUseUpdate />
-      <Animated.View style={{ flex: 1 }}>
+      <Animated.View testID="portfolio-screen" style={{ flex: 1 }}>
         <RefreshableCollapsibleHeaderFlatList
           data={data}
           renderItem={renderItem<React.JSX.Element>}

apps/ledger-live-mobile/src/screens/Portfolio/index.tsx

@@ -252,7 +252,7 @@ function PortfolioScreen({ navigation }: NavigationProps) {
     <>
       <CheckLanguageAvailability />
       <CheckTermOfUseUpdate />
-      <Animated.View style={{ flex: 1 }}>
+      <Animated.View testID="portfolio-screen" style={{ flex: 1 }}>
         <RefreshableCollapsibleHeaderFlatList
           data={data}
           renderItem={renderItem<React.JSX.Element>}

e2e/mobile/page/wallet/mainNavigation.page.ts

@@ -2,12 +2,11 @@ import { element, by } from "detox";
 import { Step } from "jest-allure2-reporter/api";
 import { openDeeplink } from "../../helpers/commonHelpers";
 
+type Wallet40TabName = "home" | "swap" | "earn" | "card";
+
 export default class MainNavigationPage {
   // --- Wallet 4.0 bottom tabs ---
-  wallet40HomeTab = () => element(by.id("w40-tab-home"));
-  wallet40SwapTab = () => element(by.id("w40-tab-swap"));
-  wallet40EarnTab = () => element(by.id("w40-tab-earn"));
-  wallet40CardTab = () => element(by.id("w40-tab-card"));
+  wallet40Tab = (tabName: Wallet40TabName) => element(by.id(`w40-tab-${tabName}`));
 
   // --- Wallet 4.0 top bar buttons ---
   topBarMyLedgerId = "topbar-myledger";
@@ -23,8 +22,7 @@ export default class MainNavigationPage {
   legacyMyLedgerTabId = "TabBarManager";
 
   // --- Destination page verification IDs ---
-  portfolioAccountsListId = "PortfolioAccountsList";
-  portfolioEmptyListId = "PortfolioEmptyList";
+  portfolioScreenId = "portfolio-screen";
   swapFormId = "swap-form-tab";
   earnScreenId = "earn-screen";
   cardScreenId = "card-landing-screen";
@@ -39,36 +37,21 @@ export default class MainNavigationPage {
 
   @Step("Wait for Wallet 4.0 navigation to be ready")
   async waitForWallet40Ready() {
-    await waitForElementById(this.topBarSettingsId, 120000);
+    await waitForElementById(this.topBarSettingsId);
   }
 
   @Step("Wait for Legacy navigation to be ready")
   async waitForLegacyReady() {
-    await waitForElementById(this.legacyMyLedgerTabId, 120000);
+    await waitForElementById(this.legacyMyLedgerTabId);
   }
 
   // =====================
   // Wallet 4.0 Tab Actions
   // =====================
 
-  @Step("Tap Home tab (Wallet 4.0)")
-  async tapWallet40HomeTab() {
-    await this.wallet40HomeTab().tap();
-  }
-
-  @Step("Tap Swap tab (Wallet 4.0)")
-  async tapWallet40SwapTab() {
-    await this.wallet40SwapTab().tap();
-  }
-
-  @Step("Tap Earn tab (Wallet 4.0)")
-  async tapWallet40EarnTab() {
-    await this.wallet40EarnTab().tap();
-  }
-
-  @Step("Tap Card tab (Wallet 4.0)")
-  async tapWallet40CardTab() {
-    await this.wallet40CardTab().tap();
+  @Step("Tap W40 tab")
+  async tapWallet40Tab(tabName: Wallet40TabName) {
+    await this.wallet40Tab(tabName).tap();
   }
 
   // =====================
@@ -125,10 +108,10 @@ export default class MainNavigationPage {
 
   @Step("Expect Wallet 4.0 bottom tabs to be visible")
   async expectWallet40BottomTabsVisible() {
-    await detoxExpect(this.wallet40HomeTab()).toBeVisible();
-    await detoxExpect(this.wallet40SwapTab()).toBeVisible();
-    await detoxExpect(this.wallet40EarnTab()).toBeVisible();
-    await detoxExpect(this.wallet40CardTab()).toBeVisible();
+    await detoxExpect(this.wallet40Tab("home")).toBeVisible();
+    await detoxExpect(this.wallet40Tab("swap")).toBeVisible();
+    await detoxExpect(this.wallet40Tab("earn")).toBeVisible();
+    await detoxExpect(this.wallet40Tab("card")).toBeVisible();
   }
 
   @Step("Expect Wallet 4.0 top bar to be visible")
@@ -175,11 +158,7 @@ export default class MainNavigationPage {
 
   @Step("Expect Portfolio page visible")
   async expectPortfolioPageVisible() {
-    try {
-      await waitForElementById(this.portfolioAccountsListId, 5000);
-    } catch {
-      await waitForElementById(this.portfolioEmptyListId, 5000);
-    }
+    await waitForElementById(this.portfolioScreenId);
   }
 
   @Step("Expect Swap page visible")

e2e/mobile/specs/mainNavigationWallet40.spec.ts

@@ -34,25 +34,25 @@ describe("Wallet 4.0 Main Navigation", () => {
   });
 
   it("should navigate to Swap via bottom tab and show Swap page", async () => {
-    await app.mainNavigation.tapWallet40SwapTab();
+    await app.mainNavigation.tapWallet40Tab("swap");
     await app.mainNavigation.expectSwapPageVisible();
     await app.mainNavigation.expectWallet40BottomTabsVisible();
   });
 
   it("should navigate to Earn via bottom tab and show Earn page", async () => {
-    await app.mainNavigation.tapWallet40EarnTab();
+    await app.mainNavigation.tapWallet40Tab("earn");
     await app.mainNavigation.expectEarnPageVisible();
     await app.mainNavigation.expectWallet40BottomTabsVisible();
   });
 
   it("should navigate to Card via bottom tab and show Card page", async () => {
-    await app.mainNavigation.tapWallet40CardTab();
+    await app.mainNavigation.tapWallet40Tab("card");
     await app.mainNavigation.expectCardPageVisible();
     await app.mainNavigation.expectWallet40BottomTabsVisible();
   });
 
   it("should navigate back to Portfolio via Home tab", async () => {
-    await app.mainNavigation.tapWallet40HomeTab();
+    await app.mainNavigation.tapWallet40Tab("home");
     await app.mainNavigation.expectPortfolioPageVisible();
     await app.mainNavigation.expectWallet40BottomTabsVisible();
     await app.mainNavigation.expectWallet40TopBarVisible();