Skip to content

Commit f2f2a74

Browse files
JasonvdbJasonvdb
committed
Merge branch 'master' into release-v1.0.4
2 parents fd9301d + c743272 commit f2f2a74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1005
-1178
lines changed

‎docker/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ services:
122122

123123
ldk-backup-server:
124124
container_name: ldk-backup-server
125-
image: synonymsoft/ldk-backup-server:latest
125+
image: synonymsoft/ldk-backup-server:0.0.146
126126
expose:
127127
- '3003'
128128
ports:

‎e2e/boost.e2e.js‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ d('Boost', () => {
5252
return;
5353
}
5454

55+
// switch off RBF mode
56+
await element(by.id('Settings')).tap();
57+
if (!__DEV__) {
58+
await element(by.id('DevOptions')).multiTap(5); // enable dev mode
59+
}
60+
await element(by.id('DevSettings')).tap();
61+
await element(by.id('RBF')).tap();
62+
await launchAndWait();
63+
5564
// fund the wallet
5665
await element(by.id('Receive')).tap();
5766
let { label: wAddress } = await element(by.id('QRCode')).getAttributes();
@@ -76,11 +85,10 @@ d('Boost', () => {
7685
await sleep(500); // wait for keyboard to hide
7786
await element(by.id('AddressContinue')).tap();
7887
await element(by.id('N1').withAncestor(by.id('SendAmountNumberPad'))).tap();
79-
for (let i = 0; i < 4; i++) {
80-
await element(
81-
by.id('N0').withAncestor(by.id('SendAmountNumberPad')),
82-
).tap();
83-
}
88+
await element(by.id('N0').withAncestor(by.id('SendAmountNumberPad'))).tap();
89+
await element(
90+
by.id('N000').withAncestor(by.id('SendAmountNumberPad')),
91+
).tap();
8492
await expect(element(by.text('10 000'))).toBeVisible();
8593
await element(by.id('ContinueAmount')).tap();
8694
await element(by.id('GRAB')).swipe('right', 'slow', 0.95, 0.5, 0.5); // Swipe to confirm
@@ -164,15 +172,6 @@ d('Boost', () => {
164172
return;
165173
}
166174

167-
// switch to RBF mode
168-
await element(by.id('Settings')).tap();
169-
if (!__DEV__) {
170-
await element(by.id('DevOptions')).multiTap(5); // enable dev mode
171-
}
172-
await element(by.id('DevSettings')).tap();
173-
await element(by.id('RBF')).tap();
174-
await launchAndWait();
175-
176175
// fund the wallet
177176
await element(by.id('Receive')).tap();
178177
let { label: wAddress } = await element(by.id('QRCode')).getAttributes();
@@ -197,11 +196,10 @@ d('Boost', () => {
197196
await sleep(500); // wait for keyboard to hide
198197
await element(by.id('AddressContinue')).tap();
199198
await element(by.id('N1').withAncestor(by.id('SendAmountNumberPad'))).tap();
200-
for (let i = 0; i < 4; i++) {
201-
await element(
202-
by.id('N0').withAncestor(by.id('SendAmountNumberPad')),
203-
).tap();
204-
}
199+
await element(by.id('N0').withAncestor(by.id('SendAmountNumberPad'))).tap();
200+
await element(
201+
by.id('N000').withAncestor(by.id('SendAmountNumberPad')),
202+
).tap();
205203
await expect(element(by.text('10 000'))).toBeVisible();
206204
await element(by.id('ContinueAmount')).tap();
207205
await element(by.id('GRAB')).swipe('right', 'slow', 0.95, 0.5, 0.5); // Swipe to confirm

‎e2e/lightning.e2e.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,11 @@ d('Lightning', () => {
9292
).getAttributes();
9393
await element(by.id('NavigationBack')).atIndex(0).tap();
9494
await sleep(100);
95+
await element(by.id('NavigationBack')).atIndex(0).tap();
96+
await element(by.id('DevSettings')).tap();
97+
await element(by.id('LDKDebug')).tap();
9598

9699
// connect to LND
97-
await element(by.id('Channels')).tap();
98100
await element(by.id('AddPeerInput')).replaceText(
99101
`${lndNodeID}@127.0.0.1:9735`,
100102
);
@@ -145,12 +147,15 @@ d('Lightning', () => {
145147
await sleep(500);
146148
await element(by.id('NavigationBack')).atIndex(0).tap();
147149
await sleep(100);
150+
await element(by.id('NavigationBack')).atIndex(0).tap();
151+
await element(by.id('AdvancedSettings')).atIndex(0).tap();
148152
await element(by.id('Channels')).tap();
149153
await element(by.id('Channel')).atIndex(0).tap();
150154
await expect(
151155
element(by.id('MoneyText').withAncestor(by.id('TotalSize'))),
152156
).toHaveText('100 000');
153157
await element(by.id('ChannelScrollView')).scrollTo('bottom', NaN, 0.1);
158+
await expect(element(by.id('IsUsableYes'))).toBeVisible();
154159
await element(by.id('NavigationClose')).atIndex(0).tap();
155160

156161
await sleep(500);
@@ -409,6 +414,7 @@ d('Lightning', () => {
409414
await element(by.id('Channels')).tap();
410415
await element(by.id('Channel')).atIndex(0).tap();
411416
await element(by.id('ChannelScrollView')).scrollTo('bottom', NaN, 0.1);
417+
await expect(element(by.id('IsUsableYes'))).toBeVisible();
412418

413419
// close channel
414420
await element(by.id('CloseConnection')).tap();

‎e2e/settings.e2e.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,8 @@ d('Settings', () => {
407407
if (!__DEV__) {
408408
await element(by.id('DevOptions')).multiTap(5); // enable dev mode
409409
}
410-
await element(by.id('AdvancedSettings')).tap();
411-
await element(by.id('Channels')).tap();
410+
await element(by.id('DevSettings')).tap();
411+
await element(by.id('LDKDebug')).tap();
412412
await element(by.id('CopyNodeId')).tap();
413413
await element(by.id('RefreshLDK')).tap();
414414
await element(by.id('RestartLDK')).tap();
@@ -417,7 +417,8 @@ d('Settings', () => {
417417
.toBeVisible()
418418
.withTimeout(5000);
419419
await element(by.id('NavigationBack')).atIndex(0).tap();
420-
420+
await element(by.id('NavigationBack')).atIndex(0).tap();
421+
await element(by.id('AdvancedSettings')).tap();
421422
await element(by.id('LightningNodeInfo')).tap();
422423
// TODO: this fails too often on CI
423424
// await waitFor(element(by.id('LDKNodeID')))
@@ -640,7 +641,6 @@ d('Settings', () => {
640641
}
641642

642643
await element(by.id('TriggerRenderError')).tap();
643-
await expect(element(by.id('ErrorClose'))).toBeVisible();
644644
await expect(element(by.id('ErrorReport'))).toBeVisible();
645645

646646
markComplete('settings-dev');

‎ios/Podfile.lock‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ PODS:
10281028
- ReactCommon/turbomodule/bridging
10291029
- ReactCommon/turbomodule/core
10301030
- Yoga
1031-
- react-native-ldk (0.0.150):
1031+
- react-native-ldk (0.0.152):
10321032
- React
10331033
- react-native-mmkv (2.12.2):
10341034
- DoubleConversion
@@ -1365,8 +1365,6 @@ PODS:
13651365
- React-Core
13661366
- RNDeviceInfo (11.1.0):
13671367
- React-Core
1368-
- RNExitApp (2.0.0):
1369-
- React-Core
13701368
- RNFS (2.20.0):
13711369
- React-Core
13721370
- RNGestureHandler (2.15.0):
@@ -1565,7 +1563,6 @@ DEPENDENCIES:
15651563
- ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`)
15661564
- "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
15671565
- RNDeviceInfo (from `../node_modules/react-native-device-info`)
1568-
- RNExitApp (from `../node_modules/react-native-exit-app`)
15691566
- RNFS (from `../node_modules/react-native-fs`)
15701567
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
15711568
- "RNKeychain (from `../node_modules/@synonymdev/react-native-keychain`)"
@@ -1738,8 +1735,6 @@ EXTERNAL SOURCES:
17381735
:path: "../node_modules/@react-native-clipboard/clipboard"
17391736
RNDeviceInfo:
17401737
:path: "../node_modules/react-native-device-info"
1741-
RNExitApp:
1742-
:path: "../node_modules/react-native-exit-app"
17431738
RNFS:
17441739
:path: "../node_modules/react-native-fs"
17451740
RNGestureHandler:
@@ -1814,7 +1809,7 @@ SPEC CHECKSUMS:
18141809
react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
18151810
react-native-blur: a2acf22fd7bd13621df5e0b1c130b81adea7009c
18161811
react-native-image-picker: c3afe5472ef870d98a4b28415fc0b928161ee5f7
1817-
react-native-ldk: 2b19de9eb94dcfd46f3f2a7191502292b75a5d7a
1812+
react-native-ldk: 1d25080cfadac349eab355725da66de140fbc7a8
18181813
react-native-mmkv: 8c9a677e64a1ac89b0c6cf240feea528318b3074
18191814
react-native-netinfo: bdb108d340cdb41875c9ced535977cac6d2ff321
18201815
react-native-quick-base64: a74c4b2607b9de016877a8edb776b6ac59785809
@@ -1850,7 +1845,6 @@ SPEC CHECKSUMS:
18501845
ReactNativeCameraKit: 71343efc1256720184ce980f164c7eedb78d5c16
18511846
RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37
18521847
RNDeviceInfo: b899ce37a403a4dea52b7cb85e16e49c04a5b88e
1853-
RNExitApp: 00036cabe7bacbb413d276d5520bf74ba39afa6a
18541848
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
18551849
RNGestureHandler: 9b113eb9b7a4cbe66e1dbf4d9914281863ee0703
18561850
RNKeychain: 35f92386e7f8548e3e60e7441121afbe8c62d8e4

0 commit comments

Comments
 (0)