Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 4
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
4c6c7a0
refactor: move satsAmount to UiState class
jvsena42 fd99716
Merge branch 'master' into refactor/state-handling-improvement
jvsena42 59a9703
refactor: move limits updating logic to viewmodel
jvsena42 8289cbe
fix: display balance after fee
jvsena42 3e51100
feat: handle retry times
jvsena42 aa2e659
refactor: move order creation code to viewmodel
jvsena42 756b985
refactor: move sats override logic to viewmodel
jvsena42 6f3aa42
feat: transfer effect
jvsena42 afcffad
feat: display toast
jvsena42 eafa65c
feat: display high balance purchase error
jvsena42 d7da4e1
refactor: code cleanup
jvsena42 adef300
refactor: code lint
jvsena42 5ba1f76
refactor: max amount handling
jvsena42 0c11183
Merge branch 'master' into refactor/state-handling-improvement
jvsena42 f6e7238
refactor: remove rememberUpdatedState
jvsena42 96fdb70
feat: preview
jvsena42 df694d5
refactor: implement spacer modifiers
jvsena42 11a6301
refactor: move private method
jvsena42 6910ac6
Merge branch 'master' into refactor/state-handling-improvement
jvsena42 08f7804
fix: use repository method to calculate max send amount
jvsena42 308b644
fix: read onTransferToSpendingConfirm
jvsena42 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
180 changes: 79 additions & 101 deletions
180 app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountScreen.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -12,57 +12,84 @@ import androidx.compose.material3.HorizontalDivider | ||
| 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.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| 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.FillHeight | ||
| import to.bitkit.ui.components.FillWidth | ||
| import to.bitkit.ui.components.MoneySSB | ||
| import to.bitkit.ui.components.NumberPadActionButton | ||
| import to.bitkit.ui.components.PrimaryButton | ||
| import to.bitkit.ui.components.Text13Up | ||
| import to.bitkit.ui.components.UnitButton | ||
| import to.bitkit.ui.components.VerticalSpacer | ||
| import to.bitkit.ui.scaffold.AppTopBar | ||
| import to.bitkit.ui.scaffold.CloseNavIcon | ||
| import to.bitkit.ui.scaffold.ScreenColumn | ||
| import to.bitkit.ui.theme.AppThemeSurface | ||
| import to.bitkit.ui.theme.Colors | ||
| import to.bitkit.ui.utils.withAccent | ||
| import to.bitkit.utils.Logger | ||
| import to.bitkit.viewmodels.CurrencyUiState | ||
| import to.bitkit.viewmodels.TransferEffect | ||
| import to.bitkit.viewmodels.TransferToSpendingUiState | ||
| 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, | ||
Uh oh!There was an error while loading. Please reload this page. | ||
| ) { | ||
| 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) | ||
| } | ||
| } | ||
| } | ||
| Content( | ||
| uiState = uiState, | ||
| currencies = currencies, | ||
| onBackClick = onBackClick, | ||
| onCloseClick = onCloseClick, | ||
| onClickQuarter = viewModel::onClickQuarter, | ||
| onClickMaxAmount = viewModel::onClickMaxAmount, | ||
| onConfirmAmount = viewModel::onConfirmAmount, | ||
| onAmountChanged = viewModel::onAmountChanged | ||
| ) | ||
| } | ||
| @Composable | ||
| private fun Content( | ||
| uiState: TransferToSpendingUiState, | ||
| currencies: CurrencyUiState, | ||
| onBackClick: () -> Unit, | ||
| onCloseClick: () -> Unit, | ||
| onClickQuarter: () -> Unit, | ||
| onClickMaxAmount: () -> Unit, | ||
| onConfirmAmount: () -> Unit, | ||
| onAmountChanged: (Long) -> Unit, | ||
Uh oh!There was an error while loading. Please reload this page. | ||
| ) { | ||
| ScreenColumn { | ||
| AppTopBar( | ||
| titleText = stringResource(R.string.lightning__transfer__nav_title), | ||
| @@ -75,56 +102,20 @@ fun SpendingAmountScreen( | ||
| .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)) | ||
| VerticalSpacer(32.dp) | ||
| Display( | ||
| text = stringResource(R.string.lightning__spending_amount__title) | ||
| .withAccent(accentColor = Colors.Purple) | ||
| ) | ||
| Spacer(modifier = Modifier.height(32.dp)) | ||
| VerticalSpacer(32.dp) | ||
| AmountInput( | ||
| primaryDisplay = currencies.primaryDisplay, | ||
| overrideSats = overrideSats, | ||
| onSatsChange = { sats -> | ||
| satsAmount = sats | ||
| overrideSats = null | ||
| }, | ||
| overrideSats = uiState.overrideSats, | ||
| onSatsChange = onAmountChanged, | ||
| ) | ||
| Spacer(modifier = Modifier.weight(1f)) | ||
| FillHeight() | ||
| // Actions | ||
| Row( | ||
| @@ -138,64 +129,51 @@ fun SpendingAmountScreen( | ||
| color = Colors.White64, | ||
| ) | ||
| Spacer(modifier = Modifier.height(8.dp)) | ||
| MoneySSB(sats = availableAmount.toLong()) | ||
| MoneySSB(sats = uiState.balanceAfterFee) | ||
| } | ||
| Spacer(modifier = Modifier.weight(1f)) | ||
| FillWidth() | ||
| 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 = onClickQuarter, | ||
| ) | ||
| // Max Button | ||
| NumberPadActionButton( | ||
| text = stringResource(R.string.common__max), | ||
| color = Colors.Purple, | ||
| onClick = { | ||
| overrideSats = maximum | ||
| }, | ||
| onClick = onClickMaxAmount, | ||
| ) | ||
| } | ||
| HorizontalDivider() | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| VerticalSpacer(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 = onConfirmAmount, | ||
| enabled = uiState.satsAmount != 0L && uiState.satsAmount <= uiState.maxAllowedToSend, | ||
| isLoading = uiState.isLoading, | ||
| ) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| VerticalSpacer(16.dp) | ||
| } | ||
| } | ||
| } | ||
| @Preview(showBackground = true) | ||
| @Composable | ||
| private fun Preview() { | ||
| AppThemeSurface { | ||
| Content( | ||
| uiState = TransferToSpendingUiState(), | ||
| currencies = CurrencyUiState(), | ||
| onBackClick = {}, | ||
| onCloseClick = {}, | ||
| onClickQuarter = {}, | ||
| onClickMaxAmount = {}, | ||
| onConfirmAmount = {}, | ||
| onAmountChanged = {}, | ||
| ) | ||
| } | ||
| } | ||
2 changes: 1 addition & 1 deletion
2 app/src/main/java/to/bitkit/ui/screens/transfer/SpendingConfirmScreen.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.