Merge pull request #469 from synonymdev/claude/fix-issue-464

Fix: Show savings activity list when balance is zero but activities exist

Author: jvsena42

Bitkit/Views/Wallets/SavingsWalletView.swift

@@ -6,6 +6,12 @@ struct SavingsWalletView: View {
     @EnvironmentObject var navigation: NavigationViewModel
     @EnvironmentObject var wallet: WalletViewModel
 
+    /// Whether there are any onchain activities to display
+    private var hasOnchainActivities: Bool {
+        guard let activities = activity.onchainActivities else { return false }
+        return !activities.isEmpty
+    }
+
     /// Calculate remaining duration for force close transfers
     private var forceCloseRemainingDuration: String? {
         guard let claimableAtHeight = wallet.forceCloseClaimableAtHeight,
@@ -42,8 +48,8 @@ struct SavingsWalletView: View {
                     .padding(.top, 16)
                 }
 
-                if wallet.totalOnchainSats > 0 {
-                    if !GeoService.shared.isGeoBlocked {
+                if wallet.totalOnchainSats > 0 || hasOnchainActivities {
+                    if wallet.totalOnchainSats > 0, !GeoService.shared.isGeoBlocked {
                         transferButton
                             .transition(.move(edge: .leading).combined(with: .opacity))
                             .padding(.top, 32)
@@ -96,7 +102,7 @@ struct SavingsWalletView: View {
         .navigationBarHidden(true)
         .animation(.spring(response: 0.3), value: wallet.totalOnchainSats)
         .overlay {
-            if wallet.totalOnchainSats == 0 {
+            if wallet.totalOnchainSats == 0 && !hasOnchainActivities {
                 EmptyStateView(type: .savings)
                     .padding(.horizontal)
                     .transition(.move(edge: .trailing).combined(with: .opacity))

Bitkit/Views/Wallets/SpendingWalletView.swift

@@ -6,6 +6,12 @@ struct SpendingWalletView: View {
     @EnvironmentObject var navigation: NavigationViewModel
     @EnvironmentObject var wallet: WalletViewModel
 
+    /// Whether there are any lightning activities to display
+    private var hasLightningActivities: Bool {
+        guard let activities = activity.lightningActivities else { return false }
+        return !activities.isEmpty
+    }
+
     var body: some View {
         ZStack(alignment: .top) {
             VStack(spacing: 0) {
@@ -27,8 +33,8 @@ struct SpendingWalletView: View {
                         .padding(.top, 16)
                 }
 
-                if wallet.totalLightningSats > 0 {
-                    if let channels = wallet.channels, !channels.isEmpty {
+                if wallet.totalLightningSats > 0 || hasLightningActivities {
+                    if wallet.totalLightningSats > 0, let channels = wallet.channels, !channels.isEmpty {
                         transferButton
                             .transition(.move(edge: .leading).combined(with: .opacity))
                             .padding(.top, 32)
@@ -81,7 +87,7 @@ struct SpendingWalletView: View {
         .navigationBarHidden(true)
         .animation(.spring(response: 0.3), value: wallet.totalLightningSats)
         .overlay {
-            if wallet.totalLightningSats == 0 {
+            if wallet.totalLightningSats == 0 && !hasLightningActivities {
                 EmptyStateView(type: .spending)
                     .padding(.horizontal)
                     .transition(.move(edge: .trailing).combined(with: .opacity))