test: fix encrypt password synchronization (#17048)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**
This PR fixes synchronization issues in AES encryption end-to-end tests
and improves test infrastructure by adding proper selectors and
reorganizing test categorization.
<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

## **Changelog**

<!--
If this PR is not End-User-Facing and should not show up in the
CHANGELOG, you can choose to either:
1. Write `CHANGELOG entry: null`
2. Label with `no-changelog`

If this PR is End-User-Facing, please write a short User-Facing
description in the past tense like:
`CHANGELOG entry: Added a new tab for users to see their NFTs`
`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`

(This helps the Release Engineer do their job more quickly and
accurately)
-->

CHANGELOG entry:

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

Author: chrisleewilcox

app/components/Views/AesCryptoTestForm/AesCryptoTestForm.tsx

@@ -20,6 +20,7 @@ import {
   aesCryptoFormButtons,
   aesCryptoFormScrollIdentifier,
   accountAddress,
+  responseText,
 } from '../../../../e2e/selectors/Settings/AesCrypto.selectors';
 import Text, {
   TextVariant,
@@ -166,6 +167,7 @@ const AesCryptoTestForm = () => {
           callback={generateSalt}
           callbackTestId={aesCryptoFormButtons.generateSaltButton}
           responseTestId={aesCryptoFormResponses.saltResponse}
+          responseTextTestId={responseText}
           styles={{ ...styles }}
         />
         <TestForm
@@ -184,6 +186,7 @@ const AesCryptoTestForm = () => {
           callback={generateEncryptionKey}
           callbackTestId={aesCryptoFormButtons.generateEncryptionKeyButton}
           responseTestId={aesCryptoFormResponses.generateEncryptionKeyResponse}
+          responseTextTestId={responseText}
           styles={{ ...styles }}
         />
         <TestForm
@@ -203,6 +206,7 @@ const AesCryptoTestForm = () => {
           callback={encryptWithKey}
           callbackTestId={aesCryptoFormButtons.encryptWithKeyButton}
           responseTestId={aesCryptoFormResponses.encryptionWithKeyResponse}
+          responseTextTestId={responseText}
           styles={{ ...styles }}
         />
         <TestForm
@@ -218,6 +222,7 @@ const AesCryptoTestForm = () => {
           callback={decryptWithKey}
           callbackTestId={aesCryptoFormButtons.decryptWithKeyButton}
           responseTestId={aesCryptoFormResponses.decryptionWithKeyResponse}
+          responseTextTestId={responseText}
           styles={{ ...styles }}
         />
         <TestForm
@@ -236,6 +241,7 @@ const AesCryptoTestForm = () => {
           callback={encrypt}
           callbackTestId={aesCryptoFormButtons.encryptButton}
           responseTestId={aesCryptoFormResponses.encryptionResponse}
+          responseTextTestId={responseText}
           styles={{ ...styles }}
         />
         <TestForm
@@ -250,6 +256,7 @@ const AesCryptoTestForm = () => {
           callback={decrypt}
           callbackTestId={aesCryptoFormButtons.decryptButton}
           responseTestId={aesCryptoFormResponses.decryptionResponse}
+          responseTextTestId={responseText}
           styles={{ ...styles }}
         />
       </SafeAreaView>

app/components/Views/AesCryptoTestForm/Form.test.tsx

@@ -15,6 +15,7 @@ describe('TestForm', () => {
         callback={() => jest.fn()}
         callbackTestId={'random-callback-test-id'}
         responseTestId={'random-response-test-id'}
+        responseTextTestId={'random-response-text-test-id'}
         styles={{
           container: {},
           title: {},

app/components/Views/AesCryptoTestForm/Form.tsx

@@ -17,6 +17,7 @@ const TestForm = ({
   callback,
   callbackTestId,
   responseTestId,
+  responseTextTestId,
   styles,
 }: {
   title: string;
@@ -33,6 +34,7 @@ const TestForm = ({
     | ((...args: any[]) => unknown);
   callbackTestId: string;
   responseTestId: string;
+  responseTextTestId?: string;
   // TODO: Replace "any" with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   styles: any;
@@ -79,7 +81,7 @@ const TestForm = ({
       ))}
       {result && (
         <>
-          <Text variant={TextVariant.BodyMDBold}>Response</Text>
+          <Text variant={TextVariant.BodyMDBold} testID={responseTextTestId}>Response</Text>
           <ClipboardText
             text={result}
             styles={styles}

bitrise.yml

@@ -250,6 +250,8 @@ stages:
       - run_tag_smoke_confirmations_redesigned_ios: {}
       - run_tag_flask_build_tests_ios: {}
       - run_tag_flask_build_tests_android: {}
+      - run_tag_smoke_accounts_ios: {}
+      - run_tag_smoke_accounts_android: {}
   run_single_e2e_ios_android_stage:
     workflows:
       - run_single_ios_e2e_test: {}
@@ -271,6 +273,8 @@ stages:
       - run_tag_smoke_identity_android: {}
       - run_tag_smoke_confirmations_redesigned_ios: {}
       - run_tag_smoke_multichain_api_ios: {}
+      - run_tag_smoke_accounts_ios: {}
+      - run_tag_smoke_accounts_android: {}
   build_regression_e2e_ios_android_stage:
     workflows:
       - ios_build_regression_tests: {}
@@ -298,6 +302,8 @@ stages:
       - run_tag_upgrade_android: {}
       - run_android_app_launch_times_appium_test: {}
       - run_tag_smoke_multichain_api_ios: {}
+      - run_tag_smoke_accounts_ios: {}
+      - run_tag_smoke_accounts_android: {}
 
   report_results_stage:
     workflows:
@@ -979,6 +985,20 @@ workflows:
       - TEST_SUITE_TAG: 'SmokeIdentity'
     after_run:
       - android_e2e_test
+  run_tag_smoke_accounts_ios:
+    envs:
+      - TEST_SUITE_TAG: 'SmokeAccounts'
+    after_run:
+      - ios_e2e_test
+  run_tag_smoke_accounts_android:
+    meta:
+      bitrise.io:
+        stack: linux-docker-android-22.04
+        machine_type_id: elite-xl
+    envs:
+      - TEST_SUITE_TAG: 'SmokeAccounts'
+    after_run:
+      - android_e2e_test
   android_e2e_build:
     envs:
       - KEYSTORE_URL: $BITRISEIO_ANDROID_QA_KEYSTORE_URL

e2e/pages/Settings/AesCryptoTestForm.js

@@ -4,6 +4,7 @@ import {
   aesCryptoFormButtons,
   aesCryptoFormScrollIdentifier,
   accountAddress,
+  responseText,
 } from '../../selectors/Settings/AesCrypto.selectors';
 import Matchers from '../../utils/Matchers';
 import Gestures from '../../utils/Gestures';
@@ -18,6 +19,11 @@ class AesCryptoTestForm {
     return Matchers.getElementByID(accountAddress);
   }
 
+  // Get response text
+  get responseText() {
+    return Matchers.getElementByID(responseText);
+  }
+
   // Generate salt getters
   get generateSaltBytesCountInput() {
     return Matchers.getElementByID(aesCryptoFormInputs.saltBytesCountInput);
@@ -207,7 +213,7 @@ class AesCryptoTestForm {
   async decrypt(encryptionKey) {
     await this.scrollToDecrypt();
     await Gestures.typeTextAndHideKeyboard(
-      await this.decryptPasswordInput,
+      this.decryptPasswordInput,
       encryptionKey,
     );
     await this.scrollToDecrypt();

e2e/selectors/Settings/AesCrypto.selectors.ts

@@ -61,4 +61,5 @@ export const aesCryptoFormButtons: AesCryptoFormButtons = {
 };
 
 export const aesCryptoFormScrollIdentifier: string = 'aes-crypto-form-scroll';
-export const accountAddress: string = 'account-address'; 
+export const accountAddress: string = 'account-address';
+export const responseText: string = 'response-text'; 

e2e/specs/accounts/aes/encryption-with-key.spec.js

@@ -1,4 +1,4 @@
-import { SmokeNetworkExpansion } from '../../../tags';
+import { SmokeAccounts } from '../../../tags';
 import TestHelpers from '../../../helpers';
 import Assertions from '../../../utils/Assertions';
 
@@ -19,7 +19,7 @@ import FixtureServer from '../../../fixtures/fixture-server';
 const fixtureServer = new FixtureServer();
 
 describe(
-  SmokeNetworkExpansion('AES Crypto - Encryption and decryption with encryption key'),
+  SmokeAccounts('AES Crypto - Encryption and decryption with encryption key'),
   () => {
     const PASSWORD_ONE = '123123123';
     // const PASSWORD_TWO = '456456456';

e2e/specs/accounts/aes/encryption-with-password.spec.ts

@@ -1,4 +1,4 @@
-import { SmokeNetworkExpansion } from '../../../tags';
+import { SmokeAccounts } from '../../../tags';
 import TestHelpers from '../../../helpers';
 import Assertions from '../../../utils/Assertions';
 import type { IndexableNativeElement } from 'detox/detox';
@@ -20,7 +20,7 @@ import FixtureServer from '../../../fixtures/fixture-server';
 const fixtureServer = new FixtureServer();
 
 describe(
-  SmokeNetworkExpansion('AES Crypto - Encryption and decryption with password'),
+  SmokeAccounts('AES Crypto - Encryption and decryption with password'),
   (): void => {
     const PASSWORD_ONE: string = '123123123';
     const PASSWORD_TWO: string = '456456456';
@@ -49,6 +49,7 @@ describe(
       await SettingsView.tapAesCryptoTestForm();
 
       await AesCryptoTestForm.encrypt(DATA_TO_ENCRYPT_ONE, PASSWORD_ONE);
+      await Assertions.checkIfVisible(AesCryptoTestForm.responseText);
       await AesCryptoTestForm.decrypt(PASSWORD_ONE);
       await Assertions.checkIfElementHasLabel(
         AesCryptoTestForm.decryptResponse as Promise<IndexableNativeElement>,

e2e/specs/accounts/aes/salt-generation.spec.js

@@ -1,4 +1,4 @@
-import { SmokeNetworkExpansion } from '../../../tags';
+import { SmokeAccounts } from '../../../tags';
 import TestHelpers from '../../../helpers';
 import Assertions from '../../../utils/Assertions';
 
@@ -18,7 +18,7 @@ import FixtureServer from '../../../fixtures/fixture-server';
 
 const fixtureServer = new FixtureServer();
 
-describe(SmokeNetworkExpansion('AES Crypto - Salt generation'), () => {
+describe(SmokeAccounts('AES Crypto - Salt generation'), () => {
   const SALT_BYTES_COUNT = 32;
 
   beforeAll(async () => {

e2e/specs/accounts/error-boundary-srp-backup.spec.js

@@ -8,15 +8,15 @@ import {
   withFixtures,
   defaultGanacheOptions,
 } from '../../fixtures/fixture-helper';
-import { SmokeNetworkExpansion } from '../../tags';
+import { SmokeAccounts } from '../../tags';
 import TestHelpers from '../../helpers';
 import Assertions from '../../utils/Assertions';
 import RevealSecretRecoveryPhrase from '../../pages/Settings/SecurityAndPrivacy/RevealSecretRecoveryPhrase';
 import ErrorBoundaryView from '../../pages/ErrorBoundaryView/ErrorBoundaryView';
 import { buildPermissions } from '../../fixtures/utils';
 const PASSWORD = '123123123';
 
-describe(SmokeNetworkExpansion('Error Boundary Screen'), () => {
+describe(SmokeAccounts('Error Boundary Screen'), () => {
   beforeAll(async () => {
     jest.setTimeout(2500000);
     await TestHelpers.reverseServerPort();