Skip to content

fix: hide monetary values in activity detail #752

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

fix: hide monetary values in activity detail #752

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
33 changes: 30 additions & 3 deletions app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package to.bitkit.ui.screens.wallets.activity

import androidx.compose.animation.AnimatedContent
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand Down Expand Up @@ -75,6 +76,9 @@ import to.bitkit.ui.scaffold.AppTopBar
import to.bitkit.ui.scaffold.DrawerNavIcon
import to.bitkit.ui.screens.wallets.activity.components.ActivityAddTagSheet
import to.bitkit.ui.screens.wallets.activity.components.ActivityIcon
import to.bitkit.ui.settingsViewModel
import to.bitkit.ui.shared.UiConstants
import to.bitkit.ui.shared.animations.BalanceAnimations
import to.bitkit.ui.shared.modifiers.clickableAlpha
import to.bitkit.ui.shared.modifiers.sheetHeight
import to.bitkit.ui.sheets.BoostTransactionSheet
Expand Down Expand Up @@ -314,6 +318,9 @@ private fun ActivityDetailContent(
onCopy: (String) -> Unit,
feeRates: FeeRates? = null,
) {
val settings = settingsViewModel ?: return
val hideBalance by settings.hideBalance.collectAsStateWithLifecycle()

val isLightning = item is Activity.Lightning
val isSent = item.isSent()
val isTransfer = item.isTransfer()
Expand Down Expand Up @@ -376,7 +383,7 @@ private fun ActivityDetailContent(
sats = item.totalValue().toLong(),
prefix = amountPrefix,
showBitcoinSymbol = false,
useSwipeToHide = false,
useSwipeToHide = true,
modifier = Modifier.weight(1f)
)
ActivityIcon(
Expand Down Expand Up @@ -468,7 +475,17 @@ private fun ActivityDetailContent(
modifier = Modifier.size(16.dp)
)
Spacer(modifier = Modifier.width(4.dp))
MoneySSB(sats = displayAmount.toLong())
AnimatedContent(
targetState = hideBalance,
transitionSpec = { BalanceAnimations.activityAmountTransition },
label = "amountAnimation"
) { isHidden ->
if (isHidden) {
BodySSB(text = UiConstants.HIDE_BALANCE_SHORT)
} else {
MoneySSB(sats = displayAmount.toLong())
}
}
}
Spacer(modifier = Modifier.height(16.dp))
HorizontalDivider()
Expand All @@ -495,7 +512,17 @@ private fun ActivityDetailContent(
modifier = Modifier.size(16.dp)
)
Spacer(modifier = Modifier.width(4.dp))
MoneySSB(sats = fee.toLong())
AnimatedContent(
targetState = hideBalance,
transitionSpec = { BalanceAnimations.activityAmountTransition },
label = "feeAnimation"
) { isHidden ->
if (isHidden) {
BodySSB(text = UiConstants.HIDE_BALANCE_SHORT)
} else {
MoneySSB(sats = fee.toLong())
}
}
}
Spacer(modifier = Modifier.height(16.dp))
HorizontalDivider()
Expand Down
Loading