From 264ceaa82a153c2e1aa4140852d5fb6c8ca0c564 Mon Sep 17 00:00:00 2001
From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
Date: Fri, 7 Mar 2025 12:56:21 -0500
Subject: [PATCH] fix(NewDeviceVerification): [Auth/PM-18641] Show translated
 invalid code error on enter keypress (#13740)

---
 .../new-device-verification.component.ts           | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts b/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts
index 6c48a471d0..57583eb24d 100644
--- a/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts
+++ b/libs/auth/src/angular/new-device-verification/new-device-verification.component.ts
@@ -15,7 +15,6 @@ import {
   FormFieldModule,
   IconButtonModule,
   LinkModule,
-  ToastService,
 } from "@bitwarden/components";
 
 import { LoginEmailServiceAbstraction } from "../../common/abstractions/login-email.service";
@@ -60,7 +59,6 @@ export class NewDeviceVerificationComponent implements OnInit, OnDestroy {
     private apiService: ApiService,
     private loginStrategyService: LoginStrategyServiceAbstraction,
     private logService: LogService,
-    private toastService: ToastService,
     private i18nService: I18nService,
     private syncService: SyncService,
     private loginEmailService: LoginEmailServiceAbstraction,
@@ -153,9 +151,17 @@ export class NewDeviceVerificationComponent implements OnInit, OnDestroy {
       await this.router.navigate(["/vault"]);
     } catch (e) {
       this.logService.error(e);
-      const errorMessage =
-        (e as any)?.response?.error_description ?? this.i18nService.t("errorOccurred");
+      let errorMessage =
+        ((e as any)?.response?.error_description as string) ?? this.i18nService.t("errorOccurred");
+
+      if (errorMessage.includes("Invalid New Device OTP")) {
+        errorMessage = this.i18nService.t("invalidVerificationCode");
+      }
+
       codeControl.setErrors({ serverError: { message: errorMessage } });
+      // For enter key press scenarios, we have to manually mark the control as touched
+      // to get the error message to display
+      codeControl.markAsTouched();
     }
   };
 }