synonymdev · ovitrif · Dec 23, 2025 · Dec 23, 2025 · Dec 24, 2025 · Dec 24, 2025
diff --git a/AGENTS.md b/AGENTS.md
@@ -154,7 +154,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
@@ -195,6 +242,7 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 - ALWAYS be mindful of thread safety when working with mutable lists & state
 - ALWAYS split screen composables into parent accepting viewmodel + inner private child accepting state and callbacks `Content()`
 - ALWAYS name lambda parameters in a composable function using present tense, NEVER use past tense
+- ALWAYS use a single root layout node in composables that emit UI
 - ALWAYS list 3 suggested commit messages after implementation work for the entire set of uncommitted changes
 - NEVER use `wheneverBlocking` in unit test expression body functions wrapped in a `= test {}` lambda
 - ALWAYS wrap unit tests `setUp` methods mocking suspending calls with `runBlocking`, e.g `setUp() = runBlocking { }`

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -192,6 +192,7 @@ dependencies {
     implementation(libs.material)
     implementation(libs.datastore.preferences)
     implementation(libs.kotlinx.datetime)
+    implementation(libs.kotlinx.collections.immutable)
     implementation(libs.biometric)
     implementation(libs.zxing)
     implementation(libs.barcode.scanning)
@@ -232,9 +233,9 @@ dependencies {
     implementation(libs.charts)
     implementation(libs.haze)
     implementation(libs.haze.materials)
-    // Compose Navigation
-    implementation(libs.navigation.compose)
-    androidTestImplementation(libs.navigation.testing)
+    // Navigation
+    implementation(libs.navigation.runtime)
+    implementation(libs.navigation.ui)
     implementation(libs.hilt.navigation.compose)
     // Hilt - DI
     implementation(libs.hilt.android)

diff --git a/app/detekt-baseline.xml b/app/detekt-baseline.xml
@@ -7,14 +7,13 @@
     <ID>ComplexCondition:MapWebViewClient.kt$MapWebViewClient$it.errorCode == ERROR_HOST_LOOKUP || it.errorCode == ERROR_CONNECT || it.errorCode == ERROR_TIMEOUT || it.errorCode == ERROR_FILE_NOT_FOUND</ID>
     <ID>ComplexCondition:ShopWebViewClient.kt$ShopWebViewClient$it.errorCode == ERROR_HOST_LOOKUP || it.errorCode == ERROR_CONNECT || it.errorCode == ERROR_TIMEOUT || it.errorCode == ERROR_FILE_NOT_FOUND</ID>
     <ID>CyclomaticComplexMethod:ActivityListGrouped.kt$private fun groupActivityItems(activityItems: List&lt;Activity&gt;): List&lt;Any&gt;</ID>
-    <ID>CyclomaticComplexMethod:ActivityRow.kt$@Composable fun ActivityRow( item: Activity, onClick: (String) -&gt; Unit, testTag: String, )</ID>
+    <ID>CyclomaticComplexMethod:ActivityRow.kt$@Composable fun ActivityRow( item: Activity, onClick: (Activity) -&gt; Unit, testTag: String, )</ID>
     <ID>CyclomaticComplexMethod:AppViewModel.kt$AppViewModel$private fun observeSendEvents()</ID>
     <ID>CyclomaticComplexMethod:AppViewModel.kt$AppViewModel$private suspend fun handleSanityChecks(amountSats: ULong)</ID>
-    <ID>CyclomaticComplexMethod:BlocktankRegtestScreen.kt$@Composable fun BlocktankRegtestScreen( navController: NavController, viewModel: BlocktankRegtestViewModel = hiltViewModel(), )</ID>
+    <ID>CyclomaticComplexMethod:BlocktankRegtestScreen.kt$@Composable private fun BlocktankRegtestContent( onBack: () -&gt; Unit, viewModel: BlocktankRegtestViewModel, )</ID>
     <ID>CyclomaticComplexMethod:ConfirmMnemonicScreen.kt$@Composable fun ConfirmMnemonicScreen( uiState: BackupContract.UiState, onContinue: () -&gt; Unit, onBack: () -&gt; Unit, )</ID>
     <ID>CyclomaticComplexMethod:HealthRepo.kt$HealthRepo$private fun collectState()</ID>
-    <ID>CyclomaticComplexMethod:HomeScreen.kt$@Composable fun HomeScreen( mainUiState: MainUiState, drawerState: DrawerState, rootNavController: NavController, walletNavController: NavHostController, settingsViewModel: SettingsViewModel, walletViewModel: WalletViewModel, appViewModel: AppViewModel, activityListViewModel: ActivityListViewModel, homeViewModel: HomeViewModel = hiltViewModel(), )</ID>
-    <ID>CyclomaticComplexMethod:SendSheet.kt$@Composable fun SendSheet( appViewModel: AppViewModel, walletViewModel: WalletViewModel, startDestination: SendRoute = SendRoute.Recipient, )</ID>
+    <ID>CyclomaticComplexMethod:HomeScreen.kt$@Composable fun HomeScreen( mainUiState: MainUiState, drawerState: DrawerState, navigator: Navigator, settingsViewModel: SettingsViewModel, walletViewModel: WalletViewModel, appViewModel: AppViewModel, activityListViewModel: ActivityListViewModel, homeViewModel: HomeViewModel = hiltViewModel(), )</ID>
     <ID>CyclomaticComplexMethod:SettingsButtonRow.kt$@Composable fun SettingsButtonRow( title: String, modifier: Modifier = Modifier, subtitle: String? = null, value: SettingsButtonValue = SettingsButtonValue.None, description: String? = null, iconRes: Int? = null, iconTint: Color = Color.Unspecified, iconSize: Dp = 32.dp, maxLinesSubtitle: Int = Int.MAX_VALUE, enabled: Boolean = true, loading: Boolean = false, onClick: () -&gt; Unit, )</ID>
     <ID>CyclomaticComplexMethod:Slider.kt$@Composable fun StepSlider( value: Int, steps: List&lt;Int&gt;, onValueChange: (Int) -&gt; Unit, modifier: Modifier = Modifier, )</ID>
     <ID>DestructuringDeclarationWithTooManyEntries:ActivityRow.kt$val (_, _, _, _, _, displayUnit, primaryDisplay) = LocalCurrencies.current</ID>
@@ -34,7 +33,6 @@
     <ID>EnumNaming:BlocktankNotificationType.kt$BlocktankNotificationType$wakeToTimeout</ID>
     <ID>ForbiddenComment:ActivityDetailScreen.kt$/* TODO: Implement assign functionality */</ID>
     <ID>ForbiddenComment:BoostTransactionViewModel.kt$BoostTransactionUiState$// TODO: Implement dynamic time estimation</ID>
-    <ID>ForbiddenComment:ContentView.kt$// TODO: display as sheet</ID>
     <ID>ForbiddenComment:ExternalNodeViewModel.kt$ExternalNodeViewModel$// TODO: pass customFeeRate to ldk-node when supported</ID>
     <ID>ForbiddenComment:LightningConnectionsViewModel.kt$LightningConnectionsViewModel$// TODO: sort channels to get consistent index; node.listChannels returns a list in random order</ID>
     <ID>ForbiddenComment:LightningService.kt$LightningService$// TODO: cleanup sensitive data after implementing a `SecureString` value holder for Keychain return values</ID>
@@ -43,12 +41,11 @@
     <ID>FunctionOnlyReturningConstant:ShopWebViewInterface.kt$ShopWebViewInterface$@JavascriptInterface fun isReady(): Boolean</ID>
     <ID>ImplicitDefaultLocale:BlocksService.kt$BlocksService$String.format("%.2f", blockInfo.difficulty / 1_000_000_000_000.0)</ID>
     <ID>ImplicitDefaultLocale:PriceService.kt$PriceService$String.format("%.2f", price)</ID>
+    <ID>ImportOrdering:TransferEntries.kt$import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation3.runtime.EntryProviderScope import androidx.navigation3.runtime.NavKey import to.bitkit.models.Toast import to.bitkit.ui.nav.Navigator import to.bitkit.ui.nav.Routes import to.bitkit.ui.screens.transfer.FundingAdvancedScreen import to.bitkit.ui.screens.transfer.FundingScreen import to.bitkit.ui.screens.transfer.LiquidityScreen import to.bitkit.ui.screens.transfer.SavingsAdvancedScreen import to.bitkit.ui.screens.transfer.SavingsAvailabilityScreen import to.bitkit.ui.screens.transfer.SavingsConfirmScreen import to.bitkit.ui.screens.transfer.SavingsIntroScreen import to.bitkit.ui.screens.transfer.SavingsProgressScreen import to.bitkit.ui.screens.transfer.SettingUpScreen import to.bitkit.ui.screens.transfer.SpendingAdvancedScreen import to.bitkit.ui.screens.transfer.SpendingAmountScreen import to.bitkit.ui.screens.transfer.SpendingConfirmScreen import to.bitkit.ui.screens.transfer.SpendingIntroScreen import to.bitkit.ui.screens.transfer.TransferIntroScreen import to.bitkit.ui.screens.transfer.external.ExternalAmountScreen import to.bitkit.ui.screens.transfer.external.ExternalConfirmScreen import to.bitkit.ui.screens.transfer.external.ExternalConnectionScreen import to.bitkit.ui.screens.transfer.external.ExternalFeeCustomScreen import to.bitkit.ui.screens.transfer.external.ExternalNodeViewModel import to.bitkit.ui.screens.transfer.external.ExternalSuccessScreen import to.bitkit.ui.screens.transfer.external.LnurlChannelScreen import to.bitkit.ui.screens.scanner.QrScanningScreen import to.bitkit.viewmodels.AppViewModel import to.bitkit.viewmodels.SettingsViewModel import to.bitkit.viewmodels.TransferViewModel import to.bitkit.viewmodels.WalletViewModel</ID>
     <ID>InstanceOfCheckForException:LightningService.kt$LightningService$e is NodeException</ID>
     <ID>LargeClass:AppViewModel.kt$AppViewModel : ViewModel</ID>
     <ID>LargeClass:LightningRepo.kt$LightningRepo</ID>
     <ID>LongMethod:AppViewModel.kt$AppViewModel$private suspend fun proceedWithPayment()</ID>
-    <ID>LongMethod:ContentView.kt$@Suppress("LongParameterList") private fun NavGraphBuilder.home( walletViewModel: WalletViewModel, appViewModel: AppViewModel, activityListViewModel: ActivityListViewModel, settingsViewModel: SettingsViewModel, navController: NavHostController, drawerState: DrawerState, )</ID>
-    <ID>LongMethod:ContentView.kt$private fun NavGraphBuilder.widgets( navController: NavHostController, settingsViewModel: SettingsViewModel, currencyViewModel: CurrencyViewModel, )</ID>
     <ID>LongMethod:CoreService.kt$ActivityService$suspend fun generateRandomTestData(count: Int = 100)</ID>
     <ID>LongMethod:MainActivity.kt$MainActivity$override fun onCreate(savedInstanceState: Bundle?)</ID>
     <ID>LongParameterList:BiometricPrompt.kt$( activity: Context, title: String, cancelButtonText: String, onAuthSucceed: () -&gt; Unit, onAuthFailed: (() -&gt; Unit), onAuthError: ((errorCode: Int, errString: CharSequence) -&gt; Unit), )</ID>
@@ -112,6 +109,7 @@
     <ID>MaxLineLength:HeadlineCard.kt$headline = "How Bitcoin changed El Salvador in more ways a big headline to test the text overflooooooow"</ID>
     <ID>MaxLineLength:LightningBalance.kt$is LightningBalance.ClaimableAwaitingConfirmations -&gt; "Claimable Awaiting Confirmations (Height: $confirmationHeight)"</ID>
     <ID>MaxLineLength:LightningConnectionsScreen.kt$if (showClosed) R.string.lightning__conn_closed_hide else R.string.lightning__conn_closed_show</ID>
+    <ID>MaxLineLength:LightningRepo.kt$LightningRepo$"Cannot execute $operationName: Node is ${_lightningState.value.nodeLifecycleState} and not starting"</ID>
     <ID>MaxLineLength:LightningRepo.kt$LightningRepo$"accelerateByCpfp error originalTxId: $originalTxId, satsPerVByte: $satsPerVByte destinationAddress: $destinationAddress"</ID>
     <ID>MaxLineLength:LightningRepo.kt$LightningRepo$"accelerateByCpfp success, newDestinationTxId: $newDestinationTxId originalTxId: $originalTxId, satsPerVByte: $satsPerVByte destinationAddress: $destinationAddress"</ID>
     <ID>MaxLineLength:LightningRepo.kt$LightningRepo$"bumpFeeByRbf success, replacementTxId: $replacementTxId originalTxId: $originalTxId, satsPerVByte: $satsPerVByte"</ID>
@@ -190,7 +188,6 @@
     <ID>TooManyFunctions:BackupNavSheetViewModel.kt$BackupNavSheetViewModel : ViewModel</ID>
     <ID>TooManyFunctions:BlocktankRepo.kt$BlocktankRepo</ID>
     <ID>TooManyFunctions:CacheStore.kt$CacheStore</ID>
-    <ID>TooManyFunctions:ContentView.kt$to.bitkit.ui.ContentView.kt</ID>
     <ID>TooManyFunctions:CoreService.kt$ActivityService</ID>
     <ID>TooManyFunctions:CoreService.kt$BlocktankService</ID>
     <ID>TooManyFunctions:DevSettingsViewModel.kt$DevSettingsViewModel : ViewModel</ID>

diff --git a/app/src/main/java/to/bitkit/data/backup/VssBackupClient.kt b/app/src/main/java/to/bitkit/data/backup/VssBackupClient.kt
@@ -155,7 +155,7 @@ class VssBackupClient @Inject constructor(
         }
     }
 
-    companion object Companion {
+    companion object {
         private const val TAG = "VssBackupClient"
     }
 }
diff --git a/app/src/main/java/to/bitkit/di/NavigationModule.kt b/app/src/main/java/to/bitkit/di/NavigationModule.kt
@@ -0,0 +1,22 @@
+package to.bitkit.di
+
+import androidx.compose.runtime.mutableStateListOf
+import androidx.navigation3.runtime.NavKey
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import to.bitkit.ui.nav.Navigator
+import to.bitkit.ui.nav.Routes
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NavigationModule {
+    @Singleton
+    @Provides
+    fun provideNavigator(): Navigator {
+        val backStack = mutableStateListOf<NavKey>(Routes.Home)
+        return Navigator(backStack)
+    }
+}
diff --git a/app/src/main/java/to/bitkit/di/TimedSheetModule.kt b/app/src/main/java/to/bitkit/di/TimedSheetModule.kt
@@ -0,0 +1,18 @@
+package to.bitkit.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import to.bitkit.utils.timedsheets.TimedSheetManager
+
+@Module
+@InstallIn(SingletonComponent::class)
+object TimedSheetModule {
+
+    @Provides
+    fun provideTimedSheetManagerProvider(): (CoroutineScope) -> TimedSheetManager {
+        return ::TimedSheetManager
+    }
+}
diff --git a/app/src/main/java/to/bitkit/repositories/WalletRepo.kt b/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