From 41f68bd2fcab3c34bcd15d2711f070cf28f87051 Mon Sep 17 00:00:00 2001
From: SleeplessOne1917 <abias1122@gmail.com>
Date: Mon, 10 Jul 2023 19:53:45 -0400
Subject: [PATCH] Incorporate PR feedback

---
 src/shared/components/common/password-input.tsx  | 4 ++--
 src/shared/components/home/login.tsx             | 2 +-
 src/shared/components/home/setup.tsx             | 4 ++--
 src/shared/components/home/signup.tsx            | 4 ++--
 src/shared/components/person/password-change.tsx | 4 ++--
 src/shared/components/person/settings.tsx        | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/shared/components/common/password-input.tsx b/src/shared/components/common/password-input.tsx
index 4e24d598..b6ab6e5d 100644
--- a/src/shared/components/common/password-input.tsx
+++ b/src/shared/components/common/password-input.tsx
@@ -12,7 +12,7 @@ interface PasswordInputProps {
   onInput: FormEventHandler<HTMLInputElement>;
   className?: string;
   showStrength?: boolean;
-  label?: string;
+  label?: string | null;
   showForgotLink?: boolean;
 }
 
@@ -96,7 +96,7 @@ class PasswordInput extends Component<PasswordInputProps, PasswordInputState> {
                 value={value}
                 required
                 maxLength={60}
-                minLength={showStrength ? 10 : 0}
+                minLength={10}
               />
               <button
                 className="btn btn-outline-dark"
diff --git a/src/shared/components/home/login.tsx b/src/shared/components/home/login.tsx
index f0817ab0..ccac6587 100644
--- a/src/shared/components/home/login.tsx
+++ b/src/shared/components/home/login.tsx
@@ -95,7 +95,7 @@ export class Login extends Component<any, State> {
               id="login-password"
               value={this.state.form.password}
               onInput={linkEvent(this, this.handleLoginPasswordChange)}
-              label={I18NextService.i18n.t("password") ?? undefined}
+              label={I18NextService.i18n.t("password")}
               showForgotLink
             />
           </div>
diff --git a/src/shared/components/home/setup.tsx b/src/shared/components/home/setup.tsx
index adf295f3..7b3d4c27 100644
--- a/src/shared/components/home/setup.tsx
+++ b/src/shared/components/home/setup.tsx
@@ -127,7 +127,7 @@ export class Setup extends Component<any, State> {
             id="password"
             value={this.state.form.password}
             onInput={linkEvent(this, this.handleRegisterPasswordChange)}
-            label={I18NextService.i18n.t("password") ?? undefined}
+            label={I18NextService.i18n.t("password")}
           />
         </div>
         <div className="mb-3">
@@ -135,7 +135,7 @@ export class Setup extends Component<any, State> {
             id="verify-password"
             value={this.state.form.password_verify}
             onInput={linkEvent(this, this.handleRegisterPasswordVerifyChange)}
-            label={I18NextService.i18n.t("verify_password") ?? undefined}
+            label={I18NextService.i18n.t("verify_password")}
           />
         </div>
         <div className="mb-3 row">
diff --git a/src/shared/components/home/signup.tsx b/src/shared/components/home/signup.tsx
index 0fe3215e..c57d545a 100644
--- a/src/shared/components/home/signup.tsx
+++ b/src/shared/components/home/signup.tsx
@@ -188,7 +188,7 @@ export class Signup extends Component<any, State> {
             value={this.state.form.password}
             onInput={linkEvent(this, this.handleRegisterPasswordChange)}
             showStrength
-            label={I18NextService.i18n.t("password") ?? undefined}
+            label={I18NextService.i18n.t("password")}
           />
         </div>
 
@@ -197,7 +197,7 @@ export class Signup extends Component<any, State> {
             id="register-verify-password"
             value={this.state.form.password_verify}
             onInput={linkEvent(this, this.handleRegisterPasswordVerifyChange)}
-            label={I18NextService.i18n.t("verify_password") ?? undefined}
+            label={I18NextService.i18n.t("verify_password")}
           />
         </div>
 
diff --git a/src/shared/components/person/password-change.tsx b/src/shared/components/person/password-change.tsx
index 718b8c35..1a60c968 100644
--- a/src/shared/components/person/password-change.tsx
+++ b/src/shared/components/person/password-change.tsx
@@ -67,7 +67,7 @@ export class PasswordChange extends Component<any, State> {
             value={this.state.form.password}
             onInput={linkEvent(this, this.handlePasswordChange)}
             showStrength
-            label={I18NextService.i18n.t("new_password") ?? undefined}
+            label={I18NextService.i18n.t("new_password")}
           />
         </div>
         <div className="mb-3">
@@ -75,7 +75,7 @@ export class PasswordChange extends Component<any, State> {
             id="password"
             value={this.state.form.password_verify}
             onInput={linkEvent(this, this.handleVerifyPasswordChange)}
-            label={I18NextService.i18n.t("verify_password") ?? undefined}
+            label={I18NextService.i18n.t("verify_password")}
           />
         </div>
         <div className="mb-3 row">
diff --git a/src/shared/components/person/settings.tsx b/src/shared/components/person/settings.tsx
index 047d73cc..458eb864 100644
--- a/src/shared/components/person/settings.tsx
+++ b/src/shared/components/person/settings.tsx
@@ -325,7 +325,7 @@ export class Settings extends Component<any, SettingsState> {
               value={this.state.changePasswordForm.new_password}
               onInput={linkEvent(this, this.handleNewPasswordChange)}
               showStrength
-              label={I18NextService.i18n.t("new_password") ?? undefined}
+              label={I18NextService.i18n.t("new_password")}
             />
           </div>
           <div className="mb-3">
@@ -333,7 +333,7 @@ export class Settings extends Component<any, SettingsState> {
               id="verify-new-password"
               value={this.state.changePasswordForm.new_password_verify}
               onInput={linkEvent(this, this.handleNewPasswordVerifyChange)}
-              label={I18NextService.i18n.t("verify_password") ?? undefined}
+              label={I18NextService.i18n.t("verify_password")}
             />
           </div>
           <div className="mb-3">
@@ -341,7 +341,7 @@ export class Settings extends Component<any, SettingsState> {
               id="user-old-password"
               value={this.state.changePasswordForm.old_password}
               onInput={linkEvent(this, this.handleOldPasswordChange)}
-              label={I18NextService.i18n.t("old_password") ?? undefined}
+              label={I18NextService.i18n.t("old_password")}
             />
           </div>
           <div className="input-group mb-3">