chore(@e2e): create smoke run

test/e2e/gui/screens/settings_messaging.py

@@ -113,7 +113,7 @@ class ContactsSettingsView(QObject):
         self._pending_request_received_panel = QObject(
             settings_names.settingsContentBaseScrollView_receivedRequests_ContactsListPanel)
         self._contacts_panel = QObject(settings_names.settingsContentBaseScrollView_mutualContacts_ContactsListPanel)
-        self._invite_friends_button = QObject(settings_names.settingsContentBaseScrollView_Invite_friends_StatusButton)
+        self.invite_friends_button = QObject(settings_names.settingsContentBaseScrollView_Invite_friends_StatusButton)
         self._no_friends_item = QObject(settings_names.settingsContentBaseScrollView_NoFriendsRectangle)
         # more options on contact
         self._verify_identity_item = QObject(settings_names.verify_Identity_StatusMenuItem)
@@ -156,11 +156,6 @@ class ContactsSettingsView(QObject):
     def no_friends_item_text(self) -> str:
         return self._no_friends_item.object.text
 
-    @property
-    @allure.step('Get state of invite friends button')
-    def is_invite_friends_button_visible(self) -> bool:
-        return self._invite_friends_button.is_visible
-
     @allure.step('Open pending requests tab')
     def open_pending_requests(self):
         self._pending_request_tab.click()

test/e2e/pytest.ini

@@ -9,6 +9,7 @@ addopts = --disable-warnings -p no:logging
 
 markers =
     critical: Critical checks for every PR
+    smoke: Tests that we use for release smoke checks
     settings_all: All tests related to the settings
     settings_keycard: Tests related to Keycard settings
     settings_messaging: Tests related to messaging settings

test/e2e/tests/communities/__init__.py

@@ -1,3 +1 @@
-import pytest
 
-marks = pytest.mark.communities

test/e2e/tests/communities/test_communities_categories.py

@@ -10,15 +10,13 @@ from helpers.SettingsHelper import enable_community_creation
 from tests import test_data
 from gui.components.context_menu import ContextMenu
 from gui.main_window import MainWindow
-from . import marks
-
-pytestmark = marks
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703272', 'Member role cannot add category')
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703273', 'Member role cannot edit category')
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703274', 'Member role cannot remove category')
 @pytest.mark.case(703272, 703273, 703274)
+@pytest.mark.communities
 @pytest.mark.parametrize('user_data', [configs.testpath.TEST_USER_DATA / 'squisher'])
 @pytest.mark.parametrize('user_account', [constants.user.user_account_one])
 def test_member_role_cannot_add_edit_or_delete_category(main_screen: MainWindow):
@@ -53,7 +51,6 @@ def test_member_role_cannot_add_edit_or_delete_category(main_screen: MainWindow)
 @pytest.mark.parametrize('category_name, general_checkbox',
                          [pytest.param('Category in general', True)])
 def test_clicking_community_category(main_screen: MainWindow, category_name, general_checkbox):
-
     enable_community_creation(main_screen)
 
     with step('Create community and select it'):

test/e2e/tests/communities/test_communities_channels.py

@@ -15,15 +15,13 @@ from gui.main_window import MainWindow
 from gui.screens.messages import MessagesScreen
 from helpers.SettingsHelper import enable_community_creation
 from scripts.utils.parsers import remove_tags
-from . import marks
-
-pytestmark = marks
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703049', 'Create community channel')
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703050', 'Edit community channel')
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703051', 'Delete community channel')
 @pytest.mark.case(703049, 703050, 703051)
+@pytest.mark.communities
 @pytest.mark.parametrize(
     'channel_name, channel_description, channel_emoji, channel_emoji_image, channel_color, new_channel_name, '
     'new_channel_description, new_channel_emoji',

test/e2e/tests/communities/test_communities_kick_ban.py

@@ -11,18 +11,15 @@ from gui.screens.community import Members
 from gui.screens.messages import MessagesScreen
 from helpers.SettingsHelper import enable_community_creation
 from scripts.utils.generators import random_text_message
-from . import marks
-
 import configs.testpath
 from gui.main_window import MainWindow
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703252', 'Kick user')
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703254', 'Edit chat - Delete any message')
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/736991', 'Owner can ban member')
 @pytest.mark.case(703252, 703252, 736991)
+@pytest.mark.communities
 @pytest.mark.skip(reason='Not possible to get floating buttons on hover for list item')
 def test_community_admin_ban_kick_member_and_delete_message(multiple_instances):
     user_one: UserAccount = RandomUser()

test/e2e/tests/communities/test_communities_limit_to_5_permissions.py

@@ -3,20 +3,17 @@ import pytest
 from allure_commons._allure import step
 
 import configs
-import constants
 import driver
 from constants import permission_data_member, RandomCommunity
 from constants.community import LimitWarnings
 from gui.main_window import MainWindow
 from helpers.SettingsHelper import enable_community_creation
-from . import marks
-
-pytestmark = marks
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/739309',
                  'Can create up to 5 member role permissions')
 @pytest.mark.case(739309)
