Onchain events adjustments

test/helpers/actions.ts

@@ -647,11 +647,10 @@ export async function receiveOnchainFunds(
   const address = await getReceiveAddress();
   await swipeFullScreen('down');
   await rpc.sendToAddress(address, btc);
-  await mineBlocks(rpc, blocksToMine);
 
-  // https://github.com/synonymdev/bitkit-android/issues/268
-  // send - onchain - receiver sees no confetti — missing-in-ldk-node missing onchain payment event
-  // await elementById('ReceivedTransaction').waitForDisplayed();
+  await acknowledgeReceivedPayment();
+
+  await mineBlocks(rpc, blocksToMine);
 
   if (driver.isAndroid) {
     await dismissBackupTimedSheet();
@@ -671,6 +670,41 @@ export async function receiveOnchainFunds(
   }
 }
 
+export type ToastId =
+  | 'BalanceUnitSwitchedToast'
+  | 'BalanceHiddenToast'
+  | 'RgsUpdatedToast'
+  | 'RgsErrorToast'
+  | 'ElectrumErrorToast'
+  | 'ElectrumUpdatedToast'
+  | 'PaymentFailedToast'
+  | 'ReceivedTransactionReplacedToast'
+  | 'TransactionReplacedToast'
+  | 'TransactionUnconfirmedToast'
+  | 'TransactionRemovedToast';
+
+export async function waitForToast(
+  toastId: ToastId,
+  { waitToDisappear = false, dismiss = true } = {}
+) {
+  await elementById(toastId).waitForDisplayed();
+  if (waitToDisappear) {
+    await elementById(toastId).waitForDisplayed({ reverse: true });
+    return;
+  }
+  if (dismiss) {
+    await dragOnElement(toastId, 'up', 0.2);
+  }
+}
+
+/** Acknowledges the received payment notification by tapping the button.
+ */
+export async function acknowledgeReceivedPayment() {
+  await elementById('ReceivedTransaction').waitForDisplayed();
+  await tap('ReceivedTransactionButton');
+  await sleep(300);
+}
+
 /**
  * Triggers the timed backup sheet by navigating to settings and back.
  * Since timed sheets are sometimes triggered by user behavior (when user goes back to home screen),
@@ -681,12 +715,25 @@ export async function receiveOnchainFunds(
  * await doTriggerTimedSheet();
  */
 export async function doTriggerTimedSheet() {
+  await sleep(700); // wait for any previous animations to finish
   await tap('HeaderMenu');
   await tap('DrawerSettings');
   await sleep(500); // wait for the app to settle
   await doNavigationClose();
 }
 
+export async function dismissBackgroundPaymentsTimedSheet({
+  triggerTimedSheet = false,
+}: { triggerTimedSheet?: boolean } = {}) {
+  if (triggerTimedSheet) {
+    await doTriggerTimedSheet();
+  }
+  await elementById('BackgroundPaymentsDescription').waitForDisplayed();
+  await sleep(500); // wait for the app to settle
+  await tap('BackgroundPaymentsCancel');
+  await sleep(500);
+}
+
 /**
  * Dismisses the backup reminder sheet.
  * This sheet is triggered by first onchain balance change.
@@ -710,7 +757,7 @@ export async function dismissBackupTimedSheet({
   }
   await elementById('BackupIntroViewDescription').waitForDisplayed();
   await sleep(500); // wait for the app to settle
-  await tap('BackupIntroViewCancel');
+  await swipeFullScreen('down');
   await sleep(500);
 }
 
@@ -732,14 +779,22 @@ export async function dismissBackupTimedSheet({
 export async function dismissQuickPayIntro({
   triggerTimedSheet = false,
 }: { triggerTimedSheet?: boolean } = {}) {
-  if (driver.isIOS) return; // Not supported on iOS yet
   if (triggerTimedSheet) {
     await doTriggerTimedSheet();
   }
-  await elementById('QuickpayIntro-button').waitForDisplayed();
-  await sleep(500); // wait for the app to settle
-  await swipeFullScreen('down');
-  await sleep(500);
+
+  if (driver.isAndroid) {
+    // TODO: it's temp, change on Android to match iOS testID
+    await elementById('QuickpayIntro-button').waitForDisplayed();
+    await sleep(500); // wait for the app to settle
+    await swipeFullScreen('down');
+    await sleep(500);
+  } else {
+    await elementById('QuickpayIntroDescription').waitForDisplayed();
+    await sleep(500); // wait for the app to settle
+    await tap('QuickpayIntroCancel');
+    await sleep(500);
+  }
 }
 
 /**

test/helpers/lnd.ts

@@ -103,6 +103,7 @@ export async function getLDKNodeID(): Promise<string> {
   await elementById('LDKNodeID').waitForDisplayed({ timeout: 60_000 });
   const ldkNodeId = (await elementById('LDKNodeID').getText()).trim();
   console.info({ ldkNodeId });
+  await sleep(500);
   await tap('NavigationBack');
   return ldkNodeId;
 }

test/helpers/setup.ts

@@ -1,32 +1,13 @@
 import { execSync } from 'node:child_process';
-import { elementsById, sleep, tap } from './actions';
+import { sleep } from './actions';
 import { getAppId, getAppPath } from './constants';
 
-export async function launchFreshApp({ tryHandleAlert = true } = {}) {
+export async function launchFreshApp() {
   const appId = getAppId();
 
   await driver.terminateApp(appId);
   await driver.activateApp(appId);
-  // workaround to get rid of "Bitkit is running in background" alert
-  if (tryHandleAlert) {
-    await sleep(1000);
-    try {
-      await tapBalanceToReset();
-    } catch {
-      await tapBalanceToReset();
-    }
-  }
-  await sleep(500);
-}
-
-async function tapBalanceToReset() {
-  await tap('TotalBalance');
-  const moneyFiatSymbols = await elementsById('MoneyFiatSymbol');
-  moneyFiatSymbols[0].waitForDisplayed();
-  moneyFiatSymbols[1].waitForDisplayed();
-  if ((await moneyFiatSymbols[1].getText()) !== '₿') {
-    await tap('TotalBalance');
-  }
+  await sleep(3000);
 }
 
 /**

test/specs/boost.e2e.ts

@@ -15,7 +15,6 @@ import {
   elementByIdWithin,
   getTextUnder,
   mineBlocks,
-  attemptRefreshOnHomeScreen,
   doNavigationClose,
   getSeed,
   waitForBackup,
@@ -80,25 +79,16 @@ describe('@boost - Boost', () => {
     // check Activity
     await elementById('BoostingIcon').waitForDisplayed();
     await elementById('ActivityShort-0').waitForDisplayed();
-
-    // no additional boost tx item on iOS, there is one on Android
-    // https://github.com/synonymdev/bitkit-android/issues/463
-    const showsBoostTxItem = driver.isAndroid;
-    if (showsBoostTxItem) {
-      await expect(elementById('ActivityShort-1')).toBeDisplayed();
-      await expect(elementById('ActivityShort-2')).not.toBeDisplayed();
-    } else {
-      await expect(elementById('ActivityShort-1')).not.toBeDisplayed();
-      await expect(elementById('ActivityShort-2')).not.toBeDisplayed();
-    }
+    await elementById('ActivityShort-1').waitForDisplayed();
+    await expect(elementById('ActivityShort-2')).not.toBeDisplayed();
+    await expectTextWithin('ActivityShort-0', '-');
+    await expectTextWithin('ActivityShort-0', 'Boost Fee');
+    await expectTextWithin('ActivityShort-1', '100 000');
+    await expectTextWithin('ActivityShort-1', '+');
 
     // orig tx still there
     await swipeFullScreen('up');
-    if (showsBoostTxItem) {
-      await tap('ActivityShort-1');
-    } else {
-      await tap('ActivityShort-0');
-    }
+    await tap('ActivityShort-1');
     await expectText('100 000', { strategy: 'contains' });
     await elementById('BoostedButton').waitForDisplayed();
     await elementById('StatusBoosting').waitForDisplayed();
@@ -111,17 +101,14 @@ describe('@boost - Boost', () => {
     console.info({ parentTxId });
     await doNavigationClose();
 
-    if (showsBoostTxItem) {
-      // new tx
-      await tap('ActivityShort-0');
-      await tap('ActivityTxDetails');
-      const boostTxId = await getTextUnder('TXID');
-      console.info({ newTxId: boostTxId });
-      await expect(origTxId !== boostTxId).toBe(true);
-      // TODO: not implemented yet
-      // await expect(boostTxId === parentTxId).toBe(true);
-      await doNavigationClose();
-    }
+    // new tx: Boost Fee
+    await tap('ActivityShort-0');
+    await tap('ActivityTxDetails');
+    const boostTxId = await getTextUnder('TXID');
+    console.info({ newTxId: boostTxId });
+    await expect(origTxId !== boostTxId).toBe(true);
+    await expect(boostTxId === parentTxId).toBe(true);
+    await doNavigationClose();
 
     // wipe & restore
     const seed = await getSeed();
@@ -131,39 +118,25 @@ describe('@boost - Boost', () => {
     // check activity after restore
     await swipeFullScreen('up');
     await elementById('BoostingIcon').waitForDisplayed();
-    if (showsBoostTxItem) {
-      await elementById('ActivityShort-1').waitForDisplayed();
-      await tap('ActivityShort-1');
-    } else {
-      await elementById('ActivityShort-0').waitForDisplayed();
-      await tap('ActivityShort-0');
-    }
+    await elementById('ActivityShort-1').waitForDisplayed();
+    await tap('ActivityShort-1');
     await elementById('BoostedButton').waitForDisplayed();
     await elementById('StatusBoosting').waitForDisplayed();
 
     // mine new block
     await mineBlocks(rpc, 1);
-
-    // check activity item after mine
-    // TEMP: refresh until proper events available
     await doNavigationClose();
     await sleep(500);
-    await swipeFullScreen('down');
-    await attemptRefreshOnHomeScreen();
-    await swipeFullScreen('up');
+
+    // check activity item after mine
     await elementById('ActivityShort-0').waitForDisplayed();
-    if (showsBoostTxItem) {
-      await elementById('ActivityShort-1').waitForDisplayed();
-    }
-    // TEMP: refresh until proper events available
+    await elementById('ActivityShort-1').waitForDisplayed();
 
     await tap('ActivityShort-0');
     await elementById('StatusConfirmed').waitForDisplayed();
     await doNavigationClose();
-    if (showsBoostTxItem) {
-      await tap('ActivityShort-1');
-      await elementById('StatusConfirmed').waitForDisplayed();
-    }
+    await tap('ActivityShort-1');
+    await elementById('StatusConfirmed').waitForDisplayed();
   });
 
   ciIt('@boost_2 - Can do RBF', async () => {
@@ -233,11 +206,10 @@ describe('@boost - Boost', () => {
     await elementById('BoostingIcon').waitForDisplayed();
     await elementById('ActivityShort-0').waitForDisplayed();
     await elementById('ActivityShort-1').waitForDisplayed();
-    await elementById('ActivityShort-2').waitForDisplayed();
+    await expect(elementById('ActivityShort-2')).not.toBeDisplayed();
     await expectTextWithin('ActivityShort-0', '-');
-    await expectTextWithin('ActivityShort-1', '-');
-    await expectTextWithin('ActivityShort-2', '100 000');
-    await expectTextWithin('ActivityShort-2', '+');
+    await expectTextWithin('ActivityShort-1', '100 000');
+    await expectTextWithin('ActivityShort-1', '+');
 
     // new tx
     await tap('ActivityShort-0');
@@ -262,32 +234,20 @@ describe('@boost - Boost', () => {
     // check activity after restore
     await swipeFullScreen('up');
     (await elementByIdWithin('ActivityShort-0', 'BoostingIcon')).waitForDisplayed();
-    (await elementByIdWithin('ActivityShort-1', 'BoostingIcon')).waitForDisplayed();
     await tap('ActivityShort-0');
     await elementById('BoostedButton').waitForDisplayed();
     await elementById('StatusBoosting').waitForDisplayed();
     await doNavigationClose();
-    await tap('ActivityShort-1');
-    await elementById('BoostedButton').waitForDisplayed();
-    await elementById('StatusRemoved').waitForDisplayed();
 
     // mine new block
     await mineBlocks(rpc, 1);
-
-    // check activity item after mine
-    // TEMP: refresh until proper events available
     await doNavigationClose();
     await sleep(500);
-    await swipeFullScreen('down');
-    await attemptRefreshOnHomeScreen();
-    await swipeFullScreen('up');
-    // TEMP: refresh until proper events available
+
+    // check activity item after mine
     await elementById('ActivityShort-0').waitForDisplayed();
     await tap('ActivityShort-0');
     await elementById('StatusConfirmed').waitForDisplayed();
     await doNavigationClose();
-    (await elementByIdWithin('ActivityShort-1', 'BoostingIcon')).waitForDisplayed();
-    await tap('ActivityShort-1');
-    await elementById('StatusRemoved').waitForDisplayed();
   });
 });