From 6ae72ec519d2ade1141b23edfbe28ecdddb06d38 Mon Sep 17 00:00:00 2001 From: Anukul Pandey Date: Thu, 5 Sep 2024 02:44:02 +0530 Subject: [PATCH 1/5] feat: added status whether pool exists or not --- src/hooks/usePoolStats.ts | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/hooks/usePoolStats.ts b/src/hooks/usePoolStats.ts index 5c6ebea..855fb1d 100644 --- a/src/hooks/usePoolStats.ts +++ b/src/hooks/usePoolStats.ts @@ -143,7 +143,7 @@ export interface PoolStats { volumeChange24h: number; } -export const usePoolInfo = (address: string, signerAddress: string, tokenPrices: TokenPrices, httpClient: AxiosInstance): [PoolStats|undefined, boolean] => { +export const usePoolInfo = (address: string, signerAddress: string, tokenPrices: TokenPrices, httpClient: AxiosInstance): [{data:PoolStats|undefined,status:boolean}, boolean] => { const [tokensData, setTokensData] = useState(); const [poolInfoData, setPoolInfoData] = useState(); const [tokenIconsMap,setTokenIconMap] = useState(); @@ -195,22 +195,28 @@ export const usePoolInfo = (address: string, signerAddress: string, tokenPrices: useAsyncEffect(async()=>{ if(tokensData){ - // resolving token icons - const { token1,token2 } = tokensData!.poolById; - - let tokenAddresses:string[] = []; - - if(token1.iconUrl=='')tokenAddresses.push(token1.id); - if(token2.iconUrl=='')tokenAddresses.push(token2.id); - - const _tokenIconMap = await tokenIconUtils.resolveTokenUrl(tokenAddresses); - setTokenIconMap(_tokenIconMap); + if(tokensData.poolById!=null){ + // resolving token icons + const { token1,token2 } = tokensData!.poolById; + + let tokenAddresses:string[] = []; + + if(token1.iconUrl=='')tokenAddresses.push(token1.id); + if(token2.iconUrl=='')tokenAddresses.push(token2.id); + + const _tokenIconMap = await tokenIconUtils.resolveTokenUrl(tokenAddresses); + setTokenIconMap(_tokenIconMap); + } } },[tokensData]) - const info = useMemo(() => { - if (!poolInfoData || !tokensData) { - return undefined; + const info = useMemo<{data:PoolStats|undefined,status:boolean}>(() => { + if (!poolInfoData || !tokensData || !(tokensData!.poolById!=null)) { + if(tokensData!.poolById!=null)return { + data:undefined, + status:false + } + return {data:undefined,status:false}; } const pool = poolInfoData.poolInfo; @@ -263,7 +269,7 @@ export const usePoolInfo = (address: string, signerAddress: string, tokenPrices: const all = amountLocked1.plus(amountLocked2); - return { + return {data:{ firstToken: { address: token1.id, icon: token1.iconUrl === '' ? tokenIconsMap? tokenIconsMap[token1.id]: getIconUrl(token1.id) : token1.iconUrl, @@ -300,7 +306,7 @@ export const usePoolInfo = (address: string, signerAddress: string, tokenPrices: tvlUSD, volume24hUSD: volume24hUSD.toFormat(2), volumeChange24h: volDiff, - }; + },status:true}; }, [poolInfoData, tokensData, tokenPrices]); return [info, tokensLoading || poolInfoLoading]; From e987fd2d67d25dc0c2ac0910d0eebf3996b3a394 Mon Sep 17 00:00:00 2001 From: Anukul Pandey Date: Thu, 5 Sep 2024 03:27:20 +0530 Subject: [PATCH 2/5] fix: loader --- src/hooks/usePoolStats.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hooks/usePoolStats.ts b/src/hooks/usePoolStats.ts index 855fb1d..dc53561 100644 --- a/src/hooks/usePoolStats.ts +++ b/src/hooks/usePoolStats.ts @@ -216,7 +216,7 @@ export const usePoolInfo = (address: string, signerAddress: string, tokenPrices: data:undefined, status:false } - return {data:undefined,status:false}; + return {data:undefined,status:true}; } const pool = poolInfoData.poolInfo; From 058e75df935cf1e05a62ac60a7a528f77ed5648d Mon Sep 17 00:00:00 2001 From: Anukul Pandey Date: Thu, 5 Sep 2024 03:33:38 +0530 Subject: [PATCH 3/5] fix: loader --- src/hooks/usePoolStats.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hooks/usePoolStats.ts b/src/hooks/usePoolStats.ts index dc53561..6df17ea 100644 --- a/src/hooks/usePoolStats.ts +++ b/src/hooks/usePoolStats.ts @@ -212,7 +212,7 @@ export const usePoolInfo = (address: string, signerAddress: string, tokenPrices: const info = useMemo<{data:PoolStats|undefined,status:boolean}>(() => { if (!poolInfoData || !tokensData || !(tokensData!.poolById!=null)) { - if(tokensData!.poolById!=null)return { + if(tokensData && tokensData!.poolById!=null)return { data:undefined, status:false } From 11f7965c562cce13626c40a4318652a6f0e860ce Mon Sep 17 00:00:00 2001 From: Anukul Pandey Date: Thu, 5 Sep 2024 03:52:00 +0530 Subject: [PATCH 4/5] fix: loader --- src/hooks/usePoolStats.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hooks/usePoolStats.ts b/src/hooks/usePoolStats.ts index 6df17ea..82143fc 100644 --- a/src/hooks/usePoolStats.ts +++ b/src/hooks/usePoolStats.ts @@ -212,7 +212,8 @@ export const usePoolInfo = (address: string, signerAddress: string, tokenPrices: const info = useMemo<{data:PoolStats|undefined,status:boolean}>(() => { if (!poolInfoData || !tokensData || !(tokensData!.poolById!=null)) { - if(tokensData && tokensData!.poolById!=null)return { + console.log("tokensData===",tokensData) + if(tokensData && tokensData!.poolById==null)return { data:undefined, status:false } From e0bfe2aa9ed384235076b2bf3c432a1556afe5f6 Mon Sep 17 00:00:00 2001 From: Anukul Pandey Date: Thu, 5 Sep 2024 03:56:16 +0530 Subject: [PATCH 5/5] cleanup --- src/hooks/usePoolStats.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/hooks/usePoolStats.ts b/src/hooks/usePoolStats.ts index 82143fc..0a871da 100644 --- a/src/hooks/usePoolStats.ts +++ b/src/hooks/usePoolStats.ts @@ -212,7 +212,6 @@ export const usePoolInfo = (address: string, signerAddress: string, tokenPrices: const info = useMemo<{data:PoolStats|undefined,status:boolean}>(() => { if (!poolInfoData || !tokensData || !(tokensData!.poolById!=null)) { - console.log("tokensData===",tokensData) if(tokensData && tokensData!.poolById==null)return { data:undefined, status:false