From c8e8db26662a6b0afa525a4a7052a4243d93da48 Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Mon, 6 Mar 2023 22:18:09 +0100
Subject: [PATCH] Stabilize nft e2e tests (#18006)

---
 test/e2e/nft/import-erc1155.spec.js       | 9 +++++----
 test/e2e/nft/remove-erc1155.spec.js       | 7 +++++--
 test/e2e/nft/view-erc1155-details.spec.js | 5 ++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/test/e2e/nft/import-erc1155.spec.js b/test/e2e/nft/import-erc1155.spec.js
index e74f6b224..9be71fd05 100644
--- a/test/e2e/nft/import-erc1155.spec.js
+++ b/test/e2e/nft/import-erc1155.spec.js
@@ -42,7 +42,7 @@ describe('Import ERC1155 NFT', function () {
         await driver.fill('[data-testid="token-id"]', '1');
         await driver.clickElement({ text: 'Add', tag: 'button' });
 
-        const newNftNotification = await driver.findElement({
+        const newNftNotification = await driver.findVisibleElement({
           text: 'NFT was successfully added!',
           tag: 'h6',
         });
@@ -53,10 +53,11 @@ describe('Import ERC1155 NFT', function () {
           css: 'h5',
           text: 'Rocks',
         });
-        const importedERC1155Image = await driver.waitForSelector(
-          '[class="nfts-items__item-image"]',
-        );
         assert.equal(await importedERC1155.isDisplayed(), true);
+
+        const importedERC1155Image = await driver.findVisibleElement(
+          '.nfts-items__item img',
+        );
         assert.equal(await importedERC1155Image.isDisplayed(), true);
       },
     );
diff --git a/test/e2e/nft/remove-erc1155.spec.js b/test/e2e/nft/remove-erc1155.spec.js
index 9ad21b6c5..e03832694 100644
--- a/test/e2e/nft/remove-erc1155.spec.js
+++ b/test/e2e/nft/remove-erc1155.spec.js
@@ -39,8 +39,11 @@ describe('Remove ERC1155 NFT', function () {
         await driver.fill('[data-testid="token-id"]', '1');
         await driver.clickElement({ text: 'Add', tag: 'button' });
 
-        // Open the details and click remove nft button
-        await driver.clickElement('.nfts-items__item-image');
+        // Open the details page and click remove nft button
+        const importedNftImage = await driver.findVisibleElement(
+          '.nfts-items__item img',
+        );
+        await importedNftImage.click();
         await driver.clickElement('[data-testid="nft-options__button"]');
         await driver.clickElement('[data-testid="nft-item-remove"]');
 
diff --git a/test/e2e/nft/view-erc1155-details.spec.js b/test/e2e/nft/view-erc1155-details.spec.js
index 63442b44b..7c035af8b 100644
--- a/test/e2e/nft/view-erc1155-details.spec.js
+++ b/test/e2e/nft/view-erc1155-details.spec.js
@@ -42,7 +42,10 @@ describe('View ERC1155 NFT details', function () {
         await driver.clickElement({ text: 'Add', tag: 'button' });
 
         // Click to open the NFT details page and check displayed account
-        await driver.clickElement('.nfts-items__item-image');
+        const importedNftImage = await driver.findVisibleElement(
+          '.nfts-items__item img',
+        );
+        await importedNftImage.click();
         const detailsPageAccount = await driver.findElement(
           '.asset-breadcrumb span:nth-of-type(2)',
         );