use correct pps for earn (#718)

ribbon-finance · Sep 3, 2023 · e27b66c · e27b66c · vercel · Sep 3, 2023
1 parent 6cb0e0b
commit e27b66c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/shared/src/components/Product/Theta/YieldCard.tsx b/shared/src/components/Product/Theta/YieldCard.tsx
@@ -866,7 +866,7 @@ const YieldCard: React.FC<YieldCardProps> = ({
               {positionState === "partiallyPaused" && "Partially Paused"}
             </SecondaryText>
             <Title fontSize={14}>
-              {vaultAccount
+              {vaultAccount && vault !== "rSOL-THETA"
                 ? `${formatBigNumber(
                     vaultAccount.totalBalance.add(pausedAmount),
                     decimals
@@ -886,6 +886,7 @@ const YieldCard: React.FC<YieldCardProps> = ({
     positionState,
     color,
     vaultAccount,
+    vault,
     pausedAmount,
     asset,
   ]);

diff --git a/shared/src/components/Vault/YourPosition.tsx b/shared/src/components/Vault/YourPosition.tsx
@@ -716,7 +716,7 @@ const YourPosition: React.FC<YourPositionProps> = ({
   ]);
 
   const render = useMemo(() => {
-    if (!vaultAccount) {
+    if (!vaultAccount || vaultOption === "rSOL-THETA") {
       return <></>;
     }
     // return paused widget if account has paused balance and no vault balance
@@ -735,6 +735,7 @@ const YourPosition: React.FC<YourPositionProps> = ({
     }
   }, [
     vaultAccount,
+    vaultOption,
     positionState,
     positionWidget,
     pausedPositionWidget,

diff --git a/shared/src/hooks/useFetchEarnVaultData.ts b/shared/src/hooks/useFetchEarnVaultData.ts
@@ -5,7 +5,6 @@ import {
   getVaultNetwork,
   EarnVaultList,
   VIPVaultList,
-  isEarnVault,
 } from "../constants/constants";
 import { isProduction, isTreasury, isVIP } from "../utils/env";
 import { getVaultContract } from "./useVaultContract";
@@ -203,7 +202,7 @@ const useFetchEarnVaultData = (): V2VaultData => {
           vault,
           totalBalance,
           cap,
-          pricePerShare: actualPricePerShare,
+          pricePerShare: usedPricePerShare,
           round: round,
           roundPricePerShare,
           lockedBalanceInAsset: accountVaultBalance,

diff --git a/webapp/src/components/Header/Header.tsx b/webapp/src/components/Header/Header.tsx
@@ -19,7 +19,6 @@ import ExternalLink from "shared/lib/assets/icons/externalLink";
 import { useGlobalState } from "shared/lib/store/store";
 import FilterDropdown from "shared/lib/components/Common/FilterDropdown";
 import { useHistory } from "react-router-dom";
-import { useLendLink } from "shared/lib/hooks/useLendLink";
 import { BuyButton } from "../Wallet/BuyButton";
 
 export const HeaderContainer = styled.div<MobileMenuOpenProps>`
@@ -158,7 +157,6 @@ const Header = () => {
   const staking = useRouteMatch({ path: "/staking", exact: true });
   const headerRef = useRef<HTMLDivElement>(null);
   const [, setComponentRefs] = useGlobalState("componentRefs");
-  const lendLink = useLendLink();
   const onToggleMenu = () => {
     setIsMenuOpen(!isMenuOpen);
   };
@@ -276,7 +274,6 @@ const Header = () => {
               />
             </div>
           )}
-          {renderLinkItem("LEND", lendLink, true, true, true, true)}
         </LinksContainer>
       </HeaderAbsoluteContainer>
 
@@ -330,7 +327,6 @@ const Header = () => {
               Boolean(useRouteMatch({ path: "/staking", exact: true }))
             )}
             {renderLinkItem("STAKE RBN", URLS.governance, false, true, true)}
-            {renderLinkItem("LEND", lendLink, true, true, true, true)}
             {renderLinkItem("DISCORD", URLS.discord, false, false, true)}
             {renderLinkItem("TWITTER", URLS.twitter, false, false, true)}
             {renderLinkItem("GITHUB", URLS.github, false, false, true)}