Skip to content

Commit 639beb2

Browse files
authored
Merge pull request #93 from synonymdev/fix/fallback-expired-ln-to-onchain
update send after #366 fix
2 parents 1bd49e5 + cf45b25 commit 639beb2

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

test/specs/send.e2e.ts

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -326,39 +326,39 @@ describe('@send - Send', () => {
326326
console.info({ amtAfterUnified2 });
327327
await expectTextWithin('ActivitySpending', '7 000');
328328

329-
//--- skip due to: https://github.com/synonymdev/bitkit-android/issues/366 ---//
330-
331-
// TODO: uncomment after fix
332-
333329
// send to unified invoice w/ expired invoice
334-
// console.info('Sending to unified invoice w/ expired invoice...');
335-
// const unified3 =
336-
// 'bitcoin:bcrt1qaytrqsrgg75rtxrtr7ur6k75la8p3v95mey48z?lightning=LNBCRT1PN33T20DQQNP4QTNTQ4D2DHDYQ420HAUQF5TS7X32TNW9WGYEPQZQ6R9G69QPHW4RXPP5QU7UYXJYJA9PJV7H6JPEYEFFNZ98N686JDEAAK8AUD5AGC5X70HQSP54V5LEFATCQDEU8TLKAF6MDK3ZLU6MWUA52J4JEMD5XA85KGKMTTQ9QYYSGQCQPCXQRRSSRZJQWU6G4HMGH26EXXQYPQD8XHVWLARA66PL53V7S9CV2EE808UGDRN4APYQQQQQQQGRCQQQQLGQQQQQQGQ2QX7F74RT5SQE0KEYCU47LYMSVY2LM4QA4KLR65PPSY55M0H4VR8AN7WVM9EFVSPYJ5R8EFGVXTGVATAGFTC372VRJ3HEPSEELFZ7FQFCQ9XDU9X';
337-
// console.info({ unified3 });
338-
339-
// // const ln =
340-
// // 'LNBCRT1PN33T20DQQNP4QTNTQ4D2DHDYQ420HAUQF5TS7X32TNW9WGYEPQZQ6R9G69QPHW4RXPP5QU7UYXJYJA9PJV7H6JPEYEFFNZ98N686JDEAAK8AUD5AGC5X70HQSP54V5LEFATCQDEU8TLKAF6MDK3ZLU6MWUA52J4JEMD5XA85KGKMTTQ9QYYSGQCQPCXQRRSSRZJQWU6G4HMGH26EXXQYPQD8XHVWLARA66PL53V7S9CV2EE808UGDRN4APYQQQQQQQGRCQQQQLGQQQQQQGQ2QX7F74RT5SQE0KEYCU47LYMSVY2LM4QA4KLR65PPSY55M0H4VR8AN7WVM9EFVSPYJ5R8EFGVXTGVATAGFTC372VRJ3HEPSEELFZ7FQFCQ9XDU9X';
341-
// // const dec = await lnd.decodePayReq({ payReq: ln });
342-
// // console.info(JSON.stringify(dec, null, 2));
343-
344-
// await sleep(1000);
345-
// await enterAddress(unified3, { acceptCameraPermission: false });
346-
// await elementById('AssetButton-savings').waitForDisplayed();
347-
// await tap('N1');
348-
// await multiTap('N0', 4);
349-
// await tap('ContinueAmount');
350-
// await amt_el.waitForDisplayed();
351-
// await expect(amt_el).toHaveText('10 000');
352-
// await dragOnElement('GRAB', 'right', 0.95);
353-
// await elementById('SendSuccess').waitForDisplayed();
354-
// await tap('Close');
355-
// await expect(moneyText).not.toHaveText(amtAfterUnified2);
356-
// const amtAfterUnified3 = await moneyText.getText();
357-
// await expectTextWithin('ActivitySpending', '7 000');
358-
359-
//--- skip due to: https://github.com/synonymdev/bitkit-android/issues/366 ---//
360-
const amtAfterUnified3 = await totalBalance.getText();
361-
console.info({ amtAfterUnified3 });
330+
let amtAfterUnified3: string;
331+
if (driver.isAndroid) {
332+
console.info('Sending to unified invoice w/ expired invoice...');
333+
const unified3 =
334+
'bitcoin:bcrt1qaytrqsrgg75rtxrtr7ur6k75la8p3v95mey48z?lightning=LNBCRT1PN33T20DQQNP4QTNTQ4D2DHDYQ420HAUQF5TS7X32TNW9WGYEPQZQ6R9G69QPHW4RXPP5QU7UYXJYJA9PJV7H6JPEYEFFNZ98N686JDEAAK8AUD5AGC5X70HQSP54V5LEFATCQDEU8TLKAF6MDK3ZLU6MWUA52J4JEMD5XA85KGKMTTQ9QYYSGQCQPCXQRRSSRZJQWU6G4HMGH26EXXQYPQD8XHVWLARA66PL53V7S9CV2EE808UGDRN4APYQQQQQQQGRCQQQQLGQQQQQQGQ2QX7F74RT5SQE0KEYCU47LYMSVY2LM4QA4KLR65PPSY55M0H4VR8AN7WVM9EFVSPYJ5R8EFGVXTGVATAGFTC372VRJ3HEPSEELFZ7FQFCQ9XDU9X';
335+
console.info({ unified3 });
336+
337+
// const ln =
338+
// 'LNBCRT1PN33T20DQQNP4QTNTQ4D2DHDYQ420HAUQF5TS7X32TNW9WGYEPQZQ6R9G69QPHW4RXPP5QU7UYXJYJA9PJV7H6JPEYEFFNZ98N686JDEAAK8AUD5AGC5X70HQSP54V5LEFATCQDEU8TLKAF6MDK3ZLU6MWUA52J4JEMD5XA85KGKMTTQ9QYYSGQCQPCXQRRSSRZJQWU6G4HMGH26EXXQYPQD8XHVWLARA66PL53V7S9CV2EE808UGDRN4APYQQQQQQQGRCQQQQLGQQQQQQGQ2QX7F74RT5SQE0KEYCU47LYMSVY2LM4QA4KLR65PPSY55M0H4VR8AN7WVM9EFVSPYJ5R8EFGVXTGVATAGFTC372VRJ3HEPSEELFZ7FQFCQ9XDU9X';
339+
// const dec = await lnd.decodePayReq({ payReq: ln });
340+
// console.info(JSON.stringify(dec, null, 2));
341+
342+
await sleep(1000);
343+
await enterAddress(unified3, { acceptCameraPermission: false });
344+
await elementById('AssetButton-savings').waitForDisplayed();
345+
await tap('N1');
346+
await multiTap('N0', 4);
347+
await tap('ContinueAmount');
348+
await reviewAmt.waitForDisplayed();
349+
await expect(reviewAmt).toHaveText('10 000');
350+
await dragOnElement('GRAB', 'right', 0.95);
351+
await elementById('SendSuccess').waitForDisplayed();
352+
await tap('Close');
353+
await expect(totalBalance).not.toHaveText(amtAfterUnified2);
354+
amtAfterUnified3 = await totalBalance.getText();
355+
console.info({ amtAfterUnified3 });
356+
await expectTextWithin('ActivitySpending', '7 000');
357+
} else {
358+
// https://github.com/synonymdev/bitkit-ios/issues/300
359+
console.info('Skipping sending to unified invoice w/ expired invoice on iOS due to /bitkit-ios/issues/300');
360+
amtAfterUnified3 = amtAfterUnified2;
361+
}
362362

363363
// send to unified invoice w/o amount (lightning)
364364
console.info('Sending to unified invoice w/o amount (lightning)...');

0 commit comments

Comments
 (0)