Stabilise E2e Android tests on pipeline

wdio/features/Accounts/CreatingWalletAccount.feature

@@ -14,5 +14,4 @@ Feature: Creating account in wallet
     When I tap on the Identicon
     Then the account list should be visible
     When I tap on Create a new account
-    Then A new account is created
-    And I am on the new account
+    Then I am on the new account

wdio/features/Accounts/ImportingAccount.feature

@@ -1,5 +1,5 @@
 @androidApp
-@smoke
+@regression
 Feature: Importing account in wallet
 
   Scenario: Import wallet

wdio/features/BrowserFlow/RemovingImportedAccountAfterConnectingToDapp.feature

@@ -1,5 +1,6 @@
-@androidApp 
-@regression
+@androidApp
+@smoke
+
 Feature: Importing account via private then revoking permissions
 
   Scenario: Import wallet
@@ -11,7 +12,7 @@ Feature: Importing account via private then revoking permissions
 
   Scenario: User grants permission to a sushiswap to access one of their accounts
     When I navigate to the browser
-        # When I tap on button with text "Wallet"
+    # When I tap on button with text "Wallet"
     And I navigate to "https://app.sushi.com/swap"
     Then the connect modal should be displayed
     And I connect my active wallet to the dapp

wdio/features/BrowserFlow/RevokingSingleAccount.feature

@@ -1,6 +1,6 @@
-@androidApp 
+@androidApp
 @regression
-Feature: Permission system in MetaMask Mobile
+Feature: Revoking access to a dapp while connected to one account.
 
     Scenario: Import wallet
         Given the app displayed the splash animation

wdio/features/Onboarding/CreateNewWallet.feature

@@ -1,12 +1,12 @@
 @androidApp
-@smoke
+@regression
 Feature: New wallet flow
 
   Scenario: Onboarding New walllet
-  User opens the app for first time and creates a new wallet.
+    User opens the app for first time and creates a new wallet.
     Given the Welcome Screen is displayed
     When I tap "Get started"
-    Then "Wallet setup" is displayed
+    Then Wallet setup screen is displayed
     When On Wallet Setup Screen I tap "Create a new wallet"
     And On Wallet Setup Screen I tap "Agree"
     And Terms of Use is displayed

wdio/features/Onboarding/ImportWallet.feature

@@ -1,27 +1,53 @@
 @androidApp
-@smoke
+@regression
 Feature: Import Wallet
-  Users  can use the app to import an existing wallet or create a new one.
+  Users can use the app to import an existing wallet or create a new one.
 
-  Scenario Outline: Import Wallet - Manual input SR
-  After a user completes the onboarding process then they are presented
-  with the option to create a new wallet and back it up.
+  Scenario: Get Started
     Given the Welcome Screen is displayed
     When I tap "Get started"
-    Then "Wallet setup" is displayed
+    Then Wallet setup screen is displayed
     When I tap "Import using Secret Recovery Phrase"
     Then "Help us improve MetaMask" is displayed
     When I tap "I agree"
     And Terms of Use is displayed
     And I agree to terms
     And Terms of Use is not displayed
     Then "Import from seed" is displayed
+
+  Scenario Outline: Password Strength
+    When I type <password> in new password field
+    Then password strength <strength> is displayed
+    Examples:
+      | password        | strength                  |
+      | metapass1       | Password strength: Weak   |
+      | Metapass12345   | Password strength: Good   |
+      | Metapass12345!@ | Password strength: Strong |
+
+  Scenario Outline: Password Matching
+    When I type <password> in confirm password field
+    Then green check mark is displayed
+    Examples:
+      | password        |
+      | Metapass12345!@ |
+
+  Scenario Outline: Invalid SRP
+    When I type <invalid_SRP> in SRP field
+    And I tap "Import"
+    Then device alert <error> is displayed
+    And I tap Yes on alert
+
+    Examples:
+      | invalid_SRP                                                              | error                                                       |
+      | fold media south not valid secret recovery phrase pause cloth just raven | Invalid Secret Recovery Phrase                              |
+      | fold media south add since false relax immense pause cloth just          | Secret Recovery Phrases contain 12, 15, 18, 21, or 24 words |
+
+  Scenario Outline: Import Wallet
     When I type <SRP> in SRP field
-    And I type <password> in new password field
     And I type <password> in confirm password field
     And I tap "Import"
     And I tap No Thanks on the Enable security check screen
     Then "Welcome to your new wallet!" is displayed
     Examples:
-      | SRP                                                                   | password  |
-      | fold media south add since false relax immense pause cloth just raven | metapass1 |
+      | SRP                                                                   | password        |
+      | fold media south add since false relax immense pause cloth just raven | Metapass12345!@ |

wdio/features/Onboarding/OnboardingCarousel.feature

@@ -4,8 +4,8 @@ Feature: Onboarding
   Users can install MetaMask mobile app from the device app store and read the onboarding carousel
 
   Scenario: New app install setup on a mobile device
-  This is the onboarding process after a new user installs the mobile app
-  and launches the app for the first time.
+    This is the onboarding process after a new user installs the mobile app
+    and launches the app for the first time.
     Given the app displayed the splash animation
     And the splash animation disappears
     And the Welcome Screen is displayed
