From f6a2fc691754f0fff25726cc3b1929ff4f41fbee Mon Sep 17 00:00:00 2001 From: Uncle Fatso Date: Tue, 7 Apr 2026 13:47:23 +0300 Subject: [PATCH] apply revision 14; applied partially Signed-off-by: Uncle Fatso --- package.json | 2 +- src/components/Sidebar/NavContent.jsx | 12 +++- .../TopBar/Wallet/InitialWalletView.tsx | 12 ---- src/containers/Bridge/BridgeModal.jsx | 71 ++++++++++++++++--- .../Stake/components/StakeInputArea.jsx | 30 -------- 5 files changed, 71 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index 5ed5067..d41779b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ghost-dao-interface", "private": true, - "version": "0.6.17", + "version": "0.6.18", "type": "module", "scripts": { "dev": "vite", diff --git a/src/components/Sidebar/NavContent.jsx b/src/components/Sidebar/NavContent.jsx index 60d487f..925d186 100644 --- a/src/components/Sidebar/NavContent.jsx +++ b/src/components/Sidebar/NavContent.jsx @@ -47,6 +47,7 @@ import { ECOSYSTEM } from "../../constants/ecosystem"; import { DecimalBigNumber } from "../../helpers/DecimalBigNumber"; import { sortBondsByDiscount, formatCurrency } from "../../helpers"; import BondDiscount from "../../containers/Bond/components/BondDiscount"; +import Chip from "../Chip/Chip"; import DashboardIcon from '@mui/icons-material/Dashboard'; import ShowerIcon from '@mui/icons-material/Shower'; @@ -143,6 +144,9 @@ const NavContent = ({ chainId, addressChainId }) => { to={`/${chainName}/bonds`} children={ + + Bond Discounts + {sortBondsByDiscount(ghostBonds).map((bond, index) => { return ( { style={{ width: "180px", justifyContent: "space-between", + alignItems: "center", display: "flex", gap: "10px" }} @@ -163,7 +168,10 @@ const NavContent = ({ chainId, addressChainId }) => { variant="body2" > {bond.displayName} - + {bond.soldOut + ? + : + } @@ -172,7 +180,7 @@ const NavContent = ({ chainId, addressChainId }) => { } /> - + {isGovernanceAvailable(chainId, addressChainId) && } diff --git a/src/components/TopBar/Wallet/InitialWalletView.tsx b/src/components/TopBar/Wallet/InitialWalletView.tsx index 63e567f..087ac23 100644 --- a/src/components/TopBar/Wallet/InitialWalletView.tsx +++ b/src/components/TopBar/Wallet/InitialWalletView.tsx @@ -151,18 +151,6 @@ function InitialWalletView({ isWalletOpen, address, chainId, onClose }) { - - onBtnClick("uniswap", RESERVE_ADDRESSES[chainId], FTSO_ADDRESSES[chainId])} - > - {`${tokens?.ftso?.symbol}-${tokens?.reserve?.symbol} on Uniswap`} - - - diff --git a/src/containers/Bridge/BridgeModal.jsx b/src/containers/Bridge/BridgeModal.jsx index b11a7c1..e9b71fb 100644 --- a/src/containers/Bridge/BridgeModal.jsx +++ b/src/containers/Bridge/BridgeModal.jsx @@ -1,4 +1,4 @@ -import { useState, useEffect } from "react"; +import { useState, useEffect, useMemo } from "react"; import { Box, Typography, Link, FormControlLabel, Checkbox, useTheme } from "@mui/material"; import { CheckBoxOutlineBlank, CheckBoxOutlined } from "@mui/icons-material"; @@ -19,10 +19,11 @@ import ContentPasteIcon from '@mui/icons-material/ContentPaste'; import InfoTooltip from "../../components/Tooltip/InfoTooltip"; import Modal from "../../components/Modal/Modal"; import GhostStyledIcon from "../../components/Icon/GhostIcon"; -import { PrimaryButton, TertiaryButton } from "../../components/Button"; +import { PrimaryButton, TertiaryButton, SecondaryButton } from "../../components/Button"; import { formatCurrency } from "../../helpers"; import { DecimalBigNumber } from "../../helpers/DecimalBigNumber"; +import { GATEKEEPER_ADDRESSES } from "../../constants/addresses"; export const BridgeModal = ({ providerDetail, @@ -50,6 +51,12 @@ export const BridgeModal = ({ }); }; + const bridgeNumbers = () => { + const connectedNetworks = Object.keys(GATEKEEPER_ADDRESSES).length; + const number = 1 + connectedNetworks * 3; + return `(${number}, ${number})`; + }; + return ( - {!providerDetail && - + window.open('https://git.ghostchain.io/ghostchain/ghost-extension-wallet/releases', '_blank', 'noopener,noreferrer')} + sx={{ + marginTop: "0 !important", + marginBottom: "0 !important" + }} + onClick={() => window.open( + 'https://git.ghostchain.io/ghostchain/ghost-extension-wallet/releases', + '_blank', + 'noopener,noreferrer' + )} > Get GHOST Connect - + } - {providerDetail && + {currentRecord?.finalization > 0 && ( <> )} - } + @@ -357,13 +392,21 @@ export const BridgeModal = ({ - removeStoredRecord()} + > + {`Get ${bridgeNumbers()} Stake\u00B2`} + } + + removeStoredRecord()} > Erase Record - + This will permanently remove the bridge transaction record from the session storage, but it will not cancel the bridge transaction. @@ -399,6 +442,12 @@ export const BridgeConfirmModal = ({ > + + + You are bridging to GHOST Chain. We will guide you towards (10, 10) Stake2 rewards right after that. + + +
} /> -
+
- {upperTokenModalOpen && ( - handleTokenModalInput(data.token, data.isUpper)} - handleClose={() => setUpperTokenModalOpen(false)} - ftsoBalance={formatNumber(ftsoBalance, formatDecimals)} - stnkBalance={formatNumber(stnkBalance, formatDecimals)} - ghstBalance={formatNumber(ghstBalance, formatDecimals)} - isUpper={true} - ftsoSymbol={ftsoSymbol} - stnkSymbol={stnkSymbol} - ghstSymbol={ghstSymbol} - /> - )} - {bottomTokenModalOpen && ( - handleTokenModalInput(data.token, data.isUpper)} - handleClose={() => setBottomTokenModalOpen(false)} - ftsoBalance={formatNumber(ftsoBalance, formatDecimals)} - stnkBalance={formatNumber(stnkBalance, formatDecimals)} - ghstBalance={formatNumber(ghstBalance, formatDecimals)} - tokenToExclude={upperToken} - isUpper={false} - ftsoSymbol={ftsoSymbol} - stnkSymbol={stnkSymbol} - ghstSymbol={ghstSymbol} - /> - )} -