Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staking UI - escrow, grants, delegation actions and summary #205

Merged
merged 27 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9a3039f
portal#121 Add validator icons
dmytrotkk Mar 24, 2024
5eeb6d0
Implement Staking UI, add escrow support, add staking actions, add va…
dmytrotkk Mar 24, 2024
149d346
Merge develop into add-delegation-ui
dmytrotkk Mar 24, 2024
414f8c4
Fix build, remove unused imports
dmytrotkk Mar 24, 2024
fbb1965
Add https://skalenetwork.github.io to connect-src policy
dmytrotkk Mar 24, 2024
1727828
Add github to connect-src policy
dmytrotkk Mar 24, 2024
78ef7b3
Add escrow address clipboard, update metaport dependency
dmytrotkk Mar 25, 2024
438620f
Add mobile optimization for staking page
dmytrotkk Mar 25, 2024
d023538
Update metadata, update metaport dependency, add new legacy network info
dmytrotkk Mar 27, 2024
0d99e66
Update connect-src policy
dmytrotkk Mar 27, 2024
51c7302
Minor bugfixes - delegation type
dmytrotkk Mar 27, 2024
b2620e4
Update mobile version, add total staked to validator
dmytrotkk Apr 1, 2024
78324b2
Update preview mode - disable actions, add warning
dmytrotkk Apr 1, 2024
a2c57dd
Update delegation state labels
dmytrotkk Apr 1, 2024
44bf51b
Update skale-network submodule
dmytrotkk Apr 1, 2024
89b1d1f
Rename delType to delegationType
dmytrotkk Apr 2, 2024
a90836a
Fix delType name, update logger
dmytrotkk Apr 2, 2024
a238d80
Handle validator id on Delegate page
dmytrotkk Apr 2, 2024
d5b9dbb
Fix some of the linter warnings, add eslint packages
dmytrotkk Apr 2, 2024
2b642ff
Remove commented code - portfolio and apps
dmytrotkk Apr 4, 2024
db45bba
Remove chains.json comment
dmytrotkk Apr 4, 2024
83237cc
Remove comments from SchainDetails
dmytrotkk Apr 4, 2024
341a2fd
Remove unused contracts
dmytrotkk Apr 4, 2024
76a106a
Remove commented block from StakeAmount
dmytrotkk Apr 4, 2024
3adcd24
Remove unused comments
dmytrotkk Apr 4, 2024
76961c4
Remove unused interface
dmytrotkk Apr 4, 2024
2dcdca7
Update legacy network metaport config
dmytrotkk Apr 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ module.exports = {
extends: [
'plugin:react/recommended',
'standard-with-typescript',
'prettier',
'plugin:storybook/recommended'
'prettier'
],
overrides: [],
overrides: [{
files: ['*.jsx', '*.tsx'],
rules: {
'@typescript-eslint/explicit-function-return-type': ['off'],
},
}],
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
Expand All @@ -18,8 +22,7 @@ module.exports = {
rules: {
'react/jsx-key': 'off',
'react/react-in-jsx-scope': 'off',
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': 'warn',
'no-console': 'warn',
'@typescript-eslint/triple-slash-reference': 'off'
},
}
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@ yarn-error.log*
.env
src/data/metaportConfig*.ts
src/meta/
src/assets/validators/index.ts

src/metadata/chainsData.json
src/metadata/faucet.json
.vercel

chainsJson.json

public/sitemap.xml
public/robots.txt
3 changes: 2 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ else
fi

node generate-imports.cjs ./src/meta/logos
node generate-imports.cjs ./src/assets/validators

bash generate_sitemap.sh

echo "Building..."
yarn build
bun run build
Binary file modified bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion generate-imports.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if (!rootDir) {
const getSvgFilesInDir = (dir) => {
return fs.readdirSync(dir).filter(file => {
const ext = path.extname(file);
return ['.png', '.svg', '.gif'].includes(ext);
return ['.png', '.svg', '.gif', '.webp', '.jpeg', '.jpg'].includes(ext);
}).map(file => path.join(dir, file))
};

Expand Down
19 changes: 13 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,35 @@
{
"name": "portal",
"private": true,
"version": "2.1.1",
"version": "2.2.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"lint": "eslint ./src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"prettier": "prettier --write \"src/**/*.{ts,tsx,js,mdx}\"",
"version": "node -e \"console.log(require('./package.json').version);\""
},
"dependencies": {
"@mdx-js/rollup": "^2.3.0",
"@mui/icons-material": "^5.14.8",
"@mui/material": "^5.14.5",
"@skalenetwork/metaport": "2.0.3-beta.2",
"@mui/icons-material": "^5.15.14",
"@mui/material": "^5.15.14",
"@skalenetwork/skale-contracts-ethers-v6": "1.0.1-develop.2",
"@skalenetwork/metaport": "2.1.0-develop.2",
"@types/react-copy-to-clipboard": "^5.0.4",
"@vercel/analytics": "^1.0.2",
"eslint-config-prettier": "^9.0.0",
"eslint-config-standard-with-typescript": "^39.1.0",
"ethers-multicall-provider": "^6.2.0",
"prettier": "^3.0.3",
"react": "^18.2.0",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
"react-jazzicon": "^1.0.4",
"react-router-dom": "^6.15.0"
"react-router-dom": "^6.15.0",
"react-transition-group": "^4.4.5"
},
"devDependencies": {
"@types/react": "^18.2.15",
Expand All @@ -37,6 +40,10 @@
"@vitejs/plugin-react": "^4.0.4",
"bun-types": "^1.0.17",
"eslint": "^8.45.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"sass": "^1.65.1",
Expand Down
Binary file modified public/apps.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/bridge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/chains.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/portfolio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/staking.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/stats.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion skale-network
Submodule skale-network updated 30 files
+34 −2 metadata/legacy/chains.json
+4 −0 metadata/legacy/icons/adorable-quaint-bellatrix-cryptocrusades.svg
+4 −0 metadata/legacy/icons/adorable-quaint-bellatrix-motodex.svg
+9 −0 metadata/legacy/icons/adorable-quaint-bellatrix-nftb.svg
+26 −0 metadata/legacy/icons/adorable-quaint-bellatrix.svg
+0 −0 metadata/legacy/icons/spanish-smug-auva-clet-domains.svg
+0 −0 metadata/legacy/icons/spanish-smug-auva-nftrade.svg
+0 −0 metadata/legacy/icons/spanish-smug-auva-untitled-platformer.svg
+0 −0 metadata/legacy/icons/spanish-smug-auva-xp-network.svg
+0 −0 metadata/legacy/icons/spanish-smug-auva.svg
+0 −0 metadata/legacy/icons/these-long-sadalsuud-ruby.svg
+0 −0 metadata/legacy/icons/these-long-sadalsuud.svg
+ metadata/legacy/logos/adorable-quaint-bellatrix.png
+ metadata/legacy/logos/spanish-smug-auva.png
+ metadata/legacy/logos/these-long-sadalsuud.png
+56 −1 metadata/mainnet/chains.json
+174 −0 metadata/mainnet/icons/green-giddy-denebola-bit-hotel.svg
+290 −0 metadata/mainnet/icons/green-giddy-denebola-dex-go.svg
+197 −0 metadata/mainnet/icons/green-giddy-denebola-fivetars.svg
+16 −0 metadata/mainnet/icons/green-giddy-denebola-heavens-compass.svg
+34 −0 metadata/mainnet/icons/green-giddy-denebola-jump-trade.svg
+17 −0 metadata/mainnet/icons/honorable-steel-rasalhague-dmail.svg
+34 −0 metadata/mainnet/icons/honorable-steel-rasalhague-dripverse.svg
+90 −0 metadata/mainnet/icons/honorable-steel-rasalhague-pixudi.svg
+17,359 −0 releases/mainnet/skale-manager/1.10.0/skale-manager-1.10.0-mainnet-abi.json
+27 −0 releases/mainnet/skale-manager/1.10.0/skale-manager-1.10.0-mainnet-contracts.json
+1,859 −0 releases/staging/ima-contracts/1.5.0/mainnet/manifest.json
+11,096 −0 releases/staging/skale-manager/1.10.0/manifest.json
+15,455 −0 releases/staging/skale-manager/1.10.0/skale-manager-1.10.0-beta.0-custom-abi.json
+5,799 −0 releases/staging/skale-manager/1.9.4/manifest.json
Loading
Loading