diff --git a/src/pages/Acknowledgements/AcknowledgementProgressTracker/index.tsx b/src/pages/Acknowledgements/AcknowledgementProgressTracker/index.tsx index 1e517a05..fb1047bb 100644 --- a/src/pages/Acknowledgements/AcknowledgementProgressTracker/index.tsx +++ b/src/pages/Acknowledgements/AcknowledgementProgressTracker/index.tsx @@ -49,9 +49,6 @@ export const _AcknowledgementProgressTracker = ({ [AcknowledgementIdsEnum.keyManagement]: formatMessage({ defaultMessage: 'Key management', }), - [AcknowledgementIdsEnum.earlyAdoptionRisks]: formatMessage({ - defaultMessage: 'Early adoption risks', - }), [AcknowledgementIdsEnum.checklist]: formatMessage({ defaultMessage: 'Checklist', }), diff --git a/src/pages/Acknowledgements/index copy.tsx b/src/pages/Acknowledgements/index copy.tsx deleted file mode 100644 index cfe97ccf..00000000 --- a/src/pages/Acknowledgements/index copy.tsx +++ /dev/null @@ -1,145 +0,0 @@ -import React, { useState } from 'react'; -import { FormattedMessage, useIntl } from 'react-intl'; -import { connect } from 'react-redux'; -import styled from 'styled-components'; -import { Dispatch } from 'redux'; -import _every from 'lodash/every'; -import _pickBy from 'lodash/pickBy'; -import _values from 'lodash/values'; -import { - AcknowledgementIdsEnum, - AcknowledgementStateInterface, - StoreState, -} from '../../store/reducers'; -import { - DispatchWorkflowUpdateType, - WorkflowStep, - updateWorkflow, -} from '../../store/actions/workflowActions'; -import { - DispatchAcknowledgementStateUpdateType, - updateAcknowledgementState, -} from '../../store/actions/acknowledgementActions'; -import { pageContent, PageContentInterface } from './pageContent'; -import { AcknowledgementProgressTracker } from './AcknowledgementProgressTracker'; -import { AcknowledgementSection } from './AcknowledgementSection'; -import { WorkflowPageTemplate } from '../../components/WorkflowPage/WorkflowPageTemplate'; -import { Paper } from '../../components/Paper'; - -interface OwnProps {} -interface StateProps { - acknowledgementState: AcknowledgementStateInterface; - workflow: WorkflowStep; -} - -interface DispatchProps { - dispatchAcknowledgementStateUpdate: DispatchAcknowledgementStateUpdateType; - dispatchWorkflowUpdate: DispatchWorkflowUpdateType; -} -type Props = StateProps & DispatchProps & OwnProps; - -const _AcknowledgementPage = ({ - acknowledgementState, - dispatchAcknowledgementStateUpdate, - workflow, - dispatchWorkflowUpdate, -}: Props): JSX.Element => { - const [activeAcknowledgementId, setActiveAcknowledgementId] = useState< - AcknowledgementIdsEnum - >( - workflow === WorkflowStep.OVERVIEW - ? AcknowledgementIdsEnum.introSection - : AcknowledgementIdsEnum.confirmation - ); - - const allAgreedTo = _every( - _values( - _pickBy( - acknowledgementState, - // @ts-ignore - (val: boolean, id: AcknowledgementIdsEnum) => { - // eslint-disable-next-line eqeqeq - return id != AcknowledgementIdsEnum.confirmation; - } - ) - ) - ); - - const Subtitle = styled.p` - font-size: 20px; - margin-bottom: 32px; - `; - - const handleSubmit = () => { - if (workflow === WorkflowStep.OVERVIEW) { - dispatchWorkflowUpdate(WorkflowStep.SELECT_CLIENT); - } - }; - - const handleContinueClick = (id: AcknowledgementIdsEnum) => { - dispatchAcknowledgementStateUpdate(id, true); - if (+id + 1 in AcknowledgementIdsEnum) { - setTimeout(() => setActiveAcknowledgementId(+id + 1), 500); - } - }; - - const handleGoBackClick = (id: AcknowledgementIdsEnum) => { - if (+id - 1 in AcknowledgementIdsEnum) { - setActiveAcknowledgementId(+id - 1); - } - }; - - const { - title, - content, - acknowledgementText, - }: PageContentInterface = pageContent[activeAcknowledgementId]; - const { formatMessage } = useIntl(); - return ( - - - - - - - - - - ); -}; - -const mapStateToProps = (state: StoreState): StateProps => ({ - workflow: state.workflow, - acknowledgementState: state.acknowledgementState, -}); - -const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({ - dispatchAcknowledgementStateUpdate: (id, value) => - dispatch(updateAcknowledgementState(id, value)), - dispatchWorkflowUpdate: step => dispatch(updateWorkflow(step)), -}); - -export const AcknowledgementPage = connect< - StateProps, - DispatchProps, - OwnProps, - StoreState ->( - mapStateToProps, - mapDispatchToProps -)(_AcknowledgementPage); diff --git a/src/pages/Acknowledgements/index.tsx b/src/pages/Acknowledgements/index.tsx index 7f5b2088..03c28e9e 100644 --- a/src/pages/Acknowledgements/index.tsx +++ b/src/pages/Acknowledgements/index.tsx @@ -132,8 +132,8 @@ const _AcknowledgementPage = ({ - {acknowledgementIdsArray.filter(value => value !== AcknowledgementIdsEnum.confirmation && value !== AcknowledgementIdsEnum.terminal).map((value) => ( - + {acknowledgementIdsArray.filter(value => value !== AcknowledgementIdsEnum.confirmation && value !== AcknowledgementIdsEnum.terminal).map((value) => ( + - + ))} diff --git a/src/pages/Acknowledgements/pageContent.tsx b/src/pages/Acknowledgements/pageContent.tsx index 9d962b6b..a5189d9c 100644 --- a/src/pages/Acknowledgements/pageContent.tsx +++ b/src/pages/Acknowledgements/pageContent.tsx @@ -193,24 +193,6 @@ export const pageContent = { /> ), }, - [AcknowledgementIdsEnum.earlyAdoptionRisks]: { - title: , - content: ( - - - - ), - acknowledgementText: ( - - ), - }, [AcknowledgementIdsEnum.terminal]: { title: , content: ( diff --git a/src/pages/SelectMode/index.tsx b/src/pages/SelectMode/index.tsx index ac5d2f66..10ea3bc9 100644 --- a/src/pages/SelectMode/index.tsx +++ b/src/pages/SelectMode/index.tsx @@ -6,6 +6,7 @@ import { useHistory } from 'react-router-dom'; import { Link } from '../../components/Link'; import { PageTemplate } from '../../components/PageTemplate'; import { Heading } from '../../components/Heading'; +import { Text } from '../../components/Text'; import { routesEnum } from '../../Routes'; @@ -97,7 +98,7 @@ export const SelectModePage = () => { - + {formArrow} @@ -115,13 +116,35 @@ export const SelectModePage = () => { - + {formArrow} - + + + + + + +
    +
  • Automated installation and configuration
  • +
  • Fewer manual steps
  • +
  • Standardized deployment
  • +
+
+ + + + + +
    +
  • Ethereum Staking Process
  • +
  • Manual Node Configuration
  • +
  • Greater Control
  • +
+
); }; diff --git a/src/store/reducers/acknowledgementReducer.ts b/src/store/reducers/acknowledgementReducer.ts index 16e7b09a..f31f0904 100644 --- a/src/store/reducers/acknowledgementReducer.ts +++ b/src/store/reducers/acknowledgementReducer.ts @@ -7,7 +7,6 @@ export enum AcknowledgementIdsEnum { responsibilities, slashing, keyManagement, - earlyAdoptionRisks, checklist, confirmation, } @@ -23,7 +22,6 @@ const defaultAcknowledgementState: AcknowledgementStateInterface = { [AcknowledgementIdsEnum.responsibilities]: false, [AcknowledgementIdsEnum.slashing]: false, [AcknowledgementIdsEnum.keyManagement]: false, - [AcknowledgementIdsEnum.earlyAdoptionRisks]: false, [AcknowledgementIdsEnum.checklist]: false, [AcknowledgementIdsEnum.confirmation]: false, };