From 2615ac068875a1d73c4a95c3ec00ff1c72ef427c Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Wed, 6 Dec 2023 13:47:20 +0300
Subject: [PATCH 01/16] test: update tests for sepolia

---
 packages/app/cucumber.mjs                                | 2 +-
 .../tests/e2e/features/artifacts/artifactsSet1.feature   | 1 +
 .../e2e/features/redirection/redirectionSet3.feature     | 9 +++++----
 packages/app/tests/e2e/src/data/data.ts                  | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/app/cucumber.mjs b/packages/app/cucumber.mjs
index 92b66724c3..a9a2bc4cbd 100644
--- a/packages/app/cucumber.mjs
+++ b/packages/app/cucumber.mjs
@@ -16,7 +16,7 @@ export default {
     "summary",
     "progress-bar",
     "@cucumber/pretty-formatter",
-    "./tests/e2e/src/support/reporters/allure-reporter.js",
+  //  "./tests/e2e/src/support/reporters/allure-reporter.js",
   ],
   formatOptions: { snippetInterface: "async-await" },
   worldParameters: getWorldParams(),
diff --git a/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature b/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature
index c001055d46..4b1cb560f2 100644
--- a/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature
+++ b/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature
@@ -94,6 +94,7 @@ Feature: Main Page
   Examples:
       | Value                      | Dropdown |
       | zkSync Era Goerli Testnet  | network  |
+      | zkSync Era Sepolia Testnet | network  |
 
   Scenario: Network stats is displayed
     Then Element with "text" "Network Stats" should be "visible"
diff --git a/packages/app/tests/e2e/features/redirection/redirectionSet3.feature b/packages/app/tests/e2e/features/redirection/redirectionSet3.feature
index 3d6c238a45..1491fc56b8 100644
--- a/packages/app/tests/e2e/features/redirection/redirectionSet3.feature
+++ b/packages/app/tests/e2e/features/redirection/redirectionSet3.feature
@@ -65,7 +65,7 @@ Feature: Redirection
      | /address/0x000000000000000000000000000000000000800A      | zkSync Era Goerli Testnet | /address/0x000000000000000000000000000000000000800A/?network=goerli      | 
      | /address/0x000000000000000000000000000000000000800A      | Goerli (Stage2)           | /address/0x000000000000000000000000000000000000800A/?network=goerli-beta | 
      | /address/0x000000000000000000000000000000000000800A      | zkSync Era Mainnet        | /address/0x000000000000000000000000000000000000800A/?network=mainnet     |
-     | /address/0x000000000000000000000000000000000000800A      | zkSync Era Sepolia Testnet | /address/0x000000000000000000000000000000000000800A/?network=sepolia      |  
+     | /address/0x000000000000000000000000000000000000800A      | zkSync Era Sepolia Testnet | /address/0x000000000000000000000000000000000000800A/?network=sepolia    |  
 
   @id561:I @id562:I @id563:I @productionEnv
   Scenario Outline: Verify redirection to "<Network>" network 
@@ -74,6 +74,7 @@ Feature: Redirection
     Then Current page have "<url>" address 
 
     Examples: 
-     | Initial page                                         | Network                           | url                                                                      | 
-     | /address/0x000000000000000000000000000000000000800A  | zkSync Era Mainnet                | /address/0x000000000000000000000000000000000000800A/?network=mainnet     | 
-     | /address/0x000000000000000000000000000000000000800A  | zkSync Era Goerli Testnet         | /address/0x000000000000000000000000000000000000800A/?network=goerli      | 
+     | Initial page                                         | Network                           | url                                                     | 
+     | /address/0x000000000000000000000000000000000000800A  | zkSync Era Mainnet                | /address/0x000000000000000000000000000000000000800A     | 
+     | /address/0x000000000000000000000000000000000000800A  | zkSync Era Goerli Testnet         | /address/0x000000000000000000000000000000000000800A     |
+     | /address/0x000000000000000000000000000000000000800A  | zkSync Era Sepolia Testnet        | /address/0x000000000000000000000000000000000000800A     | 
diff --git a/packages/app/tests/e2e/src/data/data.ts b/packages/app/tests/e2e/src/data/data.ts
index 1fe9fa5a43..64b8362960 100644
--- a/packages/app/tests/e2e/src/data/data.ts
+++ b/packages/app/tests/e2e/src/data/data.ts
@@ -2,4 +2,5 @@ export enum NetworkSwitcher {
   zkSyncEraGoerli = "/?network=goerli",
   goerliStage2 = "/?network=goerli-beta",
   zkSyncEraMainnet = "/?network=mainnet",
+  zkSyncEraSepolia = "/?network=sepolia",
 }

From bdd9bd610f4bfa0560956b4f7f09a01f9d20310e Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Wed, 6 Dec 2023 13:52:46 +0300
Subject: [PATCH 02/16] test: refactoring

---
 packages/app/cucumber.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/app/cucumber.mjs b/packages/app/cucumber.mjs
