Skip to content

fix: send sheet is keeping the amount state after dismiss #564

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

Closed
jvsena42 wants to merge 2 commits into from
Closed

fix: send sheet is keeping the amount state after dismiss #564

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d11748f
fix: clean input if amount is zero on SendAmount sheet startup
jvsena42 Dec 30, 2025
eced692
fix: clean input on sheet startup
jvsena42 Dec 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
6 changes: 6 additions & 0 deletions app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ import to.bitkit.ui.sheets.QuickPayIntroSheet
import to.bitkit.ui.sheets.UpdateSheet
import to.bitkit.ui.utils.NotificationUtils
import to.bitkit.viewmodels.ActivityListViewModel
import to.bitkit.viewmodels.AmountInputViewModel
import to.bitkit.viewmodels.AppViewModel
import to.bitkit.viewmodels.SendEvent
import to.bitkit.viewmodels.SettingsViewModel
Expand Down Expand Up @@ -309,9 +310,12 @@ private fun EntryProviderScope<NavKey>.sendFlowEntries(
entry<Routes.Send.Recipient>(
metadata = SheetSceneStrategy.sheet()
) {
val amountInputViewModel = hiltViewModel<AmountInputViewModel>()

LaunchedEffect(Unit) {
appViewModel.resetSendState()
appViewModel.resetQuickPayData()
amountInputViewModel.clearInput()
}
SendRecipientScreen(
onEvent = { appViewModel.setSendEvent(it) },
Expand Down Expand Up @@ -502,13 +506,15 @@ private fun EntryProviderScope<NavKey>.receiveFlowEntries(
entry<Routes.Receive.Qr>(
metadata = SheetSceneStrategy.sheet()
) {
val amountInputViewModel = hiltViewModel<AmountInputViewModel>()
val walletUiState by walletViewModel.uiState.collectAsStateWithLifecycle()
val cjitInvoice by walletViewModel.pendingCjitInvoice.collectAsStateWithLifecycle()
val lightningState by walletViewModel.lightningState.collectAsStateWithLifecycle()

LaunchedEffect(Unit) {
walletViewModel.resetPreActivityMetadataTagsForCurrentInvoice()
walletViewModel.refreshReceiveState()
amountInputViewModel.clearInput()
}

ReceiveQrScreen(
Expand Down
Loading