fix: in-sheet navigation fix

Author: ovitrif

AGENTS.md

@@ -151,7 +151,54 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 }
 ```
 
-### Rules
+### Sheet Navigation Flows
+
+`SheetSceneStrategy.calculateScene()` finds the FIRST entry with sheet metadata (the sheet root) and renders ALL subsequent entries within that same sheet container. Swiping to dismiss closes the entire sheet flow.
+
+**Pattern:**
+
+- Only ROOT routes need `metadata = SheetSceneStrategy.sheet()` (e.g., `Pin.Prompt`, `Receive.Qr`)
+- Sub-routes have NO metadata - they navigate within the parent sheet container
+
+**Flows:**
+
+1. **Pin Flow** (root: `Pin.Prompt`)
+
+- Pin.Prompt → Pin.Choose → Pin.Confirm → Pin.Biometrics → Pin.Result
+
+2. **Backup Flow** (root: `Backup.Intro`)
+
+- Backup.Intro → ShowMnemonic → ShowPassphrase → ConfirmMnemonic → ConfirmPassphrase → Warning → Success → MultipleDevices → Metadata
+
+3. **Send Flow** (root: `Send.Recipient`)
+
+- Send.Recipient → Address → Amount → QrScanner → CoinSelection → FeeRate → FeeCustom → Confirm → Success/Error
+- Also: WithdrawConfirm, WithdrawError, Support, AddTag, PinCheck, QuickPay
+
+4. **Receive Flow** (root: `Receive.Qr`)
+
+- Receive.Qr → EditInvoice → AddTag
+- Receive.Qr → Amount → Confirm → Liquidity
+- Receive.Qr → GeoBlock
+- Also: ConfirmInbound, LiquidityAdditional
+
+5. **Gift Flow** (root: `Gift.Loading`)
+
+- Gift.Loading → Used/UsedUp/Error/Success
+
+**Standalone Sheets** (single-screen, each has sheet metadata):
+
+- Activity.DateRangeSelectorSheet
+- Activity.TagSelectorSheet
+- Sheet.LnurlAuth
+- Sheet.ForceTransfer
+- Sheet.Update
+- Sheet.Backup
+- Sheet.Notifications
+- Sheet.QuickPay
+- Sheet.HighBalance
+
+## Rules
 
 - USE coding rules from `.cursor/default.rules.mdc`
 - ALWAYS run `./gradlew compileDevDebugKotlin` after code changes to verify code compiles

app/src/main/java/to/bitkit/repositories/WalletRepo.kt

@@ -110,6 +110,10 @@ class WalletRepo @Inject constructor(
     suspend fun refreshBip21(): Result<Unit> = withContext(bgDispatcher) {
         Logger.debug("Refreshing bip21", context = TAG)
 
+        // Preserve current amount/description before clearing
+        val currentAmount = _walletState.value.bip21AmountSats
+        val currentDescription = _walletState.value.bip21Description
+
         // Get old payment ID and tags before refreshing (which may change payment ID)
         val oldPaymentId = paymentId()
         val tagsToMigrate = if (oldPaymentId != null && oldPaymentId.isNotEmpty()) {
@@ -123,7 +127,7 @@ class WalletRepo @Inject constructor(
 
         clearBip21State(clearTags = false)
         refreshAddressIfNeeded()
-        updateBip21Invoice()
+        updateBip21Invoice(amountSats = currentAmount, description = currentDescription)
 
         val newPaymentId = paymentId()
         val newBip21Url = _walletState.value.bip21

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -12,6 +12,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -304,15 +305,23 @@ fun ContentView(
                     }
                 )
 
+                // Use derivedStateOf to ensure reactive observation of backStack changes
+                val showTabBar by remember {
+                    derivedStateOf { navigator.shouldShowTabBar() }
+                }
+
                 AnimatedVisibility(
-                    visible = navigator.shouldShowTabBar(),
+                    visible = showTabBar,
                     enter = slideInVertically { it },
                     exit = slideOutVertically { it },
                     modifier = Modifier.align(Alignment.BottomCenter),
                 ) {
                     TabBar(
                         onSendClick = { navigator.navigate(Routes.Send.Recipient) },
-                        onReceiveClick = { navigator.navigate(Routes.Receive.Qr) },
+                        onReceiveClick = {
+                            walletViewModel.resetReceiveState()
+                            navigator.navigate(Routes.Receive.Qr)
+                        },
                         onScanClick = { navigator.navigate(Routes.QrScanner) },
                     )
                 }

app/src/main/java/to/bitkit/ui/nav/SheetSceneStrategy.kt

@@ -1,5 +1,13 @@
 package to.bitkit.ui.nav
 
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
 import androidx.compose.runtime.Composable
 import androidx.navigation3.runtime.NavEntry
 import androidx.navigation3.scene.OverlayScene
@@ -12,19 +20,39 @@ import to.bitkit.ui.components.SheetSize
 class SheetSceneStrategy<T : Any> : SceneStrategy<T> {
 
     override fun SceneStrategyScope<T>.calculateScene(entries: List<NavEntry<T>>): Scene<T>? {
-        val lastEntry = entries.lastOrNull()
-        val sheetProperties = lastEntry?.metadata?.get(KEY_SHEET) as? SheetProperties
-        return sheetProperties?.let { props ->
-            @Suppress("UNCHECKED_CAST")
-            SheetScene(
-                key = lastEntry.contentKey as T,
-                previousEntries = entries.dropLast(1),
-                overlaidEntries = entries.dropLast(1),
-                entry = lastEntry,
-                sheetSize = props.size,
-                onBack = onBack,
-            )
+        val lastEntry = entries.lastOrNull() ?: return null
+
+        // Find the sheet root (first entry with sheet metadata)
+        val sheetRootIndex = entries.indexOfFirst {
+            it.metadata?.get(KEY_SHEET) != null
         }
+
+        // No sheet root found - not a sheet flow
+        if (sheetRootIndex < 0) return null
+
+        val sheetRootEntry = entries[sheetRootIndex]
+        val sheetProps = sheetRootEntry.metadata?.get(KEY_SHEET) as? SheetProperties ?: return null
+
+        // Entries before the sheet root (to be overlaid)
+        val entriesBeforeSheet = entries.take(sheetRootIndex)
+
+        // Number of entries in the sheet flow (for dismiss behavior)
+        val sheetEntryCount = entries.size - sheetRootIndex
+
+        // Current entry's index within the sheet flow (for animation direction)
+        val currentEntryIndex = entries.size - 1
+
+        @Suppress("UNCHECKED_CAST")
+        return SheetScene(
+            key = lastEntry.contentKey as T,
+            previousEntries = entriesBeforeSheet,
+            overlaidEntries = entriesBeforeSheet,
+            entry = lastEntry,
+            sheetSize = sheetProps.size,
+            onBack = onBack,
+            sheetEntryCount = sheetEntryCount,
+            entryIndex = currentEntryIndex,
+        )
     }
 
     companion object {
@@ -40,23 +68,72 @@ data class SheetProperties(
     val size: SheetSize = SheetSize.LARGE,
 )
 
+private const val MS_ANIM_DURATION = 300
+
+private data class IndexedEntry<T : Any>(
+    val index: Int,
+    val entry: NavEntry<T>,
+)
+
+@Suppress("LongParameterList")
 internal class SheetScene<T : Any>(
     override val key: T,
     override val previousEntries: List<NavEntry<T>>,
     override val overlaidEntries: List<NavEntry<T>>,
     private val entry: NavEntry<T>,
     private val sheetSize: SheetSize,
     private val onBack: () -> Unit,
+    private val sheetEntryCount: Int,
+    private val entryIndex: Int,
 ) : OverlayScene<T> {
 
     override val entries: List<NavEntry<T>> = listOf(entry)
 
     override val content: @Composable (() -> Unit) = {
         SheetHost(
             sheetSize = sheetSize,
-            onDismiss = onBack,
+            onDismiss = {
+                // Pop all entries in the sheet flow to dismiss entire sheet
+                repeat(sheetEntryCount) { onBack() }
+            },
         ) {
-            entry.Content()
+            AnimatedContent(
+                targetState = IndexedEntry(entryIndex, entry),
+                transitionSpec = {
+                    val isForward = targetState.index > initialState.index
+                    if (isForward) {
+                        // Forward navigation: slide in from right, slide out to left
+                        slideInHorizontally(
+                            initialOffsetX = { it },
+                            animationSpec = tween(MS_ANIM_DURATION, easing = FastOutSlowInEasing)
+                        ) + fadeIn(
+                            animationSpec = tween(MS_ANIM_DURATION, easing = FastOutSlowInEasing),
+                            initialAlpha = 0.8f
+                        ) togetherWith slideOutHorizontally(
+                            targetOffsetX = { -it / 3 },
+                            animationSpec = tween(MS_ANIM_DURATION, easing = FastOutSlowInEasing)
+                        ) + fadeOut(
+                            animationSpec = tween(MS_ANIM_DURATION, easing = FastOutSlowInEasing),
+                            targetAlpha = 0.8f
+                        )
+                    } else {
+                        // Backward navigation: slide in from left, slide out to right
+                        slideInHorizontally(
+                            initialOffsetX = { -it / 3 },
+                            animationSpec = tween(MS_ANIM_DURATION, easing = FastOutSlowInEasing)
+                        ) + fadeIn(
+                            animationSpec = tween(MS_ANIM_DURATION, easing = FastOutSlowInEasing),
+                            initialAlpha = 0.8f
+                        ) togetherWith slideOutHorizontally(
+                            targetOffsetX = { it },
+                            animationSpec = tween(MS_ANIM_DURATION, easing = FastOutSlowInEasing)
+                        )
+                    }
+                },
+                label = "SheetContentTransition",
+            ) { indexedEntry ->
+                indexedEntry.entry.Content()
+            }
         }
     }
 }

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

@@ -55,6 +55,7 @@ fun EntryProviderScope<NavKey>.homeEntries(
     entry<Routes.Savings> {
         SavingsEntry(
             navigator = navigator,
+            walletViewModel = walletViewModel,
             appViewModel = appViewModel,
             activityListViewModel = activityListViewModel,
             settingsViewModel = settingsViewModel,
@@ -80,7 +81,10 @@ fun EntryProviderScope<NavKey>.homeEntries(
             onActivityItemClick = { navigator.navigate(Routes.Activity.Detail(it)) },
             onTagClick = { navigator.navigate(Routes.Activity.TagSelectorSheet) },
             onDateRangeClick = { navigator.navigate(Routes.Activity.DateRangeSelectorSheet) },
-            onEmptyActivityRowClick = { navigator.navigate(Routes.Receive.Qr) },
+            onEmptyActivityRowClick = {
+                walletViewModel.resetReceiveState()
+                navigator.navigate(Routes.Receive.Qr)
+            },
         )
     }
 
@@ -130,6 +134,7 @@ fun EntryProviderScope<NavKey>.homeEntries(
 @Composable
 private fun SavingsEntry(
     navigator: Navigator,
+    walletViewModel: WalletViewModel,
     appViewModel: AppViewModel,
     activityListViewModel: ActivityListViewModel,
     settingsViewModel: SettingsViewModel,
@@ -143,7 +148,10 @@ private fun SavingsEntry(
         onchainActivities = onchainActivities.orEmpty(),
         onAllActivityButtonClick = { navigator.navigate(Routes.Activity.All) },
         onActivityItemClick = { navigator.navigate(Routes.Activity.Detail(it)) },
-        onEmptyActivityRowClick = { navigator.navigate(Routes.Receive.Qr) },
+        onEmptyActivityRowClick = {
+            walletViewModel.resetReceiveState()
+            navigator.navigate(Routes.Receive.Qr)
+        },
         onTransferToSpendingClick = {
             if (!hasSeenSpendingIntro) {
                 navigator.navigate(Routes.Transfer.ToSpending.Intro)
@@ -171,7 +179,10 @@ private fun SpendingEntry(
         lightningActivities = lightningActivities.orEmpty(),
         onAllActivityButtonClick = { navigator.navigate(Routes.Activity.All) },
         onActivityItemClick = { navigator.navigate(Routes.Activity.Detail(it)) },
-        onEmptyActivityRowClick = { navigator.navigate(Routes.Receive.Qr) },
+        onEmptyActivityRowClick = {
+            walletViewModel.resetReceiveState()
+            navigator.navigate(Routes.Receive.Qr)
+        },
         onTransferToSavingsClick = {
             if (!hasSeenSavingsIntro) {
                 navigator.navigate(Routes.Transfer.ToSavings.Intro)