diff --git a/packages/e2e-tests/src/elements/accounts/WalletAccountsMenuItem.ts b/packages/e2e-tests/src/elements/accounts/WalletAccountsMenuItem.ts index 6a4d44bee1..1e6113f420 100644 --- a/packages/e2e-tests/src/elements/accounts/WalletAccountsMenuItem.ts +++ b/packages/e2e-tests/src/elements/accounts/WalletAccountsMenuItem.ts @@ -4,7 +4,7 @@ import { ChainablePromiseElement } from 'webdriverio'; class WalletAccountsMenuItem { protected CONTAINER_SELECTOR; private ITEM = '//div[@data-testid="wallet-account-item"]'; - private ICON = '//span[@data-testid="wallet-account-item-icon"]'; + private ICON = '//span[@data-testid="avatar-root"]'; private LABEL = '//span[@data-testid="wallet-account-item-label"]'; private PATH = '//span[@data-testid="wallet-account-item-path"]'; private DISABLE_BUTTON = '//button[@data-testid="wallet-account-item-lock-btn"]'; diff --git a/packages/e2e-tests/src/elements/transactionsPage.ts b/packages/e2e-tests/src/elements/transactionsPage.ts index ffe9699984..611d25bd58 100644 --- a/packages/e2e-tests/src/elements/transactionsPage.ts +++ b/packages/e2e-tests/src/elements/transactionsPage.ts @@ -16,7 +16,7 @@ class TransactionsPage { private TRANSACTIONS_TABLE_ITEM_FIAT_AMOUNT = '[data-testid="fiat-amount"]'; private TRANSACTIONS_TABLE_ITEM_TIMESTAMP = '[data-testid="timestamp"]'; private TRANSACTIONS_SKELETON = '[data-testid="infinite-scroll-skeleton"]'; - private TRANSACTIONS_COST_ADA = '[data-testid="send-transaction-fee-ada"]'; + private TRANSACTIONS_COST_ADA = '[data-testid="transaction-fee-value-ada"]'; private ASSET_INFO_AMOUNT = '[data-testid="asset-info-amount"]'; private SUMMARY_FEE_CONTAINER = '[data-testid="summary-fee-container"]'; private OUTPUT_SUMMARY_CONTAINER = '[data-testid="output-summary-container"]'; diff --git a/packages/e2e-tests/src/features/MultidelegationDelegatedFundsMultiplePoolsExtended.feature b/packages/e2e-tests/src/features/MultidelegationDelegatedFundsMultiplePoolsExtended.feature index 3a4ba32142..24b8de91ed 100644 --- a/packages/e2e-tests/src/features/MultidelegationDelegatedFundsMultiplePoolsExtended.feature +++ b/packages/e2e-tests/src/features/MultidelegationDelegatedFundsMultiplePoolsExtended.feature @@ -151,3 +151,32 @@ Feature: Staking Page - Delegated funds - Multiple pools - Extended View And I navigate to Staking extended page When I click on pool name in the first currently staking component Then I see stake pool details drawer for "AzureADA" stake pool opened from currently staked component + + @LW-4877 + Scenario: Extended View - Stake pool details - Enter and Escape buttons support + Given I am on Staking extended page + And I open Browse pools tab + And I switch to list view on "Browse pools" tab + And I input "APEX" to the search bar + And I click on the stake pool with ticker "APEX" + Then Drawer is displayed + When I press keyboard Enter button + Then I see Changing Staking Preferences modal + When I press keyboard Enter button + Then I see Manage delegation drawer + # When I press keyboard Enter button # TODO: update when LW-8625 is resolved + # Then I see Manage delegation drawer Confirmation page + # When I press keyboard Escape button # TODO: update when LW-8623 is resolved + # Then Staking exit modal is displayed + # When I press keyboard Escape button + # Then I see Manage delegation drawer Confirmation page + # When I press keyboard Enter button + # And I press keyboard Enter button + # Then staking password drawer is displayed + # When I press keyboard Escape button # TODO: update when LW-8623 is resolved + # Then Staking exit modal is displayed + # When I press keyboard Escape button + # Then staking password drawer is displayed + When I press keyboard Escape button + # When I press keyboard Enter button + Then Drawer is not displayed diff --git a/packages/e2e-tests/src/features/NFTsExtended.feature b/packages/e2e-tests/src/features/NFTsExtended.feature index b333619439..993f1aa3ae 100644 --- a/packages/e2e-tests/src/features/NFTsExtended.feature +++ b/packages/e2e-tests/src/features/NFTsExtended.feature @@ -57,7 +57,7 @@ Feature: LW-423: NFTs - Extended view Given I am on NFTs extended page When I click on a widget item with subtitle: "" Then I see a "" article with title "" - Examples: + Examples: | type | subtitle | | Glossary | What are collections? | | FAQ | How to buy an NFT? | diff --git a/packages/e2e-tests/src/features/NetworkSwitchingExtended.feature b/packages/e2e-tests/src/features/NetworkSwitchingExtended.feature index bdad0248e1..accdbc938c 100644 --- a/packages/e2e-tests/src/features/NetworkSwitchingExtended.feature +++ b/packages/e2e-tests/src/features/NetworkSwitchingExtended.feature @@ -1,8 +1,10 @@ -@NetworkSwitching-extended +@NetworkSwitching-extended @Testnet @Mainnet Feature: LW: Network Switching - extended view Background: Given Wallet is synced + And I disable showing Multidelegation beta banner + And I disable showing Multidelegation persistence banner @LW-3226 Scenario Outline: Extended View - Currency symbol is correct when on different network @@ -14,9 +16,7 @@ Feature: LW: Network Switching - extended view And I wait for the transaction history to be loaded and all transactions to be confirmed Then I see in the list of transactions When I navigate to Staking extended page - And I wait for stake pool list to be populated - Then I see in the cost column - And I see in current staked pool + Then I see in current staked pool When I click "Send" button on page header And I've entered accepted values for all fields of simple Tx Then I see in transaction fee diff --git a/packages/e2e-tests/src/features/NetworkSwitchingPopup.feature b/packages/e2e-tests/src/features/NetworkSwitchingPopup.feature index 6a49192dcc..ca21765086 100644 --- a/packages/e2e-tests/src/features/NetworkSwitchingPopup.feature +++ b/packages/e2e-tests/src/features/NetworkSwitchingPopup.feature @@ -1,4 +1,4 @@ -@NetworkSwitching-popup +@NetworkSwitching-popup @Testnet @Mainnet Feature: LW: Network Switching - popup view Background: diff --git a/packages/e2e-tests/src/features/StakingPageDelegatedFundsExtended.feature b/packages/e2e-tests/src/features/StakingPageDelegatedFundsExtended.feature deleted file mode 100644 index ef4de35a8c..0000000000 --- a/packages/e2e-tests/src/features/StakingPageDelegatedFundsExtended.feature +++ /dev/null @@ -1,25 +0,0 @@ -@Staking-DelegatedFunds-Extended @Testnet @Mainnet @Pending -Feature: Staking Page - Funds already delegated - Extended Browser View - - Background: - Given Wallet is synced - - @LW-4877 - Scenario: Extended View - Stake pool details - Enter and Escape buttons support - Given I am on Staking extended page - And I input "Apex" to the search bar - And I click stake pool with name "Apex Cardano Pool" - Then Drawer is displayed - When I press keyboard Enter button - Then An "browserView.staking.details.switchingPoolsModal.title" text is displayed - When I press keyboard Enter button - Then An "browserView.staking.details.confirmation.title" text is displayed - When I press keyboard Enter button - Then An "browserView.transaction.send.enterWalletPasswordToConfirmTransaction" text is displayed - When I press keyboard Escape button - Then An "browserView.staking.details.exitStakingModal.title" text is displayed - When I press keyboard Escape button - Then An "browserView.transaction.send.enterWalletPasswordToConfirmTransaction" text is displayed - When I press keyboard Escape button - When I press keyboard Enter button - Then Drawer is not displayed diff --git a/packages/e2e-tests/src/features/governance/CIP95StaticMethods.feature b/packages/e2e-tests/src/features/governance/CIP95StaticMethods.feature index 08f420309a..55cfcfba70 100644 --- a/packages/e2e-tests/src/features/governance/CIP95StaticMethods.feature +++ b/packages/e2e-tests/src/features/governance/CIP95StaticMethods.feature @@ -1,8 +1,8 @@ -@Staking-NonDelegatedFunds-Extended @Testnet +@CIP-95-Extended @Testnet Feature: CIP-95 Static methods @LW-10611 - Scenario: [CIP-95] Static methods - user hasn't staked yet + Scenario: CIP-95 - Static methods - user hasn't staked yet Given I open wallet: "TAWalletNonDelegated" in: extended mode When I open CIP-95 test DApp And I see CIP-95 test DApp authorization window diff --git a/packages/e2e-tests/src/hooks/beforeTagHooks.ts b/packages/e2e-tests/src/hooks/beforeTagHooks.ts index 3fea7d0ec9..f9ddd3b2dd 100644 --- a/packages/e2e-tests/src/hooks/beforeTagHooks.ts +++ b/packages/e2e-tests/src/hooks/beforeTagHooks.ts @@ -163,7 +163,7 @@ Before( async () => await extendedViewWalletInitialization(TestWalletName.TAWalletDelegatedFunds) ); -Before({ tags: '@Staking-NonDelegatedFunds-Extended' }, async () => { +Before({ tags: '@Staking-NonDelegatedFunds-Extended or @CIP-95-Extended' }, async () => { await extendedViewWalletInitialization(TestWalletName.TAWalletNonDelegatedFunds); await localStorageInitializer.disableShowingMultidelegationBetaBanner(); await localStorageInitializer.disableShowingMultidelegationDAppsIssueModal(); diff --git a/packages/e2e-tests/src/steps/commonSteps.ts b/packages/e2e-tests/src/steps/commonSteps.ts index 4c0c3a6ac2..3e7716b745 100755 --- a/packages/e2e-tests/src/steps/commonSteps.ts +++ b/packages/e2e-tests/src/steps/commonSteps.ts @@ -117,14 +117,6 @@ When(/^I close a toast message$/, async () => { await ToastMessage.clickCloseButton(); }); -// TODO: deprecated step, to be removed when remaining usages are replaced inside StakingPageDelegatedFundsExtended.feature -Then(/(An|No) "([^"]*)" text is displayed/, async (expectedResult: string, expectedText: string) => { - await $(`//*[contains(text(), "${(await t(expectedText)) ?? expectedText}")]`).waitForDisplayed({ - timeout: 5000, - reverse: expectedResult === 'No' - }); -}); - Then( /I see that content of "([^"]*)" (public key|address) is in clipboard/, async (walletName: string, walletProperty: string) => { diff --git a/packages/e2e-tests/src/steps/stakingSteps.ts b/packages/e2e-tests/src/steps/stakingSteps.ts index ba2382abc7..aa943fc7e8 100644 --- a/packages/e2e-tests/src/steps/stakingSteps.ts +++ b/packages/e2e-tests/src/steps/stakingSteps.ts @@ -54,10 +54,6 @@ Then( } ); -Then(/^I click pool name in currently staking component$/, async () => { - await StakingPageObject.clickPoolNameInStakingInfoComponent(); -}); - Then( /^(Initial|Switching) Delegation success screen is displayed in (extended|popup) mode$/, async (process: 'Initial' | 'Switching', mode: 'extended' | 'popup') => { diff --git a/packages/ui/src/design-system/profile-picture/user-profile.component.tsx b/packages/ui/src/design-system/profile-picture/user-profile.component.tsx index 68a6629abf..c5cc0b241d 100644 --- a/packages/ui/src/design-system/profile-picture/user-profile.component.tsx +++ b/packages/ui/src/design-system/profile-picture/user-profile.component.tsx @@ -39,7 +39,7 @@ export const UserProfile = ({ [cx.circle]: radius === 'circle', [cx.noBackground]: background === 'none', })} - data-testid={testId ?? 'avatar-root'} + data-testid={'avatar-root'} >