diff --git a/packages/common-resources/static-resources/src/i18n/en_US/tables.ts b/packages/common-resources/static-resources/src/i18n/en_US/tables.ts index c3b7d31b5..a49f05f10 100644 --- a/packages/common-resources/static-resources/src/i18n/en_US/tables.ts +++ b/packages/common-resources/static-resources/src/i18n/en_US/tables.ts @@ -240,7 +240,7 @@ export default { labelDualAssetSettlement_Date: 'Settlement Date', labelDualAssetAPR: 'APR', labelDualAssetAction: 'Actions', - labelDualAssetDetail: 'Detail', + labelDualAssetDetail: 'Details', labelDualAssetRefresh: 'Refresh', labelDualTxsSide: 'Type', labelDualTxsProduct: 'Product', diff --git a/packages/common-resources/static-resources/src/i18n/zh_CN/tables.ts b/packages/common-resources/static-resources/src/i18n/zh_CN/tables.ts index a94891c97..e3f968d92 100644 --- a/packages/common-resources/static-resources/src/i18n/zh_CN/tables.ts +++ b/packages/common-resources/static-resources/src/i18n/zh_CN/tables.ts @@ -239,7 +239,7 @@ export default { labelDualAssetSettlement_Date: 'Settlement Date', labelDualAssetAPR: 'APR', labelDualAssetAction: 'Actions', - labelDualAssetDetail: 'Detail', + labelDualAssetDetail: 'Details', labelDualAssetRefresh: 'Refresh', labelDualTxsSide: 'Type', labelDualTxsProduct: 'Product', diff --git a/packages/component-lib/src/components/tableList/dualTxsTable/DualAssetTable.tsx b/packages/component-lib/src/components/tableList/dualTxsTable/DualAssetTable.tsx index df8529b72..5d0d069b6 100644 --- a/packages/component-lib/src/components/tableList/dualTxsTable/DualAssetTable.tsx +++ b/packages/component-lib/src/components/tableList/dualTxsTable/DualAssetTable.tsx @@ -33,7 +33,7 @@ const TableWrapperStyled = styled(Box)` .rdg { ${({ isMobile }) => !isMobile - ? `--template-columns: 14% 16% 20% 10% 14% 10% 8% 8% !important` + ? `--template-columns: 16% 15% 20% 105px 14% 80px 110px 90px!important` : `--template-columns: 16% 30% 44% 10% !important;`} } @@ -245,7 +245,7 @@ export const DualAssetTable = withTranslation(['tables', 'common'])( }, { key: 'Settlement_Date', - sortable: true, + sortable: false, width: 'auto', name: t('labelDualAssetSettlement_Date'), cellClass: 'textAlignCenter', @@ -256,7 +256,7 @@ export const DualAssetTable = withTranslation(['tables', 'common'])( }, { key: 'APR', - sortable: true, + sortable: false, width: 'auto', cellClass: 'textAlignCenter', headerCellClass: 'textAlignCenter', @@ -267,7 +267,7 @@ export const DualAssetTable = withTranslation(['tables', 'common'])( }, { key: 'Auto', - sortable: true, + sortable: false, name: t('labelDualAutoReinvest'), formatter: ({ row }: FormatterProps) => { return row?.__raw__.order?.dualReinvestInfo?.isRecursive ? ( diff --git a/packages/web-earn/src/pages/AssetPage/HistoryPanel/useDualAsset.tsx b/packages/web-earn/src/pages/AssetPage/HistoryPanel/useDualAsset.tsx index e3174ddbc..32701b222 100644 --- a/packages/web-earn/src/pages/AssetPage/HistoryPanel/useDualAsset.tsx +++ b/packages/web-earn/src/pages/AssetPage/HistoryPanel/useDualAsset.tsx @@ -512,13 +512,13 @@ export const useDualAsset = ( tokenMap[sellTokenSymbol].precision, true, ) - + const market = dualMarketMap[item.tokenInfoOrigin.market] as sdk.DefiMarketInfo const currentPrice = { - base: item.tokenInfoOrigin.base, - quote: item.tokenInfoOrigin.quote, + base: idIndex[market.baseTokenId], + quote: idIndex[market.quoteTokenId], currentPrice: findIndex?.index, - precisionForPrice: dualMarketMap[item.tokenInfoOrigin.market]?.precisionForPrice, - quoteUnit: item.tokenInfoOrigin.quote, + precisionForPrice: market.precisionForPrice, + quoteUnit: idIndex[market.quoteTokenId], } prev.push({ ...format, diff --git a/packages/webapp/src/pages/AssetPage/HistoryPanel/useDualAsset.tsx b/packages/webapp/src/pages/AssetPage/HistoryPanel/useDualAsset.tsx index 81bbd4d8c..717ffb70c 100644 --- a/packages/webapp/src/pages/AssetPage/HistoryPanel/useDualAsset.tsx +++ b/packages/webapp/src/pages/AssetPage/HistoryPanel/useDualAsset.tsx @@ -364,14 +364,13 @@ export const useDualAsset = ( indexP.quote === _item.tokenInfoOrigin.quote ) }) + const market = dualMarketMap[_item.tokenInfoOrigin.market] as sdk.DefiMarketInfo const currentPrice = { - base: _item.tokenInfoOrigin.base, - quote: _item.tokenInfoOrigin.quote, + base: idIndex[market.baseTokenId], + quote: idIndex[market.quoteTokenId], currentPrice: findIndex?.index, - precisionForPrice: - dualMarketMap[_item.tokenInfoOrigin.market]?.precisionForPrice ?? - tokenMap[_item.tokenInfoOrigin.quote]?.precision, - quoteUnit: _item.tokenInfoOrigin.quote, + precisionForPrice: dualMarketMap[_item.tokenInfoOrigin.market]?.precisionForPrice, + quoteUnit: idIndex[market.quoteTokenId], } const format = makeDualOrderedItem( _item, @@ -543,16 +542,16 @@ export const useDualAsset = ( tokenMap[sellTokenSymbol].precision, true, ) + const market = dualMarketMap[item.tokenInfoOrigin.market] as sdk.DefiMarketInfo const currentPrice = { - base: item.tokenInfoOrigin.base, - quote: item.tokenInfoOrigin.quote, + base: idIndex[market.baseTokenId], + quote: idIndex[market.quoteTokenId], currentPrice: findIndex?.index, - precisionForPrice: - dualMarketMap[item.tokenInfoOrigin.market]?.precisionForPrice ?? - tokenMap[item.tokenInfoOrigin.quote]?.precision, - quoteUnit: item.tokenInfoOrigin.quote, + precisionForPrice: dualMarketMap[item.tokenInfoOrigin.market]?.precisionForPrice, + quoteUnit: idIndex[market.quoteTokenId], } + prev.push({ ...format, amount,