refactor: use alert in email link and update password

Author: demolaf

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift

@@ -21,14 +21,14 @@ public struct EmailLinkView {
   @Environment(AuthService.self) private var authService
   @Environment(\.reportError) private var reportError
   @State private var email = ""
-  @State private var showModal = false
+  @State private var showAlert = false
 
   public init() {}
 
   private func sendEmailLink() async throws {
     do {
       try await authService.sendEmailSignInLink(email: email)
-      showModal = true
+      showAlert = true
     } catch {
       if let errorHandler = reportError {
         errorHandler(error)
@@ -73,24 +73,15 @@ extension EmailLinkView: View {
     .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
     .navigationTitle(authService.string.signInWithEmailLinkViewTitle)
     .safeAreaPadding()
-    .sheet(isPresented: $showModal) {
-      VStack(spacing: 24) {
-        Text(authService.string.signInWithEmailLinkViewMessage)
-          .font(.headline)
-        Button {
-          showModal = false
-        } label: {
-          Text(authService.string.okButtonLabel)
-            .padding(.vertical, 8)
-            .frame(maxWidth: .infinity)
-        }
-        .buttonStyle(.borderedProminent)
-        .padding([.top, .bottom], 8)
-        .frame(maxWidth: .infinity)
+    .alert(
+      authService.string.signInWithEmailLinkViewTitle,
+      isPresented: $showAlert
+    ) {
+      Button(authService.string.okButtonLabel) {
+        showAlert = false
       }
-      .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
-      .safeAreaPadding()
-      .presentationDetents([.medium])
+    } message: {
+      Text(authService.string.signInWithEmailLinkViewMessage)
     }
     .onOpenURL { url in
       Task {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/UpdatePasswordView.swift

@@ -32,13 +32,25 @@ public struct UpdatePasswordView {
   @Environment(AuthService.self) private var authService
   @State private var password = ""
   @State private var confirmPassword = ""
+  @State private var showAlert = false
 
   @FocusState private var focus: FocusableField?
 
   private var isValid: Bool {
     FormValidators.atLeast6Characters.isValid(input: password) &&
       FormValidators.confirmPassword(password: password).isValid(input: confirmPassword)
   }
+
+  private func updatePassword() {
+    Task {
+      do {
+        try await authService.updatePassword(to: confirmPassword)
+        showAlert = true
+      } catch {
+        
+      }
+    }
+  }
 }
 
 extension UpdatePasswordView: View {
@@ -80,15 +92,11 @@ extension UpdatePasswordView: View {
       .focused($focus, equals: .confirmPassword)
 
       Button(action: {
-        Task {
-          try await authService.updatePassword(to: confirmPassword)
-          authService.navigator.clear()
-        }
+        updatePassword()
       }, label: {
         Text(authService.string.updatePasswordButtonLabel)
           .padding(.vertical, 8)
           .frame(maxWidth: .infinity)
-
       })
       .disabled(!isValid)
       .padding([.top, .bottom], 8)
@@ -98,6 +106,17 @@ extension UpdatePasswordView: View {
     .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
     .safeAreaPadding()
     .navigationTitle(authService.string.passwordRecoveryTitle)
+    .alert(
+      "Password Updated",
+      isPresented: $showAlert
+    ) {
+      Button(authService.string.okButtonLabel) {
+        showAlert = false
+        authService.navigator.clear()
+      }
+    } message: {
+      Text("Your password has been successfully updated.")
+    }
     .sheet(isPresented: $passwordPrompt.isPromptingPassword) {
       PasswordPromptSheet(coordinator: authService.passwordPrompt)
     }