diff --git a/test/e2e/constants/wallet.py b/test/e2e/constants/wallet.py index 7b4b8c630d..2b54157306 100644 --- a/test/e2e/constants/wallet.py +++ b/test/e2e/constants/wallet.py @@ -73,7 +73,7 @@ class WalletOrigin(Enum): class WalletTransactions(Enum): - TRANSACTION_PENDING_TOAST_MESSAGE = 'Transaction pending' + TRANSACTION_SENDING_TOAST_MESSAGE = 'Sending' class WalletScreensHeaders(Enum): diff --git a/test/e2e/tests/crtitical_tests_prs/test_add_account_after_restart.py b/test/e2e/tests/crtitical_tests_prs/test_add_account_after_restart.py index a669a8399b..a2a3c7f17a 100644 --- a/test/e2e/tests/crtitical_tests_prs/test_add_account_after_restart.py +++ b/test/e2e/tests/crtitical_tests_prs/test_add_account_after_restart.py @@ -1,10 +1,12 @@ import time import allure +import pyperclip import pytest from allure import step from constants import RandomUser +from constants.wallet import WalletNetworkSettings from helpers.WalletHelper import authenticate_with_password from . import marks @@ -33,6 +35,18 @@ def test_add_generated_account_restart_add_again( color: str, emoji: str, emoji_unicode: str, name: str, color2: str, emoji2: str, emoji_unicode2: str, name2: str, ): + with step('Open wallet and choose default account'): + default_name = WalletNetworkSettings.STATUS_ACCOUNT_DEFAULT_NAME.value + wallet = main_screen.left_panel.open_wallet() + wallet_account = wallet.left_panel.select_account(default_name) + wallet.left_panel.copy_account_address_in_context_menu(default_name) + wallet_address = pyperclip.paste() + + with step('Check QR code and address in Receive modal from footer'): + receive_popup = wallet_account.open_receive_popup() + assert receive_popup.qr_code.is_visible, f'QR code is not present in Receive modal' + assert wallet_address == receive_popup.copy_address(), f'Addresses do not match' + with step('Add the first generated wallet account'): wallet = main_screen.left_panel.open_wallet() account_popup = wallet.left_panel.open_add_account_popup() diff --git a/test/e2e/tests/transactions_tests/test_buy_ens_name_in_settings.py b/test/e2e/tests/transactions_tests/test_buy_ens_name_in_settings.py index bf702553ac..0536613adf 100644 --- a/test/e2e/tests/transactions_tests/test_buy_ens_name_in_settings.py +++ b/test/e2e/tests/transactions_tests/test_buy_ens_name_in_settings.py @@ -56,7 +56,7 @@ def test_ens_name_purchase(main_window, user_account, ens_name): authenticate_with_password(user_account) with step('Verify toast message with Transaction pending appears'): - assert WalletTransactions.TRANSACTION_PENDING_TOAST_MESSAGE.value in ' '.join( + assert WalletTransactions.TRANSACTION_SENDING_TOAST_MESSAGE.value in ' '.join( main_window.wait_for_notification()) with step('Verify username registered view appears'): diff --git a/test/e2e/tests/transactions_tests/test_wallet_send_eth.py b/test/e2e/tests/transactions_tests/test_wallet_send_eth.py index 049fcecfff..8abe9c8905 100644 --- a/test/e2e/tests/transactions_tests/test_wallet_send_eth.py +++ b/test/e2e/tests/transactions_tests/test_wallet_send_eth.py @@ -38,5 +38,5 @@ def test_wallet_send_0_eth(main_window, user_account, receiver_account_address, authenticate_with_password(user_account) - assert WalletTransactions.TRANSACTION_PENDING_TOAST_MESSAGE.value in ' '.join( + assert WalletTransactions.TRANSACTION_SENDING_TOAST_MESSAGE.value + ' ' + str(amount) + ' ' + asset in ' '.join( main_window.wait_for_notification()) diff --git a/test/e2e/tests/transactions_tests/test_wallet_send_nft.py b/test/e2e/tests/transactions_tests/test_wallet_send_nft.py index 6e286a447e..b1bfe2eacb 100644 --- a/test/e2e/tests/transactions_tests/test_wallet_send_nft.py +++ b/test/e2e/tests/transactions_tests/test_wallet_send_nft.py @@ -31,5 +31,5 @@ def test_wallet_send_nft(main_window, user_account, receiver_account_address, am main_window, account_name=WalletNetworkSettings.STATUS_ACCOUNT_DEFAULT_NAME) send_popup.send(receiver_account_address, amount, asset) authenticate_with_password(user_account) - assert WalletTransactions.TRANSACTION_PENDING_TOAST_MESSAGE.value in ' '.join( + assert WalletTransactions.TRANSACTION_SENDING_TOAST_MESSAGE.value in ' '.join( main_window.wait_for_notification()) diff --git a/test/e2e/tests/wallet_main_screen/test_wallet_share_address_popup.py b/test/e2e/tests/wallet_main_screen/test_wallet_share_address_popup.py deleted file mode 100644 index 3d73d9efdc..0000000000 --- a/test/e2e/tests/wallet_main_screen/test_wallet_share_address_popup.py +++ /dev/null @@ -1,28 +0,0 @@ -import allure -import pyperclip -import pytest -from allure_commons._allure import step - -from constants.wallet import WalletNetworkSettings -from tests.settings.settings_keycard import marks - -from gui.components.signing_phrase_popup import SigningPhrasePopup -from gui.main_window import MainWindow - -pytestmark = marks - - -@allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/738783','Share your address') -@pytest.mark.case(738783) -def test_share_wallet_address(main_screen: MainWindow): - with step('Open wallet and choose default account'): - default_name = WalletNetworkSettings.STATUS_ACCOUNT_DEFAULT_NAME.value - wallet = main_screen.left_panel.open_wallet() - wallet_account = wallet.left_panel.select_account(default_name) - wallet.left_panel.copy_account_address_in_context_menu(default_name) - wallet_address = pyperclip.paste() - - with step('Check QR code and address in Receive modal from footer'): - receive_popup = wallet_account.open_receive_popup() - assert receive_popup.qr_code.is_visible, f'QR code is not present in Receive modal' - assert wallet_address == receive_popup.copy_address(), f'Addresses do not match'