test(@desktop/wallet): tests for adding wallet accounts updated according to the latest changes (`Authentication` flow)

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

@@ -69,9 +69,15 @@ class AddAccountPopup(Enum):
     TYPE_PRIVATE_KEY: str = "mainWallet_Add_Account_Popup_Type_Private_Key"
     ADDRESS_INPUT: str = "mainWallet_Add_Account_Popup_Watch_Only_Address"
     PRIVATE_KEY_INPUT: str = "mainWallet_Add_Account_Popup_Private_Key"
+    AUTHENTICATE_BUTTON: str = "mainWallet_Authenticate_Popup_Footer_Add_Account"
     ADD_ACCOUNT_BUTTON: str = "mainWallet_Add_Account_Popup_Footer_Add_Account"
     SEED_PHRASE_INPUT_TEMPLATE: str = "mainWindow_Add_Account_Popup_Seed_Phrase_"
     
+class SharedPopup(Enum):
+    POPUP_CONTENT: str = "sharedPopup_Popup_Content"
+    PASSWORD_INPUT: str = "sharedPopup_Password_Input"
+    PRIMARY_BUTTON: str = "sharedPopup_Primary_Button"
+    
 class CollectiblesView(Enum):
     COLLECTIONS_REPEATER: str =  "mainWallet_Collections_Repeater"  
     COLLECTIBLES_REPEATER: str =  "mainWallet_Collectibles_Repeater"  
@@ -89,12 +95,11 @@ class StatusWalletScreen:
     def add_watch_only_account(self, account_name: str, address: str):
         click_obj_by_name(MainWalletScreen.ADD_ACCOUNT_BUTTON.value)
         
-        type(AddAccountPopup.ACCOUNT_NAME_INPUT.value, account_name)
-
         click_obj_by_name(AddAccountPopup.ADVANCE_SECTION.value)
         click_obj_by_name(AddAccountPopup.TYPE_SELECTOR.value)
         time.sleep(1)
         click_obj_by_name(AddAccountPopup.TYPE_WATCH_ONLY.value)
+        type(AddAccountPopup.ACCOUNT_NAME_INPUT.value, account_name)
         
         type(AddAccountPopup.ADDRESS_INPUT.value, address)
         click_obj_by_name(AddAccountPopup.ADD_ACCOUNT_BUTTON.value)
@@ -102,13 +107,16 @@ class StatusWalletScreen:
     def import_private_key(self, account_name: str, password: str, private_key: str):
         click_obj_by_name(MainWalletScreen.ADD_ACCOUNT_BUTTON.value)
         
-        type(AddAccountPopup.PASSWORD_INPUT.value, password)
-        type(AddAccountPopup.ACCOUNT_NAME_INPUT.value, account_name)
-
+        click_obj_by_name(AddAccountPopup.AUTHENTICATE_BUTTON.value)
+        
+        wait_for_object_and_type(SharedPopup.PASSWORD_INPUT.value, password)
+        click_obj_by_name(SharedPopup.PRIMARY_BUTTON.value)
+        
         click_obj_by_name(AddAccountPopup.ADVANCE_SECTION.value)
         click_obj_by_name(AddAccountPopup.TYPE_SELECTOR.value)
         time.sleep(1)
         click_obj_by_name(AddAccountPopup.TYPE_PRIVATE_KEY.value)
+        type(AddAccountPopup.ACCOUNT_NAME_INPUT.value, account_name)
         
         type(AddAccountPopup.PRIVATE_KEY_INPUT.value, private_key)
         click_obj_by_name(AddAccountPopup.ADD_ACCOUNT_BUTTON.value)
@@ -116,14 +124,17 @@ class StatusWalletScreen:
     def import_seed_phrase(self, account_name: str, password: str, mnemonic: str):
         click_obj_by_name(MainWalletScreen.ADD_ACCOUNT_BUTTON.value)
         
-        type(AddAccountPopup.PASSWORD_INPUT.value, password)
-        type(AddAccountPopup.ACCOUNT_NAME_INPUT.value, account_name)
+        click_obj_by_name(AddAccountPopup.AUTHENTICATE_BUTTON.value)
+        
+        wait_for_object_and_type(SharedPopup.PASSWORD_INPUT.value, password)
+        click_obj_by_name(SharedPopup.PRIMARY_BUTTON.value)
         
         click_obj_by_name(AddAccountPopup.ADVANCE_SECTION.value)
         click_obj_by_name(AddAccountPopup.TYPE_SELECTOR.value)
         time.sleep(1)
         click_obj_by_name(AddAccountPopup.TYPE_SEED_PHRASE.value)
-        
+        type(AddAccountPopup.ACCOUNT_NAME_INPUT.value, account_name)
+                
         words = mnemonic.split()
         scroll_obj_by_name(AddAccountPopup.SCROLL_BAR.value)
         time.sleep(1)
@@ -147,10 +158,12 @@ class StatusWalletScreen:
     def generate_new_account(self, account_name: str, password: str):
         click_obj_by_name(MainWalletScreen.ADD_ACCOUNT_BUTTON.value)
         
