From 3a2e6ba2433d347af0642ff4a311ea473c623d60 Mon Sep 17 00:00:00 2001
From: Todd Martin <tmartin@bitwarden.com>
Date: Fri, 21 Mar 2025 10:52:38 -0400
Subject: [PATCH] Merge conflict

---
 .../login-via-auth-request.component.ts                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts b/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts
index 8d7e7868698..bb37c15fcb1 100644
--- a/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts
+++ b/libs/auth/src/angular/login-via-auth-request/login-via-auth-request.component.ts
@@ -187,9 +187,9 @@ export class LoginViaAuthRequestComponent implements OnInit, OnDestroy {
   private async initStandardAuthRequestFlow(): Promise<void> {
     this.flow = Flow.StandardAuthRequest;
 
-    this.email = (await firstValueFrom(this.loginEmailService.loginEmail$)) || undefined;
+    const email = (await firstValueFrom(this.loginEmailService.loginEmail$)) || undefined;
 
-    if (!this.email) {
+    if (!email) {
       await this.handleMissingEmail();
       return;
     }