diff --git a/PadelClub/Views/Components/RowButtonView.swift b/PadelClub/Views/Components/RowButtonView.swift index 0dce2d5..d3aa97e 100644 --- a/PadelClub/Views/Components/RowButtonView.swift +++ b/PadelClub/Views/Components/RowButtonView.swift @@ -97,7 +97,7 @@ struct RowButtonView: View { .confirmationDialog("Confirmation", isPresented: $askConfirmation, titleVisibility: .visible) { - Button("OK") { + Button("OK", role: self.role) { if let action { action() } else if let asyncAction { diff --git a/PadelClub/Views/User/AccountView.swift b/PadelClub/Views/User/AccountView.swift index f0d5e5f..539a2d4 100644 --- a/PadelClub/Views/User/AccountView.swift +++ b/PadelClub/Views/User/AccountView.swift @@ -9,7 +9,9 @@ import SwiftUI import LeStorage struct AccountView: View { - + + @Environment(\.dismiss) private var dismiss + var user: CustomUser var handler: () -> () @@ -28,13 +30,14 @@ struct AccountView: View { Section { RowButtonView("Déconnexion", role: .destructive) { DataStore.shared.disconnect() - handler() + dismiss() +// handler() } } Section { RowButtonView("Supprimer mon compte", role: .destructive, confirmationMessage: "Voulez-vous vraiment supprimer définitivement votre compte et ses données associées ?") { DataStore.shared.deleteAccount() - handler() +// handler() } } }.navigationTitle(user.username)