diff --git a/packages/e2e-tests/src/assert/nftAssert.ts b/packages/e2e-tests/src/assert/nftAssert.ts index 04157e168f..206f21ac7c 100644 --- a/packages/e2e-tests/src/assert/nftAssert.ts +++ b/packages/e2e-tests/src/assert/nftAssert.ts @@ -10,7 +10,6 @@ import chaiSorted from 'chai-sorted'; import testContext from '../utils/testContext'; import { Asset } from '../data/Asset'; import adaHandleAssert from './adaHandleAssert'; -import { scrollToTheTop } from '../utils/scrollUtils'; import NftsCommon from '../elements/NFTs/nftsCommon'; use(chaiSorted); @@ -125,7 +124,7 @@ class NftAssert { await NftsPage.waitForNft(nftName); } catch { if (!shouldBeDisplayed) { - await scrollToTheTop(`${NftsPage.LIST_CONTAINER} ${NftsPage.NFT_CONTAINER}`); + await NftsPage.scrollToTheTop(); } } const nftItem = await NftsPage.getNftContainer(nftName); diff --git a/packages/e2e-tests/src/assert/nftCreateFolderAssert.ts b/packages/e2e-tests/src/assert/nftCreateFolderAssert.ts index 3a8b3c4e3a..2512943e32 100644 --- a/packages/e2e-tests/src/assert/nftCreateFolderAssert.ts +++ b/packages/e2e-tests/src/assert/nftCreateFolderAssert.ts @@ -12,7 +12,6 @@ import YoullHaveToStartAgainModal from '../elements/NFTs/youllHaveToStartAgainMo import NftsFolderPage from '../elements/NFTs/nftsFolderPage'; import adaHandleAssert from './adaHandleAssert'; import { browser } from '@wdio/globals'; -import { scrollToTheTop } from '../utils/scrollUtils'; import NftsCommon from '../elements/NFTs/nftsCommon'; class NftCreateFolderAssert { @@ -101,7 +100,7 @@ class NftCreateFolderAssert { async verifySeeAllOwnedNfts() { const ownedNftNames = testContext.load('ownedNfts'); - await scrollToTheTop(`${TokenSelectionPage.ASSET_SELECTOR_CONTAINER} ${TokenSelectionPage.NFT_CONTAINER}`); // make sure we are starting from the top + await TokenSelectionPage.scrollToTheTop(); // make sure we are starting from the top const displayedNftNames = await NftsCommon.getAllNftNamesWithScroll( `${TokenSelectionPage.ASSET_SELECTOR_CONTAINER} ${TokenSelectionPage.NFT_CONTAINER}` diff --git a/packages/e2e-tests/src/elements/NFTs/nftsCommon.ts b/packages/e2e-tests/src/elements/NFTs/nftsCommon.ts index 5c0217eaee..7888881853 100644 --- a/packages/e2e-tests/src/elements/NFTs/nftsCommon.ts +++ b/packages/e2e-tests/src/elements/NFTs/nftsCommon.ts @@ -13,7 +13,8 @@ class NftsCommon { while (hasMoreItems) { for (const nftElement of nftElements) { const nftName = await nftElement.getText(); - if (!nftNames.includes(nftName)) { + if (!nftNames.includes(nftName) && !nftName.toLowerCase().includes('folder')) { + // skip saving folders nftNames.push(nftName); } } diff --git a/packages/e2e-tests/src/elements/NFTs/nftsPage.ts b/packages/e2e-tests/src/elements/NFTs/nftsPage.ts index 388e1269f8..81b3a1d8f0 100644 --- a/packages/e2e-tests/src/elements/NFTs/nftsPage.ts +++ b/packages/e2e-tests/src/elements/NFTs/nftsPage.ts @@ -4,7 +4,7 @@ import { ChainablePromiseArray } from 'webdriverio/build/types'; import { ChainablePromiseElement } from 'webdriverio'; import testContext from '../../utils/testContext'; import { browser } from '@wdio/globals'; -import { scrollDownWithOffset } from '../../utils/scrollUtils'; +import { scrollDownWithOffset, scrollToTheTop } from '../../utils/scrollUtils'; import NftsCommon from './nftsCommon'; class NftsPage { @@ -108,6 +108,10 @@ class NftsPage { } ); } + + async scrollToTheTop() { + await scrollToTheTop(`${this.LIST_CONTAINER} ${this.NFT_CONTAINER}`); + } } export default new NftsPage(); diff --git a/packages/e2e-tests/src/elements/newTransaction/tokenSelectionPage.ts b/packages/e2e-tests/src/elements/newTransaction/tokenSelectionPage.ts index 5cb2da2c19..b648363a46 100644 --- a/packages/e2e-tests/src/elements/newTransaction/tokenSelectionPage.ts +++ b/packages/e2e-tests/src/elements/newTransaction/tokenSelectionPage.ts @@ -4,7 +4,7 @@ import testContext from '../../utils/testContext'; import { generateRandomString } from '../../utils/textUtils'; import { TokenSearchResult } from './tokenSearchResult'; import { browser } from '@wdio/globals'; -import { scrollDownWithOffset } from '../../utils/scrollUtils'; +import { scrollDownWithOffset, scrollToTheTop } from '../../utils/scrollUtils'; import { ChainablePromiseElement } from 'webdriverio'; class TokenSelectionPage extends CommonDrawerElements { @@ -251,6 +251,10 @@ class TokenSelectionPage extends CommonDrawerElements { } } } + + async scrollToTheTop() { + await scrollToTheTop(`${this.ASSET_SELECTOR_CONTAINER} ${this.NFT_CONTAINER}`); + } } export default new TokenSelectionPage(); diff --git a/packages/e2e-tests/src/features/SendTransactionMultipleSelectionExtended.feature b/packages/e2e-tests/src/features/SendTransactionMultipleSelectionExtended.feature index 7672f3001b..18370ae764 100644 --- a/packages/e2e-tests/src/features/SendTransactionMultipleSelectionExtended.feature +++ b/packages/e2e-tests/src/features/SendTransactionMultipleSelectionExtended.feature @@ -4,7 +4,8 @@ Feature: Send - Multiple selection for Extended Browser View Background: Given Wallet is synced - @LW-5043 + @LW-5043 @Pending + @issue=LW-12151 Scenario Outline: Extended view - Send - Multiple tokens selection - - happy path And I click "Send" button on page header When I enter a valid "shelley" address in the bundle 1 recipient's address @@ -65,7 +66,8 @@ Feature: Send - Multiple selection for Extended Browser View | Tokens | | NFTs | - @LW-5046 + @LW-5046 @Pending + @issue=LW-12151 Scenario Outline: Extended view - Send - Multiple tokens selection - - clear and cancel And I click "Send" button on page header When I enter a valid "shelley" address in the bundle 1 recipient's address @@ -91,7 +93,8 @@ Feature: Send - Multiple selection for Extended Browser View | Tokens | | NFTs | - @LW-5267 + @LW-5267 @Pending + @issue=LW-12151 Scenario Outline: Extended view - Send - Multiple tokens selection - - Maximum amount to select is 30 And I click "Send" button on page header When I enter a valid "shelley" address in the bundle 1 recipient's address diff --git a/packages/e2e-tests/src/features/SendTransactionMultipleSelectionPopup.feature b/packages/e2e-tests/src/features/SendTransactionMultipleSelectionPopup.feature index 1652ef27e5..2e5d8a09a7 100644 --- a/packages/e2e-tests/src/features/SendTransactionMultipleSelectionPopup.feature +++ b/packages/e2e-tests/src/features/SendTransactionMultipleSelectionPopup.feature @@ -4,7 +4,8 @@ Feature: Send - Multiple selection for Popup View Background: Given Wallet is synced - @LW-5044 + @LW-5044 @Pending + @issue=LW-12151 Scenario Outline: Popup view - Send - Multiple tokens selection - - happy path And I click "Send" button on Tokens page in popup mode When I enter a valid "shelley" address in the bundle 1 recipient's address @@ -26,7 +27,8 @@ Feature: Send - Multiple selection for Popup View | Tokens | | NFTs | - @LW-5045 + @LW-5045 @Pending + @issue=LW-12151 Scenario Outline: Extended view - Send - Multiple tokens selection - - clear and cancel And I click "Send" button on Tokens page in popup mode When I enter a valid "shelley" address in the bundle 1 recipient's address @@ -52,7 +54,8 @@ Feature: Send - Multiple selection for Popup View | Tokens | | NFTs | - @LW-5268 + @LW-5268 @Pending + @issue=LW-12151 Scenario Outline: Extended view - Send - Multiple tokens selection - - Maximum amount to select is 30 And I click "Send" button on Tokens page in popup mode When I enter a valid "shelley" address in the bundle 1 recipient's address diff --git a/packages/e2e-tests/src/pageobject/newTransactionExtendedPageObject.ts b/packages/e2e-tests/src/pageobject/newTransactionExtendedPageObject.ts index 92aaaea4b0..75eb0278a9 100644 --- a/packages/e2e-tests/src/pageobject/newTransactionExtendedPageObject.ts +++ b/packages/e2e-tests/src/pageobject/newTransactionExtendedPageObject.ts @@ -81,6 +81,7 @@ export default new (class NewTransactionExtendedPageObject { const nftNames = await NftsCommon.getAllNftNamesWithScroll( `${TokenSelectionPage.ASSET_SELECTOR_CONTAINER} ${TokenSelectionPage.NFT_CONTAINER}` ); + await TokenSelectionPage.scrollToTheTop(); let nftsCount = nftNames.length; for (const nftName of nftNames) { nftsCount--; diff --git a/packages/e2e-tests/src/steps/nftFoldersSteps.ts b/packages/e2e-tests/src/steps/nftFoldersSteps.ts index 0e60ffd186..492620095c 100644 --- a/packages/e2e-tests/src/steps/nftFoldersSteps.ts +++ b/packages/e2e-tests/src/steps/nftFoldersSteps.ts @@ -49,6 +49,7 @@ Given( ); When(/^I click "Create folder" button on NFTs page$/, async () => { + await NftsPage.createFolderButton.waitForClickable(); await NftsPage.createFolderButton.click(); }); @@ -206,6 +207,7 @@ Then(/^I can see "Add NFT" button active$/, async () => { When( /^I (left|right) click on the NFT folder with name "([^"]*)"$/, async (clickType: 'left' | 'right', folderName: string) => { + await NftsPage.scrollToTheTop(); const nftFolder = await NftsPage.getFolder(folderName); await nftFolder.click({ button: clickType }); }