diff --git a/packages/kit/src/views/Swap/pages/components/SwapStockTokenDetails.tsx b/packages/kit/src/views/Swap/pages/components/SwapStockTokenDetails.tsx index 11b1ac5d2f2f..3ae448b3ab7d 100644 --- a/packages/kit/src/views/Swap/pages/components/SwapStockTokenDetails.tsx +++ b/packages/kit/src/views/Swap/pages/components/SwapStockTokenDetails.tsx @@ -9,7 +9,6 @@ import { Dialog, InteractiveIcon, SizableText, - Skeleton, XStack, YStack, useClipboard, @@ -24,6 +23,8 @@ import type { IMarketTokenDetail } from '@onekeyhq/shared/types/marketV2'; import { SwapTestIDs } from '../../testIDs'; +import { SwapSmoothReveal } from './SwapSmoothReveal'; + // cspell:words xstock xStocks const STOCK_ISSUER_NAMES: Record = { coingecko: 'Ondo', @@ -248,47 +249,33 @@ export function SwapStockTokenDetails({ }); }, []); - if (!loading && (!stock || !tokenAddress)) { - return null; - } - - const ratioValue = - !loading && stock?.tokenToAssetRatio - ? [stock.tokenToAssetRatio, stock.underlyingAssetTicker] - .filter(Boolean) - .join(' ') - : undefined; + const ratioValue = stock?.tokenToAssetRatio + ? [stock.tokenToAssetRatio, stock.underlyingAssetTicker] + .filter(Boolean) + .join(' ') + : undefined; - return ( - - - {intl.formatMessage({ id: ETranslations.trade_stocks_token_details })} - - - - {loading ? ( - - ) : ( + const tokenDetailsContent = + stock && tokenAddress ? ( + + + {intl.formatMessage({ id: ETranslations.trade_stocks_token_details })} + + + - {stock?.underlyingAssetTicker ?? '--'} + {stock.underlyingAssetTicker ?? '--'} - )} - - - {loading ? ( - - ) : ( + + {issuerName} @@ -302,42 +289,43 @@ export function SwapStockTokenDetails({ /> ) : null} - )} - - {ratioValue ? ( + + {ratioValue ? ( + + } + > + + {ratioValue} + + + ) : null} - } > - - {ratioValue} - - - ) : null} - - {loading || !tokenAddress ? ( - - ) : ( - )} - + + - + ) : null; + + return ( + + {tokenDetailsContent} + ); } diff --git a/packages/kit/src/views/Swap/testIDs.ts b/packages/kit/src/views/Swap/testIDs.ts index 1e142eb3ca22..8d525eda44e9 100644 --- a/packages/kit/src/views/Swap/testIDs.ts +++ b/packages/kit/src/views/Swap/testIDs.ts @@ -59,7 +59,6 @@ export const SwapTestIDs = { stockTokenRatioInfo: 'swap-stock-token-ratio-info', stockTokenRatioDialog: 'swap-stock-token-ratio-dialog', stockTokenRatioDialogClose: 'swap-stock-token-ratio-dialog-close', - stockTokenDetailsLoading: 'swap-stock-token-details-loading', stockChartLoading: 'swap-stock-chart-loading', stockChartContent: 'swap-stock-chart-content', stockChartEmpty: 'swap-stock-chart-empty',