Merge pull request #381 from synonymdev/fix/savings-spending-wallets

fix(wallet): fix savings & spending empty views and transfer button logic

Author: ovitrif

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

@@ -537,7 +537,7 @@ private fun RootNavHost(
                     onAdvanced = { navController.navigate(Routes.FundingAdvanced) },
                     onBackClick = { navController.popBackStack() },
                     onCloseClick = { navController.navigateToHome() },
-                    isGeoBlocked = isGeoBlocked
+                    isGeoBlocked = isGeoBlocked,
                 )
             }
             composableWithDefaultTransitions<Routes.FundingAdvanced> {

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

@@ -3,6 +3,7 @@ package to.bitkit.ui.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -51,7 +52,7 @@ private val buttonRightShape = RoundedCornerShape(topEndPercent = 50, bottomEndP
 
 @OptIn(ExperimentalHazeMaterialsApi::class)
 @Composable
-fun TabBar(
+fun BoxScope.TabBar(
     modifier: Modifier = Modifier,
     hazeState: HazeState = rememberHazeState(),
     onSendClick: () -> Unit = {},
@@ -61,6 +62,7 @@ fun TabBar(
     Box(
         contentAlignment = Alignment.Center,
         modifier = modifier
+            .align(Alignment.BottomCenter)
             .fillMaxWidth()
             .background(
                 Brush.verticalGradient(

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

@@ -79,7 +79,6 @@ fun HomeNav(
             onSendClick = { appViewModel.showSheet(Sheet.Send()) },
             onReceiveClick = { appViewModel.showSheet(Sheet.Receive) },
             onScanClick = { rootNavController.navigateToScanner() },
-            modifier = Modifier.align(Alignment.BottomCenter)
         )
 
         DrawerMenu(
@@ -125,7 +124,12 @@ private fun NavContent(
             exitTransition = { Transitions.slideOutHorizontally },
         ) {
             val hasSeenSpendingIntro by settingsViewModel.hasSeenSpendingIntro.collectAsStateWithLifecycle()
+            val isGeoBlocked by appViewModel.isGeoBlocked.collectAsStateWithLifecycle()
+            val onchainActivities by activityListViewModel.onchainActivities.collectAsStateWithLifecycle()
+
             SavingsWalletScreen(
+                isGeoBlocked = isGeoBlocked,
+                onchainActivities = onchainActivities.orEmpty(),
                 onAllActivityButtonClick = { walletNavController.navigate(HomeRoutes.AllActivity) },
                 onActivityItemClick = { rootNavController.navigateToActivityItem(it) },
                 onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive) },
@@ -144,8 +148,10 @@ private fun NavContent(
             exitTransition = { Transitions.slideOutHorizontally },
         ) {
             val hasSeenSavingsIntro by settingsViewModel.hasSeenSavingsIntro.collectAsStateWithLifecycle()
+            val lightningActivities by activityListViewModel.lightningActivities.collectAsStateWithLifecycle()
             SpendingWalletScreen(
                 uiState = mainUiState,
+                lightningActivities = lightningActivities.orEmpty(),
                 onAllActivityButtonClick = { walletNavController.navigate(HomeRoutes.AllActivity) },
                 onActivityItemClick = { rootNavController.navigateToActivityItem(it) },
                 onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive) },

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

@@ -693,7 +693,7 @@ private fun Preview() {
                     totalSats = 200_000u,
                 ),
             )
-            TabBar(modifier = Modifier.align(Alignment.BottomCenter))
+            TabBar()
         }
     }
 }
@@ -712,13 +712,9 @@ private fun PreviewEmpty() {
                 walletNavController = rememberNavController(),
                 drawerState = rememberDrawerState(initialValue = DrawerValue.Closed),
                 latestActivities = previewActivityItems.take(3),
-                balances = BalanceState(
-                    totalOnchainSats = 165_000u,
-                    totalLightningSats = 45_000u,
-                    totalSats = 200_000u,
-                )
+                balances = BalanceState(totalSats = 0u)
             )
-            TabBar(modifier = Modifier.align(Alignment.BottomCenter))
+            TabBar()
         }
     }
 }

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

@@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -26,31 +25,41 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.synonym.bitkitcore.Activity
 import to.bitkit.R
 import to.bitkit.models.BalanceState
 import to.bitkit.ui.LocalBalances
-import to.bitkit.ui.activityListViewModel
 import to.bitkit.ui.components.BalanceHeaderView
 import to.bitkit.ui.components.EmptyStateView
 import to.bitkit.ui.components.SecondaryButton
+import to.bitkit.ui.components.TabBar
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.screens.wallets.activity.components.ActivityListGrouped
+import to.bitkit.ui.screens.wallets.activity.utils.previewOnchainActivityItems
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent
 
 @Composable
 fun SavingsWalletScreen(
+    isGeoBlocked: Boolean,
+    onchainActivities: List<Activity>,
     onAllActivityButtonClick: () -> Unit,
     onEmptyActivityRowClick: () -> Unit,
     onActivityItemClick: (String) -> Unit,
     onTransferToSpendingClick: () -> Unit,
     onBackClick: () -> Unit,
     balances: BalanceState = LocalBalances.current,
 ) {
-    val showEmptyState by remember(balances.totalOnchainSats) {
-        mutableStateOf(balances.totalOnchainSats == 0uL) // TODO use && hasOnchainActivity
+    val showEmptyState by remember(balances.totalOnchainSats, onchainActivities.size) {
+        val hasFunds = balances.totalOnchainSats > 0uL
+        val hasActivity = onchainActivities.isNotEmpty()
+        mutableStateOf(!hasFunds && !hasActivity)
+    }
+    val canTransfer by remember(balances.totalOnchainSats) {
+        val hasFunds = balances.totalOnchainSats > 0uL
+        mutableStateOf(hasFunds && !isGeoBlocked)
     }
 
     Box(
@@ -85,21 +94,22 @@ fun SavingsWalletScreen(
                 )
                 if (!showEmptyState) {
                     Spacer(modifier = Modifier.height(32.dp))
-                    SecondaryButton(
-                        onClick = onTransferToSpendingClick,
-                        text = "Transfer To Spending", // TODO add missing localized text
-                        icon = {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_transfer),
-                                contentDescription = null,
-                                modifier = Modifier.size(16.dp),
-                            )
-                        },
-                        modifier = Modifier.testTag("TransferToSpending")
-                    )
 
-                    val activity = activityListViewModel ?: return@Column
-                    val onchainActivities by activity.onchainActivities.collectAsState()
+                    if (canTransfer) {
+                        SecondaryButton(
+                            onClick = onTransferToSpendingClick,
+                            text = "Transfer To Spending", // TODO add missing localized text
+                            icon = {
+                                Icon(
+                                    painter = painterResource(R.drawable.ic_transfer),
+                                    contentDescription = null,
+                                    modifier = Modifier.size(16.dp),
+                                )
+                            },
+                            modifier = Modifier.testTag("TransferToSpending")
+                        )
+                    }
+
                     ActivityListGrouped(
                         items = onchainActivities,
                         onActivityItemClick = onActivityItemClick,
@@ -125,27 +135,77 @@ fun SavingsWalletScreen(
 @Composable
 private fun Preview() {
     AppThemeSurface {
-        SavingsWalletScreen(
-            onAllActivityButtonClick = {},
-            onActivityItemClick = {},
-            onEmptyActivityRowClick = {},
-            onTransferToSpendingClick = {},
-            onBackClick = {},
-            balances = BalanceState(totalOnchainSats = 50_000u),
-        )
+        Box {
+            SavingsWalletScreen(
+                isGeoBlocked = false,
+                onchainActivities = previewOnchainActivityItems(),
+                onAllActivityButtonClick = {},
+                onActivityItemClick = {},
+                onEmptyActivityRowClick = {},
+                onTransferToSpendingClick = {},
+                onBackClick = {},
+                balances = BalanceState(totalOnchainSats = 50_000u),
+            )
+            TabBar()
+        }
+    }
+}
+
+@Preview(showSystemUi = true)
+@Composable
+private fun PreviewNoActivity() {
+    AppThemeSurface {
+        Box {
+            SavingsWalletScreen(
+                isGeoBlocked = false,
+                onchainActivities = emptyList(),
+                onAllActivityButtonClick = {},
+                onActivityItemClick = {},
+                onEmptyActivityRowClick = {},
+                onTransferToSpendingClick = {},
+                onBackClick = {},
+                balances = BalanceState(totalOnchainSats = 50_000u),
+            )
+            TabBar()
+        }
+    }
+}
+
+@Preview(showSystemUi = true)
+@Composable
+private fun PreviewGeoBlocked() {
+    AppThemeSurface {
+        Box {
+            SavingsWalletScreen(
+                isGeoBlocked = true,
+                onchainActivities = previewOnchainActivityItems(),
+                onAllActivityButtonClick = {},
+                onActivityItemClick = {},
+                onEmptyActivityRowClick = {},
+                onTransferToSpendingClick = {},
+                onBackClick = {},
+                balances = BalanceState(totalOnchainSats = 50_000u),
+            )
+            TabBar()
+        }
     }
 }
 
 @Preview(showSystemUi = true)
 @Composable
 private fun PreviewEmpty() {
     AppThemeSurface {
-        SavingsWalletScreen(
-            onAllActivityButtonClick = {},
-            onActivityItemClick = {},
-            onEmptyActivityRowClick = {},
-            onTransferToSpendingClick = {},
-            onBackClick = {},
-        )
+        Box {
+            SavingsWalletScreen(
+                isGeoBlocked = false,
+                onchainActivities = emptyList(),
+                onAllActivityButtonClick = {},
+                onActivityItemClick = {},
+                onEmptyActivityRowClick = {},
+                onTransferToSpendingClick = {},
+                onBackClick = {},
+            )
+            TabBar()
+        }
     }
 }