From eab3bfc8d0a6d619e7c96a773ec51f9fa9c1e6b8 Mon Sep 17 00:00:00 2001
From: Isaac Janzen <50783505+janzenisaac@users.noreply.github.com>
Date: Thu, 24 Aug 2023 17:36:02 -0500
Subject: [PATCH] DEV: Allow `ForgotPassword` `emailOrUsername` arg to be null
 (#23246)

---
 .../discourse/app/components/modal/forgot-password.js      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/components/modal/forgot-password.js b/app/assets/javascripts/discourse/app/components/modal/forgot-password.js
index 8b1d64b4ee2..516a3355d95 100644
--- a/app/assets/javascripts/discourse/app/components/modal/forgot-password.js
+++ b/app/assets/javascripts/discourse/app/components/modal/forgot-password.js
@@ -14,7 +14,8 @@ import { htmlSafe } from "@ember/template";
 export default class ForgotPassword extends Component {
   @service siteSettings;
 
-  @tracked emailOrUsername = cookie("email") || this.args.model.emailOrUsername;
+  @tracked
+  emailOrUsername = cookie("email") || this.args.model?.emailOrUsername || "";
   @tracked disabled = false;
   @tracked helpSeen = false;
   @tracked offerHelp;
@@ -24,9 +25,9 @@ export default class ForgotPassword extends Component {
     if (this.disabled) {
       return true;
     } else if (this.siteSettings.hide_email_address_taken) {
-      return !(this.emailOrUsername || "").includes("@");
+      return !this.emailOrUsername.includes("@");
     } else {
-      return isEmpty((this.emailOrUsername || "").trim());
+      return isEmpty(this.emailOrUsername.trim());
     }
   }