Merge pull request #355 from HathorNetwork/master

[0.21.0] Start release process

.eslintrc.js

@@ -5,6 +5,7 @@ module.exports = {
     node: true,
   },
   extends: ['airbnb-base', 'plugin:react/recommended', 'plugin:prettier/recommended'],
+  parser: 'babel-eslint',
   parserOptions: {
     ecmaFeatures: {
       jsx: true,

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@ name: deploy
 
 on:
   push:
-    branches: [master]
+    branches: [release]
     tags: ['v*']
 
 permissions:
@@ -51,7 +51,7 @@ jobs:
           retention-days: 1
 
   deploy-testnet-explorer:
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/release'
     needs: dependencies
     runs-on: ubuntu-latest
     steps:
@@ -79,7 +79,7 @@ jobs:
           make deploy site=testnet
 
   deploy-nano-testnet-explorer:
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/release'
     needs: dependencies
     runs-on: ubuntu-latest
     steps:
@@ -105,7 +105,7 @@ jobs:
           make deploy site=nano-testnet
 
   deploy-ekvilibro-testnet-explorer:
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/release'
     needs: dependencies
     runs-on: ubuntu-latest
     steps:

.github/workflows/pr-validation.yml

@@ -2,10 +2,10 @@ name: PR validation
 
 on:
   push:
-    branches: [master, dev]
+    branches: [master, release]
   pull_request:
     branches:
-    - dev
+    - release
     - master
 
 jobs:
@@ -35,3 +35,7 @@ jobs:
       - name: Format
         run: |
           npm run format:check
+
+      - name: Linting
+        run: |
+          npm run lint

RELEASING.md

@@ -13,6 +13,6 @@ Create a git tag and a new release on GitHub.
 ## Deploying
 Deploys are automated using Github Actions.
 
-To deploy to the `testnet` website, simply commit to the `master` branch.
+The `testnet` website will be deployed on commits to the `release` branch.
 
-To deploy to the `mainnet` website, create a release in Github using a tag in the format `v0.0.0`. You should use the same version that you updated in the files in the previous section.
+To deploy to the `mainnet` website, create a release in Github using a tag in the format `v0.0.0` and pointing to the `release` branch. You should use the same version that you updated in the files in the previous section.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hathor-admin",
-  "version": "0.20.6",
+  "version": "0.21.0",
   "engines": {
     "node": ">=20.0.0",
     "npm": ">=10.0.0"
@@ -37,15 +37,15 @@
     "viz.js": "2.1.2"
   },
   "scripts": {
-    "build-css": "sass src:src",
+    "build-css": "sass src/index.scss:src/index.css && sass src/newUi.scss:src/newUi.css",
     "watch-css": "npm run build-css && sass --watch src:src",
     "start-js": "react-scripts --openssl-legacy-provider start",
     "start": "npm-run-all -p watch-css start-js",
     "build-js": "react-scripts --openssl-legacy-provider build",
     "build": "npm-run-all build-css build-js",
     "test": "react-scripts test --env=jsdom",
     "lint": "eslint 'src/**/*.js'",
-    "lint:fix": "eslint 'src/**/*.js' --fix",
+    "lint:fix": "eslint src/**/*.js --fix",
     "format": "prettier --write 'src/**/*.js'",
     "format:check": "prettier --check 'src/**/*.js'",
     "eject": "react-scripts eject"

scripts/check_version

@@ -1,17 +1,27 @@
 #!/bin/bash
 
-SRC_VERSION=`grep "const VERSION " ./src/constants.js | cut -d"'" -f2`
+set -e  # Exit on any command failure.
+set -u  # Exit on unset variables.
+
 PACKAGE_VERSION=`grep '"version":' ./package.json | cut -d '"' -f4`
+PACKAGE_LOCK_VERSION=`node -p "require('./package-lock.json').version"`
+PACKAGE_LOCK_VERSION_2=`node -p "require('./package-lock.json').packages[''].version"`
 
 # For debugging:
-# echo x${SRC_VERSION}x
 # echo x${PACKAGE_VERSION}x
+# echo x${PACKAGE_LOCK_VERSION}x
+# echo x${PACKAGE_LOCK_VERSION_2}x
 
 EXITCODE=0
 
-if [[ x${PACKAGE_VERSION}x != x${SRC_VERSION}x ]]; then
-	echo Version different in package.json and src/constants.js
+if [[ x${PACKAGE_VERSION}x != x${PACKAGE_LOCK_VERSION}x ]]; then
+	echo Version different in package.json and package-lock.json
+	EXITCODE=-1
+fi
+
+if [[ x${PACKAGE_VERSION}x != x${PACKAGE_LOCK_VERSION_2}x ]]; then
+	echo Version different in package.json and the packages property in package-lock.json
 	EXITCODE=-1
 fi
 
-exit $EXITCODE
+exit $EXITCODE

src/App.js

@@ -10,9 +10,11 @@ import React, { useCallback, useEffect } from 'react';
 import { Switch, BrowserRouter as Router, Route } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import { axios as hathorLibAxios, config as hathorLibConfig } from '@hathor/wallet-lib';
+import { useTheme, useNewUiEnabled, useNewUiLoad } from './hooks';
 import GDPRConsent from './components/GDPRConsent';
 import Loading from './components/Loading';
 import Navigation from './components/Navigation';
+import Footer from './components/Footer';
 import PeerAdmin from './screens/PeerAdmin';
 import DashboardTx from './screens/DashboardTx';
 import TransactionDetail from './screens/TransactionDetail';
@@ -28,6 +30,7 @@ import TokenDetail from './screens/TokenDetail';
 import Dag from './screens/Dag';
 import Dashboard from './screens/Dashboard';
 import VersionError from './screens/VersionError';
+import ErrorMessage from './components/error/ErrorMessage';
 import WebSocketHandler from './WebSocketHandler';
 import NanoContractDetail from './screens/nano/NanoContractDetail';
 import BlueprintDetail from './screens/nano/BlueprintDetail';
@@ -44,17 +47,24 @@ import createRequestInstance from './api/customAxiosInstance';
 
 hathorLibConfig.setServerUrl(BASE_URL);
 
-const NavigationRoute = ({ internalScreen: InternalScreen }) => (
-  <div>
-    <Navigation />
-    <InternalScreen />
-  </div>
-);
+const NavigationRoute = ({ internalScreen: InternalScreen }) => {
+  const newUiEnabled = useNewUiEnabled();
+
+  return (
+    <div>
+      <Navigation />
+      <InternalScreen />
+      {newUiEnabled ? <Footer /> : ''}
+    </div>
+  );
+};
 
 function Root() {
+  useTheme();
   const dispatch = useDispatch();
   const isVersionAllowed = useSelector(state => state.isVersionAllowed);
   const apiLoadError = useSelector(state => state.apiLoadError);
+  const newUiLoading = useNewUiLoad();
 
   const handleWebsocket = useCallback(
     wsData => {
@@ -97,15 +107,7 @@ function Root() {
       <Router>
         <>
           <Navigation />
-          {apiLoadError ? (
-            <div className="content-wrapper">
-              <h3 className="text-danger">
-                Error loading the explorer. Please reload the page to try again.
-              </h3>
-            </div>
-          ) : (
-            <Loading />
-          )}
+          {apiLoadError ? <ErrorMessage /> : <Loading />}
         </>
       </Router>
     );
@@ -115,6 +117,10 @@ function Root() {
     return <VersionError />;
   }
 
+  if (newUiLoading) {
+    return <Loading />;
+  }
+
   return (
     <>
       <Router>

src/actions/index.js

@@ -5,6 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import store from '../store/index';
+import themeUtils from '../utils/theme';
+
 export const dashboardUpdate = data => ({ type: 'dashboard_update', payload: data });
 
 export const isVersionAllowedUpdate = data => ({
@@ -15,3 +18,12 @@ export const isVersionAllowedUpdate = data => ({
 export const apiLoadErrorUpdate = data => ({ type: 'api_load_error_update', payload: data });
 
 export const updateServerInfo = data => ({ type: 'update_server_info', payload: data });
+
+export const toggleTheme = () => {
+  const state = store.getState();
+  const currentTheme = state.theme === 'light' ? 'dark' : 'light';
+
+  themeUtils.applyTheme(currentTheme);
+
+  return { type: 'toggle_theme', payload: currentTheme };
+};