Skip to content

Wait for node starts in SpendingAmountScreen #311

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 5 commits into from
Aug 20, 2025
Merged

Wait for node starts in SpendingAmountScreen #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17e054e
feat: implement SyncNodeView
jvsena42 Aug 20, 2025
2ebdb1d
fix: wait for node runs before performs node related calls
jvsena42 Aug 20, 2025
578d07a
refactor: remove unnecessary retry logic
jvsena42 Aug 20, 2025
4270f8e
fix: implement adaptative spacing
jvsena42 Aug 20, 2025
54c38d9
chore: lint
jvsena42 Aug 20, 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
10 changes: 10 additions & 0 deletions app/src/main/java/to/bitkit/ui/components/Spacers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.sizeIn
import androidx.compose.foundation.layout.width
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
Expand All @@ -18,6 +19,15 @@ fun VerticalSpacer(height: Dp) {
Spacer(modifier = Modifier.height(height))
}

@Composable
fun ColumnScope.VerticalSpacer(minHeight: Dp, maxHeight: Dp) {
Spacer(
modifier = Modifier
.weight(1f)
.sizeIn(minHeight = minHeight, maxHeight = maxHeight)
)
}

@Composable
fun HorizontalSpacer(width: Dp) {
Spacer(modifier = Modifier.width(width))
Expand Down
205 changes: 130 additions & 75 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 @@ -34,6 +34,7 @@ import to.bitkit.ui.components.MoneySSB
import to.bitkit.ui.components.NumberPadActionButton
import to.bitkit.ui.components.NumberPadTextField
import to.bitkit.ui.components.PrimaryButton
import to.bitkit.ui.components.SyncNodeView
import to.bitkit.ui.components.Text13Up
import to.bitkit.ui.components.UnitButton
import to.bitkit.ui.components.VerticalSpacer
Expand All @@ -59,9 +60,10 @@ fun SpendingAmountScreen(
) {
val currencies = LocalCurrencies.current
val uiState by viewModel.spendingUiState.collectAsStateWithLifecycle()
val isNodeRunning by viewModel.isNodeRunning.collectAsStateWithLifecycle()

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

LaunchedEffect(Unit) {
Expand All @@ -86,6 +88,7 @@ fun SpendingAmountScreen(
)

Content(
isNodeRunning = isNodeRunning,
uiState = uiState,
currencies = currencies,
onBackClick = onBackClick,
Expand All @@ -99,6 +102,7 @@ fun SpendingAmountScreen(

@Composable
private fun Content(
isNodeRunning: Boolean,
uiState: TransferToSpendingUiState,
currencies: CurrencyUiState,
onBackClick: () -> Unit,
Expand All @@ -114,92 +118,123 @@ private fun Content(
onBackClick = onBackClick,
actions = { CloseNavIcon(onCloseClick) },
)
Column(
modifier = Modifier
.padding(horizontal = 16.dp)
.fillMaxSize()
.imePadding()
.testTag("SpendingAmount")
) {
VerticalSpacer(16.dp)
Display(
text = stringResource(R.string.lightning__spending_amount__title)
.withAccent(accentColor = Colors.Purple)
)

NumberPadTextField(
input = uiState.input,
displayUnit = currencies.displayUnit,
showSecondaryField = false,
primaryDisplay = currencies.primaryDisplay,
if (isNodeRunning) {
SpendingAmountNodeRunning(
uiState = uiState,
currencies = currencies,
onClickQuarter = onClickQuarter,
onClickMaxAmount = onClickMaxAmount,
onConfirmAmount = onConfirmAmount,
onInputChange = onInputChange,
)
} else {
SyncNodeView(
modifier = Modifier
.fillMaxWidth()
.testTag("SpendingAmountNumberField")
.weight(1f)
)
}
}
}

FillHeight()
@Composable
private fun SpendingAmountNodeRunning(
uiState: TransferToSpendingUiState,
currencies: CurrencyUiState,
onClickQuarter: () -> Unit,
onClickMaxAmount: () -> Unit,
onConfirmAmount: () -> Unit,
onInputChange: (String) -> Unit,
) {
Column(
modifier = Modifier
.padding(horizontal = 16.dp)
.fillMaxSize()
.imePadding()
.testTag("SpendingAmount")
) {
VerticalSpacer(minHeight = 16.dp, maxHeight = 32.dp)

Row(
verticalAlignment = Alignment.Bottom,
horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier
.padding(vertical = 8.dp)
.testTag("SendAmountNumberPad")
) {
Column {
Text13Up(
text = stringResource(R.string.wallet__send_available),
color = Colors.White64,
modifier = Modifier.testTag("SpendingAmountAvailable")
)
Spacer(modifier = Modifier.height(8.dp))
MoneySSB(sats = uiState.balanceAfterFee, modifier = Modifier.testTag("SpendingAmountUnit"))
}
FillWidth()
UnitButton(color = Colors.Purple)
// 25% Button
NumberPadActionButton(
text = stringResource(R.string.lightning__spending_amount__quarter),
color = Colors.Purple,
onClick = onClickQuarter,
modifier = Modifier.testTag("SpendingAmountQuarter")
)
// Max Button
NumberPadActionButton(
text = stringResource(R.string.common__max),
color = Colors.Purple,
onClick = onClickMaxAmount,
modifier = Modifier.testTag("SpendingAmountMax")
Display(
text = stringResource(R.string.lightning__spending_amount__title)
.withAccent(accentColor = Colors.Purple)
)

FillHeight()

NumberPadTextField(
input = uiState.input,
displayUnit = currencies.displayUnit,
showSecondaryField = false,
primaryDisplay = currencies.primaryDisplay,
modifier = Modifier
.fillMaxWidth()
.testTag("SpendingAmountNumberField")
)

FillHeight()

Row(
verticalAlignment = Alignment.Bottom,
horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier
.padding(vertical = 8.dp)
.testTag("SendAmountNumberPad")
) {
Column {
Text13Up(
text = stringResource(R.string.wallet__send_available),
color = Colors.White64,
modifier = Modifier.testTag("SpendingAmountAvailable")
)
Spacer(modifier = Modifier.height(8.dp))
MoneySSB(sats = uiState.balanceAfterFee, modifier = Modifier.testTag("SpendingAmountUnit"))
}
HorizontalDivider()

VerticalSpacer(16.dp)

Keyboard(
onClick = { number ->
onInputChange(if (uiState.input == "0") number else uiState.input + number)
},
onClickBackspace = {
onInputChange(if (uiState.input.length > 1) uiState.input.dropLast(1) else "0")
},
isDecimal = currencies.primaryDisplay == PrimaryDisplay.FIAT,
modifier = Modifier
.fillMaxWidth()
FillWidth()
UnitButton(color = Colors.Purple)
// 25% Button
NumberPadActionButton(
text = stringResource(R.string.lightning__spending_amount__quarter),
color = Colors.Purple,
onClick = onClickQuarter,
modifier = Modifier.testTag("SpendingAmountQuarter")
)
// Max Button
NumberPadActionButton(
text = stringResource(R.string.common__max),
color = Colors.Purple,
onClick = onClickMaxAmount,
modifier = Modifier.testTag("SpendingAmountMax")
)
}
HorizontalDivider()

VerticalSpacer(8.dp)
VerticalSpacer(16.dp)

PrimaryButton(
text = stringResource(R.string.common__continue),
onClick = onConfirmAmount,
enabled = uiState.satsAmount != 0L && uiState.satsAmount <= uiState.maxAllowedToSend,
isLoading = uiState.isLoading,
modifier = Modifier.testTag("SpendingAmountContinue")
)
Keyboard(
onClick = { number ->
onInputChange(if (uiState.input == "0") number else uiState.input + number)
},
onClickBackspace = {
onInputChange(if (uiState.input.length > 1) uiState.input.dropLast(1) else "0")
},
isDecimal = currencies.primaryDisplay == PrimaryDisplay.FIAT,
modifier = Modifier
.fillMaxWidth()
)

VerticalSpacer(16.dp)
}
VerticalSpacer(8.dp)

PrimaryButton(
text = stringResource(R.string.common__continue),
onClick = onConfirmAmount,
enabled = uiState.satsAmount != 0L && uiState.satsAmount <= uiState.maxAllowedToSend,
isLoading = uiState.isLoading,
modifier = Modifier.testTag("SpendingAmountContinue")
)

VerticalSpacer(16.dp)
}
}

Expand All @@ -208,6 +243,7 @@ private fun Content(
private fun Preview() {
AppThemeSurface {
Content(
isNodeRunning = true,
uiState = TransferToSpendingUiState(input = "5 000"),
currencies = CurrencyUiState(),
onBackClick = {},
Expand All @@ -225,6 +261,25 @@ private fun Preview() {
private fun Preview2() {
AppThemeSurface {
Content(
isNodeRunning = true,
uiState = TransferToSpendingUiState(input = "5 000"),
currencies = CurrencyUiState(),
onBackClick = {},
onCloseClick = {},
onClickQuarter = {},
onClickMaxAmount = {},
onConfirmAmount = {},
onInputChange = {},
)
}
}

@Preview(showBackground = true, device = NEXUS_5)
@Composable
private fun Preview3() {
AppThemeSurface {
Content(
isNodeRunning = false,
uiState = TransferToSpendingUiState(input = "5 000"),
currencies = CurrencyUiState(),
onBackClick = {},
Expand Down
Loading