Merge branch 'main' into feat/rn-migration

Author: piotr-iohk

test/helpers/actions.ts

@@ -559,6 +559,8 @@ export async function restoreWallet(
   await tap('RestoreButton');
   await waitForSetupWalletScreenFinish();
 
+  await handleAndroidAlert();
+
   // Wait for Get Started
   const getStarted = await elementById('GetStartedButton');
   await getStarted.waitForDisplayed();
@@ -672,21 +674,12 @@ export async function receiveOnchainFunds(
 
   await mineBlocks(rpc, blocksToMine);
 
-  if (driver.isAndroid) {
-    await dismissBackupTimedSheet();
-    if (expectHighBalanceWarning) {
-      await acknowledgeHighBalanceWarning();
-    }
-  }
-
   const moneyText = await elementByIdWithin('TotalBalance-primary', 'MoneyText');
   await expect(moneyText).toHaveText(formattedSats);
 
-  if (driver.isIOS) {
-    await dismissBackupTimedSheet({ triggerTimedSheet: true });
-    if (expectHighBalanceWarning) {
-      await acknowledgeHighBalanceWarning({ triggerTimedSheet: true });
-    }
+  await dismissBackupTimedSheet({ triggerTimedSheet: true });
+  if (expectHighBalanceWarning) {
+    await acknowledgeHighBalanceWarning({ triggerTimedSheet: true });
   }
 }
 

test/helpers/lnd.ts

@@ -127,6 +127,7 @@ export async function checkChannelStatus({ size = '100 000' } = {}) {
   await tap('DrawerSettings');
   await tap('AdvancedSettings');
   await tap('Channels');
+  await sleep(1000);
   await tap('Channel');
   await expectTextWithin('TotalSize', `₿ ${size}`);
   await swipeFullScreen('up');

test/specs/lightning.e2e.ts

@@ -116,7 +116,7 @@ describe('@lightning - Lightning', () => {
       await dismissBackgroundPaymentsTimedSheet({ triggerTimedSheet: driver.isIOS });
       await dismissQuickPayIntro({ triggerTimedSheet: driver.isIOS });
     } else {
-      await dismissQuickPayIntro();
+      await dismissQuickPayIntro({ triggerTimedSheet: true });
     }
     const totalBalance = await elementByIdWithin('TotalBalance-primary', 'MoneyText');
     await expect(totalBalance).toHaveText('11 000'); // 1k onchain + 10k lightning

test/specs/lnurl.e2e.ts

@@ -141,12 +141,13 @@ describe('@lnurl - LNURL', () => {
       await waitForActiveChannel(lnd as any, ldkNodeID);
 
       // Success toast/flow
-      if (driver.isIOS) await waitForToast('SpendingBalanceReadyToast');
-      if (driver.isAndroid) await dismissQuickPayIntro();
+      await waitForToast('SpendingBalanceReadyToast');
       await acknowledgeExternalSuccess();
       if (driver.isIOS) {
         await dismissBackgroundPaymentsTimedSheet();
         await dismissQuickPayIntro({ triggerTimedSheet: driver.isIOS });
+      } else {
+        await dismissQuickPayIntro({ triggerTimedSheet: driver.isAndroid });
       }
       await expectTextWithin('ActivitySpending', '20 001');
 

test/specs/onchain.e2e.ts

@@ -129,19 +129,14 @@ describe('@onchain - Onchain', () => {
 
       await mineBlocks(rpc, 1);
       await electrum?.waitForSync();
-
-      if (i === 1 && driver.isAndroid) {
-        await dismissBackupTimedSheet();
-        await acknowledgeHighBalanceWarning();
-      }
       await sleep(1000); // wait for the app to settle
 
       // - shows correct total balance
       const totalBalance = await elementByIdWithin('TotalBalance-primary', 'MoneyText');
       const expected = `${i}00 000 000`;
       await expect(totalBalance).toHaveText(expected);
 
-      if (i === 1 && driver.isIOS) {
+      if (i === 1) {
         await dismissBackupTimedSheet({ triggerTimedSheet: true });
         await acknowledgeHighBalanceWarning({ triggerTimedSheet: true });
       }

test/specs/send.e2e.ts

@@ -200,7 +200,7 @@ describe('@send - Send', () => {
       await dismissBackgroundPaymentsTimedSheet({ triggerTimedSheet: driver.isIOS });
       await dismissQuickPayIntro({ triggerTimedSheet: driver.isIOS });
     } else {
-      await dismissQuickPayIntro();
+      await dismissQuickPayIntro({ triggerTimedSheet: true });
     }
 
     const totalBalance = await elementByIdWithin('TotalBalance-primary', 'MoneyText');

test/specs/transfer.e2e.ts

@@ -347,7 +347,7 @@ describe('@transfer - Transfer', () => {
       await dismissBackgroundPaymentsTimedSheet({ triggerTimedSheet: driver.isIOS });
       await dismissQuickPayIntro({ triggerTimedSheet: driver.isIOS });
     } else {
-      await dismissQuickPayIntro();
+      await dismissQuickPayIntro({ triggerTimedSheet: true });
     }
     await expectNoTextWithin('ActivitySpending', '0');
     await waitForActiveChannel(lnd, ldkNodeId);