+@pytest.mark.communities
 def test_add_5_member_role_permissions(main_screen: MainWindow):
     enable_community_creation(main_screen)
 

test/e2e/tests/communities/test_communities_pin_and_unpin_messages.py

@@ -9,21 +9,20 @@ from gui.components.community.pinned_messages_popup import PinnedMessagesPopup
 from gui.main_window import MainWindow
 from helpers.SettingsHelper import enable_community_creation
 from scripts.utils.generators import random_text_message
-from . import marks
 import configs
 from constants import ColorCodes, UserAccount, RandomUser, RandomCommunity
 from gui.screens.community_settings import CommunitySettingsScreen
 from gui.screens.messages import MessagesScreen
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703255',
                  'Edit chat - Add pinned message (when any member can pin is disabled)')
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703256',
                  'Edit chat - Remove pinned message (when any member can pin is disabled)')
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703510', 'Join community via owner invite')
-@pytest.mark.case(703255, 703256, 703510)
+@pytest.mark.case(703255, 703256, 703510, 738743, 738754, 738798, 738799)
+@pytest.mark.communities
+@pytest.mark.smoke
 def test_join_community_and_pin_unpin_message(multiple_instances):
     user_one: UserAccount = RandomUser()
     user_two: UserAccount = RandomUser()

test/e2e/tests/communities/test_communities_screens_overview.py

@@ -4,14 +4,11 @@ from allure_commons._allure import step
 
 from constants import RandomCommunity
 from helpers.SettingsHelper import enable_community_creation
-from . import marks
 
 from constants.community import AirdropsElements, TokensElements, PermissionsElements
 from constants.images_paths import AIRDROPS_WELCOME_IMAGE_PATH, TOKENS_WELCOME_IMAGE_PATH, PERMISSION_WELCOME_IMAGE_PATH
 from gui.main_window import MainWindow
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703198',
                  'Manage community: Manage Permissions screen overview')

test/e2e/tests/communities/test_communities_send_accept_decline_request_from_profile.py

@@ -8,16 +8,15 @@ from gui.components.remove_contact_popup import RemoveContactPopup
 from gui.main_window import MainWindow
 from helpers.SettingsHelper import enable_community_creation
 from scripts.utils.generators import random_text_message
-from . import marks
 import configs
 from constants import UserAccount, RandomUser, RandomCommunity
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/736170',
                  "Add a contact from community's member list")
-@pytest.mark.case(736170)
+@pytest.mark.case(736170, 738776, 738777)
+@pytest.mark.smoke
+@pytest.mark.communities
 def test_communities_send_accept_decline_request_remove_contact_from_profile(multiple_instances):
     user_one: UserAccount = RandomUser()
     user_two: UserAccount = RandomUser()
