Merge branch 'dev' into chore/polish-slot-page

iotaledger · Apr 22, 2024 · 3da9332 · 3da9332
2 parents 82aa756 + 8e00c3d
commit 3da9332
Show file tree

Hide file tree

Showing 9 changed files with 934 additions and 1,299 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -26,7 +26,7 @@
         "node": ">=16 <=16.20.2"
     },
     "dependencies": {
-        "@google-cloud/logging-winston": "^5.3.0",
+        "@google-cloud/logging-winston": "^6.0.0",
         "@iota/core": "^1.0.0-beta.30",
         "@iota/crypto.js": "^1.8.6",
         "@iota/identity-wasm": "^0.5.0-dev.6",
@@ -44,7 +44,7 @@
         "big-integer": "^1.6.51",
         "compression": "^1.7.4",
         "dotenv": "^16.0.3",
-        "express": "^4.18.1",
+        "express": "^4.19.2",
         "influx": "^5.9.3",
         "jszip": "^3.10.1",
         "lint-staged": "^14.0.1",

diff --git a/api/src/services/nova/validatorService.ts b/api/src/services/nova/validatorService.ts
@@ -6,9 +6,9 @@ import { INetwork } from "../../models/db/INetwork";
 
 /**
  * The collect validators interval cron expression.
- * Every hour at 55 min 55 sec
+ * Every 10 minutes
  */
-const COLLECT_VALIDATORS_CRON = "55 55 * * * *";
+const COLLECT_VALIDATORS_CRON = "*/10 * * * *";
 
 export class ValidatorService {
     /**

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -41,7 +41,7 @@
         "d3-shape": "^3.1.0",
         "d3-time": "^3.1.0",
         "d3-time-format": "^4.1.0",
-        "express": "^4.18.1",
+        "express": "^4.19.2",
         "jsonschema": "^1.4.1",
         "moment": "^2.29.4",
         "qr.js": "0.0.0",
@@ -98,7 +98,7 @@
         "stylelint-config-sass-guidelines": "^9.0.1",
         "stylelint-config-standard-scss": "^5.0.0",
         "typescript": "^4.9.3",
-        "vite": "^4.5.2",
+        "vite": "^4.5.3",
         "vite-aliases": "^0.11.3",
         "vite-plugin-node-polyfills": "^0.16.0",
         "vite-plugin-svgr": "^4.2.0",

diff --git a/client/src/app/App.tsx b/client/src/app/App.tsx
@@ -45,7 +45,7 @@ const App: React.FC<RouteComponentProps<AppRouteProps>> = ({
 
     useEffect(() => {
         if (networksLoaded && !network) {
-            network = networks.length > 0 ? networks[0].network : MAINNET;
+            network = networks.find((n) => n.network === MAINNET)?.network ?? networks[0]?.network ?? MAINNET;
             history.replace(`/${network}`);
         }
     }, [networksLoaded]);

diff --git a/client/src/helpers/nova/hooks/useGenerateValidatorsTable.ts b/client/src/helpers/nova/hooks/useGenerateValidatorsTable.ts
@@ -33,13 +33,13 @@ function getValidatorTableRow(
             case ValidatorsTableHeadings.Candidate:
                 tableData = {
                     type: TableCellType.Text,
-                    data: (!inCommittee).toString(),
+                    data: validatorResponse.active ? "Yes" : "No",
                 };
                 break;
             case ValidatorsTableHeadings.Elected:
                 tableData = {
                     type: TableCellType.Text,
-                    data: inCommittee.toString(),
+                    data: inCommittee ? "Yes" : "No",
                 };
                 break;
             case ValidatorsTableHeadings.FixedCost: