Merge pull request #252 from synonymdev/fix/wallet-load-first-receive

ben-kaufman · web-flow · commit 6092396519cd · 2025-11-28T16:42:32.000-05:00
diff --git a/Bitkit/Views/Wallets/HomeView.swift b/Bitkit/Views/Wallets/HomeView.swift
@@ -22,7 +22,7 @@ struct HomeView: View {
                 .padding(.top, 16 + 48)
                 .padding(.horizontal, 16)
 
-                if !app.showHomeViewEmptyState {
+                if !app.showHomeViewEmptyState || wallet.totalBalanceSats > 0 {
                     VStack(spacing: 0) {
                         HStack(spacing: 0) {
                             NavigationLink(value: Route.savingsWallet) {
@@ -86,9 +86,9 @@ struct HomeView: View {
             }
         }
         .animation(.spring(response: 0.3), value: app.showHomeViewEmptyState)
-        .onChange(of: wallet.totalBalanceSats) { _ in
-            if wallet.totalBalanceSats > 0 {
-                DispatchQueue.main.async {
+        .onChange(of: wallet.totalBalanceSats) { newValue in
+            if newValue > 0 && app.showHomeViewEmptyState {
+                withAnimation(.spring(response: 0.3)) {
                     app.showHomeViewEmptyState = false
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ struct HomeView: View {`
`22`	`22`	`.padding(.top, 16 + 48)`
`23`	`23`	`.padding(.horizontal, 16)`
`24`	`24`
`25`		`- if !app.showHomeViewEmptyState {`
	`25`	`+ if !app.showHomeViewEmptyState \|\| wallet.totalBalanceSats > 0 {`
`26`	`26`	`VStack(spacing: 0) {`
`27`	`27`	`HStack(spacing: 0) {`
`28`	`28`	`NavigationLink(value: Route.savingsWallet) {`
`@@ -86,9 +86,9 @@ struct HomeView: View {`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`.animation(.spring(response: 0.3), value: app.showHomeViewEmptyState)`
`89`		`- .onChange(of: wallet.totalBalanceSats) { _ in`
`90`		`- if wallet.totalBalanceSats > 0 {`
`91`		`- DispatchQueue.main.async {`
	`89`	`+ .onChange(of: wallet.totalBalanceSats) { newValue in`
	`90`	`+ if newValue > 0 && app.showHomeViewEmptyState {`
	`91`	`+ withAnimation(.spring(response: 0.3)) {`
`92`	`92`	`app.showHomeViewEmptyState = false`
`93`	`93`	`}`
`94`	`94`	`}`