diff --git a/mocks/pools/pool.ts b/mocks/pools/pool.ts index 78dce73b1d..1096496967 100644 --- a/mocks/pools/pool.ts +++ b/mocks/pools/pool.ts @@ -9,8 +9,10 @@ export const base: Pool = { quote_token_address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', quote_token_symbol: 'WETH', quote_token_icon_url: 'https://localhost:3000/secondary_utia.jpg', - fully_diluted_valuation_usd: '75486579078', - market_cap_usd: '139312819076.195', + base_token_fully_diluted_valuation_usd: '75486579078', + base_token_market_cap_usd: '139312819076.195', + quote_token_fully_diluted_valuation_usd: '486579078', + quote_token_market_cap_usd: '312819076.195', liquidity: '2099941.2238', dex: { id: 'sushiswap', name: 'SushiSwap' }, fee: '0.03', diff --git a/stubs/pools.ts b/stubs/pools.ts index 47aadaf6a0..d3111cc5d0 100644 --- a/stubs/pools.ts +++ b/stubs/pools.ts @@ -7,8 +7,10 @@ export const POOL = { quote_token_address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', quote_token_symbol: 'WETH', quote_token_icon_url: 'https://coin-images.coingecko.com/coins/images/2518/small/weth.png?1696503332', - fully_diluted_valuation_usd: '15211385', - market_cap_usd: '15211385', + base_token_fully_diluted_valuation_usd: '15211385', + base_token_market_cap_usd: '15211385', + quote_token_fully_diluted_valuation_usd: '15211385', + quote_token_market_cap_usd: '15211385', liquidity: '394101.2428', dex: { id: 'uniswap_v2', name: 'Uniswap V2' }, coin_gecko_terminal_url: 'https://www.geckoterminal.com/eth/pools/0x6a1041865b76d1dc33da0257582591227c57832c', diff --git a/types/api/pools.tsx b/types/api/pools.tsx index 21560f6735..9727a57768 100644 --- a/types/api/pools.tsx +++ b/types/api/pools.tsx @@ -15,8 +15,10 @@ export type Pool = { quote_token_address: string; quote_token_symbol: string; quote_token_icon_url: string | null; - fully_diluted_valuation_usd: string; - market_cap_usd: string; + base_token_fully_diluted_valuation_usd: string; + base_token_market_cap_usd: string; + quote_token_fully_diluted_valuation_usd: string; + quote_token_market_cap_usd: string; liquidity: string; dex: { id: string; diff --git a/ui/pages/__screenshots__/Pool.pw.tsx_dark-color-mode_base-view-mobile-dark-mode-1.png b/ui/pages/__screenshots__/Pool.pw.tsx_dark-color-mode_base-view-mobile-dark-mode-1.png index 3f05bb9e09..f8e37f1d8c 100644 Binary files a/ui/pages/__screenshots__/Pool.pw.tsx_dark-color-mode_base-view-mobile-dark-mode-1.png and b/ui/pages/__screenshots__/Pool.pw.tsx_dark-color-mode_base-view-mobile-dark-mode-1.png differ diff --git a/ui/pages/__screenshots__/Pool.pw.tsx_default_base-view-mobile-dark-mode-1.png b/ui/pages/__screenshots__/Pool.pw.tsx_default_base-view-mobile-dark-mode-1.png index 9a1d6e1c5a..f5d0fbc217 100644 Binary files a/ui/pages/__screenshots__/Pool.pw.tsx_default_base-view-mobile-dark-mode-1.png and b/ui/pages/__screenshots__/Pool.pw.tsx_default_base-view-mobile-dark-mode-1.png differ diff --git a/ui/pages/__screenshots__/Pool.pw.tsx_mobile_base-view-mobile-dark-mode-1.png b/ui/pages/__screenshots__/Pool.pw.tsx_mobile_base-view-mobile-dark-mode-1.png index 6014df238e..b8266e97eb 100644 Binary files a/ui/pages/__screenshots__/Pool.pw.tsx_mobile_base-view-mobile-dark-mode-1.png and b/ui/pages/__screenshots__/Pool.pw.tsx_mobile_base-view-mobile-dark-mode-1.png differ diff --git a/ui/pages/__screenshots__/Pools.pw.tsx_dark-color-mode_base-view-dark-mode-1.png b/ui/pages/__screenshots__/Pools.pw.tsx_dark-color-mode_base-view-dark-mode-1.png index c138b37a3a..62d2208078 100644 Binary files a/ui/pages/__screenshots__/Pools.pw.tsx_dark-color-mode_base-view-dark-mode-1.png and b/ui/pages/__screenshots__/Pools.pw.tsx_dark-color-mode_base-view-dark-mode-1.png differ diff --git a/ui/pages/__screenshots__/Pools.pw.tsx_default_base-view-dark-mode-1.png b/ui/pages/__screenshots__/Pools.pw.tsx_default_base-view-dark-mode-1.png index 0964bf83cb..149ca1d45d 100644 Binary files a/ui/pages/__screenshots__/Pools.pw.tsx_default_base-view-dark-mode-1.png and b/ui/pages/__screenshots__/Pools.pw.tsx_default_base-view-dark-mode-1.png differ diff --git a/ui/pages/__screenshots__/Pools.pw.tsx_default_mobile-base-view-1.png b/ui/pages/__screenshots__/Pools.pw.tsx_default_mobile-base-view-1.png index 84ed179a77..a20e81f808 100644 Binary files a/ui/pages/__screenshots__/Pools.pw.tsx_default_mobile-base-view-1.png and b/ui/pages/__screenshots__/Pools.pw.tsx_default_mobile-base-view-1.png differ diff --git a/ui/pool/PoolInfo.tsx b/ui/pool/PoolInfo.tsx index 36c660a992..7d83d317f2 100644 --- a/ui/pool/PoolInfo.tsx +++ b/ui/pool/PoolInfo.tsx @@ -18,7 +18,7 @@ const PoolInfo = ({ data, isPlaceholderData }: Props) => { { isLoading={ isPlaceholderData } hint="Fully Diluted Valuation: theoretical market cap if all tokens were in circulation" > - FDV + Base token FDV - ${ Number(data.fully_diluted_valuation_usd).toLocaleString(undefined, { maximumFractionDigits: 2, notation: 'compact' }) } + ${ Number(data.base_token_fully_diluted_valuation_usd).toLocaleString(undefined, { maximumFractionDigits: 2, notation: 'compact' }) } - Market cap + Base token market cap - ${ Number(data.market_cap_usd).toLocaleString(undefined, { maximumFractionDigits: 2, notation: 'compact' }) } + ${ Number(data.base_token_market_cap_usd).toLocaleString(undefined, { maximumFractionDigits: 2, notation: 'compact' }) } + + + + + Quote token FDV + + + + ${ Number(data.quote_token_fully_diluted_valuation_usd).toLocaleString(undefined, { maximumFractionDigits: 2, notation: 'compact' }) } + + + + + Quote token market cap + + + + ${ Number(data.quote_token_market_cap_usd).toLocaleString(undefined, { maximumFractionDigits: 2, notation: 'compact' }) } diff --git a/ui/pools/PoolsListItem.tsx b/ui/pools/PoolsListItem.tsx index 7874ce68e7..b3973aa7fd 100644 --- a/ui/pools/PoolsListItem.tsx +++ b/ui/pools/PoolsListItem.tsx @@ -30,20 +30,6 @@ const UserOpsListItem = ({ item, isLoading }: Props) => { - FDV - - - ${ Number(item.fully_diluted_valuation_usd).toLocaleString(undefined, { maximumFractionDigits: 2, notation: 'compact' }) } - - - - Market cap - - - ${ Number(item.market_cap_usd).toLocaleString(undefined, { maximumFractionDigits: 2, notation: 'compact' }) } - - - Liquidity diff --git a/ui/pools/PoolsTable.tsx b/ui/pools/PoolsTable.tsx index 71c5c60e05..f587911144 100644 --- a/ui/pools/PoolsTable.tsx +++ b/ui/pools/PoolsTable.tsx @@ -1,10 +1,9 @@ -import { Table, Tbody, Th, Tr, Flex } from '@chakra-ui/react'; +import { Table, Tbody, Th, Tr } from '@chakra-ui/react'; import React from 'react'; import type { Pool } from 'types/api/pools'; import { ACTION_BAR_HEIGHT_DESKTOP } from 'ui/shared/ActionBar'; -import Hint from 'ui/shared/Hint'; import { default as Thead } from 'ui/shared/TheadSticky'; import PoolsTableItem from './PoolsTableItem'; @@ -23,17 +22,6 @@ const PoolsTable = ({ items, page, isLoading, top }: Props) => { Pool DEX - - - FDV - - - - Market cap Liquidity View in diff --git a/ui/pools/PoolsTableItem.tsx b/ui/pools/PoolsTableItem.tsx index 47a991fabb..60ef1f399d 100644 --- a/ui/pools/PoolsTableItem.tsx +++ b/ui/pools/PoolsTableItem.tsx @@ -46,16 +46,6 @@ const PoolsTableItem = ({ { item.dex.name } - - - ${ Number(item.fully_diluted_valuation_usd).toLocaleString(undefined, { maximumFractionDigits: 2, notation: 'compact' }) } - - - - - ${ Number(item.market_cap_usd).toLocaleString(undefined, { maximumFractionDigits: 2, notation: 'compact' }) } - - ${ Number(item.liquidity).toLocaleString(undefined, { maximumFractionDigits: 2, notation: 'compact' }) }