Skip to content

fix: smooth Stock token details reveal (OK-60172) #12870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhaono1 wants to merge 2 commits into from
+55 −68
Closed

fix: smooth Stock token details reveal (OK-60172) #12870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9b2be7
fix: smooth stock token details reveal (OK-60172)
zhaono1 Aug 13, 2026
a490be6
Merge branch 'x' into fix/zhaono1-081303
zhaono1 Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 55 additions & 67 deletions packages/kit/src/views/Swap/pages/components/SwapStockTokenDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
Dialog,
InteractiveIcon,
SizableText,
Skeleton,
XStack,
YStack,
useClipboard,
Expand All @@ -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<string, string> = {
coingecko: 'Ondo',
Expand Down Expand Up @@ -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 (
<YStack mt="$6" gap="$2.5" testID={SwapTestIDs.stockTokenDetails}>
<SizableText size="$bodyMdMedium" color="$text">
{intl.formatMessage({ id: ETranslations.trade_stocks_token_details })}
</SizableText>
<YStack
gap="$2"
testID={loading ? SwapTestIDs.stockTokenDetailsLoading : undefined}
>
<TokenDetailRow
label={intl.formatMessage({
id: ETranslations.trade_stocks_underlying_asset,
})}
>
{loading ? (
<Skeleton h="$5" w="$12" />
) : (
const tokenDetailsContent =
stock && tokenAddress ? (
<YStack pt="$6" gap="$2.5" testID={SwapTestIDs.stockTokenDetails}>
<SizableText size="$bodyMdMedium" color="$text">
{intl.formatMessage({ id: ETranslations.trade_stocks_token_details })}
</SizableText>
<YStack gap="$2">
<TokenDetailRow
label={intl.formatMessage({
id: ETranslations.trade_stocks_underlying_asset,
})}
>
<SizableText size="$bodyMdMedium" color="$text" numberOfLines={1}>
{stock?.underlyingAssetTicker ?? '--'}
{stock.underlyingAssetTicker ?? '--'}
</SizableText>
)}
</TokenDetailRow>
<TokenDetailRow
label={intl.formatMessage({
id: ETranslations.trade_stocks_token_issuer,
})}
>
{loading ? (
<Skeleton h="$5" w="$16" />
) : (
</TokenDetailRow>
<TokenDetailRow
label={intl.formatMessage({
id: ETranslations.trade_stocks_token_issuer,
})}
>
<XStack alignItems="center" gap="$1.5">
<SizableText size="$bodyMdMedium" color="$text" numberOfLines={1}>
{issuerName}
Expand All @@ -302,42 +289,43 @@ export function SwapStockTokenDetails({
/>
) : null}
</XStack>
)}
</TokenDetailRow>
{ratioValue ? (
</TokenDetailRow>
{ratioValue ? (
<TokenDetailRow
label={intl.formatMessage({
id: ETranslations.trade_stocks_token_to_share_ratio,
})}
labelAction={
<InteractiveIcon
testID={SwapTestIDs.stockTokenRatioInfo}
icon="InfoCircleOutline"
size="$4"
onPress={handleShowRatioInfo}
/>
}
>
<SizableText size="$bodyMdMedium" color="$text" numberOfLines={1}>
{ratioValue}
</SizableText>
</TokenDetailRow>
) : null}
<TokenDetailRow
label={intl.formatMessage({
id: ETranslations.trade_stocks_token_to_share_ratio,
id: ETranslations.trade_stocks_contract_address,
})}
labelAction={
<InteractiveIcon
testID={SwapTestIDs.stockTokenRatioInfo}
icon="InfoCircleOutline"
size="$4"
onPress={handleShowRatioInfo}
/>
}
>
<SizableText size="$bodyMdMedium" color="$text" numberOfLines={1}>
{ratioValue}
</SizableText>
</TokenDetailRow>
) : null}
<TokenDetailRow
label={intl.formatMessage({
id: ETranslations.trade_stocks_contract_address,
})}
>
{loading || !tokenAddress ? (
<Skeleton h="$5" w="$32" />
) : (
<ContractAddressValue
address={tokenAddress}
networkId={networkId}
/>
)}
</TokenDetailRow>
</TokenDetailRow>
</YStack>
</YStack>
</YStack>
) : null;

return (
<SwapSmoothReveal visible={!loading && !!tokenDetailsContent}>
{tokenDetailsContent}
</SwapSmoothReveal>
);
}
1 change: 0 additions & 1 deletion packages/kit/src/views/Swap/testIDs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading