Fixed merge conflicts

make-software · May 24, 2024 · 0194d36 · 0194d36
2 parents b79cc8c + 559d2c3
commit 0194d36
Show file tree

Hide file tree

Showing 85 changed files with 8,974 additions and 378 deletions.
diff --git a/e2e-tests/popup/import-account-with-file/import-account-with-file.spec.ts b/e2e-tests/popup/import-account-with-file/import-account-with-file.spec.ts
@@ -58,7 +58,7 @@ popup.describe('Popup UI: import account with file', () => {
         popupPage.getByText(IMPORTED_PEM_ACCOUNT.truncatedPublicKey)
       ).toBeVisible();
       await popupExpect(
-        popupPage.getByText('Imported', { exact: true })
+        popupPage.getByTestId('import-account-icon')
       ).toBeVisible();
     }
   );
@@ -112,7 +112,7 @@ popup.describe('Popup UI: import account with file', () => {
         popupPage.getByText(IMPORTED_CER_ACCOUNT.truncatedPublicKey)
       ).toBeVisible();
       await popupExpect(
-        popupPage.getByText('Imported', { exact: true })
+        popupPage.getByTestId('import-account-icon')
       ).toBeVisible();
     }
   );

diff --git a/e2e-tests/popup/import-torus-account/import-torus-account.spec.ts b/e2e-tests/popup/import-torus-account/import-torus-account.spec.ts
@@ -46,7 +46,7 @@ popup.describe('Popup UI: import account with file', () => {
       popupPage.getByText(IMPORTED_TORUS_ACCOUNT.truncatedPublicKey)
     ).toBeVisible();
     await popupExpect(
-      popupPage.getByText('Imported', { exact: true })
+      popupPage.getByTestId('import-account-icon')
     ).toBeVisible();
   });
 });
diff --git a/package-lock.json b/package-lock.json