From ee3348a5e100a1c6649fe388efd18f8f579ad020 Mon Sep 17 00:00:00 2001
From: Hristo Nedelkov <hristo.nedelkow@gmail.com>
Date: Tue, 13 Feb 2024 14:32:34 +0200
Subject: [PATCH] fix(back button): make code cleaner

---
 src/App.tsx                                   |  1 -
 .../ValidatorOnboarding/ContinueButton.tsx    |  9 ++++----
 .../ValidatorSetup/BackButton.tsx             | 22 ++++++++++++-------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 80df30c8..9f9214db 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -32,7 +32,6 @@ import ClientSetup from './pages/ValidatorOnboarding/ClientSetup/ClientSetup'
 import KeyGeneration from './pages/ValidatorOnboarding/KeyGeneration/KeyGeneration'
 import Deposit from './pages/ValidatorOnboarding/Deposit/Deposit'
 import Activation from './pages/ValidatorOnboarding/Activation/Activation'
-import RecoveryPhrase from './pages/ValidatorOnboarding/KeyGeneration/RecoveryPhrase'
 import ConfirmRecoveryPhrase from './pages/ValidatorOnboarding/KeyGeneration/ConfirmRecoveryPhrase/ConfirmRecoveryPhrase'
 
 const injected = injectedModule()
diff --git a/src/pages/ValidatorOnboarding/ContinueButton.tsx b/src/pages/ValidatorOnboarding/ContinueButton.tsx
index a5904f4c..3ff2c6e0 100644
--- a/src/pages/ValidatorOnboarding/ContinueButton.tsx
+++ b/src/pages/ValidatorOnboarding/ContinueButton.tsx
@@ -7,7 +7,7 @@ import { useNavigate } from 'react-router-dom'
 import { RootState } from '../../redux/store'
 import LinkWithArrow from '../../components/General/LinkWithArrow'
 import { setActiveStep } from '../../redux/ValidatorOnboarding/slice'
-import { FORM_STEPS, KEYSTORE_FILES, STEPPER_PATHS } from '../../constants'
+import { KEYSTORE_FILES, STEPPER_PATHS } from '../../constants'
 import {
   setIsConfirmPhraseStage,
   setIsCopyPastedPhrase,
@@ -117,13 +117,14 @@ const ContinueButton = () => {
       nextPath = isConfirmPhraseStage
         ? '/validator-onboarding/deposit'
         : '/validator-onboarding/recovery-phrase'
-
       handleRecoveryMechanism()
+    } else if (activeStep === 8) {
+      nextPath = '/validator-onboarding/activation'
+    } else if (activeStep === 9) {
+      nextPath = '/dashboard'
     }
-
     navigate(nextPath)
   }
-
   return (
     <YStack style={{ width: '100%' }}>
       {windowSize.width < 1155 && (
diff --git a/src/pages/ValidatorOnboarding/ValidatorSetup/BackButton.tsx b/src/pages/ValidatorOnboarding/ValidatorSetup/BackButton.tsx
index e7ad2197..03a32f9e 100644
--- a/src/pages/ValidatorOnboarding/ValidatorSetup/BackButton.tsx
+++ b/src/pages/ValidatorOnboarding/ValidatorSetup/BackButton.tsx
@@ -7,10 +7,10 @@ import { useNavigate } from 'react-router-dom'
 import { RootState } from '../../../redux/store'
 import { useDispatch, useSelector } from 'react-redux'
 import { setIsConfirmPhraseStage } from '../../../redux/ValidatorOnboarding/KeyGeneration/slice'
-import { setActiveStep } from '../../../redux/ValidatorOnboarding/slice'
 
 const BackButton = () => {
   const dispatch = useDispatch()
+  const [prevPageName, setPrevPageName] = useState<string>('Back')
   const isConfirmPhraseStage = useSelector(
     (state: RootState) => state.keyGeneration.isConfirmPhraseStage,
   )
@@ -24,14 +24,21 @@ const BackButton = () => {
 
   useEffect(() => {
     setButtonState(activeStep > 0 ? 'enabled' : 'disabled')
+    prevPageNameHandler()
   }, [activeStep])
 
-  const prevPageName = () => {
-    let name = FORM_STEPS[activeStep - 1]?.label || 'Back'
-    if (activeStep === 7) {
-      name = 'Key Generation'
+  const prevPageNameHandler = () => {
+    console.log(activeStep)
+
+    let adjustedStepIndex = activeStep - 1
+    if (activeStep > 4 && activeStep < 7) {
+      adjustedStepIndex -= 2
+    } else if (activeStep >= 7) {
+      adjustedStepIndex -= isConfirmPhraseStage ? 3 : 4
     }
-    return name
+
+    const stepLabel = FORM_STEPS[adjustedStepIndex]?.label || 'Back'
+    setPrevPageName(stepLabel)
   }
 
   const handleMouseEnter = () => {
@@ -62,7 +69,6 @@ const BackButton = () => {
       navigate('/validator-onboarding/key-generation')
       return
     } else {
-      // Handle other cases as before
       let prevPath = STEPPER_PATHS[activeStep - 1] || '/validator-onboarding/'
       navigate(prevPath)
     }
@@ -88,7 +94,7 @@ const BackButton = () => {
         <ArrowLeftIcon size={16} color={`#${buttonStyle.color}`} />
       </Stack>
       <Text size={15} color={`#${buttonStyle.textColor}`} weight={'semibold'}>
-        {prevPageName()}
+        {prevPageName}
       </Text>
     </XStack>
   )