diff --git a/gui/objects_map/community_names.py b/gui/objects_map/community_names.py index 8bc5abec..ba575d56 100644 --- a/gui/objects_map/community_names.py +++ b/gui/objects_map/community_names.py @@ -50,7 +50,9 @@ chatMessageViewDelegate_channelIdentifierNameText_StyledText = {"container": mainWindow_ChatColumnView, "objectName": "channelIdentifierNameText", "type": "StyledText", "visible": True} chatMessageViewDelegate_Welcome = {"container": mainWindow_ChatColumnView, "type": "StatusBaseText", "unnamed": 1, "visible": True} chatMessageViewDelegate_channelIdentifierSmartIdenticon_StatusSmartIdenticon = {"container": mainWindow_ChatMessagesView, "objectName": "channelIdentifierSmartIdenticon", "type": "StatusSmartIdenticon", "visible": True} -chatMessageViewDelegate_ChannelIdentifierView = {"container": mainWindow_ChatMessagesView, "type": "ChannelIdentifierView", "unnamed": 1, "visible": True} +chatView_log = {"container": mainWindow_ChatMessagesView, "objectName": "chatLogView", "type": "StatusListView", "visible": True} +chatLogView_chatMessageViewDelegate_MessageView = {"container": chatView_log, "index": 1, "objectName": "chatMessageViewDelegate", "type": "MessageView", "visible": True} +chatMessageViewDelegate_ChannelIdentifierView = {"container": chatLogView_chatMessageViewDelegate_MessageView, "type": "ChannelIdentifierView", "unnamed": 1, "visible": True} # Community Settings mainWindow_communitySettingsBackToCommunityButton_StatusBaseText = {"container": mainWindow_communityLoader_Loader, "objectName": "communitySettingsBackToCommunityButton", "type": "StatusBaseText", "visible": True} diff --git a/gui/objects_map/wallet_names.py b/gui/objects_map/wallet_names.py index 005a64c2..bd21001e 100644 --- a/gui/objects_map/wallet_names.py +++ b/gui/objects_map/wallet_names.py @@ -22,5 +22,6 @@ # Wallet Account View mainWindow_StatusSectionLayout_ContentItem = {"container": statusDesktop_mainWindow, "objectName": "StatusSectionLayout", "type": "ContentItem", "visible": True} -mainWallet_Account_Name = {"container": mainWindow_StatusSectionLayout_ContentItem, "objectName": "accountName", "type": "StatusBaseText", "visible": True} +mainWindow_RightTabView = {"container": statusDesktop_mainWindow, "type": "RightTabView", "unnamed": 1, "visible": True} +mainWallet_Account_Name = {"container": mainWindow_RightTabView, "objectName": "walletHeaderTitle", "type": "StatusBaseText", "visible": True} mainWindow_Send_Button = {"container": mainWindow_StatusWindow, "type": "DisabledTooltipButton", "icon": "send", "visible": True} diff --git a/gui/screens/settings_wallet.py b/gui/screens/settings_wallet.py index 2c782922..611c2779 100644 --- a/gui/screens/settings_wallet.py +++ b/gui/screens/settings_wallet.py @@ -216,7 +216,7 @@ class NetworkWalletSettings(WalletSettingsView): def __init__(self): super(NetworkWalletSettings, self).__init__() - self._testnet_text_item = QObject('s') + self._testnet_text_item = QObject('settingsContentBaseScrollView_Goerli_testnet_active_StatusBaseText') self._testnet_mode_toggle = Button('settings_Wallet_NetworksView_TestNet_Toggle') self._testnet_mode_title = TextLabel('settings_Wallet_NetworksView_TestNet_Toggle_Title') self._back_button = Button('main_toolBar_back_button') diff --git a/tests/communities/test_join_community.py b/tests/communities/test_join_community.py index 7762107d..3922fbe9 100644 --- a/tests/communities/test_join_community.py +++ b/tests/communities/test_join_community.py @@ -17,6 +17,7 @@ @pytest.mark.parametrize('user_data_one, user_data_two', [ (configs.testpath.TEST_USER_DATA / 'user_account_one', configs.testpath.TEST_USER_DATA / 'user_account_two') ]) +@pytest.mark.xfail(reason='https://github.com/status-im/status-desktop/issues/13199') def test_join_community_via_owner_invite(multiple_instance, user_data_one, user_data_two): user_one: UserAccount = constants.user_account_one user_two: UserAccount = constants.user_account_two diff --git a/tests/messages/test_messaging_group_chat.py b/tests/messages/test_messaging_group_chat.py index 761049f9..ce54fb8c 100644 --- a/tests/messages/test_messaging_group_chat.py +++ b/tests/messages/test_messaging_group_chat.py @@ -20,6 +20,7 @@ (configs.testpath.TEST_USER_DATA / 'user_account_one', configs.testpath.TEST_USER_DATA / 'user_account_two', configs.testpath.TEST_USER_DATA / 'user_account_two') ]) +@pytest.mark.xfail(reason='https://github.com/status-im/status-desktop/issues/13199') def test_group_chat(multiple_instance, user_data_one, user_data_two, user_data_three): user_one: UserAccount = constants.user_account_one user_two: UserAccount = constants.user_account_two diff --git a/tests/settings/settings_messaging/test_messaging_settings_accept_request.py b/tests/settings/settings_messaging/test_messaging_settings_accept_request.py index ef7e1bdb..0c6387ca 100644 --- a/tests/settings/settings_messaging/test_messaging_settings_accept_request.py +++ b/tests/settings/settings_messaging/test_messaging_settings_accept_request.py @@ -18,6 +18,7 @@ ]) @pytest.mark.flaky # reason='https://github.com/status-im/desktop-qa-automation/issues/346' +@pytest.mark.xfail(reason='https://github.com/status-im/status-desktop/issues/13199') def test_messaging_settings_accepting_request(multiple_instance, user_data_one, user_data_two): user_one: UserAccount = constants.user_account_one user_two: UserAccount = constants.user_account_two diff --git a/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py b/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py index a659659a..9539b4dc 100644 --- a/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py +++ b/tests/settings/settings_messaging/test_messaging_settings_identity_verification.py @@ -17,6 +17,7 @@ @pytest.mark.parametrize('user_data_one, user_data_two', [ (configs.testpath.TEST_USER_DATA / 'user_account_one', configs.testpath.TEST_USER_DATA / 'user_account_two') ]) +@pytest.mark.xfail(reason='https://github.com/status-im/status-desktop/issues/13199') def test_messaging_settings_identity_verification(multiple_instance, user_data_one, user_data_two): user_one: UserAccount = constants.user_account_one user_two: UserAccount = constants.user_account_two diff --git a/tests/settings/settings_messaging/test_messaging_settings_reject_request.py b/tests/settings/settings_messaging/test_messaging_settings_reject_request.py index 7f3f30b6..d789c0f8 100644 --- a/tests/settings/settings_messaging/test_messaging_settings_reject_request.py +++ b/tests/settings/settings_messaging/test_messaging_settings_reject_request.py @@ -14,6 +14,7 @@ @pytest.mark.parametrize('user_data_one, user_data_two', [ (configs.testpath.TEST_USER_DATA / 'user_account_one', configs.testpath.TEST_USER_DATA / 'user_account_two') ]) +@pytest.mark.xfail(reason='https://github.com/status-im/status-desktop/issues/13199') def test_messaging_settings_rejecting_request(multiple_instance, user_data_one, user_data_two): user_one: UserAccount = constants.user_account_one user_two: UserAccount = constants.user_account_two