refactor(settings): move LDK debug UI (#2209)

synonymdev · Sep 7, 2024 · f9c4eaa · f9c4eaa
1 parent 910e714
commit f9c4eaa
Show file tree

Hide file tree

Showing 6 changed files with 458 additions and 329 deletions.
diff --git a/e2e/lightning.e2e.js b/e2e/lightning.e2e.js
@@ -92,9 +92,11 @@ d('Lightning', () => {
 			).getAttributes();
 			await element(by.id('NavigationBack')).atIndex(0).tap();
 			await sleep(100);
+			await element(by.id('NavigationBack')).atIndex(0).tap();
+			await element(by.id('DevSettings')).tap();
+			await element(by.id('LDKDebug')).tap();
 
 			// connect to LND
-			await element(by.id('Channels')).tap();
 			await element(by.id('AddPeerInput')).replaceText(
 				`${lndNodeID}@127.0.0.1:9735`,
 			);
@@ -145,6 +147,8 @@ d('Lightning', () => {
 			await sleep(500);
 			await element(by.id('NavigationBack')).atIndex(0).tap();
 			await sleep(100);
+			await element(by.id('NavigationBack')).atIndex(0).tap();
+			await element(by.id('AdvancedSettings')).atIndex(0).tap();
 			await element(by.id('Channels')).tap();
 			await element(by.id('Channel')).atIndex(0).tap();
 			await expect(

diff --git a/e2e/settings.e2e.js b/e2e/settings.e2e.js
@@ -407,8 +407,8 @@ d('Settings', () => {
 			if (!__DEV__) {
 				await element(by.id('DevOptions')).multiTap(5); // enable dev mode
 			}
-			await element(by.id('AdvancedSettings')).tap();
-			await element(by.id('Channels')).tap();
+			await element(by.id('DevSettings')).tap();
+			await element(by.id('LDKDebug')).tap();
 			await element(by.id('CopyNodeId')).tap();
 			await element(by.id('RefreshLDK')).tap();
 			await element(by.id('RestartLDK')).tap();
@@ -417,7 +417,8 @@ d('Settings', () => {
 				.toBeVisible()
 				.withTimeout(5000);
 			await element(by.id('NavigationBack')).atIndex(0).tap();
-
+			await element(by.id('NavigationBack')).atIndex(0).tap();
+			await element(by.id('AdvancedSettings')).tap();
 			await element(by.id('LightningNodeInfo')).tap();
 			// TODO: this fails too often on CI
 			// await waitFor(element(by.id('LDKNodeID')))

diff --git a/src/navigation/settings/SettingsNavigator.tsx b/src/navigation/settings/SettingsNavigator.tsx
@@ -15,6 +15,7 @@ import CoinSelectPreference from '../../screens/Settings/CoinSelectPreference';
 import PaymentPreference from '../../screens/Settings/PaymentPreference';
 import AddressTypePreference from '../../screens/Settings/AddressTypePreference';
 import DevSettings from '../../screens/Settings/DevSettings';
+import LdkDebug from '../../screens/Settings/DevSettings/LdkDebug';
 import AddressViewer from '../../screens/Settings/AddressViewer';
 import LightningNodeInfo from '../../screens/Settings/Lightning/LightningNodeInfo';
 import UnitSettings from '../../screens/Settings/Unit';
@@ -91,6 +92,7 @@ export type SettingsStackParamList = {
 	PaymentPreference: undefined;
 	AddressTypePreference: undefined;
 	DevSettings: undefined;
+	LdkDebug: undefined;
 	ExportToPhone: undefined;
 	ResetAndRestore: undefined;
 	BitcoinNetworkSelection: undefined;
@@ -160,6 +162,7 @@ const SettingsNavigator = (): ReactElement => {
 				component={AddressTypePreference}
 			/>
 			<Stack.Screen name="DevSettings" component={DevSettings} />
+			<Stack.Screen name="LdkDebug" component={LdkDebug} />
 			<Stack.Screen name="AddressViewer" component={AddressViewer} />
 			<Stack.Screen name="ExportToPhone" component={ExportToPhone} />
 			<Stack.Screen name="ResetAndRestore" component={ResetAndRestore} />