Merge pull request #5891 from EdgeApp/jared/maestro-small-fix

Jared/maestro small fix

Author: JP0P

…o/01-accounts/C000006-light-account.yaml …d/01-accounts/C000006-light-account.yamlmaestro/01-accounts/C000006-light-account.yaml renamed to maestro-disabled/01-accounts/C000006-light-account.yaml maestro/01-accounts/C000006-light-account.yaml renamed to maestro-disabled/01-accounts/C000006-light-account.yaml

@@ -9,8 +9,6 @@
 #   2. Validates first token activation warning - "Need ETH"
 
 # TODO: validate "delete token" action (need targeting for edit icon)
-# TODO: remove extra "A" and delete for iOS autocomplete
-
 
 appId: ${MAESTRO_APP_ID}
 env:
@@ -46,22 +44,27 @@ tags:
 - longPressOn: ETH
 - tapOn: ".*Add / Edit Tokens"
 
+# Test search
+- tapOn: Search Tokens
+- inputText: "1INCH"
+- pressKey: Enter
+
 # First time token warning modal
-- tapOn: "1INCH.*"
+- tapOn: 
+    text: "1INCH.*"
+    index: 2
 - assertVisible: "ETH Needed to Send Tokens"
 - tapOn: "ETH is required to pay the mining fees when sending tokens. The associated ETH wallet must contain a sufficient.*"
 - tapOn: "Please confirm your understanding below:"
 - tapOn: "I understand and agree to the terms"
 - tapOn: "Confirm & Finish"
 
+- tapOn:
+    id: "undefined.clearIcon"
+
 - runFlow:
     label: "Add custom token"
     commands:
-      # Test search
-      - tapOn: Search Tokens
-      # Test custom token - details for $UNI token
-      - tapOn:
-          id: "undefined.clearIcon"
       - tapOn: Add Custom
       - assertVisible: Add Token
       - assertVisible: Contract Address # Different for some networks
@@ -84,14 +87,9 @@ tags:
                 optional: true
             - tapOn:
                 text: "Contract Address"
-            - inputText: ${UNI_CONTRACT_ADDRESS}
-            # Fix: iOS is inconsistent - may type too fast on maestro
-            - runFlow:
-                when:
-                  platform: iOS
-                commands:
-                  - inputText: "A"
-                  - pressKey: Backspace
+            # Enter separately to reduce errors from maestro typing too fast
+            - inputText: ${UNI_CONTRACT_ADDRESS.slice(0, -1)}
+            - inputText: ${UNI_CONTRACT_ADDRESS.slice(-1)}
             # Ensure autocomplete is working
             - pressKey: Enter # Drop keyboard
             - extendedWaitUntil:
@@ -109,14 +107,9 @@ tags:
                 index: 0
             - tapOn:
                 text: "Contract Address"
-            - inputText: ${MOG_CONTRACT_ADDRESS}
-            # Fix: iOS is inconsistent - may type too fast on maestro
-            - runFlow:
-                when:
-                  platform: iOS
-                commands:
-                  - inputText: "A"
-                  - pressKey: Backspace
+            # Enter separately to reduce errors from maestro typing too fast
+            - inputText: ${MOG_CONTRACT_ADDRESS.slice(0, -1)}
+            - inputText: ${MOG_CONTRACT_ADDRESS.slice(-1)}
             # Ensure autocomplete is working
             - pressKey: Enter # Drop keyboard
             - extendedWaitUntil:
@@ -156,8 +149,13 @@ tags:
     env:
       USERNAME: ${output.newAccountUsername}
       PASSWORD: ${output.newAccountPassword}
+# Dismiss option to save password to keychain (iOS)
+- tapOn:
+    text: Not Now
+    optional: true
 - runFlow:
     file: ../common/dismiss-modals.yaml
+
 - tapOn: Assets
 - scrollUntilVisible: 
     element: "Mog"