initial v60 settings adjustments

Author: piotr-iohk

test/helpers/actions.ts

@@ -1,6 +1,7 @@
 import type { ChainablePromiseElement } from 'webdriverio';
 import { reinstallApp } from './setup';
 import { deposit, mineBlocks } from './regtest';
+import { openSettings } from './settings';
 
 export const sleep = (ms: number) => browser.pause(ms);
 
@@ -610,9 +611,7 @@ export async function doNavigationClose() {
 }
 
 export async function getSeed(): Promise<string> {
-  await tap('HeaderMenu');
-  await tap('DrawerSettings');
-  await tap('BackupSettings');
+  await openSettings('security');
   await tap('BackupWallet');
 
   // get seed from SeedContainer
@@ -810,9 +809,7 @@ async function assertAddressTypeSwitchFeedback() {
 }
 
 export async function switchPrimaryAddressType(nextType: addressTypePreference) {
-  await tap('HeaderMenu');
-  await tap('DrawerSettings');
-  await tap('AdvancedSettings');
+  await openSettings('advanced');
   await tap('AddressTypePreference');
   await tap(nextType);
   await assertAddressTypeSwitchFeedback();
@@ -1165,6 +1162,8 @@ export type ToastId =
   | 'TransactionRemovedToast'
   | 'InvalidAddressToast'
   | 'ExpiredLightningToast'
+  | 'DevModeEnabledToast'
+  | 'DevModeDisabledToast'
   | 'InsufficientSpendingToast'
   | 'InsufficientSavingsToast';
 
@@ -1363,9 +1362,7 @@ export async function acknowledgeHighBalanceWarning({
 // enable/disable widgets in settings
 export async function toggleWidgets() {
   await sleep(3000);
-  await tap('HeaderMenu');
-  await tap('DrawerSettings');
-  await tap('GeneralSettings');
+  await openSettings();
   await tap('WidgetsSettings');
   const widgets = await elementsByText('Widgets');
   await widgets[1].click();
@@ -1476,8 +1473,7 @@ export async function attemptRefreshOnHomeScreen() {
 }
 
 export async function waitForBackup() {
-  await tap('HeaderMenu');
-  await tap('DrawerSettings');
+  await openSettings('security');
   await tap('BackupSettings');
   await elementById('AllSynced').waitForDisplayed();
   await doNavigationClose();

test/helpers/lnd.ts

@@ -10,6 +10,7 @@ import {
   typeText,
 } from './actions';
 import { LndConfig } from './constants';
+import { openSettings } from './settings';
 import createLndRpc, { LnRpc, WalletUnlockerRpc } from '@radar/lnrpc';
 
 export async function setupLND(
@@ -94,9 +95,7 @@ export async function waitForActiveChannel(
 }
 
 export async function getLDKNodeID(): Promise<string> {
-  await tap('HeaderMenu');
-  await tap('DrawerSettings');
-  await tap('AdvancedSettings');
+  await openSettings('advanced');
   // wait for LDK to start
   await sleep(5000);
   await tap('LightningNodeInfo');
@@ -123,9 +122,7 @@ export async function connectToLND(lndNodeID: string, { navigationClose = true }
 }
 
 export async function checkChannelStatus({ size = '100 000' } = {}) {
-  await tap('HeaderMenu');
-  await tap('DrawerSettings');
-  await tap('AdvancedSettings');
+  await openSettings('advanced');
   await tap('Channels');
   await sleep(1000);
   await tap('Channel');

test/helpers/regtest.ts

@@ -51,7 +51,7 @@ async function localMineBlocks(count: number): Promise<void> {
 
 function lndRestRequest(
   path: string,
-  body: Record<string, unknown>,
+  body: Record<string, unknown>
 ): Promise<Record<string, unknown>> {
   const tlsCert = fs.readFileSync(lndConfig.tls);
   const macaroon = fs.readFileSync(lndConfig.macaroonPath).toString('hex');
@@ -74,15 +74,17 @@ function lndRestRequest(
       },
       (res) => {
         let data = '';
-        res.on('data', (chunk: Buffer) => { data += chunk.toString(); });
+        res.on('data', (chunk: Buffer) => {
+          data += chunk.toString();
+        });
         res.on('end', () => {
           if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
             resolve(JSON.parse(data) as Record<string, unknown>);
           } else {
             reject(new Error(`LND REST ${res.statusCode}: ${data}`));
           }
         });
-      },
+      }
     );
     req.on('error', reject);
     req.write(payload);

test/helpers/settings.ts

@@ -0,0 +1,24 @@
+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');
+}

test/specs/backup.e2e.ts

@@ -19,6 +19,7 @@ import {
 } from '../helpers/actions';
 import { ciIt } from '../helpers/suite';
 import { ensureLocalFunds } from '../helpers/regtest';
+import { openSettings } from '../helpers/settings';
 
 describe('@backup - Backup', () => {
   let electrum: Awaited<ReturnType<typeof initElectrum>> | undefined;
@@ -66,9 +67,7 @@ describe('@backup - Backup', () => {
     await tap('NavigationBack');
 
     // - change settings (currency to GBP) //
-    await tap('HeaderMenu');
-    await tap('DrawerSettings');
-    await tap('GeneralSettings');
+    await openSettings();
     await tap('CurrenciesSettings');
     const gbp_opt = await elementByText('GBP (£)');
     await gbp_opt.waitForDisplayed();

test/specs/lightning.e2e.ts

@@ -39,6 +39,7 @@ import {
 } from '../helpers/lnd';
 import { ciIt } from '../helpers/suite';
 import { ensureLocalFunds, getBitcoinRpc, mineBlocks } from '../helpers/regtest';
+import { openSettings } from '../helpers/settings';
 
 describe('@lightning - Lightning', () => {
   let electrum: { waitForSync: any; stop: any };
@@ -262,9 +263,7 @@ describe('@lightning - Lightning', () => {
     await doNavigationClose();
 
     // check channel status
-    await tap('HeaderMenu');
-    await tap('DrawerSettings');
-    await tap('AdvancedSettings');
+    await openSettings('advanced');
     await tap('Channels');
     await sleep(2000);
     await tap('Channel');

test/specs/migration.e2e.ts

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

test/specs/multiaddress.e2e.ts

@@ -51,6 +51,7 @@ import {
   getExternalAddress,
   mineBlocks,
 } from '../helpers/regtest';
+import { openSettings } from '../helpers/settings';
 
 describe('@multi_address - Multi address', () => {
   let electrum: Awaited<ReturnType<typeof initElectrum>> | undefined;
@@ -163,10 +164,7 @@ describe('@multi_address - Multi address', () => {
       await swipeFullScreen('down');
 
       // check in address viewer all savings are in taproot address
-      await tap('HeaderMenu');
-      await tap('DrawerSettings');
-      await sleep(1000);
-      await tap('AdvancedSettings');
+      await openSettings('advanced');
       await sleep(1000);
       await tap('AddressViewer');
       await sleep(1000);
@@ -238,10 +236,7 @@ describe('@multi_address - Multi address', () => {
       await expect(remainingTotal).toBeGreaterThan(0);
 
       // verify change is in taproot address
-      await tap('HeaderMenu');
-      await tap('DrawerSettings');
-      await sleep(1000);
-      await tap('AdvancedSettings');
+      await openSettings('advanced');
       await sleep(1000);
       await tap('AddressViewer');
       await sleep(1000);
@@ -294,10 +289,7 @@ describe('@multi_address - Multi address', () => {
       const savingsBalance = await getSavingsBalance();
       await expect(savingsBalance).toEqual(satsPerAddressType);
 
-      await tap('HeaderMenu');
-      await tap('DrawerSettings');
-      await sleep(1000);
-      await tap('AdvancedSettings');
+      await openSettings('advanced');
       await sleep(1000);
       await tap('AddressViewer');
       await sleep(1000);

test/specs/numberpad.e2e.ts

@@ -15,6 +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';
 
 describe('@numberpad - NumberPad', () => {
   let electrum: Awaited<ReturnType<typeof initElectrum>> | undefined;
@@ -178,9 +179,7 @@ async function makeSureIsBitcoinInput(mode: NumberpadMode) {
 }
 
 async function switchToClassicDenomination() {
-  await tap('HeaderMenu');
-  await tap('DrawerSettings');
-  await tap('GeneralSettings');
+  await openSettings();
   await tap('UnitSettings');
   await tap('DenominationClassic');
   await doNavigationClose();

test/specs/onboarding.e2e.ts

@@ -14,6 +14,7 @@ import {
 } from '../helpers/actions';
 import { reinstallApp } from '../helpers/setup';
 import { ciIt } from '../helpers/suite';
+import { openSettings } from '../helpers/settings';
 
 describe('@onboarding - Onboarding', () => {
   beforeEach(async () => {
@@ -85,9 +86,7 @@ describe('@onboarding - Onboarding', () => {
 
     // Go to Address Viewer
     await swipeFullScreen('down');
-    await tap('HeaderMenu');
-    await tap('DrawerSettings');
-    await tap('AdvancedSettings');
+    await openSettings('advanced');
     await tap('AddressViewer');
 
     const address0Element = await elementById('Address-0');