diff --git a/src/constant/firebase.ts b/src/constant/firebase.ts index 7c1d543e..18d52483 100644 --- a/src/constant/firebase.ts +++ b/src/constant/firebase.ts @@ -50,6 +50,7 @@ export const ANALYTICS_EVENTS = { TRANSFER_OUT_CLICK: 'transfer_out_click', TRANSFER_OUT_CONFIRMED: 'transfer_out_confirmed', DEPOSIT_CLICK: 'deposit_click', + VIEW_DETAILS_CLICK: 'view_details_click', QUIT_DEPOSIT_FLOW_MODAL_OPEN: 'quit_deposit_flow_modal_open', QUIT_DEPOSIT_FLOW_MODAL_CONFIRMED: 'quit_deposit_flow_modal_confirmed', QUIT_DEPOSIT_FLOW_MODAL_CANCELLED: 'quit_deposit_flow_modal_cancelled', diff --git a/src/locales/en.ts b/src/locales/en.ts index 0eb8bf4e..1861a967 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -273,8 +273,9 @@ export default { tvl: 'TVL:', apy: 'Estimated APR:', cta: 'Deposit in Pool', + viewDetails: 'Chance to win', drawEndAt: 'Next draw in:', - poolId: 'Pool #{{ poolId }}', + poolId: 'Pool', }, poolDetails: { myDeposits: 'My {{ denom }} deposits', @@ -314,7 +315,7 @@ export default { noDraws: 'No draws yet', noDrawsDescription: 'Draws will be available as soon as the first prize is won', noDrawsCta: 'Deposit in Pool', - tableHeaders: ['Pool ID', 'Draw ID', 'Date', 'Prizes', 'Prize Value'], + tableHeaders: ['Draw ID', 'Date', 'Prizes', 'Prize Value'], }, drawDetails: { winnersBtn: 'Winners', diff --git a/src/pages/MySavings/components/DepositTable/DepositTable.tsx b/src/pages/MySavings/components/DepositTable/DepositTable.tsx index 8a898103..489bd6e9 100644 --- a/src/pages/MySavings/components/DepositTable/DepositTable.tsx +++ b/src/pages/MySavings/components/DepositTable/DepositTable.tsx @@ -127,7 +127,7 @@ const DepositTable = ({ deposits, pools, prices, onLeavePool, onDepositRetry, on )}

- {numeral(usdPrice).format('$0,0[.]00')} - {I18n.t('pools.poolId', { poolId: deposit.poolId?.toString() || '' })} -{' '} + {numeral(usdPrice).format('$0,0[.]00')} - {DenomsUtils.getNormalDenom(deposit.amount?.denom || '').toUpperCase()} {I18n.t('pools.poolId')} -{' '} {I18n.t('deposit.depositId', { depositId: deposit.depositId?.toString() || '' })}

diff --git a/src/pages/PoolDetails/PoolDetails.tsx b/src/pages/PoolDetails/PoolDetails.tsx index 61f4d0b3..222930d6 100644 --- a/src/pages/PoolDetails/PoolDetails.tsx +++ b/src/pages/PoolDetails/PoolDetails.tsx @@ -69,7 +69,7 @@ const PoolDetails = () => { } }; - getLeaderboard(); + getLeaderboard().finally(() => null); }, [lumWallet]); useEffect(() => { @@ -585,9 +585,6 @@ const PoolDetails = () => { }} className='scale-hover' > - -
#{draw.poolId.toString()}
-
#{draw.drawId.toString()}
diff --git a/src/pages/Pools/Pools.scss b/src/pages/Pools/Pools.scss index 6c1c1725..bb8ffd38 100644 --- a/src/pages/Pools/Pools.scss +++ b/src/pages/Pools/Pools.scss @@ -11,11 +11,11 @@ display: flex; flex-direction: column; align-items: stretch; - height: 400px; + height: 440px; justify-content: space-between; @include media-breakpoint-up(xl) { - height: 440px; + height: 470px; } .name-container { diff --git a/src/pages/Pools/components/PoolCard.tsx b/src/pages/Pools/components/PoolCard.tsx index b37115d3..6ad0fb8c 100644 --- a/src/pages/Pools/components/PoolCard.tsx +++ b/src/pages/Pools/components/PoolCard.tsx @@ -1,5 +1,4 @@ import React, { useState } from 'react'; -import { useNavigate } from 'react-router-dom'; import { useSelector } from 'react-redux'; import numeral from 'numeral'; @@ -24,19 +23,12 @@ const PoolCard = ({ denom, tvl, poolId, estimatedPrize, drawEndAt, apy }: IProps const loadingAdditionalInfo = useSelector((state: RootState) => state.loading.effects.pools.getPoolsAdditionalInfo); const lumWallet = useSelector((state: RootState) => state.wallet.lumWallet); - const navigate = useNavigate(); - const [drawInProgress, setDrawInProgress] = useState(false); const price = prices?.[denom]; return ( - { - navigate(`${NavigationConstants.POOL_DETAILS}/${denom}/${poolId}`); - }} - > +
{denom}
@@ -83,6 +75,13 @@ const PoolCard = ({ denom, tvl, poolId, estimatedPrize, drawEndAt, apy }: IProps
+