Merge branch 'master' into release-v1.0.4

synonymdev · Sep 9, 2024 · f2f2a74 · f2f2a74
2 parents fd9301d + c743272
commit f2f2a74
Show file tree

Hide file tree

Showing 50 changed files with 1,005 additions and 1,178 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -122,7 +122,7 @@ services:
 
   ldk-backup-server:
     container_name: ldk-backup-server
-    image: synonymsoft/ldk-backup-server:latest
+    image: synonymsoft/ldk-backup-server:0.0.146
     expose:
       - '3003'
     ports:

diff --git a/e2e/boost.e2e.js b/e2e/boost.e2e.js
@@ -52,6 +52,15 @@ d('Boost', () => {
 			return;
 		}
 
+		// switch off RBF mode
+		await element(by.id('Settings')).tap();
+		if (!__DEV__) {
+			await element(by.id('DevOptions')).multiTap(5); // enable dev mode
+		}
+		await element(by.id('DevSettings')).tap();
+		await element(by.id('RBF')).tap();
+		await launchAndWait();
+
 		// fund the wallet
 		await element(by.id('Receive')).tap();
 		let { label: wAddress } = await element(by.id('QRCode')).getAttributes();
@@ -76,11 +85,10 @@ d('Boost', () => {
 		await sleep(500); // wait for keyboard to hide
 		await element(by.id('AddressContinue')).tap();
 		await element(by.id('N1').withAncestor(by.id('SendAmountNumberPad'))).tap();
-		for (let i = 0; i < 4; i++) {
-			await element(
-				by.id('N0').withAncestor(by.id('SendAmountNumberPad')),
-			).tap();
-		}
+		await element(by.id('N0').withAncestor(by.id('SendAmountNumberPad'))).tap();
+		await element(
+			by.id('N000').withAncestor(by.id('SendAmountNumberPad')),
+		).tap();
 		await expect(element(by.text('10 000'))).toBeVisible();
 		await element(by.id('ContinueAmount')).tap();
 		await element(by.id('GRAB')).swipe('right', 'slow', 0.95, 0.5, 0.5); // Swipe to confirm
@@ -164,15 +172,6 @@ d('Boost', () => {
 			return;
 		}
 
-		// switch to RBF mode
-		await element(by.id('Settings')).tap();
-		if (!__DEV__) {
-			await element(by.id('DevOptions')).multiTap(5); // enable dev mode
-		}
-		await element(by.id('DevSettings')).tap();
-		await element(by.id('RBF')).tap();
-		await launchAndWait();
-
 		// fund the wallet
 		await element(by.id('Receive')).tap();
 		let { label: wAddress } = await element(by.id('QRCode')).getAttributes();
@@ -197,11 +196,10 @@ d('Boost', () => {
 		await sleep(500); // wait for keyboard to hide
 		await element(by.id('AddressContinue')).tap();
 		await element(by.id('N1').withAncestor(by.id('SendAmountNumberPad'))).tap();
-		for (let i = 0; i < 4; i++) {
-			await element(
-				by.id('N0').withAncestor(by.id('SendAmountNumberPad')),
-			).tap();
-		}
+		await element(by.id('N0').withAncestor(by.id('SendAmountNumberPad'))).tap();
+		await element(
+			by.id('N000').withAncestor(by.id('SendAmountNumberPad')),
+		).tap();
 		await expect(element(by.text('10 000'))).toBeVisible();
 		await element(by.id('ContinueAmount')).tap();
 		await element(by.id('GRAB')).swipe('right', 'slow', 0.95, 0.5, 0.5); // Swipe to confirm

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,12 +147,15 @@ 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(
 				element(by.id('MoneyText').withAncestor(by.id('TotalSize'))),
 			).toHaveText('100 000');
 			await element(by.id('ChannelScrollView')).scrollTo('bottom', NaN, 0.1);
+			await expect(element(by.id('IsUsableYes'))).toBeVisible();
 			await element(by.id('NavigationClose')).atIndex(0).tap();
 
 			await sleep(500);
@@ -409,6 +414,7 @@ d('Lightning', () => {
 			await element(by.id('Channels')).tap();
 			await element(by.id('Channel')).atIndex(0).tap();
 			await element(by.id('ChannelScrollView')).scrollTo('bottom', NaN, 0.1);
+			await expect(element(by.id('IsUsableYes'))).toBeVisible();
 
 			// close channel
 			await element(by.id('CloseConnection')).tap();

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')))
@@ -640,7 +641,6 @@ d('Settings', () => {
 			}
 
 			await element(by.id('TriggerRenderError')).tap();
-			await expect(element(by.id('ErrorClose'))).toBeVisible();
 			await expect(element(by.id('ErrorReport'))).toBeVisible();
 
 			markComplete('settings-dev');

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1028,7 +1028,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-ldk (0.0.150):
+  - react-native-ldk (0.0.152):
     - React
   - react-native-mmkv (2.12.2):
     - DoubleConversion
@@ -1365,8 +1365,6 @@ PODS:
     - React-Core
   - RNDeviceInfo (11.1.0):
     - React-Core
-  - RNExitApp (2.0.0):
-    - React-Core
   - RNFS (2.20.0):
     - React-Core
   - RNGestureHandler (2.15.0):
@@ -1565,7 +1563,6 @@ DEPENDENCIES:
   - ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`)
   - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
-  - RNExitApp (from `../node_modules/react-native-exit-app`)
   - RNFS (from `../node_modules/react-native-fs`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - "RNKeychain (from `../node_modules/@synonymdev/react-native-keychain`)"
@@ -1738,8 +1735,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-clipboard/clipboard"
   RNDeviceInfo:
     :path: "../node_modules/react-native-device-info"
-  RNExitApp:
-    :path: "../node_modules/react-native-exit-app"
   RNFS:
     :path: "../node_modules/react-native-fs"
   RNGestureHandler:
@@ -1814,7 +1809,7 @@ SPEC CHECKSUMS:
   react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
   react-native-blur: a2acf22fd7bd13621df5e0b1c130b81adea7009c
   react-native-image-picker: c3afe5472ef870d98a4b28415fc0b928161ee5f7
-  react-native-ldk: 2b19de9eb94dcfd46f3f2a7191502292b75a5d7a
+  react-native-ldk: 1d25080cfadac349eab355725da66de140fbc7a8
   react-native-mmkv: 8c9a677e64a1ac89b0c6cf240feea528318b3074
   react-native-netinfo: bdb108d340cdb41875c9ced535977cac6d2ff321
   react-native-quick-base64: a74c4b2607b9de016877a8edb776b6ac59785809
@@ -1850,7 +1845,6 @@ SPEC CHECKSUMS:
   ReactNativeCameraKit: 71343efc1256720184ce980f164c7eedb78d5c16
   RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37
   RNDeviceInfo: b899ce37a403a4dea52b7cb85e16e49c04a5b88e
-  RNExitApp: 00036cabe7bacbb413d276d5520bf74ba39afa6a
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 9b113eb9b7a4cbe66e1dbf4d9914281863ee0703
   RNKeychain: 35f92386e7f8548e3e60e7441121afbe8c62d8e4