fix: remove delay and wait for accounts to be synced

Author: mathieuartu

test/e2e/tests/identity/account-syncing/new-user-sync.spec.ts

@@ -63,8 +63,20 @@ describe('Account syncing - New User', function () {
             accountType: ACCOUNT_TYPE.Ethereum,
             accountName: secondAccountName,
           });
-          // Add a delay to allow the account to sync, this can be long for MV2
-          await driver.delay(2000);
+          // Wait for the account to be synced
+          await driver.waitUntil(
+            async () => {
+              return (
+                userStorageMockttpController.paths.get(
+                  USER_STORAGE_FEATURE_NAMES.accounts,
+                )?.response.length === 2
+              );
+            },
+            {
+              timeout: 5000,
+              interval: 500,
+            },
+          );
 
           // Set SRP to use for retreival
           const headerNavbar = new HeaderNavbar(driver);

test/e2e/tests/identity/account-syncing/onboarding-with-opt-out.spec.ts

@@ -165,8 +165,20 @@ describe('Account syncing - Opt-out Profile Sync', function () {
             accountType: ACCOUNT_TYPE.Ethereum,
             accountName: 'New Account',
           });
-          // Add a delay to allow the account to sync, this can be long for MV2
-          await driver.delay(2000);
+          // Wait for the account to be synced
+          await driver.waitUntil(
+            async () => {
+              return (
+                userStorageMockttpController.paths.get(
+                  USER_STORAGE_FEATURE_NAMES.accounts,
+                )?.response.length === 3
+              );
+            },
+            {
+              timeout: 5000,
+              interval: 500,
+            },
+          );
 
           // Set SRP to use for retreival
           const headerNavbar = new HeaderNavbar(driver);

test/e2e/tests/identity/account-syncing/sync-after-adding-account.spec.ts

@@ -88,8 +88,20 @@ describe('Account syncing - Add Account', function () {
             accountType: ACCOUNT_TYPE.Ethereum,
             accountName: customNameAccount3,
           });
-          // Add a delay to allow the account to sync, this can be long for MV2
-          await driver.delay(2000);
+          // Wait for the account to be synced
+          await driver.waitUntil(
+            async () => {
+              return (
+                userStorageMockttpController.paths.get(
+                  USER_STORAGE_FEATURE_NAMES.accounts,
+                )?.response.length === 3
+              );
+            },
+            {
+              timeout: 5000,
+              interval: 500,
+            },
+          );
         },
       );
 
@@ -184,8 +196,20 @@ describe('Account syncing - Add Account', function () {
           await accountListPage.addAccount({
             accountType: ACCOUNT_TYPE.Ethereum,
           });
-          // Add a delay to allow the account to sync, this can be long for MV2
-          await driver.delay(2000);
+          // Wait for the account to be synced
+          await driver.waitUntil(
+            async () => {
+              return (
+                userStorageMockttpController.paths.get(
+                  USER_STORAGE_FEATURE_NAMES.accounts,
+                )?.response.length === 3
+              );
+            },
+            {
+              timeout: 5000,
+              interval: 500,
+            },
+          );
         },
       );
 

test/e2e/tests/identity/account-syncing/sync-with-account-balances.spec.ts

@@ -1,4 +1,5 @@
 import { Mockttp } from 'mockttp';
+import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
 import { unlockWallet, withFixtures } from '../../../helpers';
 import FixtureBuilder from '../../../fixture-builder';
 import { mockInfuraAndAccountSync } from '../mocks';
@@ -135,8 +136,20 @@ describe('Account syncing - User already has balances on multiple accounts', fun
           await accountListPage.addAccount({
             accountType: ACCOUNT_TYPE.Ethereum,
           });
-          // Add a delay to allow the account to sync, this can be long for MV2
-          await driver.delay(2000);
+          // Wait for the account to be synced
+          await driver.waitUntil(
+            async () => {
+              return (
+                userStorageMockttpController.paths.get(
+                  USER_STORAGE_FEATURE_NAMES.accounts,
+                )?.response.length === 5
+              );
+            },
+            {
+              timeout: 5000,
+              interval: 500,
+            },
+          );
 
           accountsToMockBalances = [
             ...INITIAL_ACCOUNTS,