From a54352fe8efb0488fab1c41019df7a5ce305454c Mon Sep 17 00:00:00 2001
From: Kyle Johnson <kyle@solidstategroup.com>
Date: Tue, 16 Jan 2024 09:27:24 +0000
Subject: [PATCH] fix: Reset password error handling (#3271)

---
 frontend/web/components/base/forms/InputGroup.js   | 5 ++++-
 frontend/web/components/pages/PasswordResetPage.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/web/components/base/forms/InputGroup.js b/frontend/web/components/base/forms/InputGroup.js
index aef4962c1d89..715d646b998a 100644
--- a/frontend/web/components/base/forms/InputGroup.js
+++ b/frontend/web/components/base/forms/InputGroup.js
@@ -108,7 +108,10 @@ const InputGroup = class extends Component {
               id={props.inputProps.name ? `${props.inputProps.name}-error` : ''}
               className='text-danger'
             >
-              {inputProps.error}
+              {typeof inputProps.error === 'string'
+                ? inputProps.error
+                : !!inputProps.error?.length &&
+                  inputProps.error.map((err, i) => <div key={i}>{err}</div>)}
             </span>
           </span>
         )}
diff --git a/frontend/web/components/pages/PasswordResetPage.js b/frontend/web/components/pages/PasswordResetPage.js
index 8184eb26b0dd..710bdfc1aa78 100644
--- a/frontend/web/components/pages/PasswordResetPage.js
+++ b/frontend/web/components/pages/PasswordResetPage.js
@@ -56,7 +56,7 @@ const PasswordResetPage = class extends Component {
                   <InputGroup
                     inputProps={{
                       className: 'full-width',
-                      error: error && error.new_password1,
+                      error: error && error.new_password,
                       name: 'new-password',
                     }}
                     title='New Password'