Skip to content

fix(perps): correct initial chart viewport and leverage badges #6717

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

Merged
crossle merged 1 commit into from
Sep 29, 2026
+12 −9
Merged

fix(perps): correct initial chart viewport and leverage badges #6717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/src/main/java/one/mixin/android/ui/home/web3/market/MarketPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ private fun MarketRecommendations(
entry = entry,
selected = selected,
quoteColorReversed = quoteColorReversed,
perpetualBadgeStyle = PerpetualMarketBadgeStyle.PERPETUAL,
perpetualBadgeStyle = PerpetualMarketBadgeStyle.LEVERAGE,
onSelect = {
selectedIds =
if (selected) {
Expand Down Expand Up @@ -531,7 +531,7 @@ private fun MarketRow(
market = entry.market,
isFavored = entry.isFavored,
quoteColorReversed = settings.quoteColorReversed,
badgeStyle = PerpetualMarketBadgeStyle.PERPETUAL,
badgeStyle = PerpetualMarketBadgeStyle.LEVERAGE,
onFavorite = onFavorite,
onClick = onClick,
)
Expand Down
17 changes: 10 additions & 7 deletions app/src/main/java/one/mixin/android/ui/home/web3/trade/CandleChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ private fun ScrollableCandleChart(
val baseSpacing = 2.dp
val density = LocalDensity.current

val scrollState = rememberScrollState()
val coroutineScope = rememberCoroutineScope()
var touchXOnChart by remember { mutableStateOf<Float?>(null) }
var isTouching by remember { mutableStateOf(false) }
Expand All @@ -239,12 +238,6 @@ private fun ScrollableCandleChart(
(8.dp + (candleWidth * items.size) + (spacing * (items.size - 1).coerceAtLeast(0))).toPx()
}

LaunchedEffect(items.size) {
if (items.size > 50) {
scrollState.scrollTo(scrollState.maxValue)
}
}

val selectedIndex = touchXOnChart?.let { x ->
((x - chartStartPaddingPx) / candleStepPx).toInt().coerceIn(0, items.lastIndex)
}
Expand Down Expand Up @@ -274,6 +267,16 @@ private fun ScrollableCandleChart(
) {
val axisPanelWidthPx = with(density) { axisPanelWidth.toPx() }
val viewportWidthPx = (with(density) { maxWidth.toPx() } - axisPanelWidthPx).coerceAtLeast(1f)
val scrollState = rememberScrollState(
initial = (totalChartWidthPx.roundToInt() - viewportWidthPx.roundToInt()).coerceAtLeast(0),
)

LaunchedEffect(items.size) {
if (items.size > 50) {
scrollState.scrollTo(scrollState.maxValue)
}
}

val viewportLeft = scrollState.value.toFloat()
val viewportRight = viewportLeft + viewportWidthPx
val startIndex = ((((viewportLeft - chartStartPaddingPx) - candleWidthPx) / candleStepPx).toInt() - 1)
Expand Down
Loading