minimal refactor to navigation

Author: piotr-iohk

test/helpers/actions.ts

@@ -1,7 +1,9 @@
 import type { ChainablePromiseElement } from 'webdriverio';
 import { reinstallApp } from './setup';
 import { deposit, mineBlocks } from './regtest';
-import { openSettings } from './settings';
+import { doNavigationClose, doTriggerTimedSheet, openSettings } from './navigation';
+
+export { doNavigationClose, doTriggerTimedSheet } from './navigation';
 
 export const sleep = (ms: number) => browser.pause(ms);
 
@@ -604,12 +606,6 @@ export async function handleAndroidAlert(
   }
 }
 
-export async function doNavigationClose() {
-  await tap('HeaderMenu');
-  await tap('DrawerWallet');
-  await sleep(500);
-}
-
 export async function getSeed(): Promise<string> {
   await openSettings('security');
   await tap('BackupWallet');
@@ -1203,23 +1199,6 @@ export async function acknowledgeExternalSuccess() {
   await sleep(300);
 }
 
-/**
- * Triggers the timed backup sheet by navigating to settings and back.
- * Since timed sheets are sometimes triggered by user behavior (when user goes back to home screen),
- * we need to trigger them manually.
- *
- * @example
- * // Trigger backup sheet before testing dismissal
- * await doTriggerTimedSheet();
- */
-export async function doTriggerTimedSheet() {
-  await sleep(700); // wait for any previous animations to finish
-  await tap('HeaderMenu');
-  await tap('DrawerSettings');
-  await sleep(500); // wait for the app to settle
-  await doNavigationClose();
-}
-
 export async function dismissBackgroundPaymentsTimedSheet({
   triggerTimedSheet = false,
 }: { triggerTimedSheet?: boolean } = {}) {

test/helpers/lnd.ts

@@ -10,7 +10,7 @@ import {
   typeText,
 } from './actions';
 import { LndConfig } from './constants';
-import { openSettings } from './settings';
+import { openSettings } from './navigation';
 import createLndRpc, { LnRpc, WalletUnlockerRpc } from '@radar/lnrpc';
 
 export async function setupLND(

test/helpers/navigation.ts

@@ -0,0 +1,46 @@
+import { tap, sleep } from './actions';
+
+export type SettingsTab = 'general' | 'security' | 'advanced';
+
+/**
+ * Opens the Settings screen at the given tab.
+ * General is the default tab so no extra tap is needed for it.
+ */
+export async function openSettings(tab: SettingsTab = 'general') {
+  await tap('HeaderMenu');
+  await tap('DrawerSettings');
+  if (tab !== 'general') {
+    await tap(`Tab-${tab}`);
+    await sleep(300);
+  }
+}
+
+/**
+ * Opens the Support screen from the drawer menu.
+ */
+export async function openSupport() {
+  await tap('HeaderMenu');
+  await tap('DrawerSupport');
+}
+
+/**
+ * Closes the drawer and navigates back to the Wallet home screen.
+ */
+export async function doNavigationClose() {
+  await tap('HeaderMenu');
+  await tap('DrawerWallet');
+  await sleep(500);
+}
+
+/**
+ * Triggers the timed backup sheet by navigating to settings and back.
+ * Since timed sheets are sometimes triggered by user behavior (when user goes back to home screen),
+ * we need to trigger them manually.
+ */
+export async function doTriggerTimedSheet() {
+  await sleep(700);
+  await tap('HeaderMenu');
+  await tap('DrawerSettings');
+  await sleep(500);
+  await doNavigationClose();
+}

test/helpers/settings.ts

@@ -19,7 +19,7 @@ import {
 } from '../helpers/actions';
 import { ciIt } from '../helpers/suite';
 import { ensureLocalFunds } from '../helpers/regtest';
-import { openSettings } from '../helpers/settings';
+import { openSettings } from '../helpers/navigation';
 
 describe('@backup - Backup', () => {
   let electrum: Awaited<ReturnType<typeof initElectrum>> | undefined;

test/specs/backup.e2e.ts

@@ -39,7 +39,7 @@ import {
 } from '../helpers/lnd';
 import { ciIt } from '../helpers/suite';
 import { ensureLocalFunds, getBitcoinRpc, mineBlocks } from '../helpers/regtest';
-import { openSettings } from '../helpers/settings';
+import { openSettings } from '../helpers/navigation';
 
 describe('@lightning - Lightning', () => {
   let electrum: { waitForSync: any; stop: any };

test/specs/lightning.e2e.ts

@@ -39,7 +39,6 @@ import {
   mineBlocks,
   payInvoice,
 } from '../helpers/regtest';
-import { openSettings } from '../helpers/settings';
 
 // Module-level electrum client (set in before hook)
 let electrumClient: ElectrumClient;

test/specs/migration.e2e.ts

@@ -51,7 +51,7 @@ import {
   getExternalAddress,
   mineBlocks,
 } from '../helpers/regtest';
-import { openSettings } from '../helpers/settings';
+import { openSettings } from '../helpers/navigation';
 
 describe('@multi_address - Multi address', () => {
   let electrum: Awaited<ReturnType<typeof initElectrum>> | undefined;

test/specs/multiaddress.e2e.ts

@@ -15,7 +15,7 @@ import initElectrum from '../helpers/electrum';
 import { launchFreshApp, reinstallApp } from '../helpers/setup';
 import { ciIt } from '../helpers/suite';
 import { ensureLocalFunds } from '../helpers/regtest';
-import { openSettings } from '../helpers/settings';
+import { openSettings } from '../helpers/navigation';
 
 describe('@numberpad - NumberPad', () => {
   let electrum: Awaited<ReturnType<typeof initElectrum>> | undefined;

test/specs/numberpad.e2e.ts

@@ -14,7 +14,7 @@ import {
 } from '../helpers/actions';
 import { reinstallApp } from '../helpers/setup';
 import { ciIt } from '../helpers/suite';
-import { openSettings } from '../helpers/settings';
+import { openSettings } from '../helpers/navigation';
 
 describe('@onboarding - Onboarding', () => {
   beforeEach(async () => {