From 18823f78697ab348d1c04ff4b28d89fc18f467cc Mon Sep 17 00:00:00 2001
From: Hristo Nedelkov <hristo.nedelkow@gmail.com>
Date: Tue, 10 Oct 2023 11:56:05 +0300
Subject: [PATCH] fix handlers

---
 .../ClientSetup/ClientSetup.tsx               |  7 ++++--
 .../ValidatorOnboarding/ContinueButton.tsx    | 23 ++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/pages/ValidatorOnboarding/ClientSetup/ClientSetup.tsx b/src/pages/ValidatorOnboarding/ClientSetup/ClientSetup.tsx
index 70ba55f8..0d244e5a 100644
--- a/src/pages/ValidatorOnboarding/ClientSetup/ClientSetup.tsx
+++ b/src/pages/ValidatorOnboarding/ClientSetup/ClientSetup.tsx
@@ -6,12 +6,15 @@ import WithdrawalAddress from './WithdrawalAddress'
 import LinkWithArrow from '../../../components/General/LinkWithArrow'
 import ValidatorsMenuWithPrice from '../../../components/General/ValidatorsMenuWithPrice'
 import { CLIENT_SETUP_SUBTITLE } from '../../../constants'
+import { useDispatch } from 'react-redux'
+import { setIsValidatorSet } from '../../../redux/ValidatorOnboarding/ValidatorSetup/slice'
 
 const ClientSetup = () => {
-  const [, setIsValidatorSet] = useState(false)
+  const dispatch = useDispatch()
   const [validatorCount, setValidatorCount] = useState(0)
+  
   useEffect(() => {
-    setIsValidatorSet(validatorCount > 0)
+    dispatch(setIsValidatorSet(validatorCount > 0))
   }, [validatorCount])
 
   const changeValidatorCountHandler = (value: string) => {
diff --git a/src/pages/ValidatorOnboarding/ContinueButton.tsx b/src/pages/ValidatorOnboarding/ContinueButton.tsx
index 088da189..30594cb7 100644
--- a/src/pages/ValidatorOnboarding/ContinueButton.tsx
+++ b/src/pages/ValidatorOnboarding/ContinueButton.tsx
@@ -31,7 +31,10 @@ const ContinueButton = () => {
   const { activeStep, subStepValidatorSetup } = useSelector(
     (state: RootState) => state.validatorOnboarding,
   )
-  const { subStepAdvisories, isValidatorSet } = useSelector((state: RootState) => state.advisories)
+  const { isValidatorSet } = useSelector(
+    (state: RootState) => state.validatorSetup,
+  )
+  const { subStepAdvisories } = useSelector((state: RootState) => state.advisories)
 
   const dispatch = useDispatch()
   const navigate = useNavigate()
@@ -41,14 +44,14 @@ const ContinueButton = () => {
     const getDisabledButton = () => {
       if (activeStep === 4 && isConfirmPhraseStage) {
         if (validWords.some(w => w === false)) {
-          return false
+          return true
         }
-      }
+      } else if (activeStep === 3 && !isValidatorSet) { return true }
       return false
     }
 
     setIsDisabled(getDisabledButton())
-  }, [activeStep, subStepValidatorSetup, isConfirmPhraseStage, mnemonic, validWords])
+  }, [activeStep, subStepValidatorSetup, isConfirmPhraseStage, mnemonic, validWords, isValidatorSet])
 
   const handleStep1 = () => {
     if (subStepAdvisories < 5) {
@@ -58,12 +61,7 @@ const ContinueButton = () => {
       dispatch(setActiveStep(activeStep + 1))
     }
   }
-  const handleStep3 = () => {
-    subStepValidatorSetup < 3
-      ? dispatch(setSubStepValidatorSetup(subStepValidatorSetup + 1))
-      : dispatch(setSubStepValidatorSetup(0))
-  }
-
+ 
   const handleStep4 = () => {
     if (!isConfirmPhraseStage && recoveryMechanism === KEYSTORE_FILES) {
       return dispatch(setActiveStep(activeStep + 1))
@@ -90,8 +88,7 @@ const ContinueButton = () => {
   const continueHandler = () => {
     if (activeStep === 1) {
       handleStep1()
-    } else if (activeStep === 3) {
-      handleStep3()
+
     } else if (activeStep === 4) {
       handleStep4()
     } else {
@@ -133,7 +130,7 @@ const ContinueButton = () => {
       <Button
         onPress={continueHandler}
         size={40}
-        disabled={isDisabled || (isValidatorSet === false && activeStep === 3)}
+        disabled={isDisabled}
       >
         {activeStep < 5 ? 'Continue' : 'Continue to Dashboard'}
       </Button>