fix: navigate to CJIT flow in onFund

Author: jvsena42

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

@@ -100,6 +100,7 @@ import to.bitkit.ui.screens.wallets.activity.ActivityExploreScreen
 import to.bitkit.ui.screens.wallets.activity.AllActivityScreen
 import to.bitkit.ui.screens.wallets.activity.DateRangeSelectorSheet
 import to.bitkit.ui.screens.wallets.activity.TagSelectorSheet
+import to.bitkit.ui.screens.wallets.receive.ReceiveRoute
 import to.bitkit.ui.screens.wallets.receive.ReceiveSheet
 import to.bitkit.ui.screens.wallets.suggestion.BuyIntroScreen
 import to.bitkit.ui.screens.widgets.AddWidgetsScreen
@@ -381,6 +382,7 @@ fun ContentView(
                         is Sheet.Receive -> {
                             val walletState by walletViewModel.walletState.collectAsStateWithLifecycle()
                             ReceiveSheet(
+                                startRoute = sheet.route,
                                 walletState = walletState,
                                 navigateToExternalConnection = {
                                     navController.navigateTo(ExternalConnection())
@@ -475,7 +477,7 @@ fun ContentView(
                     if (showTabBar) {
                         TabBar(
                             onSendClick = { appViewModel.showSheet(Sheet.Send()) },
-                            onReceiveClick = { appViewModel.showSheet(Sheet.Receive) },
+                            onReceiveClick = { appViewModel.showSheet(Sheet.Receive()) },
                             onScanClick = { appViewModel.showScannerSheet() },
                         )
                     }
@@ -664,10 +666,9 @@ private fun RootNavHost(
                     },
                     onFund = {
                         scope.launch {
-                            // TODO show receive sheet -> ReceiveAmount
                             navController.navigateToHome()
                             delay(500) // Wait for nav to actually finish
-                            appViewModel.showSheet(Sheet.Receive)
+                            appViewModel.showSheet(Sheet.Receive(route = ReceiveRoute.Amount))
                         }
                     },
                     onManual = { navController.navigateTo(Routes.ExternalNav) },
@@ -792,7 +793,7 @@ private fun NavGraphBuilder.home(
             onchainActivities = onchainActivities ?: persistentListOf(),
             onAllActivityButtonClick = { navController.navigateToAllActivity(activityListViewModel::clearFilters) },
             onActivityItemClick = { navController.navigateToActivityItem(it) },
-            onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive) },
+            onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive()) },
             onTransferToSpendingClick = {
                 if (!hasSeenSpendingIntro) {
                     navController.navigateToTransferSpendingIntro()
@@ -814,7 +815,7 @@ private fun NavGraphBuilder.home(
             lightningActivities = lightningActivities ?: persistentListOf(),
             onAllActivityButtonClick = { navController.navigateToAllActivity(activityListViewModel::clearFilters) },
             onActivityItemClick = { navController.navigateToActivityItem(it) },
-            onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive) },
+            onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive()) },
             onTransferToSavingsClick = {
                 if (!hasSeenSavingsIntro) {
                     navController.navigateToTransferSavingsIntro()

app/src/main/java/to/bitkit/ui/components/SheetHost.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
 import to.bitkit.ui.shared.modifiers.clickableAlpha
+import to.bitkit.ui.screens.wallets.receive.ReceiveRoute
 import to.bitkit.ui.sheets.BackupRoute
 import to.bitkit.ui.sheets.PinRoute
 import to.bitkit.ui.sheets.SendRoute
@@ -37,7 +38,7 @@ private val sheetContainerColor = Color(0xFF141414) // Equivalent to White08 on
 @Stable
 sealed interface Sheet {
     data class Send(val route: SendRoute = SendRoute.Recipient) : Sheet
-    data object Receive : Sheet
+    data class Receive(val route: ReceiveRoute = ReceiveRoute.QR) : Sheet
     data class Pin(val route: PinRoute = PinRoute.Prompt()) : Sheet
     data object ChangePin : Sheet
     data object DisablePin : Sheet

app/src/main/java/to/bitkit/ui/screens/wallets/activity/AllActivityScreen.kt

@@ -70,7 +70,7 @@ fun AllActivityScreen(
         onTagClick = { app.showSheet(Sheet.ActivityTagSelector) },
         onDateRangeClick = { app.showSheet(Sheet.ActivityDateRangeSelector) },
         onActivityItemClick = onActivityItemClick,
-        onEmptyActivityRowClick = { app.showSheet(Sheet.Receive) },
+        onEmptyActivityRowClick = { app.showSheet(Sheet.Receive()) },
     )
 }
 

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveSheet.kt

@@ -31,6 +31,7 @@ import to.bitkit.viewmodels.SettingsViewModel
 fun ReceiveSheet(
     navigateToExternalConnection: () -> Unit,
     walletState: WalletState,
+    startRoute: ReceiveRoute = ReceiveRoute.QR,
     editInvoiceAmountViewModel: AmountInputViewModel = hiltViewModel(),
     settingsViewModel: SettingsViewModel = hiltViewModel(),
 ) {
@@ -49,6 +50,12 @@ fun ReceiveSheet(
         wallet.refreshReceiveState()
     }
 
+    LaunchedEffect(startRoute) {
+        if (startRoute != ReceiveRoute.QR) {
+            navController.navigateTo(startRoute)
+        }
+    }
+
     Column(
         modifier = Modifier
             .fillMaxWidth()