index a9a2bc4cbd..6b3342d9e8 100644
--- a/packages/app/cucumber.mjs
+++ b/packages/app/cucumber.mjs
@@ -16,7 +16,7 @@ export default {
     "summary",
     "progress-bar",
     "@cucumber/pretty-formatter",
-  //  "./tests/e2e/src/support/reporters/allure-reporter.js",
+    // "./tests/e2e/src/support/reporters/allure-reporter.js",
   ],
   formatOptions: { snippetInterface: "async-await" },
   worldParameters: getWorldParams(),

From e6b6a5cb2acb04133531dad931bedd23478ac924 Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Wed, 6 Dec 2023 14:13:57 +0300
Subject: [PATCH 03/16] test: refactoring

---
 .../e2e/features/redirection/redirectionSet3.feature      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/app/tests/e2e/features/redirection/redirectionSet3.feature b/packages/app/tests/e2e/features/redirection/redirectionSet3.feature
index 1491fc56b8..970f0c8325 100644
--- a/packages/app/tests/e2e/features/redirection/redirectionSet3.feature
+++ b/packages/app/tests/e2e/features/redirection/redirectionSet3.feature
@@ -74,7 +74,7 @@ Feature: Redirection
     Then Current page have "<url>" address 
 
     Examples: 
-     | Initial page                                         | Network                           | url                                                     | 
-     | /address/0x000000000000000000000000000000000000800A  | zkSync Era Mainnet                | /address/0x000000000000000000000000000000000000800A     | 
-     | /address/0x000000000000000000000000000000000000800A  | zkSync Era Goerli Testnet         | /address/0x000000000000000000000000000000000000800A     |
-     | /address/0x000000000000000000000000000000000000800A  | zkSync Era Sepolia Testnet        | /address/0x000000000000000000000000000000000000800A     | 
+     | Initial page                                         | Network                           | url                                                                      | 
+     | /address/0x000000000000000000000000000000000000800A  | zkSync Era Goerli Testnet         | /address/0x000000000000000000000000000000000000800A/?network=goerli      |
+     | /address/0x000000000000000000000000000000000000800A  | zkSync Era Sepolia Testnet        | /address/0x000000000000000000000000000000000000800A/?network=sepolia     | 
+     | /address/0x000000000000000000000000000000000000800A  | zkSync Era Mainnet                | /address/0x000000000000000000000000000000000000800A/?network=mainnet     | 

From 221d31f102d130cdd0a66abfba983f96cebd2036 Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Wed, 6 Dec 2023 14:34:26 +0300
Subject: [PATCH 04/16] test: refactoring

---
 packages/app/cucumber.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/app/cucumber.mjs b/packages/app/cucumber.mjs
index 6b3342d9e8..92b66724c3 100644
--- a/packages/app/cucumber.mjs
+++ b/packages/app/cucumber.mjs
@@ -16,7 +16,7 @@ export default {
     "summary",
     "progress-bar",
     "@cucumber/pretty-formatter",
-    // "./tests/e2e/src/support/reporters/allure-reporter.js",
+    "./tests/e2e/src/support/reporters/allure-reporter.js",
   ],
   formatOptions: { snippetInterface: "async-await" },
   worldParameters: getWorldParams(),

From fd74c3863f59d5f2bfb2d8be6ed0718b23f46bbd Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Wed, 6 Dec 2023 14:53:56 +0300
Subject: [PATCH 05/16] test: switch default test network to sepolia

---
 packages/app/cucumber.mjs                     |  2 +-
 .../app/src/composables/useRuntimeConfig.ts   | 20 +++++++++----------
 packages/app/src/configs/index.ts             |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/app/cucumber.mjs b/packages/app/cucumber.mjs
index 92b66724c3..6b3342d9e8 100644
--- a/packages/app/cucumber.mjs
+++ b/packages/app/cucumber.mjs
@@ -16,7 +16,7 @@ export default {
     "summary",
     "progress-bar",
     "@cucumber/pretty-formatter",
-    "./tests/e2e/src/support/reporters/allure-reporter.js",
+    // "./tests/e2e/src/support/reporters/allure-reporter.js",
   ],
   formatOptions: { snippetInterface: "async-await" },
   worldParameters: getWorldParams(),
