From 2a3fc8d5d798091690e49047616b3c8592d4af8d Mon Sep 17 00:00:00 2001 From: treyt Date: Fri, 20 Feb 2026 21:38:13 -0600 Subject: [PATCH] fix: resolve issue #1 - Follow teams Automated fix by Tony CI. Closes #1 Co-Authored-By: Claude --- .../Trip/Views/Wizard/Steps/TeamPickerStep.swift | 9 +++++---- .../Features/Trip/Views/Wizard/TeamFirstWizardStep.swift | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/SportsTime/Features/Trip/Views/Wizard/Steps/TeamPickerStep.swift b/SportsTime/Features/Trip/Views/Wizard/Steps/TeamPickerStep.swift index 9bc11d5..d0796bd 100644 --- a/SportsTime/Features/Trip/Views/Wizard/Steps/TeamPickerStep.swift +++ b/SportsTime/Features/Trip/Views/Wizard/Steps/TeamPickerStep.swift @@ -116,7 +116,8 @@ struct TeamPickerStep: View { .sheet(isPresented: $showTeamPicker) { TeamPickerSheet( selectedSport: $selectedSport, - selectedTeamId: $selectedTeamId + selectedTeamId: $selectedTeamId, + isPresented: $showTeamPicker ) } } @@ -125,11 +126,11 @@ struct TeamPickerStep: View { // MARK: - Team Picker Sheet private struct TeamPickerSheet: View { - @Environment(\.dismiss) private var dismiss @Environment(\.colorScheme) private var colorScheme @Binding var selectedSport: Sport? @Binding var selectedTeamId: String? + @Binding var isPresented: Bool var body: some View { NavigationStack { @@ -142,7 +143,7 @@ private struct TeamPickerSheet: View { onSelect: { teamId in selectedSport = sport selectedTeamId = teamId - dismiss() + isPresented = false } ) } label: { @@ -171,7 +172,7 @@ private struct TeamPickerSheet: View { .navigationBarTitleDisplayMode(.inline) .toolbar { ToolbarItem(placement: .cancellationAction) { - Button("Cancel") { dismiss() } + Button("Cancel") { isPresented = false } } } } diff --git a/SportsTime/Features/Trip/Views/Wizard/TeamFirstWizardStep.swift b/SportsTime/Features/Trip/Views/Wizard/TeamFirstWizardStep.swift index 954c8a5..461435f 100644 --- a/SportsTime/Features/Trip/Views/Wizard/TeamFirstWizardStep.swift +++ b/SportsTime/Features/Trip/Views/Wizard/TeamFirstWizardStep.swift @@ -115,7 +115,8 @@ struct TeamFirstWizardStep: View { .sheet(isPresented: $showTeamPicker) { TeamFirstPickerSheet( selectedSport: $selectedSport, - selectedTeamIds: $selectedTeamIds + selectedTeamIds: $selectedTeamIds, + isPresented: $showTeamPicker ) } } @@ -184,11 +185,11 @@ struct TeamFirstWizardStep: View { // MARK: - Team First Picker Sheet private struct TeamFirstPickerSheet: View { - @Environment(\.dismiss) private var dismiss @Environment(\.colorScheme) private var colorScheme @Binding var selectedSport: Sport? @Binding var selectedTeamIds: Set + @Binding var isPresented: Bool var body: some View { NavigationStack { @@ -200,7 +201,7 @@ private struct TeamFirstPickerSheet: View { selectedTeamIds: $selectedTeamIds, onDone: { selectedSport = sport - dismiss() + isPresented = false } ) } label: { @@ -229,7 +230,7 @@ private struct TeamFirstPickerSheet: View { .navigationBarTitleDisplayMode(.inline) .toolbar { ToolbarItem(placement: .cancellationAction) { - Button("Cancel") { dismiss() } + Button("Cancel") { isPresented = false } } } }