Skip to content

fix(wallet): match iOS token order and card-stack spacing #1222

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
bmc08gt merged 1 commit into from
Aug 12, 2026
Merged

fix(wallet): match iOS token order and card-stack spacing #1222

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
6 changes: 4 additions & 2 deletions ...features/balance/src/main/kotlin/com/flipcash/app/balance/internal/WalletScreenContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.rememberVectorPainter
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.flipcash.app.core.AppRoute
import com.flipcash.app.core.ui.TokenCardStack
Expand Down Expand Up @@ -73,13 +74,14 @@ internal fun WalletScreenContent(
state = listState,
modifier = Modifier.fillMaxSize(),
contentPadding = PaddingValues(
top = CodeTheme.dimens.inset,
start = CodeTheme.dimens.inset,
end = CodeTheme.dimens.inset,
bottom = LocalTabBarPadding.current.calculateBottomPadding(),
bottom = LocalTabBarPadding.current.calculateBottomPadding() + CodeTheme.dimens.grid.x12,
)
) {
item {
Spacer(Modifier.height(CodeTheme.dimens.grid.x20))
Spacer(Modifier.height(CodeTheme.dimens.grid.x15))
}

item {
Expand Down
7 changes: 5 additions & 2 deletions ...flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SelectTokenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,11 @@ class SelectTokenViewModel @Inject constructor(
)
}
.sortedWith(
compareByDescending<TokenWithLocalizedBalance> { it.balance.nativeAmount.rounded() }
.thenBy { it.token.address.base58() }
// Match iOS (Session.balances): descending by exact value, then
// alphabetical by name (not by mint address, which reordered equal-value
// tokens like LaunchIt/Teddies differently than iOS).
compareByDescending<TokenWithLocalizedBalance> { it.balance.nativeAmount }
.thenBy { it.token.name }
)
.filter {
val hasBalance = it.balance.nativeAmount.hasDisplayableValue
Expand Down
Loading