From a0a14d963ebd64faad492c5731aaacb0de09c982 Mon Sep 17 00:00:00 2001 From: "ilya.razievskij" Date: Thu, 3 Jul 2025 15:36:16 +0300 Subject: [PATCH] chore: v2 ui pause --- src/ui/src/components/AllMarketModal/index.js | 2 +- src/ui/src/components/BorrowModal/index.js | 2 +- .../Dashboard/SuppliedTokenTable.tsx | 2 +- src/ui/src/components/Header/index.js | 104 +++++++++--------- src/ui/src/components/Header/style.js | 6 + src/ui/src/components/SupplyModal/index.js | 2 +- 6 files changed, 64 insertions(+), 54 deletions(-) diff --git a/src/ui/src/components/AllMarketModal/index.js b/src/ui/src/components/AllMarketModal/index.js index b79876bb..72e2d3f9 100644 --- a/src/ui/src/components/AllMarketModal/index.js +++ b/src/ui/src/components/AllMarketModal/index.js @@ -192,7 +192,7 @@ const AllMarketModal = (props) => { inputBtnTextTwo = {`${new BigNumber(tokenDetails.collateralFactor).multipliedBy(100)}% Limit`} useMaxAmount= {useMaxAmount} errorText={publicKeyHash && ((currentTab === 'one') ? buttonOne.errorText : buttonTwo.errorText)} - disabled={(currentTab === 'one') ? buttonOne.disabled : buttonTwo.disabled} + disabled={true} pendingLimit={(currentTab === 'two') ? pendingLimit : false} pendingLimitUsed={(currentTab === 'two') ? pendingLimitUsed : false} getProps={(tokenAmount, tabValue) => { setTokenValue(tokenAmount); setCurrentTab(tabValue); }} diff --git a/src/ui/src/components/BorrowModal/index.js b/src/ui/src/components/BorrowModal/index.js index 88d53d30..0ef9b4c2 100644 --- a/src/ui/src/components/BorrowModal/index.js +++ b/src/ui/src/components/BorrowModal/index.js @@ -232,7 +232,7 @@ const BorrowModal = (props) => { inputBtnTextTwo="Use Max" useMaxAmount={useMaxAmount} errorText={currentTab === 'one' ? buttonOne.errorText : buttonTwo.errorText} - disabled={currentTab === 'one' ? buttonOne.disabled : buttonTwo.disabled} + disabled={currentTab === 'one' ? true : buttonTwo.disabled} pendingLimit={pendingLimit} pendingLimitUsed={pendingLimitUsed} getProps={(tokenAmount, tabValue) => { diff --git a/src/ui/src/components/Dashboard/SuppliedTokenTable.tsx b/src/ui/src/components/Dashboard/SuppliedTokenTable.tsx index 21c7128f..050434ca 100644 --- a/src/ui/src/components/Dashboard/SuppliedTokenTable.tsx +++ b/src/ui/src/components/Dashboard/SuppliedTokenTable.tsx @@ -88,7 +88,7 @@ const SuppliedTokenTable = (props) => { <> - + {/* */} )} diff --git a/src/ui/src/components/Header/index.js b/src/ui/src/components/Header/index.js index e8b67826..ff5f6d2d 100644 --- a/src/ui/src/components/Header/index.js +++ b/src/ui/src/components/Header/index.js @@ -13,68 +13,72 @@ import collateralizedIcon from "../../assets/collateralizedIcon.svg"; import borrowingIcon from "../../assets/borrowing.svg"; import borrowLimitIcon from "../../assets/borrowLimitIcon.svg"; import questionCircle from "../../assets/questionCircle.svg"; +import Box from '@mui/material/Box'; import { supplyCompositionAction } from "../../reduxContent/supplyComposition/actions"; import { borrowCompositionAction } from "../../reduxContent/borrowComposition/actions"; import { LightTooltip } from "../StackedBars/style.tsx"; // eslint-disable-next-line import/no-dynamic-require -const config = require( - `../../library/${process.env.REACT_APP_ENV || "prod"}-network-config.json`, -); +const config = require(`../../library/${process.env.REACT_APP_ENV || "prod"}-network-config.json`); const Header = () => { - const classes = useStyles(); - const dispatch = useDispatch(); - const { network } = config.infra.conseilServer; - const networkType = network.charAt(0).toUpperCase() + network.slice(1); + const classes = useStyles(); + const dispatch = useDispatch(); + const { network } = config.infra.conseilServer; + const networkType = network.charAt(0).toUpperCase() + network.slice(1); - const { supplyComposition } = useSelector((state) => state.supplyComposition); - const { borrowComposition } = useSelector((state) => state.borrowComposition); - const account = useSelector((state) => state.addWallet.account); - const { suppliedMarkets, borrowedMarkets } = useSelector( - (state) => state.market, - ); + const { supplyComposition } = useSelector((state) => state.supplyComposition); + const { borrowComposition } = useSelector((state) => state.borrowComposition); + const account = useSelector((state) => state.addWallet.account); + const { suppliedMarkets, borrowedMarkets } = useSelector((state) => state.market); - useEffect(() => { - dispatch(supplyCompositionAction(suppliedMarkets)); - dispatch(borrowCompositionAction(borrowedMarkets)); - }, [dispatch, account, suppliedMarkets, borrowedMarkets]); + useEffect(() => { + dispatch(supplyCompositionAction(suppliedMarkets)); + dispatch(borrowCompositionAction(borrowedMarkets)); + }, [dispatch, account, suppliedMarkets, borrowedMarkets]); - return ( - - - {network !== "mainnet" && - `Note: Tezfin is currently operating on the Tezos test network ${networkType}.`} - - - + return ( + + + {network !== "mainnet" && + `Note: Tezfin is currently operating on the Tezos test network ${networkType}.`} + + + + { + "This is the legacy app for TezFin v2. Please repay all borrowing positions and/or withdraw deposits, and move to the latest TezFin." + } + + + + - - - - ); + + + + ); }; export default Header; diff --git a/src/ui/src/components/Header/style.js b/src/ui/src/components/Header/style.js index ca765129..9ee6304b 100644 --- a/src/ui/src/components/Header/style.js +++ b/src/ui/src/components/Header/style.js @@ -329,6 +329,12 @@ export const useStyles = makeStyles({ fontSize: '0.625rem', paddingBottom: '0.5rem' } + }, + legacyAppNote: { + backgroundColor: '#ed6c02', + padding: '16px', + textAlign: 'center', + color: 'white' } }); diff --git a/src/ui/src/components/SupplyModal/index.js b/src/ui/src/components/SupplyModal/index.js index cf0f1ddc..93a58ca0 100644 --- a/src/ui/src/components/SupplyModal/index.js +++ b/src/ui/src/components/SupplyModal/index.js @@ -191,7 +191,7 @@ const SupplyModal = (props) => { inputBtnTextTwo = "Use Max" useMaxAmount= {useMaxAmount} errorText={(currentTab === 'one') ? buttonOne.errorText : buttonTwo.errorText} - disabled={(currentTab === 'one') ? buttonOne.disabled : buttonTwo.disabled} + disabled={(currentTab === 'one') ? true : buttonTwo.disabled} getProps={(tokenAmount, tabValue) => { setTokenValue(tokenAmount); setCurrentTab(tabValue); }} tab={tab} />