From 7c19e1f1f7be2bfd03b3275fd3690d9f871449b9 Mon Sep 17 00:00:00 2001
From: Joseph Garrone <joseph.garrone.gj@gmail.com>
Date: Wed, 12 Jun 2024 21:38:48 +0200
Subject: [PATCH] Fix wrong condition for displaying error in the template

---
 src/login/pages/LoginConfigTotp.tsx    | 9 ++++++++-
 src/login/pages/LoginUpdateProfile.tsx | 3 ++-
 src/login/pages/Register.tsx           | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/login/pages/LoginConfigTotp.tsx b/src/login/pages/LoginConfigTotp.tsx
index 997f3f0c..58fc6a09 100644
--- a/src/login/pages/LoginConfigTotp.tsx
+++ b/src/login/pages/LoginConfigTotp.tsx
@@ -16,7 +16,14 @@ export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pa
     const { msg, msgStr, advancedMsg } = i18n;
 
     return (
-        <Template kcContext={kcContext} i18n={i18n} doUseDefaultCss={doUseDefaultCss} classes={classes} headerNode={msg("loginTotpTitle")}>
+        <Template
+            kcContext={kcContext}
+            i18n={i18n}
+            doUseDefaultCss={doUseDefaultCss}
+            classes={classes}
+            headerNode={msg("loginTotpTitle")}
+            displayMessage={!messagesPerField.existsError("totp", "userLabel")}
+        >
             <>
                 <ol id="kc-totp-settings">
                     <li>
diff --git a/src/login/pages/LoginUpdateProfile.tsx b/src/login/pages/LoginUpdateProfile.tsx
index eb48d2a9..a7477961 100644
--- a/src/login/pages/LoginUpdateProfile.tsx
+++ b/src/login/pages/LoginUpdateProfile.tsx
@@ -19,7 +19,7 @@ export default function LoginUpdateProfile(props: LoginUpdateProfileProps) {
         classes
     });
 
-    const { url, isAppInitiatedAction } = kcContext;
+    const { messagesPerField, url, isAppInitiatedAction } = kcContext;
 
     const { msg, msgStr } = i18n;
 
@@ -33,6 +33,7 @@ export default function LoginUpdateProfile(props: LoginUpdateProfileProps) {
             classes={classes}
             displayRequiredFields
             headerNode={msg("loginProfileTitle")}
+            displayMessage={messagesPerField.exists("global")}
         >
             <form id="kc-update-profile-form" className={kcClsx("kcFormClass")} action={url.loginAction} method="post">
                 <UserProfileFormFields
diff --git a/src/login/pages/Register.tsx b/src/login/pages/Register.tsx
index 4b50d37c..5c176caf 100644
--- a/src/login/pages/Register.tsx
+++ b/src/login/pages/Register.tsx
@@ -34,6 +34,7 @@ export default function Register(props: RegisterProps) {
             doUseDefaultCss={doUseDefaultCss}
             classes={classes}
             headerNode={msg("registerTitle")}
+            displayMessage={messagesPerField.exists("global")}
             displayRequiredFields
         >
             <form id="kc-register-form" className={kcClsx("kcFormClass")} action={url.registrationAction} method="post">