@@ -52,7 +51,8 @@ def test_communities_send_accept_decline_request_remove_contact_from_profile(mul
             contact_request_popup.send(chat_key, f'Hello {user_two.name}')
             main_screen.hide()
 
-        with step(f'User {user_two.name}, accept contact request from {user_one.name} and send contact request to {user_three.name} '):
+        with step(
+                f'User {user_two.name}, accept contact request from {user_one.name} and send contact request to {user_three.name} '):
             aut_two.attach()
             main_screen.prepare()
             settings = main_screen.left_panel.open_settings()
@@ -133,14 +133,16 @@ def test_communities_send_accept_decline_request_remove_contact_from_profile(mul
             assert driver.waitFor(lambda: not community_screen.left_panel.is_join_community_visible,
                                   configs.timeouts.UI_LOAD_TIMEOUT_MSEC), 'Join community button not hidden'
 
-        with step(f'User {user_one.name} send contact request to {user_three.name} from user profile from members list'):
+        with step(
+                f'User {user_one.name} send contact request to {user_three.name} from user profile from members list'):
             community_screen = main_screen.left_panel.select_community(community.name)
             profile_popup = community_screen.right_panel.click_member(user_three.name)
             profile_popup.send_request().send(f'Hello {user_three.name}')
             ProfilePopupFromMembers().wait_until_appears()
             main_screen.hide()
 
-        with step(f'User {user_three.name}, accept contact request from {user_one.name} from user profile from members list'):
+        with step(
+                f'User {user_three.name}, accept contact request from {user_one.name} from user profile from members list'):
             aut_three.attach()
             main_screen.prepare()
             community_screen = main_screen.left_panel.select_community(community.name)

test/e2e/tests/crtitical_tests_prs/__init__.py

@@ -1,3 +0,0 @@
-import pytest
-
-marks = pytest.mark.critical

test/e2e/tests/crtitical_tests_prs/test_add_account_after_restart.py

@@ -5,22 +5,18 @@ 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
 
 import constants
 from driver.aut import AUT
 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/704459',
                  'User can add  one more account after restarting the app')
-@pytest.mark.case(704459)
+@pytest.mark.case(704459, 738724, 738782, 738786)
 @pytest.mark.parametrize('name, color, emoji, emoji_unicode,',
                          [
                              pytest.param('GenAcc1', '#2a4af5', 'sunglasses', '1f60e')
@@ -30,6 +26,7 @@ pytestmark = marks
                              pytest.param('GenAcc2', '#2a4af5', 'sunglasses', '1f60e')
                          ])
 @pytest.mark.critical
+@pytest.mark.smoke
 def test_add_generated_account_restart_add_again(
         aut: AUT, main_screen: MainWindow, user_account,
         color: str, emoji: str, emoji_unicode: str, name: str,

test/e2e/tests/crtitical_tests_prs/test_add_delete_account_from_settings.py

@@ -5,18 +5,13 @@ import allure
 import pytest
 from allure_commons._allure import step
 
-from constants import RandomUser
 from helpers.WalletHelper import authenticate_with_password
-from . import marks
 
 import driver
 from constants.wallet import WalletAccountSettings, DerivationPathValue
-from gui.components.signing_phrase_popup import SigningPhrasePopup
 from gui.main_window import MainWindow
 from gui.screens.settings_wallet import WalletSettingsView
 
-pytestmark = marks
-
 
 @pytest.mark.critical
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704454',

test/e2e/tests/crtitical_tests_prs/test_add_edit_delete_generated_account.py

@@ -4,17 +4,12 @@ import allure
 import pytest
 from allure_commons._allure import step
 
-from constants import RandomUser
 from helpers.WalletHelper import authenticate_with_password
 from scripts.utils.generators import random_wallet_acc_keypair_name
 
 import constants
 import driver
-from gui.components.signing_phrase_popup import SigningPhrasePopup
 from gui.main_window import MainWindow
-from . import marks
-
-pytestmark = marks
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703033', 'Manage a generated account')

test/e2e/tests/crtitical_tests_prs/test_community_category_add_edit_delete.py

@@ -2,13 +2,9 @@ import allure
 import pytest
 from allure_commons._allure import step
 
-import constants
 from constants import RandomCommunity
 from gui.main_window import MainWindow
 from helpers.SettingsHelper import enable_community_creation
-from . import marks
-
-pytestmark = marks
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703226', 'Add category')

test/e2e/tests/crtitical_tests_prs/test_community_create_edit_share_link.py

@@ -8,17 +8,15 @@ from helpers.SettingsHelper import enable_community_creation
 from scripts.utils.browser import get_response, get_page_content
 from scripts.utils.generators import random_community_name, random_community_description, random_community_introduction, \
     random_community_leave_message
-from . import marks
 
 import configs.testpath
 from gui.main_window import MainWindow
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703057', 'Edit community')
-@pytest.mark.case(703057)
+@pytest.mark.case(703057, 738790, 738751)
 @pytest.mark.critical
+@pytest.mark.smoke
 def test_create_edit_community(main_screen: MainWindow):
     enable_community_creation(main_screen)
 

test/e2e/tests/crtitical_tests_prs/test_community_permissions_add_edit_delete_duplicate.py

@@ -5,18 +5,14 @@ import pytest
 from allure_commons._allure import step
 
 import configs
-import constants
 import driver
 from constants import permission_data, RandomCommunity
 from constants.community import ToastMessages, PermissionsElements
 from gui.components.changes_detected_popup import PermissionsChangesDetectedToastMessage
-from gui.components.delete_popup import DeletePermissionPopup
 from gui.main_window import MainWindow
 from gui.screens.community_settings import PermissionsIntroView
 from helpers.SettingsHelper import enable_community_creation
-from . import marks
 
-pytestmark = marks
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703632',

test/e2e/tests/crtitical_tests_prs/test_messaging_1x1_chat.py

@@ -18,14 +18,12 @@ from constants import RandomUser, UserAccount
 from gui.main_window import MainWindow
 from scripts.utils.generators import random_text_message
 from scripts.utils.parsers import remove_tags
-from . import marks
-
-pytestmark = marks
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703087', '1-1 Chat')
-@pytest.mark.case(703087)
+@pytest.mark.case(703087, 738732, 738734, 738742, 738744, 738745)
 @pytest.mark.critical
+@pytest.mark.smoke
 def test_1x1_chat_add_contact_in_settings(multiple_instances):
     user_one: UserAccount = RandomUser()
     user_two: UserAccount = RandomUser()
@@ -260,4 +258,4 @@ def test_1x1_chat_add_contact_in_settings(multiple_instances):
             main_window.prepare()
             assert driver.waitFor(lambda: user_two.name in messages_screen.left_panel.get_chats_names,
                                   timeout), f'{chat} is present in chats list'
-            main_window.hide()
+            main_window.hide()

test/e2e/tests/crtitical_tests_prs/test_messaging_group_chat.py

@@ -14,18 +14,17 @@ from constants.messaging import Messaging
 from gui.main_window import MainWindow
 from gui.screens.messages import MessagesScreen, ToolBar
 from scripts.utils.generators import random_text_message
-from . import marks
-
-pytestmark = marks
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703014', 'Create a group and send messages')
-@pytest.mark.case(703014)
+@pytest.mark.case(703014, 738735, 738736, 738739, 738740)
 @pytest.mark.timeout(timeout=315)
 @pytest.mark.critical
+@pytest.mark.smoke
 @pytest.mark.parametrize('community_name, domain_link, domain_link_2',
                          [pytest.param('Status', 'status.app', 'github.com')
                           ])
+# TODO: add clearing chat history action
 def test_group_chat_add_contact_in_ac(multiple_instances, community_name, domain_link, domain_link_2):
     user_one: UserAccount = RandomUser()
     user_two: UserAccount = RandomUser()
@@ -214,7 +213,9 @@ def test_group_chat_add_contact_in_ac(multiple_instances, community_name, domain
                 messages_screen.group_chat.type_message(message)
 
             with step('Wait until link preview is ready'):
-                assert driver.waitFor(lambda: domain_link_2 == messages_screen.group_chat.get_link_preview_bubble_description(), configs.timeouts.UI_LOAD_TIMEOUT_MSEC)
+                assert driver.waitFor(
+                    lambda: domain_link_2 == messages_screen.group_chat.get_link_preview_bubble_description(),
+                    configs.timeouts.UI_LOAD_TIMEOUT_MSEC)
 
             with step(f'Paste image to the same message'):
                 messages_screen.group_chat.choose_image(str(path))

test/e2e/tests/crtitical_tests_prs/test_onboarding_generate_account_back_up_seed.py

@@ -6,10 +6,8 @@ from allure import step
 
 import constants
 import driver
-from constants import RandomUser
 from gui.components.back_up_your_seed_phrase_banner import BackUpSeedPhraseBanner
 from gui.components.signing_phrase_popup import SigningPhrasePopup
-from . import marks
 
 import configs.timeouts
 from gui.components.onboarding.before_started_popup import BeforeStartedPopUp
@@ -19,13 +17,12 @@ from gui.components.splash_screen import SplashScreen
 from gui.screens.onboarding import WelcomeToStatusView, BiometricsView, \
     YourEmojihashAndIdenticonRingView
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703421', 'Generate new keys')
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703010', 'Settings - Sign out & Quit')
-@pytest.mark.case(703421, 703010)
+@pytest.mark.case(703421, 703010, 738725, 738758, 738771)
 @pytest.mark.critical  # TODO 'https://github.com/status-im/status-desktop/issues/13013'
+@pytest.mark.smoke
 @pytest.mark.parametrize('user_image, zoom, shift', [
     pytest.param(
         random.choice(['sample_JPEG_1920×1280.jpeg', 'file_example_PNG_3MB.png', 'file_example_JPG_2500kB.jpg']
@@ -124,7 +121,7 @@ def test_generate_account_back_up_seed_sign_out(aut, main_window, user_account,
     with step('Open share profile popup and check the data'):
         share_profile_popup = profile_popup.share_profile()
         profile_link = share_profile_popup.get_profile_link()
-        assert share_profile_popup.is_profile_qr_code_visibile
+        assert share_profile_popup.is_profile_qr_code_visibile, f'QR code is not displayed'
         assert chat_key in profile_link, f'Profile link is wrong {profile_link}, it does not contain correct chat key'
         share_profile_popup.close()
 

test/e2e/tests/crtitical_tests_prs/test_onboarding_import_seed.py

@@ -2,25 +2,23 @@ import allure
 import pytest
 from allure_commons._allure import step
 
-from constants import RandomUser
 from constants.onboarding import KeysExistText
 from constants.wallet import WalletNetworkSettings
 from driver.aut import AUT
 from helpers.OnboardingHelper import open_generate_new_keys_view, open_import_seed_view_and_do_import, \
     finalize_onboarding_and_login
 from scripts.utils.generators import random_mnemonic, get_wallet_address_from_mnemonic
-from . import marks
 
 from gui.main_window import LeftPanel
 from gui.screens.onboarding import LoginView
 
-pytestmark = marks
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703040', 'Import: 12 word seed phrase')
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/736372', 'Re-importing seed-phrase')
-@pytest.mark.case(703040, 736372)
+@pytest.mark.case(703040, 736372, 738726)
 @pytest.mark.critical
+@pytest.mark.smoke
 def test_import_and_reimport_random_seed(main_window, aut: AUT, user_account):
 
     keys_screen = open_generate_new_keys_view()

test/e2e/tests/crtitical_tests_prs/test_onboarding_sync_with_code.py

@@ -4,7 +4,6 @@ import pytest
 from allure_commons._allure import step
 
 from gui.components.signing_phrase_popup import SigningPhrasePopup
-from . import marks
 
 import configs.testpath
 import driver
@@ -16,12 +15,11 @@ from gui.main_window import MainWindow
 from gui.screens.onboarding import AllowNotificationsView, WelcomeToStatusView, SyncResultView, SyncDeviceFoundView, \
     YourEmojihashAndIdenticonRingView
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703592', 'Sync device during onboarding')
-@pytest.mark.case(703592)
+@pytest.mark.case(703592, 738760)
 @pytest.mark.critical
+@pytest.mark.smoke
 def test_sync_device_during_onboarding(multiple_instances):
     user: UserAccount = RandomUser()
     main_window = MainWindow()

test/e2e/tests/crtitical_tests_prs/test_settings_password_change_password.py

@@ -5,13 +5,10 @@ from allure_commons._allure import step
 from constants import UserAccount
 from scripts.utils.generators import random_password_string
 from gui.components.change_password_popup import ChangePasswordPopup
-from tests.settings.settings_profile import marks
 
 from driver.aut import AUT
 from gui.main_window import MainWindow
 
-pytestmark = marks
-
 
 @pytest.mark.timeout(timeout=180)
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703005',

test/e2e/tests/crtitical_tests_prs/test_wallet_settings_saved_addresses_add.py

@@ -5,14 +5,11 @@ import allure
 import pytest
 from allure_commons._allure import step
 
-from . import marks
 
 import configs
 import driver
 from gui.main_window import MainWindow
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704620',
                  'Saved addresses: Add new saved address (ethereum address)')
@@ -22,8 +19,9 @@ pytestmark = marks
                                  ''.join(random.choices(string.ascii_letters, k=24)),
                                  '0x8397bc3c5a60a1883174f722403d63a8833312b7')
                          ])
-@pytest.mark.case(704620)
+@pytest.mark.case(704620, 738787)
 @pytest.mark.critical
+@pytest.mark.smoke
 def test_wallet_settings_add_saved_address(main_screen: MainWindow, address: str, name: str):
     with (step('Open wallet settings - Saved addresses section')):
         settings_saved_addresses = \

test/e2e/tests/settings/settings_messaging/__init__.py

@@ -1,4 +1 @@
-import pytest
-from .. import marks
 
-marks = [pytest.mark.settings_messaging, marks]

test/e2e/tests/settings/settings_messaging/test_block_unblock_user.py

@@ -2,36 +2,31 @@ import allure
 import pytest
 from allure_commons._allure import step
 
-import constants
 import driver
 from constants import UserAccount, RandomUser
 from constants.community import BlockPopupWarnings, ToastMessages
 from gui.main_window import MainWindow
 import configs
 from gui.screens.messages import ToolBar
-from gui.screens.settings_messaging import ContactItem
-from tests.communities import marks
-
-pytestmark = marks
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/738772',
                  "Block or unblock someone in Status")
-@pytest.mark.case(738772)
+@pytest.mark.case(738772, 738772)
+@pytest.mark.smoke
+@pytest.mark.settings_messaging
+# TODO: add step when blocked user sends a message
 def test_block_and_unblock_user_from_settings_and_profile(multiple_instances):
     user_one: UserAccount = RandomUser()
     user_two: UserAccount = RandomUser()
-    user_three: UserAccount = RandomUser()
     timeout = configs.timeouts.UI_LOAD_TIMEOUT_MSEC
     main_screen = MainWindow()
 
     with \
             multiple_instances(user_data=None) as aut_one, \
-            multiple_instances(user_data=None) as aut_two, \
+            multiple_instances(user_data=None) as aut_two:
-            multiple_instances(user_data=None) as aut_three:
+        with step(f'Launch multiple instances with new users {user_one.name}, {user_two.name}'):
-
+            for aut, account in zip([aut_one, aut_two], [user_one, user_two]):
-        with step(f'Launch multiple instances with new users {user_one.name}, {user_two.name}, {user_three.name}'):
-            for aut, account in zip([aut_one, aut_two, aut_three], [user_one, user_two, user_three]):
                 aut.attach()
                 main_screen.wait_until_appears(configs.timeouts.APP_LOAD_TIMEOUT_MSEC).prepare()
                 main_screen.authorize_user(account)
@@ -62,39 +57,14 @@ def test_block_and_unblock_user_from_settings_and_profile(multiple_instances):
                 main_screen.left_panel.click()
                 main_screen.hide()
 
-            with step(f'User {user_three.name}, get chat key'):
-                aut_three.attach()
-                main_screen.prepare()
-                profile_popup = main_screen.left_panel.open_online_identifier().open_profile_popup_from_online_identifier()
-                user_3_chat_key = profile_popup.copy_chat_key
-                profile_popup.close()
-                main_screen.hide()
-
-            with step(f'User {user_two.name}, send contact request to {user_three.name}'):
-                aut_two.attach()
-                main_screen.prepare()
-                settings = main_screen.left_panel.open_settings()
-                contact_request_form = settings.left_panel.open_messaging_settings().open_contacts_settings().open_contact_request_form()
-                contact_request_form.send(user_3_chat_key, f'Hello {user_three.name}')
-                main_screen.hide()
-
-            with step(f'User {user_three.name}, accept contact request from {user_two.name} via activity center'):
-                aut_three.attach()
-                main_screen.prepare()
-                activity_center = ToolBar().open_activity_center()
-                request = activity_center.find_contact_request_in_list(user_two.name, timeout)
-                activity_center.click_activity_center_button(
-                    'Contact requests').accept_contact_request(request)
-                main_screen.left_panel.click()
-                main_screen.hide()
-
         with step(
                 f'User {user_one.name}, block contact {user_two.name} from user profile and verify button Block '
                 f'appeared'):
             aut_one.attach()
             main_screen.prepare()
             contacts_settings = main_screen.left_panel.open_settings().left_panel.open_messaging_settings().open_contacts_settings()
-            assert driver.waitFor(lambda: user_two.name in [str(contact) for contact in contacts_settings.contact_items], timeout)
+            assert driver.waitFor(
+                lambda: user_two.name in [str(contact) for contact in contacts_settings.contact_items], timeout)
             block_popup = contacts_settings.open_contacts().open_more_options_popup(user_two.name).block_user()
             warning_text = BlockPopupWarnings.BLOCK_WARNING_PART_1.value + user_two.name + BlockPopupWarnings.BLOCK_WARNING_PART_2.value
             assert driver.waitFor(lambda: block_popup.get_warning_text() == warning_text,
@@ -115,7 +85,7 @@ def test_block_and_unblock_user_from_settings_and_profile(multiple_instances):
             aut_two.attach()
             main_screen.prepare()
             contacts_settings = main_screen.left_panel.open_settings().left_panel.open_messaging_settings().open_contacts_settings()
-            assert driver.waitFor(lambda: user_one.name not in [str(contact) for contact in contacts_settings.contact_items], timeout)
+            assert contacts_settings.invite_friends_button.is_visible
             main_screen.hide()
 
         with step(

test/e2e/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py

@@ -3,21 +3,17 @@ import time
 import allure
 import pytest
 from allure_commons._allure import step
-from . import marks
 
 import configs.testpath
-import constants
+from constants import RandomUser
-from constants import UserAccount, RandomUser
-from scripts.utils.generators import random_name_string, random_password_string
 from constants.messaging import Messaging
 from gui.main_window import MainWindow
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704611', 'Reply to identity request')
 @pytest.mark.case(704611)
 @pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/14954")
+@pytest.mark.settings_messaging
 def test_messaging_settings_identity_verification(multiple_instances):
     user_one: RandomUser()
     user_two: RandomUser()

test/e2e/tests/settings/settings_messaging/test_messaging_settings_reject_request.py

@@ -4,16 +4,14 @@ import configs.timeouts
 import pytest
 from allure_commons._allure import step
 from constants import UserAccount, RandomUser
-from . import marks
 from constants.messaging import Messaging
 from gui.main_window import MainWindow
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704610',
                  'Reject a contact request with a chat key')
 @pytest.mark.case(704610)
+@pytest.mark.settings_messaging
 def test_messaging_settings_rejecting_request(multiple_instances):
     user_one: UserAccount = RandomUser()
     user_two: UserAccount = RandomUser()
@@ -60,7 +58,7 @@ def test_messaging_settings_rejecting_request(multiple_instances):
             contacts_settings = main_window.left_panel.open_settings().left_panel.open_messaging_settings().open_contacts_settings()
             contacts_settings.open_contacts()
             assert str(contacts_settings.no_friends_item_text) == Messaging.NO_FRIENDS_ITEM.value
-            assert contacts_settings.is_invite_friends_button_visible
+            assert contacts_settings.invite_friends_button.is_visible
             main_window.hide()
 
         with step(f'Verify that contacts list of {user_one.name} is empty in messaging settings'):
@@ -69,4 +67,4 @@ def test_messaging_settings_rejecting_request(multiple_instances):
             contacts_settings = main_window.left_panel.open_settings().left_panel.open_messaging_settings().open_contacts_settings()
             contacts_settings.open_contacts()
             assert str(contacts_settings.no_friends_item_text) == Messaging.NO_FRIENDS_ITEM.value
-            assert contacts_settings.is_invite_friends_button_visible
+            assert contacts_settings.invite_friends_button.is_visible

test/e2e/tests/settings/settings_profile/test_settings_profile_edit.py

@@ -16,8 +16,10 @@ pytestmark = marks
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703006',
                  'Set display name, bio and social links')
-@pytest.mark.case(703006)
+@pytest.mark.case(703006, 738755)
 @pytest.mark.parametrize('bio, links', [pytest.param('This is my bio', constants.social_links)])
+@pytest.mark.smoke
+# TODO: add clicking Preview button and check data there
 def test_set_name_bio_social_links(main_screen: MainWindow, aut: AUT, user_account, bio, links):
     with step('Open profile settings and check name, bio and links'):
         profile_settings = main_screen.left_panel.open_settings().left_panel.open_profile_settings()

test/e2e/tests/settings/settings_wallet/__init__.py

@@ -1,4 +1 @@
-import pytest
-from .. import marks
 
-marks = [pytest.mark.settings_wallet, marks]

test/e2e/tests/settings/settings_wallet/test_wallet_rename_keypair.py

@@ -8,14 +8,10 @@ from allure_commons._allure import step
 from constants.wallet import WalletRenameKeypair, WalletAccountPopup
 from helpers.WalletHelper import authenticate_with_password
 from scripts.utils.generators import random_wallet_acc_keypair_name
-from tests.wallet_main_screen import marks
 
 import constants
-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/703420',
                  'Wallet -> Settings -> Keypair interactions: Rename keypair')

test/e2e/tests/settings/settings_wallet/test_wallet_settings_account_order.py

@@ -3,14 +3,11 @@ import pytest
 from allure_commons._allure import step
 
 from helpers.WalletHelper import authenticate_with_password
-from . import marks
 
 import configs
 import driver
-from gui.components.signing_phrase_popup import SigningPhrasePopup
 from gui.main_window import MainWindow
 
-pytestmark = marks
 
 
 def _verify_account_order(account_order, main_screen, default_name, order):

test/e2e/tests/settings/settings_wallet/test_wallet_settings_acct_interactions_edit_status_account.py

@@ -4,18 +4,16 @@ import string
 import allure
 import pytest
 from allure_commons._allure import step
-from . import marks
 
 from constants.wallet import WalletNetworkSettings, WalletAccountSettings, DerivationPathValue
 from gui.main_window import MainWindow
 from gui.screens.settings import SettingsScreen
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704433',
                  'Account view interactions: Edit Status default account')
-@pytest.mark.case(704433)
+@pytest.mark.case(704433, 738789)
+@pytest.mark.smoke
 @pytest.mark.parametrize('new_name', [
     pytest.param(''.join(random.choices(string.ascii_letters +
                                         string.digits, k=20)))

test/e2e/tests/settings/settings_wallet/test_wallet_settings_add_account.py

@@ -8,14 +8,10 @@ from allure_commons._allure import step
 
 from helpers.WalletHelper import authenticate_with_password
 from constants.wallet import WalletAccountPopup
-from . import marks
 
 import constants
-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/edit/703598',
                  'Add new account from wallet settings screen')

test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_edit_network.py

@@ -1,7 +1,6 @@
 import allure
 import pytest
 from allure_commons._allure import step
-from . import marks
 
 import driver
 
@@ -9,8 +8,6 @@ from constants.wallet import WalletNetworkNaming, WalletEditNetworkErrorMessages
 
 from gui.main_window import MainWindow
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703515',
                  'Network:  Network: Editing network -> Restore defaults')

test/e2e/tests/settings/settings_wallet/test_wallet_settings_networks_testnet_mode.py

@@ -1,7 +1,6 @@
 import allure
 import pytest
 from allure import step
-from . import marks
 
 import configs.system
 from constants.wallet import WalletNetworkSettings, WalletNetworkNaming
@@ -9,8 +8,6 @@ from gui.components.wallet.testnet_mode_banner import TestnetModeBanner
 from gui.components.toast_message import ToastMessage
 from gui.main_window import MainWindow
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703505', 'Network: Testnet switching')
 @pytest.mark.case(703505)

test/e2e/tests/settings/settings_wallet/test_wallet_settings_watched_addr_include_in_total_balance.py

@@ -5,18 +5,13 @@ import allure
 import pytest
 from allure_commons._allure import step
 
-from configs import testpath
-from . import marks
 
 import configs
 import driver
 from constants.wallet import WalletAccountSettings
-from gui.components.signing_phrase_popup import SigningPhrasePopup
 from gui.main_window import MainWindow
 from gui.screens.settings_wallet import WalletSettingsView
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703508',
                  'Watched addresses: Excl. / Include in total balance functionality for watched address')

