diff --git a/test/helpers/actions.ts b/test/helpers/actions.ts index 45db991..0db0bd8 100644 --- a/test/helpers/actions.ts +++ b/test/helpers/actions.ts @@ -446,7 +446,7 @@ export async function confirmInputOnKeyboard() { } } -export async function acceptAppNotificationAlert( +export async function handleAndroidAlert( button: string = 'permission_allow_button' ): Promise { if (driver.isAndroid) { @@ -503,7 +503,7 @@ export async function completeOnboarding({ isFirstTime = true } = {}) { await waitForSetupWalletScreenFinish(); if (isFirstTime) { - await acceptAppNotificationAlert(); + await handleAndroidAlert(); } // Wait for wallet to be created @@ -559,7 +559,7 @@ export async function restoreWallet( await tap('RestoreButton'); await waitForSetupWalletScreenFinish(); - await acceptAppNotificationAlert(); + await handleAndroidAlert(); // Wait for Get Started const getStarted = await elementById('GetStartedButton'); @@ -672,21 +672,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: driver.isIOS }); } } @@ -887,7 +878,7 @@ export async function enterAddress(address: string, { acceptCameraPermission = t await tap('Send'); await sleep(700); if (acceptCameraPermission) { - await acceptAppNotificationAlert('permission_allow_one_time_button'); + await handleAndroidAlert('permission_allow_one_time_button'); } await tap('RecipientManual'); await typeAddressAndVerifyContinue({ address }); @@ -901,7 +892,7 @@ export async function enterAddressViaScanPrompt( await tap('Scan'); await sleep(700); if (acceptCameraPermission) { - await acceptAppNotificationAlert('permission_allow_foreground_only_button'); + await handleAndroidAlert('permission_allow_foreground_only_button'); } await tap('ScanPrompt'); await typeText('QRInput', address); diff --git a/test/helpers/lnd.ts b/test/helpers/lnd.ts index 811ae76..6a3a296 100644 --- a/test/helpers/lnd.ts +++ b/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'); diff --git a/test/specs/lightning.e2e.ts b/test/specs/lightning.e2e.ts index 01a5ba8..b6e4db7 100644 --- a/test/specs/lightning.e2e.ts +++ b/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 diff --git a/test/specs/lnurl.e2e.ts b/test/specs/lnurl.e2e.ts index f1768c9..d1171c9 100644 --- a/test/specs/lnurl.e2e.ts +++ b/test/specs/lnurl.e2e.ts @@ -142,7 +142,7 @@ describe('@lnurl - LNURL', () => { // Success toast/flow if (driver.isIOS) await waitForToast('SpendingBalanceReadyToast'); - if (driver.isAndroid) await dismissQuickPayIntro(); + if (driver.isAndroid) await dismissQuickPayIntro({ triggerTimedSheet: true }); await acknowledgeExternalSuccess(); if (driver.isIOS) { await dismissBackgroundPaymentsTimedSheet(); diff --git a/test/specs/onboarding.e2e.ts b/test/specs/onboarding.e2e.ts index 3e52060..5dee7ce 100644 --- a/test/specs/onboarding.e2e.ts +++ b/test/specs/onboarding.e2e.ts @@ -1,5 +1,5 @@ import { - acceptAppNotificationAlert, + handleAndroidAlert, confirmInputOnKeyboard, elementById, elementByText, @@ -49,7 +49,7 @@ describe('@onboarding - Onboarding', () => { await tap('NewWallet'); await waitForSetupWalletScreenFinish(); - await acceptAppNotificationAlert(); + await handleAndroidAlert(); await elementByText('TO GET').waitForDisplayed(); }); @@ -82,7 +82,7 @@ describe('@onboarding - Onboarding', () => { await tap('CreateNewWallet'); await waitForSetupWalletScreenFinish(); - await acceptAppNotificationAlert(); + await handleAndroidAlert(); // Wait for wallet to be created for (let i = 1; i <= 3; i++) { diff --git a/test/specs/onchain.e2e.ts b/test/specs/onchain.e2e.ts index 8c96a64..44d9504 100644 --- a/test/specs/onchain.e2e.ts +++ b/test/specs/onchain.e2e.ts @@ -129,11 +129,6 @@ 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 @@ -141,9 +136,9 @@ describe('@onchain - Onchain', () => { 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 }); + await acknowledgeHighBalanceWarning({ triggerTimedSheet: driver.isIOS }); } } diff --git a/test/specs/send.e2e.ts b/test/specs/send.e2e.ts index c5589b2..0924acd 100644 --- a/test/specs/send.e2e.ts +++ b/test/specs/send.e2e.ts @@ -21,7 +21,7 @@ import { dismissQuickPayIntro, doNavigationClose, waitForToast, - acceptAppNotificationAlert, + handleAndroidAlert, dismissBackgroundPaymentsTimedSheet, acknowledgeReceivedPayment, } from '../helpers/actions'; @@ -67,7 +67,7 @@ describe('@send - Send', () => { ciIt('@send_1 - Validates payment data in the manual input', async () => { await tap('Send'); - await acceptAppNotificationAlert('permission_allow_foreground_only_button'); + await handleAndroidAlert('permission_allow_foreground_only_button'); await tap('RecipientManual'); // check validation for empty address @@ -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'); diff --git a/test/specs/settings.e2e.ts b/test/specs/settings.e2e.ts index e98ec85..fa02bac 100644 --- a/test/specs/settings.e2e.ts +++ b/test/specs/settings.e2e.ts @@ -10,7 +10,7 @@ import { dragOnElement, elementsById, getReceiveAddress, - acceptAppNotificationAlert, + handleAndroidAlert, confirmInputOnKeyboard, multiTap, getAccessibleText, @@ -437,7 +437,7 @@ describe('@settings - Settings', () => { await tap('NavigationAction'); // on the first time we need to accept the notifications permission dialog to use camera if (i === 0) { - await acceptAppNotificationAlert('permission_allow_foreground_only_button'); + await handleAndroidAlert('permission_allow_foreground_only_button'); } await tap('ScanPrompt'); await typeText('QRInput', conn.url); diff --git a/test/specs/transfer.e2e.ts b/test/specs/transfer.e2e.ts index 24e8c55..827561c 100644 --- a/test/specs/transfer.e2e.ts +++ b/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);