Merge branch 'main' into feat/add-metric-units

iotaledger · May 13, 2024 · fff46b7 · fff46b7
2 parents e7a2385 + 0fc6e35
commit fff46b7
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 10 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -1,7 +1,7 @@
 {
     "name": "explorer-api",
     "description": "API for Tangle Explorer",
-    "version": "3.3.10-rc.2",
+    "version": "3.3.11",
     "author": "Martyn Janes <[email protected]>",
     "repository": {
         "type": "git",

diff --git a/api/src/models/db/networkType.ts b/api/src/models/db/networkType.ts
@@ -7,6 +7,7 @@ export const SHIMMER = "shimmer";
 const TESTNET = "testnet";
 const IOTA_TESTNET = "iota-testnet";
 const SHIMMER_TESTNET = "shimmer-testnet";
+const IOTA2_TESTNET = "iota2-testnet";
 const ALPHANET = "alphanet";
 const CUSTOM = "custom";
 
@@ -19,6 +20,7 @@ const networkTypes = [
     TESTNET,
     IOTA_TESTNET,
     SHIMMER_TESTNET,
+    IOTA2_TESTNET,
     ALPHANET,
     CUSTOM,
 ] as const;

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,7 +1,7 @@
 {
     "name": "explorer-client",
     "description": "Tangle Explorer UI",
-    "version": "3.3.10-rc.2",
+    "version": "3.3.11",
     "author": "Martyn Janes <[email protected]>",
     "type": "module",
     "repository": {

diff --git a/client/src/app/AppUtils.tsx b/client/src/app/AppUtils.tsx
@@ -2,7 +2,17 @@ import React, { ReactNode } from "react";
 import { Helmet } from "react-helmet";
 import NetworkContext from "./context/NetworkContext";
 import { INetwork } from "~models/config/INetwork";
-import { ALPHANET, CHRYSALIS_MAINNET, DEVNET, LEGACY_MAINNET, MAINNET, NetworkType, SHIMMER, TESTNET } from "~models/config/networkType";
+import {
+    ALPHANET,
+    CHRYSALIS_MAINNET,
+    DEVNET,
+    IOTA2_TESTNET,
+    LEGACY_MAINNET,
+    MAINNET,
+    NetworkType,
+    SHIMMER,
+    TESTNET,
+} from "~models/config/networkType";
 import { IOTA_UI, Theme } from "~models/config/uiTheme";
 import { IStardustNodeInfo } from "~services/stardust/nodeInfoService";
 import { ServiceFactory } from "~/factories/serviceFactory";
@@ -86,6 +96,11 @@ export const getPages = (currentNetwork: INetwork | undefined, networks: INetwor
                     url: "https://explorer.evm.testnet.shimmer.network/",
                     isExternal: true,
                 },
+                {
+                    label: "IOTA EVM Testnet Explorer",
+                    url: "https://explorer.evm.testnet.iotaledger.net/",
+                    isExternal: true,
+                },
             ],
         },
     ];
@@ -132,7 +147,8 @@ export const buildMetaLabel = (network: NetworkType | undefined): string => {
             metaLabel = "Shimmer Explorer";
             break;
         }
-        case TESTNET: {
+        case TESTNET:
+        case IOTA2_TESTNET: {
             metaLabel = "Testnet Explorer";
             break;
         }

diff --git a/client/src/helpers/networkHelper.ts b/client/src/helpers/networkHelper.ts
@@ -3,6 +3,7 @@ import {
     CHRYSALIS_MAINNET,
     CUSTOM,
     DEVNET,
+    IOTA2_TESTNET,
     IOTA_TESTNET,
     LEGACY_MAINNET,
     MAINNET,
@@ -26,7 +27,8 @@ export const getNetworkOrder = (networkType: NetworkType) => {
         case SHIMMER: {
             return 1;
         }
-        case IOTA_TESTNET: {
+        case IOTA_TESTNET:
+        case IOTA2_TESTNET: {
             return 2;
         }
         case SHIMMER_TESTNET: {

diff --git a/client/src/models/config/networkType.ts b/client/src/models/config/networkType.ts
@@ -6,6 +6,7 @@ export const SHIMMER = "shimmer";
 export const TESTNET = "testnet";
 export const IOTA_TESTNET = "iota-testnet";
 export const SHIMMER_TESTNET = "shimmer-testnet";
+export const IOTA2_TESTNET = "iota2-testnet";
 export const ALPHANET = "alphanet";
 export const CUSTOM = "custom";
 
@@ -20,6 +21,7 @@ export type NetworkType =
     | typeof SHIMMER
     | typeof TESTNET
     | typeof IOTA_TESTNET
+    | typeof IOTA2_TESTNET
     | typeof SHIMMER_TESTNET
     | typeof ALPHANET
     | typeof CUSTOM;
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "explorer",
     "description": "Tangle Explorer",
-    "version": "3.3.10-rc.2",
+    "version": "3.3.11",
     "scripts": {
         "setup:client": "cd client && npm install && npm run postinstall",
         "setup:api": "cd api && npm install && npm run build-compile && npm run build-config",