Skip to content

Commit 592e398

Browse files
pwltrpwltr
committed
refactor(ui): cleanup
1 parent bab8d1a commit 592e398

Some content is hidden

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

77 files changed

+404
-469
lines changed

‎e2e/backup.e2e.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ d('Backup', () => {
6666
await rpc.generateToAddress(1, await rpc.getNewAddress());
6767
await electrum?.waitForSync();
6868

69-
await waitFor(element(by.id('NewTxPrompt')))
69+
await waitFor(element(by.id('ReceivedTransaction')))
7070
.toBeVisible()
7171
.withTimeout(10000);
72-
await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
72+
await element(by.id('ReceivedTransaction')).swipe('down'); // close Receive screen
7373
await sleep(200); // animation
7474

7575
// set tag to new tx

‎e2e/boost.e2e.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ d('Boost', () => {
6767
await rpc.sendToAddress(wAddress, '0.001');
6868
await rpc.generateToAddress(1, await rpc.getNewAddress());
6969
await electrum?.waitForSync();
70-
await waitFor(element(by.id('NewTxPrompt')))
70+
await waitFor(element(by.id('ReceivedTransaction')))
7171
.toBeVisible()
7272
.withTimeout(10000);
73-
await element(by.id('NewTxPromptButton')).tap();
73+
await element(by.id('ReceivedTransactionButton')).tap();
7474
await expect(
7575
element(by.id('MoneyText').withAncestor(by.id('TotalBalance'))),
7676
).toHaveText('100 000');
@@ -178,10 +178,10 @@ d('Boost', () => {
178178
await rpc.sendToAddress(wAddress, '0.001');
179179
await rpc.generateToAddress(1, await rpc.getNewAddress());
180180
await electrum?.waitForSync();
181-
await waitFor(element(by.id('NewTxPrompt')))
181+
await waitFor(element(by.id('ReceivedTransaction')))
182182
.toBeVisible()
183183
.withTimeout(10000);
184-
await element(by.id('NewTxPromptButton')).tap();
184+
await element(by.id('ReceivedTransactionButton')).tap();
185185
await expect(
186186
element(by.id('MoneyText').withAncestor(by.id('TotalBalance'))),
187187
).toHaveText('100 000');

‎e2e/helpers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,10 @@ export const receiveOnchainFunds = async (rpc, amount = '0.001') => {
138138
await rpc.sendToAddress(wAddress, amount);
139139
await rpc.generateToAddress(1, await rpc.getNewAddress());
140140

141-
await waitFor(element(by.id('NewTxPrompt')))
141+
await waitFor(element(by.id('ReceivedTransaction')))
142142
.toBeVisible()
143143
.withTimeout(10000);
144-
await element(by.id('NewTxPrompt')).swipe('down');
144+
await element(by.id('ReceivedTransaction')).swipe('down');
145145
await sleep(1000);
146146
};
147147

‎e2e/lightning.e2e.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ d('Lightning', () => {
131131
let { label: invoice1 } = await element(by.id('QRCode')).getAttributes();
132132
invoice1 = invoice1.replaceAll(/bitcoin.*=/gi, '').toLowerCase();
133133
await lnd.sendPaymentSync({ paymentRequest: invoice1, amt: 50000 });
134-
await waitFor(element(by.id('NewTxPrompt')))
134+
await waitFor(element(by.id('ReceivedTransaction')))
135135
.toBeVisible()
136136
.withTimeout(10000);
137-
await element(by.id('NewTxPrompt')).swipe('down');
137+
await element(by.id('ReceivedTransaction')).swipe('down');
138138
await waitFor(
139139
element(by.id('MoneyText').withAncestor(by.id('TotalBalance'))),
140140
)
@@ -163,10 +163,10 @@ d('Lightning', () => {
163163
by.id('ReceiveLightningInvoice'),
164164
).getAttributes();
165165
await lnd.sendPaymentSync({ paymentRequest: invoice2 });
166-
await waitFor(element(by.id('NewTxPrompt')))
166+
await waitFor(element(by.id('ReceivedTransaction')))
167167
.toBeVisible()
168168
.withTimeout(10000);
169-
await element(by.id('NewTxPrompt')).swipe('down');
169+
await element(by.id('ReceivedTransaction')).swipe('down');
170170
await waitFor(
171171
element(by.id('MoneyText').withAncestor(by.id('TotalBalance'))),
172172
)
@@ -360,10 +360,10 @@ d('Lightning', () => {
360360

361361
// TODO: for some reason this doen't work on github actions
362362
// wait for onchain payment to arrive
363-
// await waitFor(element(by.id('NewTxPrompt')))
363+
// await waitFor(element(by.id('ReceivedTransaction')))
364364
// .toBeVisible()
365365
// .withTimeout(60000);
366-
// await element(by.id('NewTxPrompt')).swipe('down');
366+
// await element(by.id('ReceivedTransaction')).swipe('down');
367367
// await expect(
368368
// element(by.id('MoneySign').withAncestor(by.id('ActivityShort-1'))),
369369
// ).toHaveText('+');

‎e2e/lnurl.e2e.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,10 @@ d('LNURL', () => {
261261
await element(by.id('DialogConfirm')).tap();
262262
await element(by.id('ContinueAmount')).tap();
263263
await element(by.id('WithdrawConfirmButton')).tap();
264-
await waitFor(element(by.id('NewTxPrompt')))
264+
await waitFor(element(by.id('ReceivedTransaction')))
265265
.toBeVisible()
266266
.withTimeout(10000);
267-
await element(by.id('NewTxPrompt')).swipe('down');
267+
await element(by.id('ReceivedTransaction')).swipe('down');
268268

269269
// test lnurl-withdraw, with min !== max amount
270270
const withdrawRequest2 = await lnurl.generateNewUrl('withdrawRequest', {
@@ -277,10 +277,10 @@ d('LNURL', () => {
277277
await element(by.id('QRInput')).replaceText(withdrawRequest2.encoded);
278278
await element(by.id('DialogConfirm')).tap();
279279
await element(by.id('WithdrawConfirmButton')).tap();
280-
await waitFor(element(by.id('NewTxPrompt')))
280+
await waitFor(element(by.id('ReceivedTransaction')))
281281
.toBeVisible()
282282
.withTimeout(10000);
283-
await element(by.id('NewTxPrompt')).swipe('down');
283+
await element(by.id('ReceivedTransaction')).swipe('down');
284284

285285
// test lnurl-auth
286286
const loginRequest1 = await lnurl.generateNewUrl('login');

‎e2e/onchain.e2e.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ d('Onchain', () => {
7474
await rpc.generateToAddress(1, await rpc.getNewAddress());
7575
await electrum?.waitForSync();
7676

77-
await waitFor(element(by.id('NewTxPrompt')))
77+
await waitFor(element(by.id('ReceivedTransaction')))
7878
.toBeVisible()
7979
.withTimeout(10000);
80-
await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
80+
await element(by.id('ReceivedTransaction')).swipe('down'); // close Receive screen
8181
await sleep(1000); // animation
8282
}
8383

@@ -201,7 +201,7 @@ d('Onchain', () => {
201201
await element(by.id('Tag-stag-delete')).tap();
202202

203203
// calendar, previous month, 0 transactions
204-
await element(by.id('TimeRangePrompt')).tap();
204+
await element(by.id('DatePicker')).tap();
205205
await expect(element(by.id('Today'))).toBeVisible();
206206
await element(by.id('PrevMonth')).tap();
207207
await expect(element(by.id('Today'))).not.toExist();
@@ -211,7 +211,7 @@ d('Onchain', () => {
211211
await expect(element(by.id('Activity-1'))).not.toExist();
212212

213213
// calendar, current date, 3 transactions
214-
await element(by.id('TimeRangePrompt')).tap();
214+
await element(by.id('DatePicker')).tap();
215215
await element(by.id('CalendarClearButton')).tap();
216216
await element(by.id('NextMonth')).tap();
217217
await element(by.id('Today')).tap();
@@ -238,10 +238,10 @@ d('Onchain', () => {
238238
// await rpc.generateToAddress(1, await rpc.getNewAddress());
239239
// await electrum?.waitForSync();
240240

241-
await waitFor(element(by.id('NewTxPrompt')))
241+
await waitFor(element(by.id('ReceivedTransaction')))
242242
.toBeVisible()
243243
.withTimeout(10000);
244-
await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
244+
await element(by.id('ReceivedTransaction')).swipe('down'); // close Receive screen
245245
await sleep(1000); // animation
246246

247247
const coreAddress = await rpc.getNewAddress();

‎e2e/security.e2e.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ d('Settings Security And Privacy', () => {
132132
await rpc.sendToAddress(wAddress, '1');
133133
await rpc.generateToAddress(1, await rpc.getNewAddress());
134134
await electrum?.waitForSync();
135-
await waitFor(element(by.id('NewTxPrompt')))
135+
await waitFor(element(by.id('ReceivedTransaction')))
136136
.toBeVisible()
137137
.withTimeout(10000);
138-
await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
138+
await element(by.id('ReceivedTransaction')).swipe('down'); // close Receive screen
139139

140140
// send, using FaceID
141141
const coreAddress = await rpc.getNewAddress();

‎e2e/send.e2e.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@ d('Send', () => {
245245
let { label: receive } = await element(by.id('QRCode')).getAttributes();
246246
receive = receive.replaceAll(/bitcoin.*=/gi, '').toLowerCase();
247247
await lnd.sendPaymentSync({ paymentRequest: receive, amt: 50000 });
248-
await waitFor(element(by.id('NewTxPrompt')))
248+
await waitFor(element(by.id('ReceivedTransaction')))
249249
.toBeVisible()
250250
.withTimeout(10000);
251-
await element(by.id('NewTxPrompt')).swipe('down');
251+
await element(by.id('ReceivedTransaction')).swipe('down');
252252

253253
await waitFor(
254254
element(by.id('MoneyText').withAncestor(by.id('TotalBalance'))),

‎e2e/slashtags.e2e.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,10 @@ d('Profile and Contacts', () => {
200200
await rpc.sendToAddress(wAddress, '1');
201201
await rpc.generateToAddress(1, await rpc.getNewAddress());
202202
await electrum?.waitForSync();
203-
await waitFor(element(by.id('NewTxPrompt')))
203+
await waitFor(element(by.id('ReceivedTransaction')))
204204
.toBeVisible()
205205
.withTimeout(10000);
206-
await element(by.id('NewTxPrompt')).swipe('down');
206+
await element(by.id('ReceivedTransaction')).swipe('down');
207207
await element(by.id('ActivitySavings')).tap();
208208
await element(by.id('Activity-1')).tap();
209209
await element(by.id('ActivityAssign')).tap();

‎e2e/transfer.e2e.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ d('Transfer', () => {
7575
await rpc.generateToAddress(1, await rpc.getNewAddress());
7676
await electrum?.waitForSync();
7777

78-
await waitFor(element(by.id('NewTxPrompt')))
78+
await waitFor(element(by.id('ReceivedTransaction')))
7979
.toBeVisible()
8080
.withTimeout(20000);
81-
await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
81+
await element(by.id('ReceivedTransaction')).swipe('down'); // close Receive screen
8282

8383
// switch to USD
8484
await element(by.id('HeaderMenu')).tap();
@@ -261,10 +261,10 @@ d('Transfer', () => {
261261
await rpc.sendToAddress(wAddress, '0.001');
262262
await rpc.generateToAddress(1, await rpc.getNewAddress());
263263

264-
await waitFor(element(by.id('NewTxPrompt')))
264+
await waitFor(element(by.id('ReceivedTransaction')))
265265
.toBeVisible()
266266
.withTimeout(20000);
267-
await element(by.id('NewTxPrompt')).swipe('down');
267+
await element(by.id('ReceivedTransaction')).swipe('down');
268268

269269
// Get LDK node id
270270
await element(by.id('HeaderMenu')).tap();

0 commit comments

Comments
 (0)