Skip to content

Commit 5c57306

Browse files
authored
Merge pull request #752 from synonymdev/fix/hide-activity-detail-balance
fix: hide monetary values in activity detail
2 parents 6a163b8 + e09ac4c commit 5c57306

1 file changed

Lines changed: 30 additions & 3 deletions

File tree

app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package to.bitkit.ui.screens.wallets.activity
22

3+
import androidx.compose.animation.AnimatedContent
34
import androidx.compose.foundation.Canvas
45
import androidx.compose.foundation.background
56
import androidx.compose.foundation.layout.Arrangement
@@ -75,6 +76,9 @@ import to.bitkit.ui.scaffold.AppTopBar
7576
import to.bitkit.ui.scaffold.DrawerNavIcon
7677
import to.bitkit.ui.screens.wallets.activity.components.ActivityAddTagSheet
7778
import to.bitkit.ui.screens.wallets.activity.components.ActivityIcon
79+
import to.bitkit.ui.settingsViewModel
80+
import to.bitkit.ui.shared.UiConstants
81+
import to.bitkit.ui.shared.animations.BalanceAnimations
7882
import to.bitkit.ui.shared.modifiers.clickableAlpha
7983
import to.bitkit.ui.shared.modifiers.sheetHeight
8084
import to.bitkit.ui.sheets.BoostTransactionSheet
@@ -314,6 +318,9 @@ private fun ActivityDetailContent(
314318
onCopy: (String) -> Unit,
315319
feeRates: FeeRates? = null,
316320
) {
321+
val settings = settingsViewModel ?: return
322+
val hideBalance by settings.hideBalance.collectAsStateWithLifecycle()
323+
317324
val isLightning = item is Activity.Lightning
318325
val isSent = item.isSent()
319326
val isTransfer = item.isTransfer()
@@ -376,7 +383,7 @@ private fun ActivityDetailContent(
376383
sats = item.totalValue().toLong(),
377384
prefix = amountPrefix,
378385
showBitcoinSymbol = false,
379-
useSwipeToHide = false,
386+
useSwipeToHide = true,
380387
modifier = Modifier.weight(1f)
381388
)
382389
ActivityIcon(
@@ -468,7 +475,17 @@ private fun ActivityDetailContent(
468475
modifier = Modifier.size(16.dp)
469476
)
470477
Spacer(modifier = Modifier.width(4.dp))
471-
MoneySSB(sats = displayAmount.toLong())
478+
AnimatedContent(
479+
targetState = hideBalance,
480+
transitionSpec = { BalanceAnimations.activityAmountTransition },
481+
label = "amountAnimation"
482+
) { isHidden ->
483+
if (isHidden) {
484+
BodySSB(text = UiConstants.HIDE_BALANCE_SHORT)
485+
} else {
486+
MoneySSB(sats = displayAmount.toLong())
487+
}
488+
}
472489
}
473490
Spacer(modifier = Modifier.height(16.dp))
474491
HorizontalDivider()
@@ -495,7 +512,17 @@ private fun ActivityDetailContent(
495512
modifier = Modifier.size(16.dp)
496513
)
497514
Spacer(modifier = Modifier.width(4.dp))
498-
MoneySSB(sats = fee.toLong())
515+
AnimatedContent(
516+
targetState = hideBalance,
517+
transitionSpec = { BalanceAnimations.activityAmountTransition },
518+
label = "feeAnimation"
519+
) { isHidden ->
520+
if (isHidden) {
521+
BodySSB(text = UiConstants.HIDE_BALANCE_SHORT)
522+
} else {
523+
MoneySSB(sats = fee.toLong())
524+
}
525+
}
499526
}
500527
Spacer(modifier = Modifier.height(16.dp))
501528
HorizontalDivider()

0 commit comments

Comments
 (0)