From d11748f9c64e29996c9afa1f65809c2109c9e9e6 Mon Sep 17 00:00:00 2001
From: jvsena42 <jvsena16@gmail.com>
Date: Tue, 30 Dec 2025 10:10:49 -0300
Subject: [PATCH 1/2] fix: clean input if amount is zero on SendAmount sheet
 startup

---
 .../java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt
index 215902134..9ed9a0b3c 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt
@@ -85,6 +85,8 @@ fun SendAmountScreen(
     LaunchedEffect(Unit) {
         if (uiState.amount > 0u) {
             amountInputViewModel.setSats(uiState.amount.toLong(), currencies)
+        } else {
+            amountInputViewModel.clearInput()
         }
     }
 

From eced692775101dafc193f509163865db1c56e3d0 Mon Sep 17 00:00:00 2001
From: jvsena42 <jvsena16@gmail.com>
Date: Tue, 30 Dec 2025 11:02:07 -0300
Subject: [PATCH 2/2] fix: clean input on sheet startup

---
 app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt  | 6 ++++++
 .../to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt   | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt b/app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt
index 6de8e12ce..a9f8022e9 100644
--- a/app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt
+++ b/app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt
@@ -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
@@ -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) },
@@ -502,6 +506,7 @@ 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()
@@ -509,6 +514,7 @@ private fun EntryProviderScope<NavKey>.receiveFlowEntries(
         LaunchedEffect(Unit) {
             walletViewModel.resetPreActivityMetadataTagsForCurrentInvoice()
             walletViewModel.refreshReceiveState()
+            amountInputViewModel.clearInput()
         }
 
         ReceiveQrScreen(
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt
index 9ed9a0b3c..215902134 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendAmountScreen.kt
@@ -85,8 +85,6 @@ fun SendAmountScreen(
     LaunchedEffect(Unit) {
         if (uiState.amount > 0u) {
             amountInputViewModel.setSats(uiState.amount.toLong(), currencies)
-        } else {
-            amountInputViewModel.clearInput()
         }
     }