Skip to content

Commit 700ea45

Browse files
pwltrpwltr
committed
feat(ui): add drawer menu
1 parent cbaa788 commit 700ea45

Some content is hidden

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

70 files changed

+1840
-1420
lines changed

‎e2e/backup.e2e.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ d('Backup', () => {
8484

8585
// change currency to GBP
8686
await element(by.id('TotalBalance')).tap(); // switch to local currency
87-
await element(by.id('Settings')).tap();
87+
await element(by.id('HeaderMenu')).tap();
88+
await element(by.id('DrawerSettings')).tap();
8889
await element(by.id('GeneralSettings')).tap();
8990
await element(by.id('CurrenciesSettings')).tap();
9091
await element(by.text('GBP (£)')).tap();

‎e2e/boost.e2e.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ d('Boost', () => {
5151
}
5252

5353
// switch off RBF mode
54-
await element(by.id('Settings')).tap();
54+
await element(by.id('HeaderMenu')).tap();
55+
await element(by.id('DrawerSettings')).tap();
5556
if (!__DEV__) {
5657
await element(by.id('DevOptions')).multiTap(5); // enable dev mode
5758
}

‎e2e/helpers.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ export const waitForActiveChannel = async (lnd, nodeId, maxRetries = 20) => {
185185
};
186186

187187
export const getSeed = async () => {
188-
await element(by.id('Settings')).tap();
188+
await element(by.id('HeaderMenu')).tap();
189+
await element(by.id('DrawerSettings')).tap();
189190
await element(by.id('BackupSettings')).tap();
190191
await element(by.id('BackupWallet')).tap();
191192
// animation
@@ -247,7 +248,8 @@ export const restoreWallet = async (seed, passphrase) => {
247248
};
248249

249250
export const waitForBackup = async () => {
250-
await element(by.id('Settings')).tap();
251+
await element(by.id('HeaderMenu')).tap();
252+
await element(by.id('DrawerSettings')).tap();
251253
await element(by.id('BackupSettings')).tap();
252254
await waitFor(element(by.id('AllSynced')))
253255
.toBeVisible()

‎e2e/lightning.e2e.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ d('Lightning', () => {
7171
const { identityPubkey: lndNodeID } = await lnd.getInfo();
7272

7373
// get LDK Node id
74-
await element(by.id('Settings')).tap();
74+
await element(by.id('HeaderMenu')).tap();
75+
await element(by.id('DrawerSettings')).tap();
7576
await element(by.id('AdvancedSettings')).tap();
7677
// wait for LDK to start
7778
await sleep(5000);
@@ -112,7 +113,8 @@ d('Lightning', () => {
112113
await waitForActiveChannel(lnd, ldkNodeId);
113114

114115
// check channel status
115-
await element(by.id('Settings')).tap();
116+
await element(by.id('HeaderMenu')).tap();
117+
await element(by.id('DrawerSettings')).tap();
116118
await element(by.id('AdvancedSettings')).atIndex(0).tap();
117119
await element(by.id('Channels')).tap();
118120
await element(by.id('Channel')).atIndex(0).tap();
@@ -331,7 +333,8 @@ d('Lightning', () => {
331333
await element(by.id('NavigationClose')).tap();
332334

333335
// check channel status
334-
await element(by.id('Settings')).tap();
336+
await element(by.id('HeaderMenu')).tap();
337+
await element(by.id('DrawerSettings')).tap();
335338
await element(by.id('AdvancedSettings')).tap();
336339
await sleep(100);
337340
await element(by.id('Channels')).tap();

‎e2e/lnurl.e2e.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ d('LNURL', () => {
9090
}
9191

9292
// get LDK Node id
93-
await element(by.id('Settings')).tap();
93+
await element(by.id('HeaderMenu')).tap();
94+
await element(by.id('DrawerSettings')).tap();
9495
if (!__DEV__) {
9596
await element(by.id('DevOptions')).multiTap(5); // enable dev mode
9697
}

‎e2e/numberpad.e2e.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ d('NumberPad', () => {
8585
}
8686

8787
// switch to classic denomination
88-
await element(by.id('Settings')).tap();
88+
await element(by.id('HeaderMenu')).tap();
89+
await element(by.id('DrawerSettings')).tap();
8990
await element(by.id('GeneralSettings')).tap();
9091
await element(by.id('UnitSettings')).tap();
9192
await element(by.id('DenominationClassic')).tap();

‎e2e/onchain.e2e.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@ d('Onchain', () => {
246246
const coreAddress = await rpc.getNewAddress();
247247

248248
// enable warning for sending over 100$ to test multiple warning dialogs
249-
await element(by.id('Settings')).tap();
249+
await element(by.id('HeaderMenu')).tap();
250+
await element(by.id('DrawerSettings')).tap();
250251
await element(by.id('SecuritySettings')).tap();
251252
await element(by.id('SendAmountWarning')).tap();
252253
await element(by.id('NavigationClose')).atIndex(0).tap();

‎e2e/security.e2e.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ d('Settings Security And Privacy', () => {
7171

7272
await device.setBiometricEnrollment(true);
7373

74-
await element(by.id('Settings')).tap();
74+
await element(by.id('HeaderMenu')).tap();
75+
await element(by.id('DrawerSettings')).tap();
7576
await element(by.id('SecuritySettings')).tap();
7677
await element(by.id('PINCode')).tap();
7778
await element(by.id('SecureWallet-button-continue')).tap();
@@ -164,7 +165,8 @@ d('Settings Security And Privacy', () => {
164165
await element(by.id('Close')).tap();
165166

166167
// test PIN on idle and disable it after
167-
await element(by.id('Settings')).tap();
168+
await element(by.id('HeaderMenu')).tap();
169+
await element(by.id('DrawerSettings')).tap();
168170
await element(by.id('SecuritySettings')).tap();
169171

170172
// FIXME: this fails too often
@@ -223,7 +225,8 @@ d('Settings Security And Privacy', () => {
223225
await element(by.id('Close')).tap();
224226

225227
// disable PIN, restart the app, it should not ask for it
226-
await element(by.id('Settings')).tap();
228+
await element(by.id('HeaderMenu')).tap();
229+
await element(by.id('DrawerSettings')).tap();
227230
await element(by.id('SecuritySettings')).tap();
228231
await element(by.id('PINCode')).tap();
229232
await element(by.id('DisablePin')).tap();
@@ -235,7 +238,8 @@ d('Settings Security And Privacy', () => {
235238
.withTimeout(10000);
236239

237240
// enable PIN for last test
238-
await element(by.id('Settings')).tap();
241+
await element(by.id('HeaderMenu')).tap();
242+
await element(by.id('DrawerSettings')).tap();
239243
await element(by.id('SecuritySettings')).tap();
240244
await element(by.id('PINCode')).tap();
241245
await element(by.id('SecureWallet-button-continue')).tap();

‎e2e/send.e2e.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ d('Send', () => {
185185
const { identityPubkey: lndNodeID } = await lnd.getInfo();
186186

187187
// get LDK Node id
188-
await element(by.id('Settings')).tap();
188+
await element(by.id('HeaderMenu')).tap();
189+
await element(by.id('DrawerSettings')).tap();
189190
await element(by.id('AdvancedSettings')).tap();
190191
// wait for LDK to start
191192
await sleep(5000);
@@ -226,7 +227,8 @@ d('Send', () => {
226227
await waitForActiveChannel(lnd, ldkNodeId);
227228

228229
// check channel status
229-
await element(by.id('Settings')).tap();
230+
await element(by.id('HeaderMenu')).tap();
231+
await element(by.id('DrawerSettings')).tap();
230232
await element(by.id('AdvancedSettings')).atIndex(0).tap();
231233
await element(by.id('Channels')).tap();
232234
await element(by.id('Channel')).atIndex(0).tap();
@@ -455,7 +457,8 @@ d('Send', () => {
455457
const { paymentRequest: invoice7 } = await lnd.addInvoice({ value: 1000 });
456458

457459
// enable quickpay
458-
await element(by.id('Settings')).tap();
460+
await element(by.id('HeaderMenu')).tap();
461+
await element(by.id('DrawerSettings')).tap();
459462
await element(by.id('GeneralSettings')).tap();
460463
await element(by.id('QuickpaySettings')).tap();
461464
await element(by.id('QuickpayIntro-button')).tap();

0 commit comments

Comments
 (0)