add dao fee to pool display

spectrum-finance · Feb 23, 2024 · ce25de3 · ce25de3
1 parent d40d2cc
commit ce25de3
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/src/network/cardano/api/ammPools/CardanoAmmPool.ts b/src/network/cardano/api/ammPools/CardanoAmmPool.ts
@@ -59,6 +59,10 @@ export class CardanoAmmPool extends AmmPool {
     return this.pool.poolFeeNum;
   }
 
+  get treasuryFeeNum(): bigint | undefined {
+    return this.pool.treasuryFee || undefined;
+  }
+
   get tvl(): Currency | undefined {
     return this.metrics?.tvlAda
       ? new Currency(

diff --git a/src/network/cardano/api/ammPools/analyticPoolNetwork.ts b/src/network/cardano/api/ammPools/analyticPoolNetwork.ts
@@ -30,7 +30,7 @@ export interface AmmPoolDescriptor {
     };
     readonly poolFeeNumX: number;
     readonly poolFeeNumY: number;
-    readonly treasuryFee: 1;
+    readonly treasuryFee: number;
     readonly treasuryX: string;
     readonly treasuryY: string;
     readonly verified: true;
@@ -119,6 +119,7 @@ export class AnalyticPoolNetwork {
           : AmmPoolType.DEFAULT,
         BigInt(rawAmmPool.pool.treasuryX || '0'),
         BigInt(rawAmmPool.pool.treasuryY || '0'),
+        BigInt(rawAmmPool.pool.treasuryFee || '0'),
       ),
       metrics: rawAmmPool.metrics,
     };

diff --git a/src/network/ergo/api/ammPools/ErgoAmmPool.ts b/src/network/ergo/api/ammPools/ErgoAmmPool.ts
@@ -54,6 +54,10 @@ export class ErgoAmmPool extends AmmPool {
     return this.pool.feeDenom;
   }
 
+  get treasuryFeeNum(): bigint | undefined {
+    return undefined;
+  }
+
   get feeDecimalsCount(): bigint {
     return 1n;
   }

diff --git a/src/pages/Liquidity/common/columns/PoolsOrPositionsColumns/columns/PairColumn/PairColumn.tsx b/src/pages/Liquidity/common/columns/PoolsOrPositionsColumns/columns/PairColumn/PairColumn.tsx
@@ -1,4 +1,4 @@
-import { Flex, useDevice } from '@ergolabs/ui-kit';
+import { BankOutlined, Flex, Tooltip, useDevice } from '@ergolabs/ui-kit';
 import { FC, MouseEvent } from 'react';
 import { useNavigate } from 'react-router-dom';
 
@@ -39,9 +39,29 @@ export const PairColumn: FC<PairColumnProps> = ({ ammPool }) => {
           isShowDivider={!s}
         />
       </Flex.Item>
-      <Flex.Item marginLeft={2} marginRight={3}>
+      <Flex.Item marginLeft={2} marginRight={2}>
         <DataTag content={`${ammPool.poolFee}%`} />
       </Flex.Item>
+      {ammPool.treasuryFee && (
+        <Flex.Item marginRight={2}>
+          <DataTag
+            content={
+              <Tooltip
+                placement="top"
+                title="The fee charged by the DAO"
+                width="200"
+              >
+                <Flex align="center">
+                  <Flex.Item marginRight={1}>
+                    <BankOutlined size={16} />
+                  </Flex.Item>
+                  {`${ammPool.treasuryFee}%`}
+                </Flex>
+              </Tooltip>
+            }
+          />
+        </Flex.Item>
+      )}
       {/*TODO: IGNORE FOR CARDANO*/}
       <IsErgo>
         {hasFarmForPool && <FarmsButton onClick={handleFarmsButtonClick} />}

diff --git a/src/pages/Liquidity/default/common/PoolsOrPositionsTableView/PoolsOrPositionsTableView.tsx b/src/pages/Liquidity/default/common/PoolsOrPositionsTableView/PoolsOrPositionsTableView.tsx
@@ -40,8 +40,8 @@ export const PoolsOrPositionsTableView: FC<
       tableItemViewPadding={[0, 4]}
     >
       <TableView.Column
-        width={401}
-        headerWidth={393}
+        width={451}
+        headerWidth={443}
         title={<Trans>Pair</Trans>}
       >
         {(ammPool) => <PairColumn ammPool={poolMapper(ammPool)} />}