Fix account required sheet and make test environment more robust

ENGAGEHF/Account/InvitationCodeModule.swift

@@ -76,16 +76,14 @@ class InvitationCodeModule: Module, EnvironmentAccessible {
         }
     }
 
-    func setupTestEnvironment(account: Account, invitationCode: String) async throws {
-        try await verifyOnboardingCode(invitationCode)
-        try await setupTestAccount(account: account)
-    }
-
     @MainActor
-    private func setupTestAccount(account: Account) async throws {
+    func setupTestEnvironment(account: Account, invitationCode: String) async throws {
         let email = "[email protected]"
         let password = "123456789"
 
+        // let the initial stateChangeDelegate of FirebaseAuth get called. Otherwise, we will interfere with that.
+        try await Task.sleep(for: .milliseconds(500))
+
         if let details = account.details,
            details.email == email {
             return
@@ -95,25 +93,25 @@ class InvitationCodeModule: Module, EnvironmentAccessible {
             preconditionFailure("Failed to retrieve a user-id-password based account service for test account setup!")
         }
 
+        do {
+            try await service.login(userId: email, password: password)
+            return // account was already established previously
+        } catch {
+            // probably doesn't exists. We try to create a new one below
+        }
+
+        try await verifyOnboardingCode(invitationCode)
+        try await setupTestAccount(service: service, email: email, password: password)
+    }
 
+    private func setupTestAccount(service: any UserIdPasswordAccountService, email: String, password: String) async throws {
         do {
-            // let the initial stateChangeDelegate of FirebaseAuth get called. Otherwise, we will interfere with that.
-            try await Task.sleep(for: .milliseconds(500))
-
-            do {
-                let details = SignupDetails.Builder()
-                    .set(\.userId, value: email)
-                    .set(\.name, value: PersonNameComponents(givenName: "Leland", familyName: "Stanford"))
-                    .set(\.password, value: password)
-                    .build()
-                try await service.signUp(signupDetails: details)
-            } catch {
-                if "\(error)".contains("accountAlreadyInUse") {
-                    try await service.login(userId: email, password: password)
-                } else {
-                    throw error
-                }
-            }
+            let details = SignupDetails.Builder()
+                .set(\.userId, value: email)
+                .set(\.name, value: PersonNameComponents(givenName: "Leland", familyName: "Stanford"))
+                .set(\.password, value: password)
+                .build()
+            try await service.signUp(signupDetails: details)
         } catch {
             logger.error("Failed setting up test account : \(error)")
             throw error

ENGAGEHF/Home.swift

@@ -26,7 +26,9 @@ struct HomeView: View {
     private var bluetoothEnabled: Bool {
         !ProcessInfo.processInfo.isPreviewSimulator
     }
-
+
+    @Environment(\.dismiss) private var dismiss
+
 
     @Environment(MeasurementManager.self) private var measurementManager
     @Environment(WeightScaleDevice.self) private var weightScale: WeightScaleDevice?
@@ -53,7 +55,11 @@ struct HomeView: View {
             .accountRequired(Self.accountEnabled) {
                 OnboardingStack {
                     InvitationCodeView()
-                    AccountSheet()
+                    AccountSetup { _ in
+                        dismiss()
+                    } header: {
+                        AccountSetupHeader()
+                    }
                 }
             }
             .verifyRequiredAccountDetails(Self.accountEnabled)

ENGAGEHFUITests/OnboardingUITests.swift

@@ -241,6 +241,10 @@ extension XCUIApplication {
         sleep(2)
 
         // Login
+        if buttons["I Already Have an Account"].waitForExistence(timeout: 2.0) {
+            buttons["I Already Have an Account"].tap()
+        }
+
         XCTAssert(textFields["E-Mail Address"].waitForExistence(timeout: 5))
         textFields["E-Mail Address"].tap()
         textFields["E-Mail Address"].typeText(email)