From bb17216ec6cdf4ec0f2ae68191c2530291f782aa Mon Sep 17 00:00:00 2001
From: Razmig Sarkissian <razmig@staxriver.com>
Date: Sat, 13 Apr 2024 20:33:38 +0200
Subject: [PATCH] fix small bugs

---
 PadelClub/ViewModel/NavigationViewModel.swift            | 1 +
 PadelClub/Views/Navigation/Agenda/ActivityView.swift     | 9 +++------
 .../Views/Tournament/Shared/TournamentCellView.swift     | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/PadelClub/ViewModel/NavigationViewModel.swift b/PadelClub/ViewModel/NavigationViewModel.swift
index b39d960..70669d8 100644
--- a/PadelClub/ViewModel/NavigationViewModel.swift
+++ b/PadelClub/ViewModel/NavigationViewModel.swift
@@ -9,6 +9,7 @@ import SwiftUI
 
 @Observable
 class NavigationViewModel {
+    var path = NavigationPath()
     var agendaDestination: AgendaDestination? = .activity
     var tournament: Tournament?
 }
diff --git a/PadelClub/Views/Navigation/Agenda/ActivityView.swift b/PadelClub/Views/Navigation/Agenda/ActivityView.swift
index 9655ce0..3aec8bf 100644
--- a/PadelClub/Views/Navigation/Agenda/ActivityView.swift
+++ b/PadelClub/Views/Navigation/Agenda/ActivityView.swift
@@ -52,8 +52,8 @@ struct ActivityView: View {
     }
     
     var body: some View {
-        NavigationStack {
-            @Bindable var navigation = navigation
+        @Bindable var navigation = navigation
+        NavigationStack(path: $navigation.path) {
             VStack(spacing: 0) {
                 GenericDestinationPickerView(selectedDestination: $navigation.agendaDestination, destinations: AgendaDestination.allCases, nilDestinationIsValid: false)
                 List {
@@ -187,16 +187,13 @@ struct ActivityView: View {
                     TournamentView()
                         .environment(tournament)
                 }
-                .navigationDestination(item: $navigation.tournament) { tournament in
-                    TournamentView()
-                        .environment(tournament)
-                }
             }
         }
     }
     
     private func _gatherFederalTournaments() {
         isGatheringFederalTournaments = true
+        NetworkFederalService.shared.formId = ""
         Task {
             do {
                 try await dataStore.clubs.filter { $0.code != nil }.concurrentForEach { club in
diff --git a/PadelClub/Views/Tournament/Shared/TournamentCellView.swift b/PadelClub/Views/Tournament/Shared/TournamentCellView.swift
index 72a4f9d..a1b6e89 100644
--- a/PadelClub/Views/Tournament/Shared/TournamentCellView.swift
+++ b/PadelClub/Views/Tournament/Shared/TournamentCellView.swift
@@ -28,7 +28,7 @@ struct TournamentCellView: View {
     
     private func _buildView(_ build: any TournamentBuildHolder, existingTournament: Tournament?) -> some View {
         HStack {
-            DateBoxView(date: tournament.startDate, displayStyle: .short)
+            DateBoxView(date: tournament.startDate, displayStyle: displayStyle == .wide ? .short : .wide)
             Rectangle()
                 .fill(color)
                 .frame(width: 2)
@@ -56,7 +56,7 @@ struct TournamentCellView: View {
                         Button {
                             if let existingTournament {
                                 navigation.agendaDestination = .activity
-                                navigation.tournament = existingTournament
+                                navigation.path.append(existingTournament)
                             } else {
                                 let event = federalTournament.getEvent()
                                 let newTournament = Tournament.newEmptyInstance()