Skip to content

Commit 5ab1514

Browse files
committed
feat: Hide transfer to spending if there are no LN channels
1 parent e37b298 commit 5ab1514

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ fun HomeScreen(
144144
) {
145145
val hasSeenSavingsIntro by appViewModel.hasSeenSavingsIntro.collectAsState()
146146
SpendingWalletScreen(
147+
uiState = uiState,
147148
onAllActivityButtonClick = { rootNavController.navigateToAllActivity() },
148149
onActivityItemClick = { rootNavController.navigateToActivityItem(it) },
149150
onTransferToSavingsClick = {

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ import to.bitkit.ui.screens.wallets.activity.ActivityListWithHeaders
3737
import to.bitkit.ui.theme.AppThemeSurface
3838
import to.bitkit.ui.theme.Colors
3939
import to.bitkit.ui.utils.withAccent
40+
import to.bitkit.viewmodels.MainUiState
4041

4142
@Composable
4243
fun SpendingWalletScreen(
44+
uiState: MainUiState,
4345
onAllActivityButtonClick: () -> Unit,
4446
onActivityItemClick: (String) -> Unit,
4547
onTransferToSavingsClick: () -> Unit,
@@ -50,8 +52,11 @@ fun SpendingWalletScreen(
5052
// TODO use && hasLnActivity + LN spendingSats
5153
mutableStateOf(balances.totalLightningSats == 0uL)
5254
}
53-
val canTransfer by remember(balances.totalLightningSats) {
54-
mutableStateOf(balances.totalLightningSats > 0uL)
55+
val canTransfer by remember(balances.totalLightningSats, uiState.channels.size) {
56+
val hasLnBalance = balances.totalLightningSats > 0uL
57+
val hasChannels = uiState.channels.isNotEmpty()
58+
59+
mutableStateOf(hasLnBalance && hasChannels)
5560
}
5661

5762
Box(
@@ -124,6 +129,7 @@ fun SpendingWalletScreen(
124129
private fun SpendingWalletScreenPreview() {
125130
AppThemeSurface {
126131
SpendingWalletScreen(
132+
uiState = MainUiState(),
127133
onAllActivityButtonClick = {},
128134
onActivityItemClick = {},
129135
onTransferToSavingsClick = {},

0 commit comments

Comments
 (0)