From 5936797fdef192d1234be68bf354dcfc1ba4ce46 Mon Sep 17 00:00:00 2001 From: henrio123 Date: Wed, 19 Jun 2024 21:30:18 +0300 Subject: [PATCH 1/5] uiconfig --- src/data/uiConfig.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/data/uiConfig.ts b/src/data/uiConfig.ts index 53fb88c1f..c8eb455dc 100644 --- a/src/data/uiConfig.ts +++ b/src/data/uiConfig.ts @@ -257,10 +257,8 @@ export const bondingPeriodOptions = ( config.cellarNameKey === CellarNameKey.TURBO_GHO || config.cellarNameKey === CellarNameKey.TURBO_SOMM || config.cellarNameKey === CellarNameKey.TURBO_EETH || - config.cellarNameKey === CellarNameKey.REAL_YIELD_ETH_ARB || config.cellarNameKey === CellarNameKey.TEST_ARBITRUM_REAL_YIELD_USD || - config.cellarNameKey === CellarNameKey.REAL_YIELD_USD_ARB || config.cellarNameKey === CellarNameKey.REAL_YIELD_BTC ) { return [ @@ -323,6 +321,17 @@ export const bondingPeriodOptions = ( }, ] } + if ( + config.cellarNameKey === CellarNameKey.REAL_YIELD_USD_ARB || + config.cellarNameKey === CellarNameKey.REAL_YIELD_ETH_ARB) { + return [ + { + title: "14 Day Unbonding", + amount: "Up to 6 PEARL per swETH daily + SOMM Rewards", + value: 0, + }, + ] + } if ( config.cellarNameKey === CellarNameKey.STEADY_BTC || config.cellarNameKey === CellarNameKey.STEADY_ETH || From 31eaea058b5239049e45690740b25daad24b3b5d Mon Sep 17 00:00:00 2001 From: aleots Date: Wed, 19 Jun 2024 21:35:36 +0300 Subject: [PATCH 2/5] Display bond btn for Merkle rewards strategies --- src/components/_cards/PortfolioCard/index.tsx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/_cards/PortfolioCard/index.tsx b/src/components/_cards/PortfolioCard/index.tsx index 826b8958f..c1efb2650 100644 --- a/src/components/_cards/PortfolioCard/index.tsx +++ b/src/components/_cards/PortfolioCard/index.tsx @@ -54,7 +54,7 @@ import { Rewards } from "./Rewards" import { useNetwork } from "wagmi" import WithdrawQueueCard from "../WithdrawQueueCard" import withdrawQueueV0821 from "src/abi/withdraw-queue-v0.8.21.json" -import { CellarNameKey } from "data/types" +import { CellarNameKey, ConfigProps } from "data/types" import { PointsDisplay } from "./PointsDisplay" import { MerklePoints } from "./MerklePoints/MerklePoints" import { BaseButton } from "components/_buttons/BaseButton" @@ -171,6 +171,11 @@ export const PortfolioCard: VFC = (props) => { checkWithdrawRequest() }, [withdrawQueueContract, address, cellarConfig]) + const isMerkleRewardsException = (config: ConfigProps) => { + return config.cellarNameKey === CellarNameKey.REAL_YIELD_ETH_ARB + ||config.cellarNameKey === CellarNameKey.REAL_YIELD_USD_ARB + } + return ( = (props) => { : "--")} - {isBondButtonEnabled(cellarConfig) && - isStakingAllowed && - isMounted && ( + {isMounted + && (isMerkleRewardsException(cellarConfig) || isStakingAllowed) + && ( Date: Wed, 19 Jun 2024 21:49:03 +0300 Subject: [PATCH 3/5] text updates --- src/data/uiConfig.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/uiConfig.ts b/src/data/uiConfig.ts index c8eb455dc..e6c8b89c5 100644 --- a/src/data/uiConfig.ts +++ b/src/data/uiConfig.ts @@ -326,8 +326,8 @@ export const bondingPeriodOptions = ( config.cellarNameKey === CellarNameKey.REAL_YIELD_ETH_ARB) { return [ { - title: "14 Day Unbonding", - amount: "Up to 6 PEARL per swETH daily + SOMM Rewards", + title: "Merkle Points bonding", + amount: "Lock your vault tokens for Merkle Points", value: 0, }, ] From 23fa3b1bd622095df96c4dd6f61798c4f9c86caf Mon Sep 17 00:00:00 2001 From: henrio123 Date: Wed, 19 Jun 2024 22:05:10 +0300 Subject: [PATCH 4/5] value: 1, --- src/data/uiConfig.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/uiConfig.ts b/src/data/uiConfig.ts index e6c8b89c5..339e56edd 100644 --- a/src/data/uiConfig.ts +++ b/src/data/uiConfig.ts @@ -328,7 +328,7 @@ export const bondingPeriodOptions = ( { title: "Merkle Points bonding", amount: "Lock your vault tokens for Merkle Points", - value: 0, + value: 1, }, ] } From b251cac2738c75991c5198a172cbe4ad8d398f86 Mon Sep 17 00:00:00 2001 From: henrio123 Date: Thu, 20 Jun 2024 14:10:07 +0300 Subject: [PATCH 5/5] merkle staking button --- src/data/uiConfig.ts | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/data/uiConfig.ts b/src/data/uiConfig.ts index 339e56edd..75d95d5eb 100644 --- a/src/data/uiConfig.ts +++ b/src/data/uiConfig.ts @@ -324,14 +324,24 @@ export const bondingPeriodOptions = ( if ( config.cellarNameKey === CellarNameKey.REAL_YIELD_USD_ARB || config.cellarNameKey === CellarNameKey.REAL_YIELD_ETH_ARB) { - return [ - { - title: "Merkle Points bonding", - amount: "Lock your vault tokens for Merkle Points", - value: 1, - }, - ] - } + return [ + { + title: "10 Day Unbonding", + amount: "1.1x SOMM", + value: 0, + }, + { + title: "14 Day Unbonding", + amount: "1.2x SOMM", + value: 1, + }, + { + title: "20 Day Unbonding", + amount: "1.25x SOMM", + value: 2, + }, + ] + } if ( config.cellarNameKey === CellarNameKey.STEADY_BTC || config.cellarNameKey === CellarNameKey.STEADY_ETH ||