diff --git a/centrifuge-app/src/components/PoolOverview/TransactionHistory.tsx b/centrifuge-app/src/components/PoolOverview/TransactionHistory.tsx index 666a1bd8dd..4265488617 100644 --- a/centrifuge-app/src/components/PoolOverview/TransactionHistory.tsx +++ b/centrifuge-app/src/components/PoolOverview/TransactionHistory.tsx @@ -1,5 +1,5 @@ import { AssetTransaction, CurrencyBalance } from '@centrifuge/centrifuge-js' -import { AnchorButton, IconDownload, IconExternalLink, Shelf, Stack, StatusChip, Text } from '@centrifuge/fabric' +import { AnchorButton, IconDownload, IconExternalLink, Shelf, Stack, Text } from '@centrifuge/fabric' import BN from 'bn.js' import { formatDate } from '../../utils/date' import { formatBalance } from '../../utils/formatting' @@ -202,7 +202,6 @@ export const TransactionHistoryTable = ({ return { activeAssetId, netFlow, - type: label, transactionDate: transaction.timestamp, assetId: transaction.asset.id, assetName: transaction.asset.name, @@ -216,11 +215,6 @@ export const TransactionHistoryTable = ({ }) || [] const columns = [ - { - align: 'left', - header: 'Type', - cell: ({ type }: Row) => {type}, - }, { align: 'left', header: , @@ -233,7 +227,7 @@ export const TransactionHistoryTable = ({ }, { align: 'left', - header: 'Asset', + header: , cell: ({ activeAssetId, assetId, assetName, fromAssetId, fromAssetName, toAssetId, toAssetName }: Row) => { const base = `${basePath}/${poolId}/assets/` return fromAssetId && toAssetId && activeAssetId === fromAssetId.split('-')[1] ? ( @@ -263,6 +257,7 @@ export const TransactionHistoryTable = ({ ) }, + sortKey: 'transaction', }, { align: 'right', @@ -299,25 +294,28 @@ export const TransactionHistoryTable = ({ Transaction history - {transactions?.length && ( - - Download - - )} + + {transactions?.length! > 8 && preview && ( + + View all + + )} + {transactions?.length && ( + + Download + + )} + - {transactions?.length! > 8 && preview && ( - - View all - - )} ) } diff --git a/centrifuge-app/src/pages/Pool/Overview/index.tsx b/centrifuge-app/src/pages/Pool/Overview/index.tsx index 1105e94740..55737365ba 100644 --- a/centrifuge-app/src/pages/Pool/Overview/index.tsx +++ b/centrifuge-app/src/pages/Pool/Overview/index.tsx @@ -153,9 +153,7 @@ export function PoolDetailOverview() { {!isTinlakePool && ( }> - - - + )}