From b9ee145aed861d7926f730ef5f8ca1a00d03affb Mon Sep 17 00:00:00 2001 From: claudiaHash <49017601+claudiaHash@users.noreply.github.com> Date: Mon, 28 Mar 2022 17:57:16 +0300 Subject: [PATCH] Get valid pool transaction link (#1268) * get transactions link * cleanup Co-authored-by: ClaudiaHolhos --- src/components/@shared/PoolTransactions/index.tsx | 5 +++-- src/components/Profile/History/PoolShares/_utils.ts | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/@shared/PoolTransactions/index.tsx b/src/components/@shared/PoolTransactions/index.tsx index 997862d28..872578d5c 100644 --- a/src/components/@shared/PoolTransactions/index.tsx +++ b/src/components/@shared/PoolTransactions/index.tsx @@ -9,6 +9,7 @@ import { fetchDataForMultipleChains } from '@utils/subgraph' import { useSiteMetadata } from '@hooks/useSiteMetadata' import NetworkName from '@shared/NetworkName' import { getAssetsFromDtList } from '@utils/aquarius' +import { getAsset } from '../../Profile/History/PoolShares/_utils' import { CancelToken } from 'axios' import Title from './Title' import styles from './index.module.css' @@ -180,8 +181,8 @@ export default function PoolTransactions({ for (let i = 0; i < data.length; i++) { poolTransactions.push({ ...data[i], - networkId: ddoList[i]?.chainId, - asset: ddoList[i] + networkId: getAsset(ddoList, data[i].datatoken.address).chainId, + asset: getAsset(ddoList, data[i].datatoken.address) }) } const sortedTransactions = poolTransactions.sort( diff --git a/src/components/Profile/History/PoolShares/_utils.ts b/src/components/Profile/History/PoolShares/_utils.ts index 11e8f159d..eef7898c3 100644 --- a/src/components/Profile/History/PoolShares/_utils.ts +++ b/src/components/Profile/History/PoolShares/_utils.ts @@ -5,7 +5,7 @@ import { PoolShares_poolShares as PoolShare } from '../../../../@types/subgraph/ import { AssetPoolShare } from '.' import { Asset } from '@oceanprotocol/lib' -function getAsset(items: Asset[], datatoken: string): Asset { +export function getAsset(items: Asset[], datatoken: string): Asset { for (let i = 0; i < items.length; i++) { if ( items[i].datatokens[0].address.toLowerCase() === datatoken.toLowerCase() @@ -36,7 +36,6 @@ export async function getAssetsFromPoolShares( data[i].pool.totalShares, data[i].pool.baseTokenLiquidity ) - console.log(data[i].pool.datatoken.address, userLiquidity) assetList.push({ poolShare: data[i], userLiquidity,