Skip to content

SpendingAmountScreen state handling improvement #264

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
jvsena42 merged 21 commits into from
Jul 30, 2025
Merged

SpendingAmountScreen state handling improvement #264

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4c6c7a0
refactor: move satsAmount to UiState class
jvsena42 Jul 28, 2025
fd99716
Merge branch 'master' into refactor/state-handling-improvement
jvsena42 Jul 28, 2025
59a9703
refactor: move limits updating logic to viewmodel
jvsena42 Jul 28, 2025
8289cbe
fix: display balance after fee
jvsena42 Jul 28, 2025
3e51100
feat: handle retry times
jvsena42 Jul 28, 2025
aa2e659
refactor: move order creation code to viewmodel
jvsena42 Jul 29, 2025
756b985
refactor: move sats override logic to viewmodel
jvsena42 Jul 29, 2025
6f3aa42
feat: transfer effect
jvsena42 Jul 29, 2025
afcffad
feat: display toast
jvsena42 Jul 29, 2025
eafa65c
feat: display high balance purchase error
jvsena42 Jul 29, 2025
d7da4e1
refactor: code cleanup
jvsena42 Jul 29, 2025
adef300
refactor: code lint
jvsena42 Jul 29, 2025
5ba1f76
refactor: max amount handling
jvsena42 Jul 29, 2025
0c11183
Merge branch 'master' into refactor/state-handling-improvement
jvsena42 Jul 29, 2025
f6e7238
refactor: remove rememberUpdatedState
jvsena42 Jul 29, 2025
96fdb70
feat: preview
jvsena42 Jul 29, 2025
df694d5
refactor: implement spacer modifiers
jvsena42 Jul 29, 2025
11a6301
refactor: move private method
jvsena42 Jul 29, 2025
6910ac6
Merge branch 'master' into refactor/state-handling-improvement
jvsena42 Jul 30, 2025
08f7804
fix: use repository method to calculate max send amount
jvsena42 Jul 30, 2025
308b644
fix: read onTransferToSpendingConfirm
jvsena42 Jul 30, 2025
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
11 changes: 10 additions & 1 deletion app/src/main/java/to/bitkit/ui/ContentView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import kotlinx.coroutines.launch
import kotlinx.serialization.Serializable
import to.bitkit.models.NewTransactionSheetDetails
import to.bitkit.models.NodeLifecycleState
import to.bitkit.models.Toast
import to.bitkit.models.WidgetType
import to.bitkit.ui.components.AuthCheckScreen
import to.bitkit.ui.components.BottomSheetType
Expand Down Expand Up @@ -504,6 +505,14 @@ private fun RootNavHost(
onBackClick = { navController.popBackStack() },
onCloseClick = { navController.navigateToHome() },
onOrderCreated = { navController.navigate(Routes.SpendingConfirm) },
toastException = { appViewModel.toast(it) },
toast = { title, description ->
appViewModel.toast(
type = Toast.ToastType.ERROR,
title = title,
description = description
)
},
)
}
composableWithDefaultTransitions<Routes.SpendingConfirm> {
Expand Down Expand Up @@ -740,7 +749,7 @@ private fun NavGraphBuilder.shop(
)
}
composableWithDefaultTransitions<Routes.ShopWebView> {
ShopWebViewScreen (
ShopWebViewScreen(
onClose = { navController.navigateToHome() },
onBack = { navController.popBackStack() },
page = it.toRoute<Routes.ShopWebView>().page,
Expand Down
121 changes: 27 additions & 94 deletions app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,14 @@
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableLongStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import kotlinx.coroutines.launch
import to.bitkit.R
import to.bitkit.models.Toast
import to.bitkit.ui.LocalBalances
import to.bitkit.ui.LocalCurrencies
import to.bitkit.ui.appViewModel
import to.bitkit.ui.blocktankViewModel
import to.bitkit.ui.components.AmountInput
import to.bitkit.ui.components.Display
import to.bitkit.ui.components.MoneySSB
Expand All @@ -43,25 +32,34 @@
import to.bitkit.ui.scaffold.ScreenColumn
import to.bitkit.ui.theme.Colors
import to.bitkit.ui.utils.withAccent
import to.bitkit.utils.Logger
import to.bitkit.viewmodels.TransferEffect
import to.bitkit.viewmodels.TransferViewModel
import kotlin.math.max
import kotlin.math.min
import kotlin.math.roundToLong

@Composable
fun SpendingAmountScreen(
viewModel: TransferViewModel,
onBackClick: () -> Unit = {},
onCloseClick: () -> Unit = {},
onOrderCreated: () -> Unit = {},
toastException: (Throwable) -> Unit,
toast: (title: String, description: String) -> Unit,
) {
val scope = rememberCoroutineScope()
val app = appViewModel ?: return
val blocktank = blocktankViewModel ?: return
val currencies = LocalCurrencies.current
val resources = LocalContext.current.resources
val transferValues by viewModel.transferValues.collectAsStateWithLifecycle()
val uiState by viewModel.spendingUiState.collectAsStateWithLifecycle()

LaunchedEffect(Unit) {
viewModel.updateLimits(retry = true)
}

LaunchedEffect(Unit) {
viewModel.transferEffects.collect { effect ->
when (effect) {
TransferEffect.OnOrderCreated -> onOrderCreated()
is TransferEffect.ToastError -> toast(effect.title, effect.description)
is TransferEffect.ToastException -> toastException(effect.e)
}
}
}

ScreenColumn {
AppTopBar(
Expand All @@ -75,38 +73,6 @@
.fillMaxSize()
.imePadding()
) {
var satsAmount by rememberSaveable { mutableLongStateOf(0) }
var overrideSats: Long? by remember { mutableStateOf(null) }
var isLoading by remember { mutableStateOf(false) }

val availableAmount = LocalBalances.current.totalOnchainSats - 512u // default tx fee
var maxLspFee by remember { mutableStateOf(0uL) }

val feeMaximum = max(0, availableAmount.toLong() - maxLspFee.toLong())
val maximum = min(
transferValues.maxClientBalance.toLong(),
feeMaximum
) // TODO USE MAX AVAILABLE TO TRANSFER INSTEAD OF MAX ONCHAIN BALANCE

// Update maxClientBalance Effect
LaunchedEffect(satsAmount) {
viewModel.updateTransferValues(satsAmount.toULong())
Logger.debug(
"satsAmount changed - maxClientBalance: ${transferValues.maxClientBalance}",
context = "SpendingAmountScreen"
)
}

// Update maxLspFee Effect
LaunchedEffect(availableAmount, transferValues.maxLspBalance) { // TODO MOVE TO VIEWMODEL
runCatching {
val estimate = blocktank.estimateOrderFee(
spendingBalanceSats = availableAmount,
receivingBalanceSats = transferValues.maxLspBalance,
)
maxLspFee = estimate.feeSat
}
}

Spacer(modifier = Modifier.height(32.dp))
Display(
Expand All @@ -117,11 +83,8 @@

AmountInput(
primaryDisplay = currencies.primaryDisplay,
overrideSats = overrideSats,
onSatsChange = { sats ->
satsAmount = sats
overrideSats = null
},
overrideSats = uiState.overrideSats,
onSatsChange = viewModel::onAmountChanged,
)

Spacer(modifier = Modifier.weight(1f))
Expand All @@ -138,61 +101,31 @@
color = Colors.White64,
)
Spacer(modifier = Modifier.height(8.dp))
MoneySSB(sats = availableAmount.toLong())
MoneySSB(sats = uiState.balanceAfterFee)
}
Spacer(modifier = Modifier.weight(1f))
UnitButton(color = Colors.Purple)
// 25% Button
NumberPadActionButton(
text = stringResource(R.string.lightning__spending_amount__quarter),
color = Colors.Purple,
onClick = {
val quarter = (availableAmount.toDouble() / 4.0).roundToLong()
val amount = min(quarter, maximum)
overrideSats = amount
},
onClick = viewModel::onClickQuarter,
)
// Max Button
NumberPadActionButton(
text = stringResource(R.string.common__max),
color = Colors.Purple,
onClick = {
overrideSats = maximum
},
onClick = viewModel::onClickMaxAmount,
)
}
HorizontalDivider()
Spacer(modifier = Modifier.height(16.dp))

PrimaryButton(
text = stringResource(R.string.common__continue),
onClick = {
if (transferValues.maxLspBalance == 0uL) {
app.toast(
type = Toast.ToastType.ERROR,
title = resources.getString(R.string.lightning__spending_amount__error_max__title),
description = resources.getString(
R.string.lightning__spending_amount__error_max__description_zero
),
)
return@PrimaryButton
}

isLoading = true
scope.launch {
try {
val order = blocktank.createOrder(satsAmount.toULong())
viewModel.onOrderCreated(order)
onOrderCreated()
} catch (e: Throwable) {
app.toast(e)
} finally {
isLoading = false
}
}
},
enabled = !isLoading && satsAmount != 0L,
isLoading = isLoading,
onClick = viewModel::onConfirmAmount,
enabled = uiState.satsAmount != 0L && uiState.satsAmount <= uiState.maxAllowedToSend,
isLoading = uiState.isLoading,
)

Spacer(modifier = Modifier.height(16.dp))
Expand Down
Loading