From f8b5e15a44c1f5770f9057e1d7fd9be7feb8d4fc Mon Sep 17 00:00:00 2001
From: John Harrington <84741727+harr1424@users.noreply.github.com>
Date: Wed, 18 Feb 2026 15:08:57 -0700
Subject: [PATCH] [PM-31731]  [Defect] No error is returned when entering an
 invalid email + an invalid verification code (#18913)

* share i18n key for both invalid email and invalid otp submission

* claude review
---
 apps/browser/src/_locales/en/messages.json            |  3 +++
 apps/cli/src/locales/en/messages.json                 |  3 +++
 apps/desktop/src/locales/en/messages.json             |  3 +++
 .../app/tools/send/send-access/send-auth.component.ts | 11 ++++++++++-
 apps/web/src/locales/en/messages.json                 |  3 +++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index cc99e0abe18..fbfaa17a87d 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -896,6 +896,9 @@
   "invalidVerificationCode": {
     "message": "Invalid verification code"
   },
+  "invalidEmailOrVerificationCode": {
+    "message": "Invalid email or verification code"
+  },
   "valueCopied": {
     "message": "$VALUE$ copied",
     "description": "Value has been copied to the clipboard.",
diff --git a/apps/cli/src/locales/en/messages.json b/apps/cli/src/locales/en/messages.json
index 18079bd2409..824b03b99cf 100644
--- a/apps/cli/src/locales/en/messages.json
+++ b/apps/cli/src/locales/en/messages.json
@@ -35,6 +35,9 @@
   "invalidVerificationCode": {
     "message": "Invalid verification code."
   },
+  "invalidEmailOrVerificationCode": {
+    "message": "Invalid email or verification code"
+  },
   "masterPassRequired": {
     "message": "Master password is required."
   },
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 3f005db0ba8..97a38235fd7 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -1023,6 +1023,9 @@
   "invalidVerificationCode": {
     "message": "Invalid verification code"
   },
+  "invalidEmailOrVerificationCode": {
+    "message": "Invalid email or verification code"
+  },
   "continue": {
     "message": "Continue"
   },
diff --git a/apps/web/src/app/tools/send/send-access/send-auth.component.ts b/apps/web/src/app/tools/send/send-access/send-auth.component.ts
index 92c3d445333..994bd7f3ee3 100644
--- a/apps/web/src/app/tools/send/send-access/send-auth.component.ts
+++ b/apps/web/src/app/tools/send/send-access/send-auth.component.ts
@@ -52,6 +52,7 @@ export class SendAuthComponent implements OnInit {
   authType = AuthType;
 
   private expiredAuthAttempts = 0;
+  private otpSubmitted = false;
 
   readonly loading = signal<boolean>(false);
   readonly error = signal<boolean>(false);
@@ -184,12 +185,20 @@ export class SendAuthComponent implements OnInit {
         this.updatePageTitle();
       } else if (emailAndOtpRequired(response.error)) {
         this.enterOtp.set(true);
+        if (this.otpSubmitted) {
+          this.toastService.showToast({
+            variant: "error",
+            title: this.i18nService.t("errorOccurred"),
+            message: this.i18nService.t("invalidEmailOrVerificationCode"),
+          });
+        }
+        this.otpSubmitted = true;
         this.updatePageTitle();
       } else if (otpInvalid(response.error)) {
         this.toastService.showToast({
           variant: "error",
           title: this.i18nService.t("errorOccurred"),
-          message: this.i18nService.t("invalidVerificationCode"),
+          message: this.i18nService.t("invalidEmailOrVerificationCode"),
         });
       } else if (passwordHashB64Required(response.error)) {
         this.sendAuthType.set(AuthType.Password);
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index ba59184a9f9..b257a68052d 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -7397,6 +7397,9 @@
   "invalidVerificationCode": {
     "message": "Invalid verification code"
   },
+  "invalidEmailOrVerificationCode": {
+    "message": "Invalid email or verification code"
+  },
   "keyConnectorDomain": {
     "message": "Key Connector domain"
   },