replace toggle and modify overlay

Author: Achyut Kumar M

GoInfoGame/GoInfoGame/Login/PasswordAuthenticationPopupView.swift

@@ -8,21 +8,15 @@
 import SwiftUI
 import LocalAuthentication
 
-import SwiftUI
-
 struct PasswordAuthenticationPopupView: View {
+    @ObservedObject var viewModel: PasswordAuthenticationViewModel
     let onSuccess: () -> Void
     let onCancel: () -> Void
-
-    @StateObject private var viewModel = PasswordAuthenticationViewModel()
-
+    let onFailure: (String) -> Void
+    
     var body: some View {
         ZStack {
-            Color.black.opacity(0.4)
-                .ignoresSafeArea()
-                .onTapGesture {
-                    onCancel()
-                }
+            Color.black.opacity(0.4).ignoresSafeArea()
 
             VStack(spacing: 16) {
                 Text("Enable Biometric Login")
@@ -43,22 +37,21 @@ struct PasswordAuthenticationPopupView: View {
                 Button("Continue") {
                     handleContinue()
                 }
-                .frame(maxWidth: .infinity)
                 .padding()
+                .frame(maxWidth: .infinity)
                 .background(Color.blue)
                 .foregroundColor(.white)
                 .cornerRadius(8)
 
                 Button("Cancel") {
                     onCancel()
                 }
-                .foregroundColor(.gray)
                 .padding(.top, 4)
             }
             .padding()
             .background(Color.white)
             .cornerRadius(16)
-            .padding(.horizontal, 40)
+            .padding(40)
 
             if viewModel.isLoading {
                 ProgressView("Logging in...")
@@ -70,33 +63,33 @@ struct PasswordAuthenticationPopupView: View {
 
     private func handleContinue() {
         let environment = APIConfiguration.shared.environment
-        guard let username = KeychainManager.load(.username, for: environment) else {
-            viewModel.errorMessage = "Username not found"
-            return
-        }
+        let username = KeychainManager.load(.username, for: environment) ?? ""
 
         viewModel.performBiometricEnrollment(
             username: username,
             environment: environment,
             onSuccess: {
                 onSuccess()
             },
-            onFailure: {
-                viewModel.errorMessage = "Failed to enroll"
+            onFailure: { error in
+                // Nothing here; viewModel will handle errorMessage
+                viewModel.errorMessage = error
+                onFailure(error)
             }
         )
     }
 }
 
 
 
-#Preview {
-    PasswordAuthenticationPopupView(
-        onSuccess: {
-            print("Biometric setup successful")
-        },
-        onCancel: {
-            print("Biometric setup cancelled")
-        }
-    )
-}
+
+//#Preview {
+//    PasswordAuthenticationPopupView(
+//        viewModel: <#PasswordAuthenticationViewModel#>, onSuccess: {
+//            print("Biometric setup successful")
+//        },
+//        onCancel: {
+//            print("Biometric setup cancelled")
+//        }
+//    )
+//}

GoInfoGame/GoInfoGame/UserProfile/View/UserProfileView.swift

@@ -20,6 +20,8 @@ struct UserProfileView: View {
 
     @State private var showPasswordAuthenticationView: Bool = false
 
+    @StateObject private var passwordAuthenticationViewModel = PasswordAuthenticationViewModel()
+    
     private var biometricToggleText: String {
         let context = LAContext()
         _ = context.canEvaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, error: nil)
@@ -55,27 +57,8 @@ struct UserProfileView: View {
                     }
                     .padding([.bottom], 200)
 
-                    Toggle(isOn: $useBiometricID) {
-                        Text(biometricToggleText)
-                    }
-                    .gesture(
-                        TapGesture()
-                            .onEnded {
-                                userManuallyToggled = true
-                            }
-                    )
-                    .onChange(of: useBiometricID) { isEnabled in
-                        let env = APIConfiguration.shared.environment
-
-                        guard userManuallyToggled else { return }
-                        userManuallyToggled = false
-
-                        if isEnabled {
-                          
-                            showPasswordAuthenticationView = true
-                        } else {
-                            useBiometricID = false
-                        }
+                    BiometricToggleView(isEnabled: $useBiometricID) {
+                        showPasswordAuthenticationView = true
                     }
                     .padding([.bottom], 30)
 
@@ -89,17 +72,19 @@ struct UserProfileView: View {
             }
             .overlay {
                 if showPasswordAuthenticationView {
-                    PasswordAuthenticationView {
+                    PasswordAuthenticationPopupView(viewModel: passwordAuthenticationViewModel) {
                         useBiometricID = true
-                        SessionManager.shared.setBiometricEnabled(true, for: APIConfiguration.shared.environment)
                         showPasswordAuthenticationView = false
+                        print("TO DO : Handle password authentication")
                     } onCancel: {
                         useBiometricID = false
-                        SessionManager.shared.setBiometricEnabled(false, for: APIConfiguration.shared.environment)
+                       showPasswordAuthenticationView = false
+                    } onFailure: { error in
+                        useBiometricID = false
                         showPasswordAuthenticationView = false
+                        
                     }
-                    .transition(.scale)
-                    .zIndex(1)
+
                 }
             }
         }