diff --git a/src/App.js b/src/App.js index f3d3047..fccb37b 100644 --- a/src/App.js +++ b/src/App.js @@ -19,6 +19,7 @@ routerStore.setRouteProps(browserHistory) const Dashboard = React.lazy(() => import("./containers/Dashboard")); const Compound = React.lazy(() => import("./containers/Compound")); const Liquity = React.lazy(() => import("./containers/Liquity")); +const LiquityLegacy = React.lazy(() => import("./containers/LiquityLegacy")); const Vesta = React.lazy(() => import("./containers/Vesta")); const Risk = React.lazy(() => import("./containers/Risk")); const TermsOfUse = React.lazy(() => import("./containers/Terms")); @@ -54,6 +55,7 @@ const App = observer(() => { (renderPage(props, Dashboard))} /> (renderPage(props, Compound))} /> (renderPage(props, Liquity))} /> + (renderPage(props, LiquityLegacy))} /> (renderPage(props, Vesta))} /> (renderPage(props, FAQ))} /> (renderPage(props, TermsOfUse))} /> diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js index 4b8a686..a808403 100644 --- a/src/components/Sidebar.js +++ b/src/components/Sidebar.js @@ -144,14 +144,13 @@ class Sidebar extends Component { Testnet -
- Lending + Legacy
this.handleItemSelect("compound")}>
+ +
this.handleItemSelect("liquity-leagacy")}> + + (Deprecated) +
diff --git a/src/components/TvlTooltip.js b/src/components/TvlTooltip.js index f78ec7b..899fc74 100644 --- a/src/components/TvlTooltip.js +++ b/src/components/TvlTooltip.js @@ -6,6 +6,7 @@ import mainStore from "../stores/main.store" import apyStore from "../stores/apy.store" import {toCommmSepratedString} from '../lib/Utils' import liquityStore from "../stores/main.liquity.store" +import mainHundredStore from "../stores/main.hundred.store" const ToolTipLine = styled.div` min-width: 160px; @@ -33,7 +34,8 @@ const ToolTipTitle = styled.div` class TvlTooltip extends React.Component { render() { - const { liquityTvlNumeric, othersTvlNumeric } = liquityStore + const { liquityTvlNumeric } = liquityStore + const totalDeposits = parseFloat(apyStore.totalCollateral) + liquityTvlNumeric + mainHundredStore.TVL return ( @@ -42,16 +44,12 @@ class TvlTooltip extends React.Component {
total deposits:
-
${toCommmSepratedString(parseFloat(apyStore.totalCollateral).toFixed(2))}
+
${toCommmSepratedString(parseFloat(totalDeposits).toFixed(2))}
total debt:
${toCommmSepratedString(parseFloat(apyStore.totalDebt).toFixed(2))}
- -
number of users:
-
{apyStore.totalUsers}
-
Maker @@ -65,10 +63,6 @@ class TvlTooltip extends React.Component {
debt:
${toCommmSepratedString(parseFloat(apyStore.makerTotalDebt).toFixed(2))}
- -
users:
-
{apyStore.makerUsers}
-
Compound @@ -82,21 +76,25 @@ class TvlTooltip extends React.Component {
debt:
${toCommmSepratedString(parseFloat(apyStore.compoundTotalDebt).toFixed(2))}
- -
users:
-
{apyStore.compoundUsers}
-
Liquity -
bprotocol.org:
+
Deposits:
${toCommmSepratedString((liquityTvlNumeric).toFixed(2))}
+ + Hundred + + + +
Arbitrum:
+
${toCommmSepratedString((mainHundredStore.hundredTvlArbitrum).toFixed(2))}
+
-
pickle.finance & others:
-
${toCommmSepratedString((othersTvlNumeric).toFixed(2))}
+
Fantom:
+
${toCommmSepratedString((mainHundredStore.hundredTvlFantom).toFixed(2))}
diff --git a/src/containers/FarmInfo.js b/src/containers/FarmInfo.js index 001455a..a421cd2 100644 --- a/src/containers/FarmInfo.js +++ b/src/containers/FarmInfo.js @@ -13,6 +13,7 @@ import bproStore, {uBproStore} from "../stores/bpro.store" import mainStore from "../stores/main.store" import mainCompStore from "../stores/main.comp.store" import liquityStore from "../stores/main.liquity.store" +import mainHundredStore from "../stores/main.hundred.store" import userStore from "../stores/user.store" import instaStore, {bproInstaStores} from "../stores/insta.store" import BproClaimModal from "../components/modals/BproClaimModal" @@ -179,8 +180,8 @@ class FarmInfo extends Component { const params = qs.parse(search, { ignoreQueryPrefix: true }) const { tvlNumeric: compTvl } = mainCompStore const { tvlUsdNumeric: makerTvl } = mainStore - const { liquityTvlNumeric: liquityTvl, othersTvlNumeric } = liquityStore - const tvl = parseInt((compTvl + makerTvl + liquityTvl + othersTvlNumeric) / 1000000) + const { liquityTvlNumeric: liquityTvl } = liquityStore + const tvl = parseInt((compTvl + makerTvl + liquityTvl + mainHundredStore.TVL) / 1000000) const instaAccounts = instaStore.accounts if(params.inIframe){ diff --git a/src/containers/Liquity.js b/src/containers/Liquity.js index 8faffb4..e6ad2c0 100644 --- a/src/containers/Liquity.js +++ b/src/containers/Liquity.js @@ -15,7 +15,7 @@ class Liquity extends Component { render() { return (