diff --git a/packages/app/src/composables/useRuntimeConfig.ts b/packages/app/src/composables/useRuntimeConfig.ts
index b0a053ee8e..70cb7a6557 100644
--- a/packages/app/src/composables/useRuntimeConfig.ts
+++ b/packages/app/src/composables/useRuntimeConfig.ts
@@ -1,19 +1,19 @@
 import type { NetworkConfig, RuntimeConfig } from "@/configs";
 
 export const DEFAULT_NETWORK: NetworkConfig = {
-  apiUrl: "https://block-explorer-api.testnets.zksync.dev",
-  verificationApiUrl: "https://zksync2-testnet-explorer.zksync.dev",
-  bridgeUrl: "https://goerli.bridge.zksync.io",
-  hostnames: ["https://goerli.explorer.zksync.io"],
+  apiUrl: "https://block-explorer-api.sepolia.zksync.dev",
+  verificationApiUrl: "https://explorer.sepolia.era.zksync.dev",
+  bridgeUrl: "https://staging.goerli.bridge.zksync.dev",
+  hostnames: ["https://sepolia.explorer.zksync.io"],
   icon: "/images/icons/zksync-arrows.svg",
-  l1ExplorerUrl: "https://goerli.etherscan.io",
-  l2ChainId: 280,
-  l2NetworkName: "zkSync Era Goerli Testnet",
-  l2WalletUrl: "https://goerli.portal.zksync.io/",
+  l1ExplorerUrl: "https://sepolia.etherscan.io",
+  l2ChainId: 300,
+  l2NetworkName: "zkSync Era Sepolia Testnet",
+  l2WalletUrl: "https://staging-portal.zksync.dev/?network=era-boojnet",
   maintenance: false,
-  name: "goerli",
+  name: "sepolia",
   published: true,
-  rpcUrl: "https://testnet.era.zksync.dev",
+  rpcUrl: "https://sepolia.era.zksync.dev"
 };
 
 export default (): RuntimeConfig => {
diff --git a/packages/app/src/configs/index.ts b/packages/app/src/configs/index.ts
index 5660e1ccdd..5fa482bbae 100644
--- a/packages/app/src/configs/index.ts
+++ b/packages/app/src/configs/index.ts
@@ -7,7 +7,7 @@ export type NetworkConfig = {
   bridgeUrl?: string;
   l2NetworkName: string;
   l2WalletUrl: string;
-  l2ChainId: 270 | 280 | 324;
+  l2ChainId: 270 | 280 | 324 | 300;
   l1ExplorerUrl?: string;
   maintenance: boolean;
   published: boolean;

From 6e4b2b8c5ceb8b12afafd91244f294a30cc3578b Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Wed, 6 Dec 2023 15:02:03 +0300
Subject: [PATCH 06/16] test: refactoring

---
 packages/app/src/composables/useRuntimeConfig.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/app/src/composables/useRuntimeConfig.ts b/packages/app/src/composables/useRuntimeConfig.ts
index 70cb7a6557..811b5fca14 100644
--- a/packages/app/src/composables/useRuntimeConfig.ts
+++ b/packages/app/src/composables/useRuntimeConfig.ts
@@ -13,7 +13,7 @@ export const DEFAULT_NETWORK: NetworkConfig = {
   maintenance: false,
   name: "sepolia",
   published: true,
-  rpcUrl: "https://sepolia.era.zksync.dev"
+  rpcUrl: "https://sepolia.era.zksync.dev",
 };
 
 export default (): RuntimeConfig => {

From 4d9cebab4d446787e05e6e16968cf7c1eb793f40 Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Wed, 6 Dec 2023 15:33:00 +0300
Subject: [PATCH 07/16] test: refactoring

---
 packages/app/cucumber.mjs                     |  2 +-
 .../app/src/composables/useRuntimeConfig.ts   | 20 +++++++++----------
 packages/app/src/configs/index.ts             |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/app/cucumber.mjs b/packages/app/cucumber.mjs
index 6b3342d9e8..92b66724c3 100644
--- a/packages/app/cucumber.mjs
+++ b/packages/app/cucumber.mjs
@@ -16,7 +16,7 @@ export default {
     "summary",
     "progress-bar",
     "@cucumber/pretty-formatter",
-    // "./tests/e2e/src/support/reporters/allure-reporter.js",
+    "./tests/e2e/src/support/reporters/allure-reporter.js",
   ],
   formatOptions: { snippetInterface: "async-await" },
   worldParameters: getWorldParams(),
diff --git a/packages/app/src/composables/useRuntimeConfig.ts b/packages/app/src/composables/useRuntimeConfig.ts
index 811b5fca14..b0a053ee8e 100644
--- a/packages/app/src/composables/useRuntimeConfig.ts
+++ b/packages/app/src/composables/useRuntimeConfig.ts
@@ -1,19 +1,19 @@
 import type { NetworkConfig, RuntimeConfig } from "@/configs";
 
 export const DEFAULT_NETWORK: NetworkConfig = {
-  apiUrl: "https://block-explorer-api.sepolia.zksync.dev",
-  verificationApiUrl: "https://explorer.sepolia.era.zksync.dev",
-  bridgeUrl: "https://staging.goerli.bridge.zksync.dev",
-  hostnames: ["https://sepolia.explorer.zksync.io"],
+  apiUrl: "https://block-explorer-api.testnets.zksync.dev",
+  verificationApiUrl: "https://zksync2-testnet-explorer.zksync.dev",
+  bridgeUrl: "https://goerli.bridge.zksync.io",
+  hostnames: ["https://goerli.explorer.zksync.io"],
   icon: "/images/icons/zksync-arrows.svg",
-  l1ExplorerUrl: "https://sepolia.etherscan.io",
-  l2ChainId: 300,
-  l2NetworkName: "zkSync Era Sepolia Testnet",
-  l2WalletUrl: "https://staging-portal.zksync.dev/?network=era-boojnet",
+  l1ExplorerUrl: "https://goerli.etherscan.io",
+  l2ChainId: 280,
+  l2NetworkName: "zkSync Era Goerli Testnet",
+  l2WalletUrl: "https://goerli.portal.zksync.io/",
   maintenance: false,
-  name: "sepolia",
+  name: "goerli",
   published: true,
-  rpcUrl: "https://sepolia.era.zksync.dev",
+  rpcUrl: "https://testnet.era.zksync.dev",
 };
 
 export default (): RuntimeConfig => {
diff --git a/packages/app/src/configs/index.ts b/packages/app/src/configs/index.ts
index 5fa482bbae..5660e1ccdd 100644
--- a/packages/app/src/configs/index.ts
+++ b/packages/app/src/configs/index.ts
@@ -7,7 +7,7 @@ export type NetworkConfig = {
   bridgeUrl?: string;
   l2NetworkName: string;
   l2WalletUrl: string;
-  l2ChainId: 270 | 280 | 324 | 300;
+  l2ChainId: 270 | 280 | 324;
   l1ExplorerUrl?: string;
   maintenance: boolean;
   published: boolean;

From 05236afda9e6424413be8cab81443987ba618cae Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Wed, 6 Dec 2023 16:17:22 +0300
Subject: [PATCH 08/16] test: sepolia for testnetSmokeSuite

---
 .github/workflows/app-e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/app-e2e.yml b/.github/workflows/app-e2e.yml
index e288cd6a8e..d8df3ab690 100644
--- a/.github/workflows/app-e2e.yml
+++ b/.github/workflows/app-e2e.yml
@@ -100,7 +100,7 @@ jobs:
           echo "Run tests"
             if [ "${{ matrix.tags }}" = "@testnetSmokeSuite" ]; then
                 echo "Run in testnetSmokeSuite only"
-                E2ENETWORK='/?network=goerli' npx cucumber-js --tags "${{ matrix.tags }} ${{ inputs.environmentTags }} and not @mainnet"
+                E2ENETWORK='/?network=sepolia' npx cucumber-js --tags "${{ matrix.tags }} ${{ inputs.environmentTags }} and not @mainnet"
             else
                 echo "Run in mainnet"
                 E2ENETWORK='${{ inputs.default_network_value_for_e2e }}' npx cucumber-js --tags "${{ matrix.tags }} ${{ inputs.environmentTags }} and not @testnet"

From 210b4c9fb96a905383b067085f7026e0d72403ba Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Thu, 7 Dec 2023 14:04:11 +0300
Subject: [PATCH 09/16] test: switch and fix test on sepolia

---
 .github/workflows/app-deploy-feature-branch.yml      |  3 ++-
 .github/workflows/app-deploy-preview.yml             |  3 ++-
 .github/workflows/app-e2e.yml                        |  6 +++++-
 .gitignore                                           |  2 +-
 .../e2e/features/artifacts/artifactsSet3.feature     | 12 ++++++------
 packages/app/tests/e2e/features/copying.feature      |  3 ++-
 .../e2e/features/redirection/redirectionSet2.feature |  8 ++++----
 .../e2e/features/redirection/redirectionSet3.feature | 10 +++++-----
 8 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/app-deploy-feature-branch.yml b/.github/workflows/app-deploy-feature-branch.yml
index 7701b73b8a..8d3debee5a 100644
--- a/.github/workflows/app-deploy-feature-branch.yml
+++ b/.github/workflows/app-deploy-feature-branch.yml
@@ -66,13 +66,14 @@ jobs:
 
   mainnet:
     needs: build
-    name: Feature Env, Mainnet+
+    name: Feature on Mainnet + Sepolia
     uses: ./.github/workflows/app-e2e.yml
     secrets: inherit
     permissions:
       contents: read
     with:
       targetUrl: ${{ needs.build.outputs.dappUrl }}
+      testnet_network_value_for_e2e: "/?network=sepolia"
       default_network_value_for_e2e: "/?network=mainnet"
       publish_to_allure: true
       environmentTags: "and not @productionEnv"
diff --git a/.github/workflows/app-deploy-preview.yml b/.github/workflows/app-deploy-preview.yml
index 1e371e4637..dc14276de3 100644
--- a/.github/workflows/app-deploy-preview.yml
+++ b/.github/workflows/app-deploy-preview.yml
@@ -63,13 +63,14 @@ jobs:
 
   mainnet:
     needs: deploy
-    name: Staging Env, Mainnet+
+    name: Staging on Mainnet + Sepolia
     uses: ./.github/workflows/app-e2e.yml
     secrets: inherit
     permissions:
       contents: read
     with:
       targetUrl: ${{ needs.deploy.outputs.dappUrl }}
+      testnet_network_value_for_e2e: "/?network=sepolia"
       default_network_value_for_e2e: "/?network=mainnet"
       publish_to_allure: true
       environmentTags: "and not @featureEnv"
diff --git a/.github/workflows/app-e2e.yml b/.github/workflows/app-e2e.yml
index d8df3ab690..354c768469 100644
--- a/.github/workflows/app-e2e.yml
+++ b/.github/workflows/app-e2e.yml
@@ -19,6 +19,10 @@ on:
         type: string
         default: '/?network=mainnet'
         required: true
+      testnet_network_value_for_e2e:
+          type: string
+          default: '/?network=sepolia'
+          required: true
       publish_to_allure: #Here we define the variable that can be overwritten by caller workflow
         type: boolean
         description: "Publish test results to allure"
@@ -100,7 +104,7 @@ jobs:
           echo "Run tests"
             if [ "${{ matrix.tags }}" = "@testnetSmokeSuite" ]; then
                 echo "Run in testnetSmokeSuite only"
-                E2ENETWORK='/?network=sepolia' npx cucumber-js --tags "${{ matrix.tags }} ${{ inputs.environmentTags }} and not @mainnet"
+                E2ENETWORK='${{ inputs.testnet_network_value_for_e2e }}' npx cucumber-js --tags "${{ matrix.tags }} ${{ inputs.environmentTags }} and not @mainnet"
             else
                 echo "Run in mainnet"
                 E2ENETWORK='${{ inputs.default_network_value_for_e2e }}' npx cucumber-js --tags "${{ matrix.tags }} ${{ inputs.environmentTags }} and not @testnet"
diff --git a/.gitignore b/.gitignore
index fe4a77a6c7..ecbf0116b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,7 @@ lerna-debug.log*
 !.vscode/extensions.json
 
 # Allure
-/allure-results/
+**allure-results/
 
 # App hyperchain config
 hyperchain.config.json
diff --git a/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature b/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
index 2c1125ea70..cc10de46ac 100644
--- a/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
+++ b/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
@@ -120,7 +120,7 @@ Feature: Main Page
     # When I click by text "Show more transactions ->"
     #Then Element with "text" "self" should be "visible"
 
-  @id580 @id578 @id619 @testnet @testnetSmokeSuite
+  @id580 @id578 @id619 @testnet
   Scenario Outline: Verify label "<label name>" for method column on Contract page
     Given I go to page "<Page>"
     Then Column with "Method" name includes "<label name>" cell
@@ -142,7 +142,7 @@ Feature: Main Page
 
   @id258 @testnet @testnetSmokeSuite
   Scenario Outline: Check data type dropdown for "<Row>" and select "<Value>"
-    Given I go to page "/tx/0x4f7406f5565d875ce1a2ebb7c83f582e9795294ad57276eae3909b59537ab051"
+    Given I go to page "/tx/0x4dca9c536124e5e2b29af17d075c3e55d15f119acf5f3327c9fdb1a3ffeab427"
     When I select "Logs" tab on "Transaction" page
     When I click on datatype dropdown of "<Row>" row
     When I click by text "<Value>"
@@ -153,11 +153,11 @@ Feature: Main Page
       | Topics | Hex     |
       | Topics | Number  |
       | Topics | Text    |
-      | Topics | Address |
+      | Topics | Addres  |
       | Data   | Hex     |
       | Data   | Number  |
       | Data   | Text    |
-      | Data   | Address |
+      | Data   | Addres  |
 
   @id258 @mainnet 
   Scenario Outline: Check data type dropdown for "<Row>" and select "<Value>"
@@ -189,13 +189,13 @@ Feature: Main Page
 
   @id588 @testnet @testnetSmokeSuite
   Scenario: Check Processed status component for Transaction page
-    Given I go to page "/tx/0x51cef3cdc8237635c6151b664c1925281766fabe2fa3d60e63f1369829c2f881"
+    Given I go to page "/tx/0x4dca9c536124e5e2b29af17d075c3e55d15f119acf5f3327c9fdb1a3ffeab427"
     Then Verify the badge with "Processed" status is visible
     Then Verify the badge with "Executed" status is visible
     Then Element with "text" "Executed" should be "visible"
     # Then Status component color with "Executed" status should be "green"
 
-  @id589 @testnet @testnetSmokeSuite
+  @id589 @testnet
   Scenario: Check Failed status component for Transaction page
     Given I go to page "/tx/0xb556d6cd77cf37002c668156b0ea7a1c18050decc1c99a67d6aa3b214647d2ae"
     Then Verify the badge with "Failed" status is visible
diff --git a/packages/app/tests/e2e/features/copying.feature b/packages/app/tests/e2e/features/copying.feature
index 6aa9b48c39..b8379a9afb 100644
--- a/packages/app/tests/e2e/features/copying.feature
+++ b/packages/app/tests/e2e/features/copying.feature
@@ -157,7 +157,8 @@ Feature: Copying
 #    And Element with "text" "Copied!" should be "visible"
 #    Then Clipboard value is not empty
 
-  @id275 @testnet @testnetSmokeSuite
+  #@testnetSmokeSuite no tokens in tokenlist
+  @id275 @testnet 
   Scenario Outline: Check "<Row>" hashes copying for Tokens page
     Given I go to page "/tokenlist"
     When I click on the copy button with "<Row>" row on "Tokens" page
diff --git a/packages/app/tests/e2e/features/redirection/redirectionSet2.feature b/packages/app/tests/e2e/features/redirection/redirectionSet2.feature
index cb0e600ae7..523a181093 100644
--- a/packages/app/tests/e2e/features/redirection/redirectionSet2.feature
+++ b/packages/app/tests/e2e/features/redirection/redirectionSet2.feature
@@ -29,7 +29,7 @@ Feature: Redirection
 
   @id242:I @testnet @testnetSmokeSuite
   Scenario Outline: Verify redirection from Contracts page after "<Artifact type>" click
-    Given I go to page "/address/0xAB2e93b557ef5FD04ABc6f57De6a1D1DE18924c4"
+    Given I go to page "/address/0x000000000000000000000000000000000000800A"
     When I click on the first "<Artifact type>" link
     Given Page with part address "<url>" includes ID result
 
@@ -91,7 +91,7 @@ Feature: Redirection
   #Transaction page 241 - navigation, 553 - redirection
   @id241 @id553 @id339 @id340 @testnet @testnetSmokeSuite
   Scenario Outline: Verify redirection from Transaction page after "<Artifact type>" click
-    Given I go to page "/tx/0x6fc015405255af17fb38f5a1408557f5f00d094e07a2f8f6af933a889d9a3330"
+    Given I go to page "/tx/0x095ba0e946b09767085c7ddfb0f9ff36fab230fc819b56d41185a3033de27bea"
     When I click on the first "<Artifact type>" link
     Given Page with part address "<url>" includes ID result
 
@@ -132,8 +132,8 @@ Feature: Redirection
       | Fee               | /address/   |
 
 
-  #Tokens page
-  @id250 @testnetSmokeSuite
+  #Tokens page @testnetSmokeSuite
+  @id250 
   Scenario Outline: Verify redirection from Tokens page after "<Artifact type>" click
     Given I go to page "/tokenlist/"
     When I click on the first "<Artifact type>" link
diff --git a/packages/app/tests/e2e/features/redirection/redirectionSet3.feature b/packages/app/tests/e2e/features/redirection/redirectionSet3.feature
index 970f0c8325..2aecd735ee 100644
--- a/packages/app/tests/e2e/features/redirection/redirectionSet3.feature
+++ b/packages/app/tests/e2e/features/redirection/redirectionSet3.feature
@@ -14,8 +14,8 @@ Feature: Redirection
 
     Examples:
     | Block Number     | Artifact type       | url         |
-    |  1003            | from address        | /address/   |
-    |  1003            | to address          | /address/   |
+    |  100            | from address        | /address/   |
+    |  100            | to address          | /address/   |
 
   @id368:I @mainnet 
   Scenario: Verify redirection from Block page L1 addresses to etherscan after address click
@@ -25,8 +25,8 @@ Feature: Redirection
 
     Examples:
     | Block Number  | Artifact type       | url         |
-    |  1003         | from address        | /address/   |
-    |  1003         | to address          | /address/   |
+    |  100          | from address        | /address/   |
+    |  100          | to address          | /address/   |
 
   #Main Page - Transaction page
   @id338 @testnetSmokeSuite
@@ -43,7 +43,7 @@ Feature: Redirection
   #369 Contract page - Pages - Redirection
   @id369 @testnet @testnetSmokeSuite
   Scenario: Verify contract link on the Contacts page
-    Given I go to page "/address/0x0BfcE1D53451B4a8175DD94e6e029F7d8a701e9c"
+    Given I go to page "/address/0xed7175341f123f7718aBaCF1702d6980CFc08784"
     When I click on the first "from address" link
     Given Page with part address "/address/" includes ID result
 

From f66191dc5a91a54a7e371e08956f1e2f5ffa051c Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Thu, 7 Dec 2023 14:45:47 +0300
Subject: [PATCH 10/16] test: fix test with self option on mainnet

---
 .../tests/e2e/features/artifacts/artifactsSet3.feature | 10 +++++-----
 packages/app/tests/e2e/src/pages/base.page.ts          |  5 +++++
 .../app/tests/e2e/src/steps/blockexplorer.steps.ts     |  7 +++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature b/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
index cc10de46ac..756b434993 100644
--- a/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
+++ b/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
@@ -114,11 +114,11 @@ Feature: Main Page
     # When I click by text "Show more transactions ->"
     Then Element with "text" "in" should be "visible"
 
-  #@id382 @mainnet
-  #Scenario: Verify label "self" for Account info on Account page
-    #Given I go to page "/address/0x94124252B5D343AB6E950A15982599ee1AADE660"
-    # When I click by text "Show more transactions ->"
-    #Then Element with "text" "self" should be "visible"
+  @id382 @mainnet
+  Scenario: Verify label "self" for Account info on Account page
+    Given I go to page "/address/0x94124252B5D343AB6E950A15982599ee1AADE660"
+    When I click by element with class "sr-only" and text "Next"
+    Then Element with "text" "self" should be "visible"
 
   @id580 @id578 @id619 @testnet
   Scenario Outline: Verify label "<label name>" for method column on Contract page
diff --git a/packages/app/tests/e2e/src/pages/base.page.ts b/packages/app/tests/e2e/src/pages/base.page.ts
index 2111d0ac2b..cd83edf724 100644
--- a/packages/app/tests/e2e/src/pages/base.page.ts
+++ b/packages/app/tests/e2e/src/pages/base.page.ts
@@ -120,6 +120,11 @@ export class BasePage {
     return await element;
   }
 
+  async getElementByClassAndText(className: string, text: string) {
+    element = await this.world.page?.locator(`//*[@class='${className}' and contains(text(), '${text}')]`);
+    return await element;
+  }
+
   async getNetworkLayer(testid: string, selectorType: string) {
     helper = new Helper(this.world);
     const dataLinkId = `//*[@class='transactions-data-link-network']`;
diff --git a/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts b/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
index 507e977eab..e4110fda57 100644
--- a/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
+++ b/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
@@ -135,6 +135,13 @@ When("I click by element with partial href {string}", async function (this: ICus
   await element.click();
 });
 
+When("I click by element with class {string} and text {string}", async function (this: ICustomWorld, className: string, text: string) {
+  basePage = new BasePage(this);
+  element = await basePage.getElementByClassAndText(className, text);
+
+  await element.click();
+});
+
 When(
   "I click by element with partial href {string} and text {string}",
   async function (this: ICustomWorld, partialHref: string, text: string) {

From 34cf5320eb4b945aed1afbd4dbf7c0e59e2e389d Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Thu, 7 Dec 2023 14:50:49 +0300
Subject: [PATCH 11/16] test: refactoring

---
 packages/app/tests/e2e/src/steps/blockexplorer.steps.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts b/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
index e4110fda57..e1b9b5f0cb 100644
--- a/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
+++ b/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
@@ -135,7 +135,9 @@ When("I click by element with partial href {string}", async function (this: ICus
   await element.click();
 });
 
-When("I click by element with class {string} and text {string}", async function (this: ICustomWorld, className: string, text: string) {
+When(
+  "I click by element with class {string} and text {string}",
+  async function (this: ICustomWorld, className: string, text: string) {
   basePage = new BasePage(this);
   element = await basePage.getElementByClassAndText(className, text);
 

From ef44cad68e669804f4c113553faf74c0fa2ff6f0 Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Thu, 7 Dec 2023 14:58:22 +0300
Subject: [PATCH 12/16] test: refactoring

---
 packages/app/tests/e2e/src/steps/blockexplorer.steps.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts b/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
index e1b9b5f0cb..7849deaa9f 100644
--- a/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
+++ b/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
@@ -138,11 +138,12 @@ When("I click by element with partial href {string}", async function (this: ICus
 When(
   "I click by element with class {string} and text {string}",
   async function (this: ICustomWorld, className: string, text: string) {
-  basePage = new BasePage(this);
-  element = await basePage.getElementByClassAndText(className, text);
+    basePage = new BasePage(this);
+    element = await basePage.getElementByClassAndText(className, text);
 
-  await element.click();
-});
+    await element.click();
+  }
+);
 
 When(
   "I click by element with partial href {string} and text {string}",

From bc6b85713390df52aecf6bf527e2359c1bd4f8d1 Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Thu, 7 Dec 2023 16:14:21 +0300
Subject: [PATCH 13/16] test: adding tokenlist tests

---
 packages/app/tests/e2e/features/copying.feature               | 3 +--
 .../tests/e2e/features/redirection/redirectionSet2.feature    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/app/tests/e2e/features/copying.feature b/packages/app/tests/e2e/features/copying.feature
index b8379a9afb..6aa9b48c39 100644
--- a/packages/app/tests/e2e/features/copying.feature
+++ b/packages/app/tests/e2e/features/copying.feature
@@ -157,8 +157,7 @@ Feature: Copying
 #    And Element with "text" "Copied!" should be "visible"
 #    Then Clipboard value is not empty
 
-  #@testnetSmokeSuite no tokens in tokenlist
-  @id275 @testnet 
+  @id275 @testnet @testnetSmokeSuite
   Scenario Outline: Check "<Row>" hashes copying for Tokens page
     Given I go to page "/tokenlist"
     When I click on the copy button with "<Row>" row on "Tokens" page
diff --git a/packages/app/tests/e2e/features/redirection/redirectionSet2.feature b/packages/app/tests/e2e/features/redirection/redirectionSet2.feature
index 523a181093..5f0d080387 100644
--- a/packages/app/tests/e2e/features/redirection/redirectionSet2.feature
+++ b/packages/app/tests/e2e/features/redirection/redirectionSet2.feature
@@ -132,8 +132,8 @@ Feature: Redirection
       | Fee               | /address/   |
 
 
-  #Tokens page @testnetSmokeSuite
-  @id250 
+  #Tokens page 
+  @id250 @testnetSmokeSuite
   Scenario Outline: Verify redirection from Tokens page after "<Artifact type>" click
     Given I go to page "/tokenlist/"
     When I click on the first "<Artifact type>" link

From 584de62c12a2315d0cb2ba127963c1330658cb7e Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Thu, 7 Dec 2023 16:29:50 +0300
Subject: [PATCH 14/16] test: refactoring

---
 packages/app/tests/e2e/src/pages/base.page.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/app/tests/e2e/src/pages/base.page.ts b/packages/app/tests/e2e/src/pages/base.page.ts
index cd83edf724..fc862fbd5e 100644
--- a/packages/app/tests/e2e/src/pages/base.page.ts
+++ b/packages/app/tests/e2e/src/pages/base.page.ts
@@ -121,6 +121,7 @@ export class BasePage {
   }
 
   async getElementByClassAndText(className: string, text: string) {
+    await this.world.page?.waitForTimeout(config.defaultTimeout.timeout);
     element = await this.world.page?.locator(`//*[@class='${className}' and contains(text(), '${text}')]`);
     return await element;
   }

From 28831156cabb1a378d5d03c9081e073f461343de Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Thu, 7 Dec 2023 18:58:46 +0300
Subject: [PATCH 15/16] test: fix test 382 on mainnet

---
 .../tests/e2e/features/artifacts/artifactsSet3.feature |  8 +++-----
 packages/app/tests/e2e/src/pages/base.page.ts          |  6 ------
 .../app/tests/e2e/src/steps/blockexplorer.steps.ts     | 10 ----------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature b/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
index 756b434993..8e5b4848f3 100644
--- a/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
+++ b/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
@@ -111,13 +111,11 @@ Feature: Main Page
   @id380 @mainnet
   Scenario: Verify label "in" for Account info on Account page
     Given I go to page "/address/0x0000000000000000000000000000000000000000"
-    # When I click by text "Show more transactions ->"
     Then Element with "text" "in" should be "visible"
 
   @id382 @mainnet
   Scenario: Verify label "self" for Account info on Account page
-    Given I go to page "/address/0x94124252B5D343AB6E950A15982599ee1AADE660"
-    When I click by element with class "sr-only" and text "Next"
+    Given I go to page "/address/0xed7175341f123f7718aBaCF1702d6980CFc08784"
     Then Element with "text" "self" should be "visible"
 
   @id580 @id578 @id619 @testnet
@@ -195,9 +193,9 @@ Feature: Main Page
     Then Element with "text" "Executed" should be "visible"
     # Then Status component color with "Executed" status should be "green"
 
-  @id589 @testnet
+  @id589 @testnet @testnetSmokeSuite
   Scenario: Check Failed status component for Transaction page
-    Given I go to page "/tx/0xb556d6cd77cf37002c668156b0ea7a1c18050decc1c99a67d6aa3b214647d2ae"
+    Given I go to page "/tx/0xd5f436a8f6785ae6d4d21375c5f497e4d0350407582a584a867cd7e01efbbc15"
     Then Verify the badge with "Failed" status is visible
     Then Element with "text" "Failed" should be "visible"
     # Then Status component color with "failed" status should be "red"
diff --git a/packages/app/tests/e2e/src/pages/base.page.ts b/packages/app/tests/e2e/src/pages/base.page.ts
index fc862fbd5e..2111d0ac2b 100644
--- a/packages/app/tests/e2e/src/pages/base.page.ts
+++ b/packages/app/tests/e2e/src/pages/base.page.ts
@@ -120,12 +120,6 @@ export class BasePage {
     return await element;
   }
 
-  async getElementByClassAndText(className: string, text: string) {
-    await this.world.page?.waitForTimeout(config.defaultTimeout.timeout);
-    element = await this.world.page?.locator(`//*[@class='${className}' and contains(text(), '${text}')]`);
-    return await element;
-  }
-
   async getNetworkLayer(testid: string, selectorType: string) {
     helper = new Helper(this.world);
     const dataLinkId = `//*[@class='transactions-data-link-network']`;
diff --git a/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts b/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
index 7849deaa9f..507e977eab 100644
--- a/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
+++ b/packages/app/tests/e2e/src/steps/blockexplorer.steps.ts
@@ -135,16 +135,6 @@ When("I click by element with partial href {string}", async function (this: ICus
   await element.click();
 });
 
-When(
-  "I click by element with class {string} and text {string}",
-  async function (this: ICustomWorld, className: string, text: string) {
-    basePage = new BasePage(this);
-    element = await basePage.getElementByClassAndText(className, text);
-
-    await element.click();
-  }
-);
-
 When(
   "I click by element with partial href {string} and text {string}",
   async function (this: ICustomWorld, partialHref: string, text: string) {

From 78d34ac5b9f9441d3c1c2b5007abe89606b146ac Mon Sep 17 00:00:00 2001
From: pcheremu <pavel.cheremushkin@gmail.com>
Date: Fri, 8 Dec 2023 13:15:22 +0300
Subject: [PATCH 16/16] test: fix text selection

---
 .../tests/e2e/features/artifacts/artifactsSet3.feature    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature b/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
index 8e5b4848f3..b917a748fe 100644
--- a/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
+++ b/packages/app/tests/e2e/features/artifacts/artifactsSet3.feature
@@ -144,18 +144,18 @@ Feature: Main Page
     When I select "Logs" tab on "Transaction" page
     When I click on datatype dropdown of "<Row>" row
     When I click by text "<Value>"
-    Then Check the element contains text "<Value>"
+    Then Check the element have the exact text "<Value>"
 
     Examples:
       | Row    | Value   |
       | Topics | Hex     |
       | Topics | Number  |
       | Topics | Text    |
-      | Topics | Addres  |
+      | Topics | Address |
       | Data   | Hex     |
       | Data   | Number  |
       | Data   | Text    |
-      | Data   | Addres  |
+      | Data   | Address |
 
   @id258 @mainnet 
   Scenario Outline: Check data type dropdown for "<Row>" and select "<Value>"
@@ -163,7 +163,7 @@ Feature: Main Page
     When I select "Logs" tab on "Transaction" page
     When I click on datatype dropdown of "<Row>" row
     When I click by text "<Value>"
-    Then Check the element contains text "<Value>"
+    Then Check the element have the exact text "<Value>"
 
     Examples:
       | Row    | Value   |