-        type(AddAccountPopup.PASSWORD_INPUT.value, password)
+        click_obj_by_name(AddAccountPopup.AUTHENTICATE_BUTTON.value)
+        
+        wait_for_object_and_type(SharedPopup.PASSWORD_INPUT.value, password)
+        click_obj_by_name(SharedPopup.PRIMARY_BUTTON.value)
+        
         type(AddAccountPopup.ACCOUNT_NAME_INPUT.value, account_name)
-
-        time.sleep(2)
         click_obj_by_name(AddAccountPopup.ADD_ACCOUNT_BUTTON.value)
          
     def verify_account_name_is_present(self, account_name: str):

test/ui-test/testSuites/suite_status/shared/scripts/sections/wallet_names.py

@@ -40,7 +40,7 @@ mainWallet_Send_Popup_GasSelector_HighGas_Button = {"container": statusDesktop_m
 # Add account popup:
 mainWallet_Add_Account_Popup_Main = {"container": statusDesktop_mainWindow, "objectName": "AddAccountModalContent", "type": "StatusScrollView", "visible": True}
 mainWallet_Add_Account_Popup_Password = {"container": mainWallet_Add_Account_Popup_Main, "text": "Enter your password...", "type": "PlaceholderText", "unnamed": 1, "visible": True}
-mainWallet_Add_Account_Popup_Advanced = {"container": mainWallet_Add_Account_Popup_Main, "text": "Advanced", "type": "StatusBaseText", "unnamed": 1, "visible": True}
+mainWallet_Add_Account_Popup_Advanced = {"container": mainWallet_Add_Account_Popup_Main, "objectName": "ExpandableItem", "type": "MouseArea", "visible": True}
 mainWallet_Add_Account_Popup_Type_Selector = {"container": mainWallet_Add_Account_Popup_Main, "text": "Default", "type": "StatusBaseText", "unnamed": 1, "visible": True}
 mainWallet_Add_Account_Popup_Type_Watch_Only = {"container": statusDesktop_mainWindow, "text": "Add a watch-only address", "type": "StatusBaseText", "unnamed": 1, "visible": True}
 mainWallet_Add_Account_Popup_Type_Private_Key = {"container": statusDesktop_mainWindow, "text": "Generate from Private key", "type": "StatusBaseText", "unnamed": 1, "visible": True}
@@ -62,6 +62,7 @@ mainWindow_Add_Account_Popup_Seed_Phrase_11 = {"container": mainWallet_Add_Accou
 mainWindow_Add_Account_Popup_Seed_Phrase_12 = {"container": mainWallet_Add_Account_Popup_Main, "type": "StatusBaseText", "objectName": "seedPhraseInputPlaceholder11", "visible": True}
 
 mainWallet_Add_Account_Popup_Footer = {"container": statusDesktop_mainWindow, "type": "StatusModalFooter", "unnamed": 1, "visible": True}
+mainWallet_Authenticate_Popup_Footer_Add_Account = {"container": mainWallet_Add_Account_Popup_Footer, "text": "Authenticate", "type": "StatusBaseText", "unnamed": 1, "visible": True}
 mainWallet_Add_Account_Popup_Footer_Add_Account = {"container": mainWallet_Add_Account_Popup_Footer, "text": "Add account", "type": "StatusBaseText", "unnamed": 1, "visible": True}
 
 # saved address view
@@ -79,3 +80,8 @@ mainWallet_Saved_Addreses_Popup_Address_Add_Button = {"container": statusDesktop
 # Collectibles view
 mainWallet_Collections_Repeater = {"container": statusDesktop_mainWindow, "objectName": "collectionsRepeater", "type": "Repeater"}
 mainWallet_Collectibles_Repeater = {"container": statusDesktop_mainWindow, "objectName": "collectiblesRepeater", "type": "Repeater"}
+
+# Shared Popup
+sharedPopup_Popup_Content = {"container": statusDesktop_mainWindow, "objectName": "KeycardSharedPopupContent", "type": "Item"}
+sharedPopup_Password_Input = {"container": sharedPopup_Popup_Content, "objectName": "Password", "type": "TextField"}
+sharedPopup_Primary_Button = {"container": statusDesktop_mainWindow, "objectName": "PrimaryButton", "type": "StatusButton"}

ui/StatusQ/src/StatusQ/Components/StatusExpandableItem.qml

@@ -160,6 +160,7 @@ Rectangle {
 
         MouseArea {
             id: sensor
+            objectName: "ExpandableItem"
             anchors.fill: parent
             onClicked: {
                 if(expandable) {

ui/imports/shared/popups/keycard/KeycardPopup.qml

@@ -81,6 +81,8 @@ StatusModal {
     }
 
     contentItem: Item {
+        objectName: "KeycardSharedPopupContent"
+
         Loader {
             id: loader
             anchors.fill: parent
@@ -485,6 +487,7 @@ StatusModal {
         },
         StatusButton {
             id: primaryButton
+            objectName: "PrimaryButton"
             height: Constants.keycard.general.footerButtonsHeight
             text: {
                 if (root.sharedKeycardModule.currentState.flowType === Constants.keycardSharedFlow.setupNewKeycard) {

ui/imports/shared/popups/keycard/states/EnterPassword.qml

@@ -79,6 +79,7 @@ Item {
 
         StatusPasswordInput {
             id: password
+            objectName: "Password"
             Layout.alignment: Qt.AlignHCenter
             signingPhrase: root.sharedKeycardModule.getSigningPhrase()
             placeholderText: qsTr("Password")