Skip to content
This repository was archived by the owner on Aug 13, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion gui/objects_map/community_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 2 additions & 1 deletion gui/objects_map/wallet_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion gui/screens/settings_wallet.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
1 change: 1 addition & 0 deletions tests/communities/test_join_community.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/messages/test_messaging_group_chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down