diff --git a/src/components/PageWrappers/layout.css b/src/components/PageWrappers/layout.css index 046fc817..d1676b63 100644 --- a/src/components/PageWrappers/layout.css +++ b/src/components/PageWrappers/layout.css @@ -40,7 +40,7 @@ /* LAYOUT RIGHT ELEMENT WITH IMAGE TAKING UP THE WHOLE HIGHT OF THE VIEWPORT */ .layout-right { - flex: 0 0 44.6%; + flex: 0 0 45%; max-width: 45%; z-index: 0; } diff --git a/src/pages/ValidatorOnboarding/Activation/Activation.tsx b/src/pages/ValidatorOnboarding/Activation/Activation.tsx index 39175d93..264e33ba 100644 --- a/src/pages/ValidatorOnboarding/Activation/Activation.tsx +++ b/src/pages/ValidatorOnboarding/Activation/Activation.tsx @@ -1,23 +1,7 @@ -import { Button, Shadow } from '@status-im/components' -import { Stack } from 'tamagui' +import { YStack } from 'tamagui' const Activation = () => { - return ( - <> - - - - - - ) + return } export default Activation diff --git a/src/pages/ValidatorOnboarding/Advicsories/Advicsories.tsx b/src/pages/ValidatorOnboarding/Advicsories/Advicsories.tsx index 95a015c3..441efdf2 100644 --- a/src/pages/ValidatorOnboarding/Advicsories/Advicsories.tsx +++ b/src/pages/ValidatorOnboarding/Advicsories/Advicsories.tsx @@ -1,8 +1,7 @@ -import { Button, Text } from '@status-im/components' +import { Text } from '@status-im/components' import { useState } from 'react' import { Stack, XStack, YStack } from 'tamagui' import AdvisoriesContent from './AdvisoriesContent' -import ValidatorBoxWrapper from '../ValidatorBoxWrapper/ValidatorBoxWrapper' type AdvisoryTopicsType = { [key: string]: string @@ -24,41 +23,35 @@ const Advicsories = () => { const [selectedTitle, setSelectedTitle] = useState('Bad Behaviour') return ( - <> - - - - - - Advisories - - - {Object.keys(advisoryTopics).map((title, index) => ( - setSelectedTitle(title)} - style={{ cursor: 'pointer' }} - > - - {unicodeNumbers[index]} {title} - - - ))} - - - - - - - - + + + + Advisories + + {Object.keys(advisoryTopics).map((title, index) => ( + setSelectedTitle(title)} style={{ cursor: 'pointer' }}> + + {unicodeNumbers[index]} {title} + + + ))} + + + + + ) } diff --git a/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx b/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx index fe88cae0..9a9a96d9 100644 --- a/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx +++ b/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx @@ -1,23 +1,7 @@ -import { Button, Shadow } from '@status-im/components' -import { Stack } from 'tamagui' +import { YStack } from 'tamagui' const KeyGeneration = () => { - return ( - <> - - - - - - ) + return } export default KeyGeneration diff --git a/src/pages/ValidatorOnboarding/Overview/Overview.tsx b/src/pages/ValidatorOnboarding/Overview/Overview.tsx index 3e1bd83b..b107b2af 100644 --- a/src/pages/ValidatorOnboarding/Overview/Overview.tsx +++ b/src/pages/ValidatorOnboarding/Overview/Overview.tsx @@ -1,5 +1,5 @@ import { Stack, Text as TextTam, XStack, YStack } from 'tamagui' -import { Button, Shadow, Text } from '@status-im/components' +import { Text } from '@status-im/components' import { Link } from 'react-router-dom' import OverviewCard from './OverviewCard' import { ArrowRightIcon } from '@status-im/icons' @@ -7,63 +7,49 @@ import { ArrowRightIcon } from '@status-im/icons' const Overview = () => { return ( <> - - - - Overview - - - Becoming a validator is a big responsibility with important preparation steps. Only - start the deposit process when youre ready. + + + Overview + + + Becoming a validator is a big responsibility with important preparation steps. Only start + the deposit process when youre ready. + + + By running a validator, you'll be responsible for securing the network and receive + continuous payouts for actions that help the network reach consensus. + + + Since the successful transition to proof-of-stake via The Merge, Ethereum is fully secured + by proof-of-stake validators. By running a validator, you'll be helping to secure the + Ethereum network. + + + + + + Learn more + + + - - By running a validator, you'll be responsible for securing the network and receive - continuous payouts for actions that help the network reach consensus. - - - Since the successful transition to proof-of-stake via The Merge, Ethereum is fully - secured by proof-of-stake validators. By running a validator, you'll be helping to - secure the Ethereum network. - - - - - - Learn more - - - - - - - - - - - - -
-
- background -
-
-
- - - + + + + + + + + +
+
+ background +
+
) } diff --git a/src/pages/ValidatorOnboarding/ValidatorBoxWrapper/ValidatorBoxWrapper.tsx b/src/pages/ValidatorOnboarding/ValidatorBoxWrapper/ValidatorBoxWrapper.tsx index c6d30a53..83797d66 100644 --- a/src/pages/ValidatorOnboarding/ValidatorBoxWrapper/ValidatorBoxWrapper.tsx +++ b/src/pages/ValidatorOnboarding/ValidatorBoxWrapper/ValidatorBoxWrapper.tsx @@ -15,6 +15,7 @@ const ValidatorBoxWrapper = ({ children }: ValidatorBoxWrapperProps) => { flexDirection: 'row', backgroundColor: '#fff', zIndex: 999, + padding: '16px 32px', }} > {children} diff --git a/src/pages/ValidatorOnboarding/ValidatorOnboarding.tsx b/src/pages/ValidatorOnboarding/ValidatorOnboarding.tsx index 882ed113..21b6e7b2 100644 --- a/src/pages/ValidatorOnboarding/ValidatorOnboarding.tsx +++ b/src/pages/ValidatorOnboarding/ValidatorOnboarding.tsx @@ -1,4 +1,4 @@ -import { YStack } from 'tamagui' +import { Stack, YStack } from 'tamagui' import FormStepper from './FormStepper/FormStepper' import Titles from '../../components/General/Titles' import { useState } from 'react' @@ -8,14 +8,26 @@ import Advicsories from './Advicsories/Advicsories' import ValidatorSetup from './ValidatorSetup/ValidatorSetup' import Activation from './Activation/Activation' import './layoutGradient.css' +import ValidatorBoxWrapper from './ValidatorBoxWrapper/ValidatorBoxWrapper' +import { Button } from '@status-im/components' +import { useNavigate } from 'react-router-dom' const ValidatorOnboarding = () => { const [activeStep, setActiveStep] = useState(0) + const navigate = useNavigate() const changeActiveStep = (step: number) => { setActiveStep(step) } + const continueHandler = () => { + if (activeStep < 4) { + setActiveStep(activeStep + 1) + } else { + navigate('/') + } + } + return (
{ subtitle="Earn Rewards for securing the Ethereum Network" /> - {activeStep === 0 && } - {activeStep === 1 && } - {activeStep === 2 && } - {activeStep === 3 && } - {activeStep === 4 && } + + {activeStep === 0 && } + {activeStep === 1 && } + {activeStep === 2 && } + {activeStep === 3 && } + {activeStep === 4 && } + + + +
) diff --git a/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup.tsx b/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup.tsx index 167c62b8..a82c74c2 100644 --- a/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup.tsx +++ b/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup.tsx @@ -1,23 +1,7 @@ -import { Button, Shadow } from '@status-im/components' -import { Stack } from 'tamagui' +import { YStack } from 'tamagui' const ValidatorSetup = () => { - return ( - <> - - - - - - ) + return } export default ValidatorSetup