Merge pull request #5379 from LiskHQ/5378-create-e2e-build-script

Introduced build:e2e script
LiskHQ · Oct 12, 2023 · 6900702 · 6900702
2 parents 2b680ba + 83fbe3e
commit 6900702
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -55,7 +55,7 @@ pipeline {
                                 sh '''
                                 cp -R /home/lisk/fonts/basierCircle setup/react/assets/fonts
                                 cp -R /home/lisk/fonts/gilroy setup/react/assets/fonts
-                                yarn run build
+                                yarn run build:e2e
 
                                 # locally serve build
                                 nohup npx serve -l 8081 ./app/buildE2E >serve.out 2>serve.err &

diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "start": "cross-env DEBUG=true && yarn rebuild && electron ./app/",
     "rebuild": "electron-rebuild -m app/node_modules/node-hid && electron-rebuild -m app/node_modules/usb",
     "build": "yarn clean:build && yarn copy:files && yarn build:prod && yarn build:electron",
+    "build:e2e": "yarn clean:build:e2e && yarn copy:files:e2e && yarn build:prod && yarn build:electron",
     "build:prod": "cross-env NODE_OPTIONS='--openssl-legacy-provider' webpack --config ./setup/config/webpack.config.prod",
     "build:electron": "cross-env NODE_OPTIONS='--openssl-legacy-provider' webpack --config ./setup/config/webpack.config.electron",
     "dist": "electron-builder --x64 --publish onTag",
@@ -39,8 +40,10 @@
     "format": "prettier --write '**/*'",
     "install:electron:dependencies": "cd ./app && yarn && cd ..",
     "analyze:bundles": "webpack  --config ./setup/config/webpack.config.analyze",
-    "copy:files": "cpx \"./setup/react/{index.html,assets/**/*}\" \"./app/${BUILD_NAME}/\"",
-    "clean:build": "rm -rf app/${BUILD_NAME}",
+    "copy:files": "cpx \"./setup/react/{index.html,assets/**/*}\" \"./app/build/\"",
+    "clean:build": "rm -rf app/build",
+    "copy:files:e2e": "cpx \"./setup/react/{index.html,assets/**/*}\" \"./app/${BUILD_NAME}/\"",
+    "clean:build:e2e": "rm -rf app/${BUILD_NAME}",
     "clean:dist": "rm -rf dist",
     "postinstall": "patch-package && electron-builder install-app-deps",
     "cucumber:playwright:open": "cucumber-js test -c cucumber.js"

diff --git a/src/modules/pos/validator/components/ValidatorPerformance/ValidatorPerformance.js b/src/modules/pos/validator/components/ValidatorPerformance/ValidatorPerformance.js
@@ -13,7 +13,7 @@ import styles from './styles.css';
 
 const ValidatorPerformance = ({ history }) => {
   const { t } = useTranslation();
-  const address = parseSearchParams(history.location.search).address;
+  const address = parseSearchParams(history.location.search).validatorAddress;
   const {
     isLoading,
     data: { data } = {},

diff --git a/src/modules/pos/validator/components/WarnPunishedValidator/WarnPunishedValidator.css b/src/modules/pos/validator/components/WarnPunishedValidator/WarnPunishedValidator.css
@@ -12,7 +12,7 @@
   font-size: 18px;
 
   &:global(.dark) {
-    color: var(--color-zodiac-blue);
+    color: var(--color-constant-zodiac-blue);
   }
 }
 
@@ -27,14 +27,10 @@
   margin-left: 12px;
   border-radius: 5px;
   border-color: var(--color-zodiac-blue);
-  color: var(--color-zodiac-blue);
+  color: var(--color-constant-zodiac-blue);
 
   &.primary {
     background-color: var(--color-ink-blue);
-
-    &:global(.dark) {
-      color: var(--color-zodiac-blue);
-    }
   }
 }