Merge pull request #476 from etn-ccis/fix/4706-change-pw-dialog-props

Fix/4706 change pw dialog props
etn-ccis · Sep 18, 2023 · d75c08c · d75c08c
2 parents 40c45b6 + a4591d4
commit d75c08c
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialog.tsx b/login-workflow/src/components/ChangePasswordDialog/ChangePasswordDialog.tsx
@@ -34,13 +34,6 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
     const { t } = useLanguageLocale();
     const passwordRef = useRef(null);
     const confirmRef = useRef(null);
-    const [currentInput, setCurrentInput] = useState('');
-    const [passwordInput, setPasswordInput] = useState('');
-    const [confirmInput, setConfirmInput] = useState('');
-    const [showErrorDialog, setShowErrorDialog] = useState(false);
-    const [isLoading, setIsLoading] = useState(false);
-    const [showSuccessScreen, setShowSuccessScreen] = useState(false);
-    const { actions } = useAuthContext();
 
     const {
         open,
@@ -53,9 +46,18 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
         onFinish,
         PasswordProps,
         ErrorDialogProps,
+        loading,
         currentPasswordTextFieldProps,
     } = props;
 
+    const [currentInput, setCurrentInput] = useState('');
+    const [passwordInput, setPasswordInput] = useState('');
+    const [confirmInput, setConfirmInput] = useState('');
+    const [showErrorDialog, setShowErrorDialog] = useState(false);
+    const [isLoading, setIsLoading] = useState(loading);
+    const [showSuccessScreen, setShowSuccessScreen] = useState(false);
+    const { actions } = useAuthContext();
+
     const passwordRequirements = defaultPasswordRequirements(t);
 
     const updateFields = useCallback(
@@ -133,7 +135,10 @@ export const ChangePasswordDialog: React.FC<ChangePasswordDialogProps> = (props)
             currentPasswordLabel={currentPasswordLabel}
             previousLabel={previousLabel}
             nextLabel={nextLabel}
-            currentPasswordChange={(currentPwd): void => setCurrentInput(currentPwd)}
+            currentPasswordChange={(currentPwd): void => {
+                setCurrentInput(currentPwd);
+                props?.currentPasswordChange?.(currentPwd);
+            }}
             enableButton={checkPasswords}
             onPrevious={onPrevious}
             PasswordProps={passwordProps}