test/e2e/tests/transactions_tests/__init__.py

@@ -1,3 +0,0 @@
-import pytest
-
-marks = pytest.mark.transaction

test/e2e/tests/transactions_tests/test_buy_ens_name_in_settings.py

@@ -13,12 +13,9 @@ from helpers.SettingsHelper import enable_testnet_mode
 from helpers.WalletHelper import authenticate_with_password
 from scripts.utils.generators import random_ens_string
 from constants.wallet import WalletTransactions
-from tests.settings import marks
 from gui.components.wallet.send_popup import SendPopup
 from gui.screens.settings_ens_usernames import ENSRegisteredView
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704597',
                  'Settings -> ENS usernames: buy ENS name on testnet')

test/e2e/tests/transactions_tests/test_mint_owner_and_tokenmaster_tokens.py

@@ -6,19 +6,15 @@ import pytest
 from allure_commons._allure import step
 
 import configs
-import constants
 import driver
 from configs import WALLET_SEED
 from constants import ReturningUser, RandomCommunity
 from helpers.OnboardingHelper import open_generate_new_keys_view, open_import_seed_view_and_do_import, \
     finalize_onboarding_and_login
 from helpers.SettingsHelper import enable_testnet_mode, enable_community_creation
-from tests.communities import marks
 from constants.community import MintOwnerTokensElements
 from gui.screens.community_settings_tokens import MintedTokensView
 
