From 2c65fd4db0130e7bb55f51a7add03506e5a0235a Mon Sep 17 00:00:00 2001 From: pocin <8642344+pocin@users.noreply.github.com> Date: Wed, 4 Dec 2024 15:00:39 +0000 Subject: [PATCH] fix: add back dsr base. Increase nav padding --- .../Core/DappPages/Dashboard/Chart/index.tsx | 2 - .../DappPages/Dashboard/DashboardConfig.tsx | 49 ++++++++++--------- .../Pages/Core/DappPages/Dashboard/index.tsx | 2 +- apps/dapp/src/constants/env/local.tsx | 3 +- apps/dapp/src/constants/env/preview.tsx | 1 + apps/dapp/src/constants/env/production.tsx | 1 + apps/dapp/src/constants/env/types.ts | 1 + 7 files changed, 31 insertions(+), 28 deletions(-) diff --git a/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/Chart/index.tsx b/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/Chart/index.tsx index 3edaba6b2..c97c9f8d9 100644 --- a/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/Chart/index.tsx +++ b/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/Chart/index.tsx @@ -31,8 +31,6 @@ const metricOptions: { value: V2SnapshotMetric; label: string }[] = [ const CHART_SELECTOR_QUERY_PARAM = 'chart'; const DashboardChart = ({ dashboardData }: DashboardChartProps) => { - console.debug('DashboardChart with name: ', dashboardData.name); - const [searchParams, setSearchParams] = useSearchParams(); const isDesktop = useMediaQuery({ query: breakpoints.queryPhone, diff --git a/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/DashboardConfig.tsx b/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/DashboardConfig.tsx index 92c7df482..a7644e694 100644 --- a/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/DashboardConfig.tsx +++ b/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/DashboardConfig.tsx @@ -9,6 +9,7 @@ export enum StrategyKey { TLC = 'TlcStrategy', TEMPLEBASE = 'TempleBaseStrategy', SKY_FARM_BASE = 'DaiSkyFarmBaseStrategy', + DSRBASE = 'DsrBaseStrategy', TEMPLO_MAYOR_GNOSIS = 'TemploMayorStrategy', FOHMO_GNOSIS = 'FohmoStrategy', } @@ -24,7 +25,6 @@ export const isTRVDashboard = (strategy: StrategyKey | TrvKey) => export type DashboardData = { key: StrategyKey | TrvKey; - name: string; title: string; path: string; description: string; @@ -34,7 +34,6 @@ export type DashboardData = { export const Dashboards: DashboardData[] = [ { key: TRV_KEY, - name: 'Treasury Reserves Vault', title: 'TRV', path: 'treasuryreservesvault', description: @@ -43,7 +42,6 @@ export const Dashboards: DashboardData[] = [ }, { key: StrategyKey.RAMOS, - name: 'Ramos', title: 'RAMOS', path: 'ramos', description: @@ -52,34 +50,14 @@ export const Dashboards: DashboardData[] = [ }, { key: StrategyKey.TLC, - name: 'TLC', title: 'TLC', path: 'tlc', description: 'Temple Loving Care (also known as Temple Line of Credit) offers DAI lending for users who supply TEMPLE as collateral. The TLC will use the current Treasury Price Index (TPI) Oracle to determine the collateral value of TEMPLE. Users may borrow up to 85% loan-to-value (LTV) with the TEMPLE liquidation LTV set to 90%. There are no origination fees and users can withdraw their TEMPLE at any time by repaying the DAI loan. The TLC interest rate is set to a fixed rate that will be periodically updated to 2X the yield from the current Treasury Base Strategy e.g. sDAI. Click here to learn more about Temple Loving Care.', contractLink: `${env.etherscan}/address/${env.contracts.strategies.tlcStrategy}`, }, - { - key: StrategyKey.TEMPLEBASE, - name: 'Temple Base', - title: 'TEMPLE BASE', - path: 'templebase', - description: - 'TEMPLE Base strategy is the funding source for TEMPLE tokens for automated market operations (AMO) in the Treasury framework. The TRV facilitates the withdrawal of newly minted TEMPLE tokens from and the issuance of TEMPLE debt to the TEMPLE Base strategy. These TEMPLE tokens will be borrowed by a Treasury Strategy such as Ramos to generate returns. Once these tokens are repaid to the TRV, they will be deposited to the TEMPLE Base strategy to be burned. Positive returns will be realized when TEMPLE flows to the TEMPLE Base strategy is net positive.', - contractLink: `${env.etherscan}/address/${env.contracts.strategies.templeStrategy}`, - }, - { - key: StrategyKey.SKY_FARM_BASE, - name: 'Sky Farm Base', - title: 'SKY FARM BASE', - path: 'skyfarmbase', - description: - 'Idle reserve capital in the TRV that is not currently borrowed by a Strategy Borrower will be automatically directed to a Base Strategy to earn yield. The TRV Base Strategy is currently set to the Sky Farm Base Strategy. The current rate of return for the Base Strategy also serves as the performance benchmark or "risk-free" interest rate for Treasury Strategies.', - contractLink: `${env.etherscan}/address/${env.contracts.strategies.daiSkyFarmBaseStrategy}`, - }, { key: StrategyKey.TEMPLO_MAYOR_GNOSIS, - name: 'Templo Mayor', title: 'TEMPLO MAYOR', path: 'templomayor', description: @@ -88,11 +66,34 @@ export const Dashboards: DashboardData[] = [ }, { key: StrategyKey.FOHMO_GNOSIS, - name: 'Fohmo', title: 'FOHMO', path: 'fohmo', description: 'FOHMO is a strategy that aims to maintain a maximally looped position in OHM', contractLink: `${env.etherscan}/address/${env.contracts.strategies.fohmoGnosisStrategy}`, }, + { + key: StrategyKey.TEMPLEBASE, + title: 'BASE TEMPLE', + path: 'templebase', + description: + 'TEMPLE Base strategy is the funding source for TEMPLE tokens for automated market operations (AMO) in the Treasury framework. The TRV facilitates the withdrawal of newly minted TEMPLE tokens from and the issuance of TEMPLE debt to the TEMPLE Base strategy. These TEMPLE tokens will be borrowed by a Treasury Strategy such as Ramos to generate returns. Once these tokens are repaid to the TRV, they will be deposited to the TEMPLE Base strategy to be burned. Positive returns will be realized when TEMPLE flows to the TEMPLE Base strategy is net positive.', + contractLink: `${env.etherscan}/address/${env.contracts.strategies.templeStrategy}`, + }, + { + key: StrategyKey.DSRBASE, + title: 'BASE DSR ', + path: 'dsrbase', + description: + 'Idle reserve capital in the TRV that is not currently borrowed by a Strategy Borrower will be automatically directed to a Base Strategy to earn yield. The TRV Base Strategy is currently set to the Dai Savings Rate (DSR) or sDAI. The current rate of return for the Base Strategy also serves as the performance benchmark or "risk-free" interest rate for Treasury Strategies.', + contractLink: `${env.etherscan}/address/${env.contracts.strategies.dsrBaseStrategy}`, + }, + { + key: StrategyKey.SKY_FARM_BASE, + title: 'BASE sUSDS+s', + path: 'skyfarmbase', + description: + 'Idle reserve capital in the TRV that is not currently borrowed by a Strategy Borrower will be automatically directed to a Base Strategy to earn yield. The TRV Base Strategy is currently set to the Sky Farm Base Strategy. The current rate of return for the Base Strategy also serves as the performance benchmark or "risk-free" interest rate for Treasury Strategies.', + contractLink: `${env.etherscan}/address/${env.contracts.strategies.daiSkyFarmBaseStrategy}`, + }, ]; diff --git a/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/index.tsx b/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/index.tsx index 96fbfc732..140ad0fdb 100644 --- a/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/index.tsx +++ b/apps/dapp/src/components/Pages/Core/DappPages/Dashboard/index.tsx @@ -72,7 +72,7 @@ const NavLink = styled(BaseNavLink)` `; const NavCell = styled.div` - padding-right: 1rem; + padding-right: 1.8rem; font-size: 1.2rem; font-weight: 600; cursor: pointer; diff --git a/apps/dapp/src/constants/env/local.tsx b/apps/dapp/src/constants/env/local.tsx index e22434698..22e952bd6 100644 --- a/apps/dapp/src/constants/env/local.tsx +++ b/apps/dapp/src/constants/env/local.tsx @@ -44,12 +44,13 @@ const env: Environment = { templeDaiBalancerPool: '', balancerHelpers: '', strategies: { + dsrBaseStrategy: '', ramosStrategy: '', templeStrategy: '', tlcStrategy: '', temploMayorGnosisStrategy: '', fohmoGnosisStrategy: '', - daiSkyFarmBaseStrategy: '0x5d8e464fca8d327fad016ea8cf3424cb113c07a8', + daiSkyFarmBaseStrategy: '', }, daiCircuitBreaker: '', templeCircuitBreaker: '', diff --git a/apps/dapp/src/constants/env/preview.tsx b/apps/dapp/src/constants/env/preview.tsx index 879be32de..587e7098c 100644 --- a/apps/dapp/src/constants/env/preview.tsx +++ b/apps/dapp/src/constants/env/preview.tsx @@ -44,6 +44,7 @@ const env: Environment = { templeDaiBalancerPool: '', balancerHelpers: '0xdAE7e32ADc5d490a43cCba1f0c736033F2b4eFca', strategies: { + dsrBaseStrategy: '0x472C7cDb6E730ff499E118dE6260c6b44c61d7bf', ramosStrategy: '0xB9507b59f91FF320631d30f774142631b30C537A', templeStrategy: '0xECe4ff1bd589b488350557A5C36D823C7B47E82F', tlcStrategy: '0x415A9B41700AC645d9C22F2499a6E853b625F792', diff --git a/apps/dapp/src/constants/env/production.tsx b/apps/dapp/src/constants/env/production.tsx index 07f03df44..95253bf05 100644 --- a/apps/dapp/src/constants/env/production.tsx +++ b/apps/dapp/src/constants/env/production.tsx @@ -188,6 +188,7 @@ const env: Environment = { '0x8bd4a1e74a27182d23b98c10fd21d4fbb0ed4ba00002000000000000000004ed', balancerHelpers: '0x5aDDCCa35b7A0D07C74063c48700C8590E87864E', strategies: { + dsrBaseStrategy: '0x8b9e20D9970Af54fbaFe64049174e24d6DE0C412', ramosStrategy: '0xDA5CeF575eaEF14032C5006eb5cbEbE7eE0E347b', templeStrategy: '0xB8d09B0436adF927004Cea0B096E8c05f6dFdc3b', tlcStrategy: '0xcABDE42dd767361739bD7c09C6E574057080ef01', diff --git a/apps/dapp/src/constants/env/types.ts b/apps/dapp/src/constants/env/types.ts index 7eb31c111..4d69d604f 100644 --- a/apps/dapp/src/constants/env/types.ts +++ b/apps/dapp/src/constants/env/types.ts @@ -46,6 +46,7 @@ interface Contracts { vaultEarlyExit: string; ramos: string; strategies: { + dsrBaseStrategy: string; ramosStrategy: string; templeStrategy: string; tlcStrategy: string;