@@ -15,7 +15,5 @@ Feature: Onboarding
     Then "Your gateway to web3" carousel item is displayed
     When I swipe left on the carousel
     And I tap "Get started"
-    Then "Wallet setup" is displayed
-    And "Import an existing wallet or create a new one" is displayed
-    And "Import using Secret Recovery Phrase" is displayed
-    And "Create a new wallet" is displayed
+    Then Wallet setup screen is displayed
+

wdio/features/Onboarding/TermsOfUse.feature

@@ -1,12 +1,12 @@
-@androidApp 
+@androidApp
 @regression
 Feature: Terms of Use
 
   Scenario: Install and launch app
     Given the app displayed the splash animation
     And the Welcome Screen is displayed
     When I tap "Get started"
-    Then "Wallet setup" is displayed
+    Then Wallet setup screen is displayed
     When I tap "Import using Secret Recovery Phrase"
     Then "Help us improve MetaMask" is displayed
     When I tap "I agree"
@@ -19,7 +19,7 @@ Feature: Terms of Use
     And the splash animation disappears
     Then the Welcome Screen is displayed
     When I tap "Get started"
-    Then "Wallet setup" is displayed
+    Then Wallet setup screen is displayed
     When I tap "Import using Secret Recovery Phrase"
     Then Terms of Use is displayed
 
@@ -34,6 +34,6 @@ Feature: Terms of Use
     And the splash animation disappears
     Then the Welcome Screen is displayed
     When I tap "Get started"
-    Then "Wallet setup" is displayed
+    Then Wallet setup screen is displayed
     When I tap "Import using Secret Recovery Phrase"
     Then Terms of Use is not displayed

wdio/features/SecurityAndPrivacy/DeleteWallet.feature

@@ -17,4 +17,4 @@ Feature: This feature deletes the wallet from the Security and Privacy View
     And I tap I understand, continue on Delete wallet modal
     And I type "delete" on Delete wallet modal permanently
     And I tap Delete my wallet on Delete wallet modal permanently
-    Then "Wallet setup" is displayed
+    Then Wallet setup screen is displayed

wdio/features/Wallet/ExploringWizard.feature

@@ -13,10 +13,10 @@ Feature: Exploring wizard
     When On the onboarding wizard I tap on "Got it" button
     Then the tutorial modal heading should read "Edit Account Name"
     And there should be an explanation about adding a nickname to your account.
-    #When I tap and hold on the account Name
-    #Then I should be able to edit the account Name
-    #When I enter "Big Bank" for account name
-    #Then the account nickname should read "Big Bank"
+    When I tap and hold on the account Name
+    Then I should be able to edit the account Name
+    When I enter "Big Bank" for account name
+    Then the account nickname should read "Big Bank"
     When On the onboarding wizard I tap on "Got it" button
     Then the tutorial modal heading should read "Main Menu"
     And there should be an explanation of the what exists within the main menu.
@@ -36,18 +36,18 @@ Feature: Exploring wizard
     Then the onboarding wizard is no longer visible
     And I close the Whats New modal
 
-  # Scenario: A user should be able to tap the Skip button
-  #   Given the app displayed the splash animation
-  #   And I have imported my wallet
-  #   And I tap No Thanks on the Enable security check screen
-  #   And the onboarding wizard is visible on wallet view
-    # When On the onboarding wizard I tap on "Take a Tour" button
-    # Then the tutorial modal heading should read "Your Accounts"
-    # And there should be an explanation of the accounts functionality.
-    # When On the onboarding wizard I tap on "Got it" button
-    # Then the tutorial modal heading should read "Edit Account Name"
-    # And there should be an explanation about adding a nickname to your account.
-    # When On the onboarding wizard I tap on "Skip" button
-    # Then the onboarding wizard is no longer visible
-    # And the "Skip" button is no longer visible
-    # And I close the Whats New modal
+# Scenario: A user should be able to tap the Skip button
+#   Given the app displayed the splash animation
+#   And I have imported my wallet
+#   And I tap No Thanks on the Enable security check screen
+#   And the onboarding wizard is visible on wallet view
+# When On the onboarding wizard I tap on "Take a Tour" button
+# Then the tutorial modal heading should read "Your Accounts"
+# And there should be an explanation of the accounts functionality.
+# When On the onboarding wizard I tap on "Got it" button
+# Then the tutorial modal heading should read "Edit Account Name"
+# And there should be an explanation about adding a nickname to your account.
+# When On the onboarding wizard I tap on "Skip" button
+# Then the onboarding wizard is no longer visible
+# And the "Skip" button is no longer visible
+# And I close the Whats New modal

wdio/features/Wallet/ImportCustomToken.feature

@@ -1,5 +1,4 @@
 @androidApp
-@smoke
 Feature: Adding a custom token to your wallet
 
   Scenario: Import wallet

wdio/features/Wallet/LockResetWallet.feature

@@ -1,5 +1,5 @@
 @androidApp
-@regression
+@smoke
 Feature: Lock and Reset Wallet
 
   Scenario: Import account
@@ -24,4 +24,4 @@ Feature: Lock and Reset Wallet
     And I tap I understand, continue on Delete wallet modal
     And I type "delete" on Delete wallet modal permanently
     And I tap Delete my wallet on Delete wallet modal permanently
-    Then "Wallet setup" is displayed
+    Then Wallet setup screen is displayed