Merge pull request #491 from etn-ccis/fix/reset-password-error-config

Fix ResetPasswordScreen error configuration
etn-ccis · Sep 29, 2023 · 7f59807 · 7f59807
2 parents 61162d3 + 95adc78
commit 7f59807
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/login-workflow/src/screens/ResetPasswordScreen/ResetPasswordScreen.tsx b/login-workflow/src/screens/ResetPasswordScreen/ResetPasswordScreen.tsx
@@ -32,14 +32,21 @@ export const ResetPasswordScreen: React.FC<ResetPasswordScreenProps> = (props) =
     const passwordRef = useRef(null);
     const confirmRef = useRef(null);
     const { triggerError, errorManagerConfig } = useErrorManager();
+    const errorDisplayConfig = {
+        ...errorManagerConfig,
+        ...props.errorDisplayConfig,
+        onClose: (): void => {
+            if (props.errorDisplayConfig && props.errorDisplayConfig.onClose) props.errorDisplayConfig.onClose();
+            if (errorManagerConfig.onClose) errorManagerConfig?.onClose();
+        },
+    };
 
     const {
         WorkflowCardBaseProps,
         WorkflowCardHeaderProps,
         WorkflowCardInstructionProps,
         WorkflowCardActionsProps,
         PasswordProps,
-        errorDisplayConfig = errorManagerConfig,
         slots = {},
         slotProps = {},
     } = props;
@@ -148,6 +155,8 @@ export const ResetPasswordScreen: React.FC<ResetPasswordScreenProps> = (props) =
         passwordRef,
         confirmRef,
         ...PasswordProps,
+        initialNewPasswordValue: passwordInput,
+        initialConfirmPasswordValue: confirmInput,
         onPasswordChange: (passwordData: { password: string; confirm: string }): void => {
             updateFields(passwordData);
             PasswordProps?.onPasswordChange?.(passwordData);