SpendingBalanceReadyToast + lnurl adjustments

Author: piotr-iohk

test/helpers/actions.ts

@@ -671,6 +671,7 @@ export async function receiveOnchainFunds(
 }
 
 export type ToastId =
+  | 'SpendingBalanceReadyToast'
   | 'BalanceUnitSwitchedToast'
   | 'BalanceHiddenToast'
   | 'RgsUpdatedToast'

test/specs/lightning.e2e.ts

@@ -26,6 +26,7 @@ import {
   dismissBackgroundPaymentsTimedSheet,
   acknowledgeReceivedPayment,
   waitForBackup,
+  waitForToast,
 } from '../helpers/actions';
 import { reinstallApp } from '../helpers/setup';
 import { bitcoinURL, lndConfig } from '../helpers/constants';
@@ -99,8 +100,7 @@ describe('@lightning - Lightning', () => {
     await waitForActiveChannel(lnd, ldkNodeId);
 
     // Toast message
-    await expectText('Spending Balance Ready');
-    await expectText('Spending Balance Ready', { visible: false });
+    await waitForToast('SpendingBalanceReadyToast');
 
     // check channel status
     await checkChannelStatus();

test/specs/lnurl.e2e.ts

@@ -21,6 +21,8 @@ import {
   expectText,
   dismissQuickPayIntro,
   doNavigationClose,
+  waitForToast,
+  dismissBackgroundPaymentsTimedSheet,
 } from '../helpers/actions';
 import { reinstallApp } from '../helpers/setup';
 import { ciIt } from '../helpers/suite';
@@ -128,6 +130,7 @@ describe('@lnurl - LNURL', () => {
 
       const channelRequestPromise = waitForEvent(lnurlServer, 'channelRequest:action');
       await elementById('ConnectButton').waitForDisplayed();
+      // await sleep(100000);
       await tap('ConnectButton');
       await channelRequestPromise;
 
@@ -142,10 +145,14 @@ describe('@lnurl - LNURL', () => {
       await waitForActiveChannel(lnd as any, ldkNodeID);
 
       // Success toast/flow
-      await dismissQuickPayIntro();
+      if (driver.isIOS) await waitForToast('SpendingBalanceReadyToast')
+      if (driver.isAndroid) await dismissQuickPayIntro();
       await elementById('ExternalSuccess').waitForDisplayed({ timeout: 30_000 });
       await tap('ExternalSuccess-button');
-
+      if (driver.isIOS) {
+        await dismissBackgroundPaymentsTimedSheet();
+        await dismissQuickPayIntro({ triggerTimedSheet: driver.isIOS });
+      } 
       await expectTextWithin('ActivitySpending', '20 001');
 
       // lnurl-pay (min != max) with comment

test/specs/send.e2e.ts

@@ -20,6 +20,7 @@ import {
   mineBlocks,
   dismissQuickPayIntro,
   doNavigationClose,
+  waitForToast,
 } from '../helpers/actions';
 import { bitcoinURL, lndConfig } from '../helpers/constants';
 import { reinstallApp } from '../helpers/setup';
@@ -161,7 +162,7 @@ describe('@send - Send', () => {
     await waitForActiveChannel(lnd, ldkNodeId);
 
     // Toast message
-    await expectText('Spending Balance Ready');
+    await waitForToast('SpendingBalanceReadyToast');
 
     // check channel status
     await checkChannelStatus();

test/specs/transfer.e2e.ts

@@ -19,6 +19,7 @@ import {
   enterAddress,
   dismissQuickPayIntro,
   doNavigationClose,
+  waitForToast,
 } from '../helpers/actions';
 import {
   checkChannelStatus,
@@ -331,7 +332,7 @@ describe('@transfer - Transfer', () => {
 
     await mineBlocks(rpc, 6);
     await electrum?.waitForSync();
-    await expectText('Spending Balance Ready');
+    await waitForToast('SpendingBalanceReadyToast');    
     await dismissQuickPayIntro();
     await waitForActiveChannel(lnd, ldkNodeId);