fix(tests): e2e saved addresses related tests fixed

test/ui-test/src/screens/StatusWalletScreen.py

@@ -196,6 +196,8 @@ class AddressesView(BaseElement):
         super(AddressesView, self).__init__('mainWindow_SavedAddressesView')
         self._add_new_address_button = Button('mainWallet_Saved_Addreses_Add_Buttton')
         self._address_list_item = BaseElement('savedAddressView_Delegate')
+        self._edit_saved_address_menu_item = BaseElement('mainWallet_Saved_Addreses_More_Edit')
+        self._delete_saved_address_menu_item = BaseElement('mainWallet_Saved_Addreses_More_Delete')
 
     @property
     def saved_addresses(self):
@@ -226,12 +228,18 @@ class AddressesView(BaseElement):
 
     def open_edit_address_popup(self, address_name: str) -> 'EditSavedAddressPopup':
         address = self._get_saved_address_by_name(address_name)
-        address.open_context_menu().select('Edit')
+        address.open_context_menu()
+        self._edit_saved_address_menu_item.wait_until_appears()
+        self._edit_saved_address_menu_item.click()
+        self._edit_saved_address_menu_item.wait_until_hidden()
         return EditSavedAddressPopup().wait_until_appears()
 
     def delete_saved_address(self, address_name):
         address = self._get_saved_address_by_name(address_name)
-        address.open_context_menu().select('Delete')
+        address.open_context_menu()
+        self._delete_saved_address_menu_item.wait_until_appears()
+        self._delete_saved_address_menu_item.click()
+        self._delete_saved_address_menu_item.wait_until_hidden()
         ConfirmationPopup().wait_until_appears().confirm()
 
 

test/ui-test/testSuites/global_shared/scripts/settings_names.py

