chore(runway): cherry-pick fix: fixes account related failures in wallet platform and identity tests (#17920)

- fix: fixes account related failures in wallet platform and identity
tests (#17863)

<!--
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 is aimed at fixing the identity and wallet platform workflows as
it pertains to the updated accounts UI.

See test runs specifically for the mentioned workflows:

https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/c4e05ff8-7ed4-4025-ba6b-38df88800e54


Keep in mind, on

[main](https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/3135cb99-523f-4933-a53c-267c454fd306)
there are a few other failing workflows which will be addressed in a
follow up.

<!--
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**

- [ ] 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).
- [ ] 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**

- [ ] 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.

---------

Co-authored-by: Curtis David <[email protected]>
[93b0b74](93b0b74)

Co-authored-by: Christopher Ferreira <[email protected]>
Co-authored-by: Curtis David <[email protected]>

Author: 3 people

e2e/specs/identity/account-syncing/adding-and-renaming-accounts.spec.ts

@@ -138,8 +138,8 @@ describe(
           await AccountListBottomSheet.tapEditAccountActionsAtIndex(1);
           await AccountActionsBottomSheet.renameActiveAccount(NEW_ACCOUNT_NAME);
 
-          // Add another new EVM account
-          await WalletView.tapIdenticon();
+          // Bottom sheet remains open after renaming account
+          // await WalletView.tapIdenticon();
           await AccountListBottomSheet.tapAddAccountButton();
           await AddAccountBottomSheet.tapCreateEthereumAccount();
 

e2e/specs/identity/account-syncing/sync-after-forgot-password.spec.ts

@@ -50,7 +50,6 @@ describe(SmokeIdentity('Account syncing - Forgot Password Flow'), () => {
         await AddAccountBottomSheet.tapCreateEthereumAccount();
         await AccountListBottomSheet.tapEditAccountActionsAtIndex(0);
         await AccountActionsBottomSheet.renameActiveAccount(NEW_ACCOUNT_NAME);
-        await WalletView.tapIdenticon();
         const visibleAccounts = [NEW_ACCOUNT_NAME, SECOND_ACCOUNT_NAME];
         for (const accountName of visibleAccounts) {
           await Assertions.expectElementToBeVisible(
@@ -96,12 +95,9 @@ describe(SmokeIdentity('Account syncing - Forgot Password Flow'), () => {
         const visibleAccounts = [NEW_ACCOUNT_NAME, SECOND_ACCOUNT_NAME];
 
         for (const accountName of visibleAccounts) {
-          await Assertions.expectElementToBeVisible(
-            AccountListBottomSheet.getAccountElementByAccountName(accountName),
-            {
-              description: `Account with name "${accountName}" should be visible`,
-            },
-          );
+          await Assertions.expectTextDisplayed(accountName, {
+            description: `Account with name "${accountName}" should be visible`,
+          });
         }
       },
     );

e2e/specs/multisrp/utils.ts

@@ -4,13 +4,13 @@ import AddAccountBottomSheet from '../../pages/wallet/AddAccountBottomSheet';
 import WalletView from '../../pages/wallet/WalletView';
 import Assertions from '../../framework/Assertions.ts';
 import SRPListItemComponent from '../../pages/wallet/MultiSrp/Common/SRPListItemComponent';
-import AccountActionsBottomSheet from '../../pages/wallet/AccountActionsBottomSheet';
 import SrpQuizModal from '../../pages/Settings/SecurityAndPrivacy/SrpQuizModal';
 import RevealSecretRecoveryPhrase from '../../pages/Settings/SecurityAndPrivacy/RevealSecretRecoveryPhrase';
 import { RevealSeedViewSelectorsText } from '../../selectors/Settings/SecurityAndPrivacy/RevealSeedView.selectors';
 import TabBarComponent from '../../pages/wallet/TabBarComponent';
 import SettingsView from '../../pages/Settings/SettingsView';
 import SecurityAndPrivacyView from '../../pages/Settings/SecurityAndPrivacy/SecurityAndPrivacyView';
+import AccountDetails from '../../pages/MultichainAccounts/AccountDetails.ts';
 
 const PASSWORD = '123123123';
 
@@ -59,7 +59,7 @@ export const goToAccountActions = async (accountIndex: number) => {
   await WalletView.tapIdenticon();
   await Assertions.expectElementToBeVisible(AccountListBottomSheet.accountList);
   await AccountListBottomSheet.tapEditAccountActionsAtIndex(accountIndex);
-  await AccountActionsBottomSheet.tapShowSRP();
+  await AccountDetails.tapExportSrpButton();
 };
 
 export const startExportForKeyring = async (keyringId: string) => {

e2e/specs/solana/create-solana-account.spec.ts

@@ -9,9 +9,10 @@ import AccountActionsBottomSheet from '../../pages/wallet/AccountActionsBottomSh
 import RevealSecretRecoveryPhrase from '../../pages/Settings/SecurityAndPrivacy/RevealSecretRecoveryPhrase';
 import RevealPrivateKey from '../../pages/Settings/SecurityAndPrivacy/RevealPrivateKeyView';
 import AddNewHdAccountComponent from '../../pages/wallet/MultiSrp/AddAccountToSrp/AddNewHdAccountComponent';
-import EditAccountNameView from '../../pages/wallet/EditAccountNameView';
 import SolanaNewFeatureSheet from '../../pages/wallet/SolanaNewFeatureSheet';
 import { withFixtures } from '../../framework/fixtures/FixtureHelper';
+import AccountDetails from '../../pages/MultichainAccounts/AccountDetails';
+import EditAccountName from '../../pages/MultichainAccounts/EditAccountName';
 
 const ACCOUNT_ONE_TEXT = 'Solana Account 1';
 const ACCOUNT_TWO_TEXT = 'Solana Account 2';
@@ -89,11 +90,12 @@ describe(SmokeNetworkExpansion('Create Solana account'), () => {
 
         await WalletView.tapIdenticon();
         await AccountListBottomSheet.tapEditAccountActionsAtIndex(1);
-        await AccountActionsBottomSheet.tapEditAccount();
-        await EditAccountNameView.updateAccountName(NEW_ACCOUNT_NAME);
-        await EditAccountNameView.tapSave();
+        await AccountDetails.tapEditAccountName();
+        await EditAccountName.updateAccountName(NEW_ACCOUNT_NAME);
+        await EditAccountName.tapSave();
+        await Assertions.expectTextDisplayed(NEW_ACCOUNT_NAME);
+        await AccountDetails.tapBackButton();
         await WalletView.tapIdenticon();
-
         await Assertions.expectTextDisplayed(NEW_ACCOUNT_NAME);
       },
     );