Merge pull request #1030 from galacticcouncil/update-fees

Update pools fee
galacticcouncil · Feb 26, 2024 · e336e11 · e336e11
2 parents 50610c4 + 4cbf4d7
commit e336e11
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 8 deletions.
diff --git a/src/sections/pools/modals/AddLiquidity/AddLiquidityForm.tsx b/src/sections/pools/modals/AddLiquidity/AddLiquidityForm.tsx
@@ -59,7 +59,10 @@ export const AddLiquidityForm = ({
   const { calculatedShares, spotPrice, omnipoolFee, assetMeta, assetBalance } =
     useAddLiquidity(assetId, assetValue)
 
-  const { api } = useRpcProvider()
+  const {
+    api,
+    assets: { native },
+  } = useRpcProvider()
   const { createTransaction } = useStore()
 
   const { data: limits } = useVerifyLimits({
@@ -214,10 +217,14 @@ export const AddLiquidityForm = ({
         />
         <SummaryRow
           label={t("liquidity.add.modal.lpFee")}
-          content={t("value.percentage.range", {
-            from: omnipoolFee?.minFee.multipliedBy(100),
-            to: omnipoolFee?.maxFee.multipliedBy(100),
-          })}
+          content={
+            assetId === native.id
+              ? "--"
+              : t("value.percentage.range", {
+                  from: omnipoolFee?.minFee.multipliedBy(100),
+                  to: omnipoolFee?.maxFee.multipliedBy(100),
+                })
+          }
         />
         <Spacer size={24} />
         <Text color="pink500" fs={15} font="FontOver" tTransform="uppercase">

diff --git a/src/sections/pools/pool/details/PoolDetails.tsx b/src/sections/pools/pool/details/PoolDetails.tsx
@@ -190,6 +190,12 @@ export const PoolDetails = ({
                 <Text color="white" fs={[14, 16]} fw={600}>
                   {ixXYKPool ? (
                     t("value.percentage", { value: pool.fee })
+                  ) : pool.id === assets.native.id ? (
+                    "--"
+                  ) : pool.stablepoolFee ? (
+                    t("value.percentage", {
+                      value: pool.stablepoolFee.times(100),
+                    })
                   ) : omnipoolFee.isLoading ? (
                     <Skeleton height={16} width={50} />
                   ) : (

diff --git a/src/sections/pools/table/PoolsTable.utils.tsx b/src/sections/pools/table/PoolsTable.utils.tsx
@@ -303,6 +303,9 @@ const APY = ({
   isLoading: boolean
 }) => {
   const { t } = useTranslation()
+  const {
+    assets: { native },
+  } = useRpcProvider()
   const farms = useFarms([assetId])
 
   if (isLoading || farms.isInitialLoading) return <CellSkeleton />
@@ -313,7 +316,7 @@ const APY = ({
   return (
     <NonClickableContainer>
       <Text color="white" fs={14}>
-        {t("value.percentage", { value: fee })}
+        {assetId === native.id ? "--" : t("value.percentage", { value: fee })}
       </Text>
     </NonClickableContainer>
   )

diff --git a/src/sections/stats/sections/omnipoolAsset/stats/AssetStats.tsx b/src/sections/stats/sections/omnipoolAsset/stats/AssetStats.tsx
@@ -4,6 +4,7 @@ import BN from "bignumber.js"
 import { Farm, useFarmAprs, useFarms } from "api/farms"
 import { useMemo } from "react"
 import { BN_0 } from "utils/constants"
+import { useRpcProvider } from "providers/rpcProvider"
 
 const APYFarmStatsCard = ({ farms, apy }: { farms: Farm[]; apy: number }) => {
   const { t } = useTranslation()
@@ -56,6 +57,9 @@ const APYStatsCard = ({
   fee: BN
 }) => {
   const { t } = useTranslation()
+  const {
+    assets: { native },
+  } = useRpcProvider()
   const farms = useFarms([assetId])
 
   if (farms.data?.length)
@@ -64,7 +68,9 @@ const APYStatsCard = ({
   return (
     <AssetStatsCard
       title={t("stats.omnipool.stats.card.apy")}
-      value={t("value.percentage", { value: fee })}
+      value={
+        assetId === native.id ? "--" : t("value.percentage", { value: fee })
+      }
       loading={loading || farms.isInitialLoading}
       tooltip={t("stats.overview.table.assets.header.apy.desc")}
     />

diff --git a/...tions/overview/components/OmnipoolAssetsTableWrapper/OmnipoolAssetsTableWrapper.utils.tsx b/...tions/overview/components/OmnipoolAssetsTableWrapper/OmnipoolAssetsTableWrapper.utils.tsx
@@ -18,6 +18,7 @@ import { BN_0 } from "utils/constants"
 import BigNumber from "bignumber.js"
 import { InfoTooltip } from "components/InfoTooltip/InfoTooltip"
 import { SInfoIcon } from "components/InfoTooltip/InfoTooltip.styled"
+import { useRpcProvider } from "providers/rpcProvider"
 
 const APYFarming = ({ farms, apy }: { farms: Farm[]; apy: number }) => {
   const { t } = useTranslation()
@@ -72,6 +73,9 @@ const APY = ({
   isLoading: boolean
 }) => {
   const { t } = useTranslation()
+  const {
+    assets: { native },
+  } = useRpcProvider()
   const farms = useFarms([assetId])
 
   if (isLoading || farms.isInitialLoading) return <CellSkeleton />
@@ -81,7 +85,7 @@ const APY = ({
 
   return (
     <Text color="white" fs={14}>
-      {t("value.percentage", { value: fee })}
+      {assetId === native.id ? "--" : t("value.percentage", { value: fee })}
     </Text>
   )
 }