@@ -88,7 +88,7 @@ linksView = {"container": statusDesktop_mainWindow, "id": "linksView", "type": "
 edit_TextEdit = {"container": statusDesktop_mainWindow_overlay, "type": "TextEdit", "unnamed": 1, "visible": True}
 
 # Wallet Settings:
-mainWallet_Saved_Addreses_More_Edit = {"container": statusDesktop_mainWindow, "objectName": "editroot", "type": "StatusMenuItem"}
+mainWallet_Saved_Addreses_More_Edit = {"container": statusDesktop_mainWindow, "objectName": "editSavedAddress", "type": "StatusMenuItem"}
 mainWallet_Saved_Addreses_More_Delete = {"container": statusDesktop_mainWindow, "objectName": "deleteSavedAddress", "type": "StatusMenuItem"}
 mainWallet_Saved_Addreses_More_Confirm_Delete = {"container": statusDesktop_mainWindow, "objectName": "confirmDeleteSavedAddress", "type": "StatusButton"}
 settings_Wallet_MainView_GeneratedAccounts = {"container": statusDesktop_mainWindow, "objectName": 'generatedAccounts', "type": 'Repeater'}

test/ui-test/testSuites/global_shared/scripts/wallet_names.py

@@ -27,6 +27,8 @@ mainWallet_Saved_Addreses_List = {"container": mainWindow_SavedAddressesView, "o
 savedAddressView_Delegate = {"container": mainWallet_Saved_Addreses_List, "objectName": RegularExpression("savedAddressView_Delegate*"), "type": "SavedAddressesDelegate", "visible": True}
 send_StatusRoundButton = {"container": "", "type": "StatusRoundButton", "unnamed": 1, "visible": True}
 savedAddressView_Delegate_menuButton = {"container": "", "objectName": RegularExpression("savedAddressView_Delegate_menuButton*"), "type": "StatusRoundButton", "visible": True}
+mainWallet_Saved_Addreses_More_Edit = {"container": statusDesktop_mainWindow, "objectName": "editSavedAddress", "type": "StatusMenuItem"}
+mainWallet_Saved_Addreses_More_Delete = {"container": statusDesktop_mainWindow, "objectName": "deleteSavedAddress", "type": "StatusMenuItem"}
 
 # Wallet Account View
 mainWindow_StatusSectionLayout_ContentItem = {"container": statusDesktop_mainWindow, "objectName": "StatusSectionLayout", "type": "ContentItem", "visible": True}
@@ -171,9 +173,9 @@ mainWallet_Saved_Addreses_Popup_Add_Network_Selector_Tag = {"container": statusD
 mainWallet_Saved_Addresses_Popup_Add_Network_Selector_Mainnet_checkbox = {"container": statusDesktop_mainWindow_overlay, "objectName": "networkSelectionCheckbox_Mainnet", "type": "StatusCheckBox", "visible": True}
 mainWallet_Saved_Addresses_Popup_Add_Network_Selector_Optimism_checkbox = {"container": statusDesktop_mainWindow_overlay, "objectName": "networkSelectionCheckbox_Optimism", "type": "StatusCheckBox", "visible": True}
 mainWallet_Saved_Addresses_Popup_Add_Network_Selector_Arbitrum_checkbox = {"container": statusDesktop_mainWindow_overlay, "objectName": "networkSelectionCheckbox_Arbitrum", "type": "StatusCheckBox", "visible": True}
-mainWallet_Saved_Addresses_Popup_Network_Selector_Mainnet_network_tag = {"container": statusDesktop_mainWindow_overlay, "objectName": "networkTagRectangle_Mainnet", "type": "Rectangle", "visible": True}
+mainWallet_Saved_Addresses_Popup_Network_Selector_Mainnet_network_tag = {"container": statusDesktop_mainWindow_overlay, "objectName": "networkTagRectangle_eth", "type": "Rectangle", "visible": True}
-mainWallet_Saved_Addresses_Popup_Network_Selector_Optimism_network_tag = {"container": statusDesktop_mainWindow_overlay, "objectName": "networkTagRectangle_Optimism", "type": "Rectangle", "visible": True}
+mainWallet_Saved_Addresses_Popup_Network_Selector_Optimism_network_tag = {"container": statusDesktop_mainWindow_overlay, "objectName": "networkTagRectangle_opt", "type": "Rectangle", "visible": True}
-mainWallet_Saved_Addresses_Popup_Network_Selector_Arbitrum_network_tag = {"container": statusDesktop_mainWindow_overlay, "objectName": "networkTagRectangle_Arbitrum", "type": "Rectangle", "visible": True}
+mainWallet_Saved_Addresses_Popup_Network_Selector_Arbitrum_network_tag = {"container": statusDesktop_mainWindow_overlay, "objectName": "networkTagRectangle_arb", "type": "Rectangle", "visible": True}
 # Collectibles view
 mainWallet_Collections_Repeater = {"container": statusDesktop_mainWindow, "objectName": "collectionsRepeater", "type": "Repeater"}
 mainWallet_Collectibles_Repeater = {"container": statusDesktop_mainWindow, "objectName": "collectiblesRepeater", "type": "Repeater"}

test/ui-test/testSuites/suite_wallet/tst_wallet_savedAddresses/test.feature

@@ -14,9 +14,9 @@ Background:
         When the user deletes the saved address with name "<name>"
         Then the saved address with name "<name>" is not in the list of saved addresses
         Examples:
-            | name | address                                    |
+            | name          | address                                    |
-            | Saved address       | 0x8397bc3c5a60a1883174f722403d63a8833312b7 |
+            | Saved address | 0x8397bc3c5a60a1883174f722403d63a8833312b7 |
-            | ENS name as address | nastya.stateofus.eth |
+            | ENS name      | nastya.stateofus.eth                       |
 
      Scenario Outline: The user can add saved address with all network options, change address name and disable networks
         When the user adds a saved address with name "<name>" and address "<address>"
@@ -24,9 +24,9 @@ Background:
         Then the saved address with name "<new_name>" is in the list of saved addresses
         # And the user can open saved address in "<explorer>" TODO: later
         Examples:
-            | name                       | address                                    |new_name                 |
+            | name          | address                                    |new_name         |
-            | Saved address name before  | 0x8397bc3c5a60a1883174f722403d63a8833312b7 |Saved address name after |
+            | Saved address | 0x8397bc3c5a60a1883174f722403d63a8833312b7 |Saved addressNew |
-            | Ens name before            | nastya.stateofus.eth                       |Ens name after           |
+            | Ens name      | nastya.stateofus.eth                       |Ens nameNew      |
 
            # | foo  | nastya.stateofus.eth | bar | https://github.com/status-im/status-desktop/issues/11090
      # TODO: actions from burger menu

ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml

@@ -132,7 +132,7 @@ StatusListItem {
         }
         StatusAction {
             text: qsTr("Edit saved address")
-            objectName: "editroot"
+            objectName: "editSavedAddress"
             assetSettings.name: "pencil-outline"
             onTriggered: {
                 Global.openAddEditSavedAddressesPopup({