-pytestmark = marks
-
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/727245', 'Mint owner token')
 @pytest.mark.case(727245)

test/e2e/tests/transactions_tests/test_wallet_send_eth.py

@@ -14,8 +14,9 @@ from helpers.WalletHelper import authenticate_with_password, open_send_modal_for
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/704527',
                  'Send: can send 0 ETH to address pasted into receiver field with Simple flow')
-@pytest.mark.case(704527)
+@pytest.mark.case(704527, 738784)
 @pytest.mark.transaction
+@pytest.mark.smoke
 @pytest.mark.parametrize('receiver_account_address, amount, asset, collectible', [
     pytest.param(WalletAddress.RECEIVER_ADDRESS.value, 0, 'ETH', '')
 ])

test/e2e/tests/wallet_main_screen/wallet - plus button/test_plus_button_add_watched_address.py

@@ -6,7 +6,6 @@ from allure_commons._allure import step
 from tests.wallet_main_screen import marks
 
 import constants
-from gui.components.signing_phrase_popup import SigningPhrasePopup
 from gui.components.authenticate_popup import AuthenticatePopup
 from gui.main_window import MainWindow
 
@@ -14,8 +13,10 @@ pytestmark = marks
 
 
 @allure.testcase('https://ethstatus.testrail.net/index.php?/cases/view/703026', 'Manage a watch-only account')
-@pytest.mark.case(703026)
+@pytest.mark.case(703026, 738788, 738815)
+@pytest.mark.smoke
 @pytest.mark.skip(reason="https://github.com/status-im/status-desktop/issues/15933")
+# TODO: to add a step of account removal
 @pytest.mark.parametrize('address, name, color, emoji, emoji_unicode', [
     pytest.param('0xea123F7beFF45E3C9fdF54B324c29DBdA14a639A', 'AccWatch1', '#2a4af5',
                  'sunglasses', '1f60e')