Skip to content

Commit eced692

Browse files
committed
fix: clean input on sheet startup
1 parent d11748f commit eced692

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ import to.bitkit.ui.sheets.QuickPayIntroSheet
7676
import to.bitkit.ui.sheets.UpdateSheet
7777
import to.bitkit.ui.utils.NotificationUtils
7878
import to.bitkit.viewmodels.ActivityListViewModel
79+
import to.bitkit.viewmodels.AmountInputViewModel
7980
import to.bitkit.viewmodels.AppViewModel
8081
import to.bitkit.viewmodels.SendEvent
8182
import to.bitkit.viewmodels.SettingsViewModel
@@ -309,9 +310,12 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
309310
entry<Routes.Send.Recipient>(
310311
metadata = SheetSceneStrategy.sheet()
311312
) {
313+
val amountInputViewModel = hiltViewModel<AmountInputViewModel>()
314+
312315
LaunchedEffect(Unit) {
313316
appViewModel.resetSendState()
314317
appViewModel.resetQuickPayData()
318+
amountInputViewModel.clearInput()
315319
}
316320
SendRecipientScreen(
317321
onEvent = { appViewModel.setSendEvent(it) },
@@ -502,13 +506,15 @@ private fun EntryProviderScope<NavKey>.receiveFlowEntries(
502506
entry<Routes.Receive.Qr>(
503507
metadata = SheetSceneStrategy.sheet()
504508
) {
509+
val amountInputViewModel = hiltViewModel<AmountInputViewModel>()
505510
val walletUiState by walletViewModel.uiState.collectAsStateWithLifecycle()
506511
val cjitInvoice by walletViewModel.pendingCjitInvoice.collectAsStateWithLifecycle()
507512
val lightningState by walletViewModel.lightningState.collectAsStateWithLifecycle()
508513

509514
LaunchedEffect(Unit) {
510515
walletViewModel.resetPreActivityMetadataTagsForCurrentInvoice()
511516
walletViewModel.refreshReceiveState()
517+
amountInputViewModel.clearInput()
512518
}
513519

514520
ReceiveQrScreen(

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ fun SendAmountScreen(
8585
LaunchedEffect(Unit) {
8686
if (uiState.amount > 0u) {
8787
amountInputViewModel.setSats(uiState.amount.toLong(), currencies)
88-
} else {
89-
amountInputViewModel.clearInput()
9088
}
9189
}
9290

0 commit comments

Comments
 (0)