From 615654975400adc72306fbcb0a17fbf7223142bf Mon Sep 17 00:00:00 2001 From: Uncle Fatso Date: Thu, 26 Mar 2026 13:34:30 +0300 Subject: [PATCH] apply UI changes Signed-off-by: Uncle Fatso --- package.json | 2 +- src/components/Sidebar/NavContent.jsx | 11 ++++----- src/components/TopBar/Wallet/Token.tsx | 2 -- .../components/TokenInfo.jsx | 23 ++++++++++++------- src/helpers/tokenConverter.js | 2 ++ src/hooks/bonds/index.js | 9 ++++---- src/hooks/helpers.js | 6 +++-- 7 files changed, 32 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 04a8dfa..dea473c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ghost-dao-interface", "private": true, - "version": "0.6.11", + "version": "0.6.12", "type": "module", "scripts": { "dev": "vite", diff --git a/src/components/Sidebar/NavContent.jsx b/src/components/Sidebar/NavContent.jsx index 5358ae3..47e9f8d 100644 --- a/src/components/Sidebar/NavContent.jsx +++ b/src/components/Sidebar/NavContent.jsx @@ -26,7 +26,7 @@ import HubIcon from '@mui/icons-material/Hub'; import PublicIcon from '@mui/icons-material/Public'; import ForkRightIcon from '@mui/icons-material/ForkRight'; import GavelIcon from '@mui/icons-material/Gavel'; -import ForumIcon from '@mui/icons-material/Forum'; +import CasinoIcon from '@mui/icons-material/Casino'; import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline'; import BookIcon from '@mui/icons-material/Book'; import CurrencyExchangeIcon from '@mui/icons-material/CurrencyExchange'; @@ -129,7 +129,7 @@ const NavContent = ({ chainId, addressChainId }) => { } /> - + { } /> - + {isGovernanceAvailable(chainId, addressChainId) && } @@ -179,9 +179,8 @@ const NavContent = ({ chainId, addressChainId }) => { - - - + + diff --git a/src/components/TopBar/Wallet/Token.tsx b/src/components/TopBar/Wallet/Token.tsx index 4605a21..b08c82d 100644 --- a/src/components/TopBar/Wallet/Token.tsx +++ b/src/components/TopBar/Wallet/Token.tsx @@ -235,7 +235,6 @@ export const useWallet = (chainId, userAddress) => { balance: nativeBalance, price: nativePrice, refetch: nativeBalanceRefetch, - faucetPath: isNetworkLegacy(chainId) ? "/faucet" : "/wrapper", }, reserve: { symbol: reserveSymbol, @@ -247,7 +246,6 @@ export const useWallet = (chainId, userAddress) => { ? "https://ghostchain.io/wp-content/uploads/2025/03/gDAI.svg" : "https://ghostchain.io/wp-content/uploads/2025/11/6A-Classic-ETC-Token.svg", refetch: reserveRefetch, - faucetPath: isNetworkLegacy(chainId) ? "/faucet" : "/wrapper", }, ftso: { symbol: ftsoSymbol, diff --git a/src/containers/TreasuryDashboard/components/TokenInfo.jsx b/src/containers/TreasuryDashboard/components/TokenInfo.jsx index c8fd4af..d0d8234 100644 --- a/src/containers/TreasuryDashboard/components/TokenInfo.jsx +++ b/src/containers/TreasuryDashboard/components/TokenInfo.jsx @@ -18,6 +18,8 @@ import { } from "../../../hooks/prices"; import { tokenNameConverter } from "../../../helpers/tokenConverter"; +import { EMPTY_ADDRESS, WETH_ADDRESSES } from "../../../constants/addresses"; + const TokenTab = ({ isMobileScreen, theme, tokenName, tokenUrl, tokenUrlParams, balance, price, description }) => { const navigate = useNavigate(); const actualBalance = balance ? balance : new DecimalBigNumber(0, 0); @@ -58,10 +60,13 @@ const TokenTab = ({ isMobileScreen, theme, tokenName, tokenUrl, tokenUrlParams, navigate({ - pathname: tokenUrl, - search: tokenUrlParams.toString() - })} + onClick={() => tokenUrlParams + ? navigate({ + pathname: tokenUrl, + search: tokenUrlParams.toString() + }) + : window.open(tokenUrl, '_blank') + } fullWidth > Get {tokenName} @@ -142,8 +147,11 @@ const TokenInfo = ({ chainId, isMobileScreen }) => { /> { { case 63: name = "wmETC" break; + default: + name = "wETH"; } } return name; diff --git a/src/hooks/bonds/index.js b/src/hooks/bonds/index.js index 3d62f35..1650c30 100644 --- a/src/hooks/bonds/index.js +++ b/src/hooks/bonds/index.js @@ -20,6 +20,7 @@ import { useTokenSymbol, useTokenSymbols } from "../tokens"; import { getTokenAddress, getTokenIcons, getBondNameDisplayName, getTokenPurchaseLink } from "../helpers"; import { DecimalBigNumber } from "../../helpers/DecimalBigNumber"; import { shorten } from "../../helpers"; +import { tokenNameConverter } from "../../helpers/tokenConverter"; export const useLiveBonds = (chainId) => { const ftsoPrice = useFtsoPrice(chainId); @@ -150,7 +151,7 @@ export const useLiveBonds = (chainId) => { ); const zero = new DecimalBigNumber(0n, 0); - const bondName = `${baseTokenSymbol}/${quoteTokenSymbol}`; + const bondName = `${baseTokenSymbol}/${tokenNameConverter(chainId, "WETH")}`; return { id, @@ -163,7 +164,7 @@ export const useLiveBonds = (chainId) => { tokenAddress: getTokenAddress(chainId, "FTSO") }, quoteToken: { - name: quoteTokenSymbol, + name: tokenNameConverter(chainId, quoteTokenSymbol), purchaseUrl: getTokenPurchaseLink(chainId, quoteTokenAddress), icons: getTokenIcons(chainId, quoteTokenAddress), decimals: quoteTokenDecimals, @@ -172,7 +173,7 @@ export const useLiveBonds = (chainId) => { duration: terms?.at(index).result?.at(3) ? terms.at(index).result.at(3) : 0, vesting: terms?.at(index).result?.at(2) ? terms.at(index).result.at(2) : 0, isFixedTerm: terms?.at(index).result?.at(0) ? terms.at(index).result.at(0) : true, - isSoldOut: capacityInBaseToken.eq(zero) || capacityInBaseToken.eq(zero), + isSoldOut: capacityInBaseToken.eq(zero), price: { inUsd: priceInUsd, inBaseToken: quoteTokenPerBaseToken, @@ -250,7 +251,7 @@ export const useNotes = (chainId, address) => { return { id, quoteToken: { - name: quoteTokenSymbol, + name: tokenNameConverter(chainId, quoteTokenSymbol), icons: getTokenIcons(chainId, quoteTokenAddress), }, vesting: terms?.at(index).result?.at(2) ? terms.at(index).result.at(2) : 0, diff --git a/src/hooks/helpers.js b/src/hooks/helpers.js index c477967..7299ace 100644 --- a/src/hooks/helpers.js +++ b/src/hooks/helpers.js @@ -7,6 +7,8 @@ import { WETH_ADDRESSES, } from "../constants/addresses"; +import { tokenNameConverter } from "../helpers/tokenConverter"; + import { abi as DaiAbi } from "../abi/Reserve.json"; import { abi as FatsoAbi } from "../abi/Fatso.json"; import { abi as StinkyAbi } from "../abi/Stinky.json"; @@ -156,7 +158,7 @@ export const getTokenIcons = (chainId, address) => { let icons = [""]; switch (address) { case RESERVE_ADDRESSES[chainId]: - icons = ["WETH"]; + icons = [tokenNameConverter(chainId, "WETH")]; break; case FTSO_ADDRESSES[chainId]: icons = ["FTSO"]; @@ -178,7 +180,7 @@ export const getTokenIcons = (chainId, address) => { export const getBondNameDisplayName = (chainId, stringValue, tokenAddress) => { if (tokenAddress.toUpperCase() === FTSO_DAI_LP_ADDRESSES[chainId].toUpperCase()) { - stringValue = `LP ${stringValue}`; + stringValue = `${stringValue} LP`; } return stringValue; }