Skip to content

Fix duplicated logic in SelectedWalletScreen and DRY balance display #534

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
praveenperera merged 1 commit into from
Jan 23, 2026
Merged

Fix duplicated logic in SelectedWalletScreen and DRY balance display #534

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
21 changes: 11 additions & 10 deletions ...id/app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/SelectedWalletScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,14 @@ fun SelectedWalletScreen(
.weight(1f)
.background(listBg),
) {
val hasTransactions =
when (val loadState = manager?.loadState) {
is WalletLoadState.SCANNING -> loadState.txns.isNotEmpty() || unsignedTransactions.isNotEmpty()
is WalletLoadState.LOADED -> loadState.txns.isNotEmpty() || unsignedTransactions.isNotEmpty()
else -> false
val loadState = manager?.loadState
val transactions =
when (loadState) {
is WalletLoadState.SCANNING -> loadState.txns
is WalletLoadState.LOADED -> loadState.txns
else -> emptyList()
}
val hasTransactions = transactions.isNotEmpty() || unsignedTransactions.isNotEmpty()

val content: @Composable () -> Unit = {
Column(modifier = Modifier.fillMaxSize()) {
Expand All @@ -353,7 +355,7 @@ fun SelectedWalletScreen(
app = app,
)

when (val loadState = manager?.loadState) {
when (loadState) {
is WalletLoadState.LOADING, null -> {
TransactionsLoadingView(
secondaryText = secondaryText,
Expand All @@ -362,17 +364,16 @@ fun SelectedWalletScreen(
)
}
is WalletLoadState.SCANNING -> {
val txns = loadState.txns
val isFirstScan = manager.walletMetadata?.internal?.lastScanFinished == null
if (isFirstScan && txns.isEmpty() && unsignedTransactions.isEmpty()) {
if (isFirstScan && transactions.isEmpty() && unsignedTransactions.isEmpty()) {
TransactionsLoadingView(
secondaryText = secondaryText,
primaryText = primaryText,
modifier = Modifier.weight(1f),
)
} else {
TransactionsCardView(
transactions = txns,
transactions = transactions,
unsignedTransactions = unsignedTransactions,
isScanning = true,
isFirstScan = isFirstScan,
Expand All @@ -388,7 +389,7 @@ fun SelectedWalletScreen(
}
is WalletLoadState.LOADED -> {
TransactionsCardView(
transactions = loadState.txns,
transactions = transactions,
unsignedTransactions = unsignedTransactions,
isScanning = false,
isFirstScan = false,
Expand Down
98 changes: 54 additions & 44 deletions ...app/src/main/java/org/bitcoinppl/cove/flows/SelectedWalletFlow/WalletBalanceHeaderView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,56 +83,51 @@ internal fun BalanceWidget(
modifier = Modifier.clickable { onToggleUnit() },
verticalArrangement = Arrangement.spacedBy(6.dp),
) {
if (isHidden) {
Text(
text = "••••••",
color = Color.White.copy(alpha = 0.7f),
fontSize = 13.sp,
)
} else if (secondaryAmount != null) {
Text(
text = secondaryAmount,
color = Color.White.copy(alpha = 0.7f),
fontSize = 13.sp,
)
} else {
CircularProgressIndicator(
modifier = Modifier.size(12.dp),
color = Color.White.copy(alpha = 0.7f),
strokeWidth = 1.5.dp,
)
}
AmountDisplay(
amount = secondaryAmount,
isHidden = isHidden,
textContent = { text ->
Text(
text = text,
color = Color.White.copy(alpha = 0.7f),
fontSize = 13.sp,
)
},
loadingContent = {
CircularProgressIndicator(
modifier = Modifier.size(12.dp),
color = Color.White.copy(alpha = 0.7f),
strokeWidth = 1.5.dp,
)
},
)

Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
) {
Box(modifier = Modifier.weight(1f)) {
if (isHidden) {
BalanceAutoSizeText(
text = "••••••",
modifier = Modifier.padding(end = 12.dp),
color = Color.White,
baseFontSize = 34.sp,
minimumScaleFactor = 0.5f,
fontWeight = FontWeight.Bold,
)
} else if (primaryAmount != null) {
BalanceAutoSizeText(
text = primaryAmount,
modifier = Modifier.padding(end = 12.dp),
color = Color.White,
baseFontSize = 34.sp,
minimumScaleFactor = 0.5f,
fontWeight = FontWeight.Bold,
)
} else {
CircularProgressIndicator(
modifier = Modifier.size(28.dp),
color = Color.White,
strokeWidth = 2.dp,
)
}
AmountDisplay(
amount = primaryAmount,
isHidden = isHidden,
textContent = { text ->
BalanceAutoSizeText(
text = text,
modifier = Modifier.padding(end = 12.dp),
color = Color.White,
baseFontSize = 34.sp,
minimumScaleFactor = 0.5f,
fontWeight = FontWeight.Bold,
)
},
loadingContent = {
CircularProgressIndicator(
modifier = Modifier.size(28.dp),
color = Color.White,
strokeWidth = 2.dp,
)
},
)
}
Icon(
imageVector = if (isHidden) Icons.Filled.VisibilityOff else Icons.Filled.Visibility,
Expand All @@ -147,6 +142,21 @@ internal fun BalanceWidget(
}
}

@Composable
private fun AmountDisplay(
amount: String?,
isHidden: Boolean,
hiddenText: String = "••••••",
textContent: @Composable (String) -> Unit,
loadingContent: @Composable () -> Unit,
) {
when {
isHidden -> textContent(hiddenText)
amount != null -> textContent(amount)
else -> loadingContent()
}
}

@Composable
private fun SendReceiveButtons(
onSend: () -> Unit,
Expand Down