Merge branch 'master' into feat/truncate-middle-address

# Conflicts:
#	CHANGELOG.md

Author: jvsena42

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Fixed
+- Retouch Primary, Secondary, and Tertiary buttons styling #887
 - Avoid msat truncation when paying invoices and LNURL callbacks #879
 - Fix ANR on RGS server settings screen caused by catastrophic regex backtracking #880
 - Fix crash when returning app to foreground on Receive screen #875
@@ -24,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Show end of address on Receive Bitcoin screen using middle ellipsis truncation #886
+- Update funding screen: replace Advanced with Manual Setup, fix Use Other Wallet navigation to open amount entry, and add Fund Wallet button to no-funds dialog #885
+- Updated design of the success screen in the manual channel setup flow #883
 - Unified send flow with payment method switcher, details toggle, Lightning support for BIP21 payments, and improved fee rate defaults #863
 - Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857
 - Icons added to all settings rows for faster scanning #857

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,13 +666,12 @@ 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))
                         }
                     },
-                    onAdvanced = { navController.navigateTo(Routes.FundingAdvanced) },
+                    onManual = { navController.navigateTo(Routes.ExternalNav) },
                     onBackClick = { navController.popBackStack() },
                     isGeoBlocked = isGeoBlocked,
                 )
@@ -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/Locals.kt

@@ -53,6 +53,3 @@ val settingsViewModel: SettingsViewModel?
 
 val backupsViewModel: BackupsViewModel?
     @Composable get() = LocalBackupsViewModel.current
-
-val drawerState: DrawerState?
-    @Composable get() = LocalDrawerState.current