From 16166e8fa7c6790ad740b964241d1545d0885865 Mon Sep 17 00:00:00 2001 From: eshark9312 Date: Mon, 31 Jul 2023 16:58:08 -0500 Subject: [PATCH] Revert "Revert "remove route, sidebar item, tab, dashboard, modal"" This reverts commit 02594e17b19b51c16c10a868945384abe5ef9116. --- packages/ui/src/app/App.tsx | 3 - packages/ui/src/app/components/SideBar.tsx | 11 ++- .../pages/Validators/ValidatorDashboard.tsx | 13 --- .../app/pages/Validators/ValidatorList.tsx | 3 - .../app/pages/Validators/ValidatorsModule.tsx | 20 ----- .../Validators/components/ValidatorsTabs.tsx | 14 ---- .../ui/src/validators/constants/routes.tsx | 11 --- .../src/validators/modals/ValidatorsInfo.tsx | 80 ------------------- 8 files changed, 5 insertions(+), 150 deletions(-) delete mode 100644 packages/ui/src/app/pages/Validators/ValidatorDashboard.tsx delete mode 100644 packages/ui/src/app/pages/Validators/ValidatorsModule.tsx delete mode 100644 packages/ui/src/app/pages/Validators/components/ValidatorsTabs.tsx delete mode 100644 packages/ui/src/validators/constants/routes.tsx delete mode 100644 packages/ui/src/validators/modals/ValidatorsInfo.tsx diff --git a/packages/ui/src/app/App.tsx b/packages/ui/src/app/App.tsx index decbf23e24..06c888a4ca 100644 --- a/packages/ui/src/app/App.tsx +++ b/packages/ui/src/app/App.tsx @@ -19,7 +19,6 @@ import { parseEnv } from '@/common/utils/env' import { CouncilRoutes, ElectionRoutes } from '@/council/constants' import { ForumRoutes } from '@/forum/constant' import { ProposalsRoutes } from '@/proposals/constants/routes' -import { ValidatorsRoutes } from '@/validators/constants/routes' import { WorkingGroupsRoutes } from '@/working-groups/constants/routes' import { ExtensionNotification } from './components/ExtensionWarning' @@ -35,7 +34,6 @@ import { MyMemberships } from './pages/Profile/MyMemberships' import { ProposalsModule } from './pages/Proposals/ProposalsModule' import { Settings } from './pages/Settings/Settings' import { PrivacyPolicy, TermsOfService } from './pages/Terms' -import { ValidatorsModule } from './pages/Validators/ValidatorsModule' import { WorkingGroupsModule } from './pages/WorkingGroups/WorkingGroupsModule' import { Providers } from './Providers' @@ -63,7 +61,6 @@ export const App = () => { - diff --git a/packages/ui/src/app/components/SideBar.tsx b/packages/ui/src/app/components/SideBar.tsx index ce032be64c..7879768c4d 100644 --- a/packages/ui/src/app/components/SideBar.tsx +++ b/packages/ui/src/app/components/SideBar.tsx @@ -37,7 +37,6 @@ import { useElectionStage } from '@/council/hooks/useElectionStage' import { ForumRoutes } from '@/forum/constant' import { ProfileComponent } from '@/memberships/components/ProfileComponent' import { ProposalsRoutes } from '@/proposals/constants/routes' -import { ValidatorsRoutes } from '@/validators/constants/routes' import { WorkingGroupsRoutes } from '@/working-groups/constants' export const SideBar = () => { @@ -120,11 +119,6 @@ export const SideBar = () => { Settings - - }> - Validators - - @@ -154,6 +148,11 @@ export const SideBar = () => { Financials + + } disabled> + Validators + + } disabled> Apps diff --git a/packages/ui/src/app/pages/Validators/ValidatorDashboard.tsx b/packages/ui/src/app/pages/Validators/ValidatorDashboard.tsx deleted file mode 100644 index 268856b383..0000000000 --- a/packages/ui/src/app/pages/Validators/ValidatorDashboard.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import React from 'react' - -import { PageHeader } from '@/app/components/PageHeader' -import { PageLayout } from '@/app/components/PageLayout' -import { MainPanel } from '@/common/components/page/PageContent' - -import { ValidatorsTabs } from './components/ValidatorsTabs' - -export const ValidatorDashboard = () => { - return ( - } />} main={} /> - ) -} diff --git a/packages/ui/src/app/pages/Validators/ValidatorList.tsx b/packages/ui/src/app/pages/Validators/ValidatorList.tsx index 5349c7d754..9058c69bc8 100644 --- a/packages/ui/src/app/pages/Validators/ValidatorList.tsx +++ b/packages/ui/src/app/pages/Validators/ValidatorList.tsx @@ -1,6 +1,5 @@ import React from 'react' -import { PageHeader } from '@/app/components/PageHeader' import { PageLayout } from '@/app/components/PageLayout' import { RowGapBlock } from '@/common/components/page/PageContent' import { Statistics } from '@/common/components/statistics' @@ -13,7 +12,6 @@ import { ValidatorsList } from '@/validators/components/ValidatorsList' import { useStakingStatistics } from '@/validators/hooks/useStakingStatistics' import { useValidatorsList } from '@/validators/hooks/useValidatorsList' -import { ValidatorsTabs } from './components/ValidatorsTabs' export const ValidatorList = () => { const { eraStartedOn, @@ -36,7 +34,6 @@ export const ValidatorList = () => { - } /> { - return ( - <> - - - - - - - ) -} diff --git a/packages/ui/src/app/pages/Validators/components/ValidatorsTabs.tsx b/packages/ui/src/app/pages/Validators/components/ValidatorsTabs.tsx deleted file mode 100644 index cafc760f65..0000000000 --- a/packages/ui/src/app/pages/Validators/components/ValidatorsTabs.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' - -import { usePageTabs } from '@/app/hooks/usePageTabs' -import { Tabs } from '@/common/components/Tabs' -import { ValidatorsRoutes } from '@/validators/constants/routes' - -export const ValidatorsTabs = () => { - const tabs = usePageTabs([ - ['Validator List', ValidatorsRoutes.list], - ['Validator Dashboard', ValidatorsRoutes.validatordashboard], - ]) - - return -} diff --git a/packages/ui/src/validators/constants/routes.tsx b/packages/ui/src/validators/constants/routes.tsx deleted file mode 100644 index 777435a7bc..0000000000 --- a/packages/ui/src/validators/constants/routes.tsx +++ /dev/null @@ -1,11 +0,0 @@ -export const ValidatorsRoutes = { - list: '/validators', - validatordashboard: '/validators/validator dashboard', -} as const - -type ValidatorsRoutesType = typeof ValidatorsRoutes - -declare module '@/app/constants/routes' { - // eslint-disable-next-line @typescript-eslint/no-empty-interface - interface Routes extends ValidatorsRoutesType {} -} diff --git a/packages/ui/src/validators/modals/ValidatorsInfo.tsx b/packages/ui/src/validators/modals/ValidatorsInfo.tsx deleted file mode 100644 index 20908bcfc7..0000000000 --- a/packages/ui/src/validators/modals/ValidatorsInfo.tsx +++ /dev/null @@ -1,80 +0,0 @@ -import React, { useState } from 'react' -import { Link } from 'react-router-dom' -import styled from 'styled-components' - -import { RowGapBlock } from '@/common/components/page/PageContent' -import { useLocalStorage } from '@/common/hooks/useLocalStorage' -import { useToggle } from '@/common/hooks/useToggle' - -import { ButtonPrimary } from '../../common/components/buttons' -import { Checkbox } from '../../common/components/forms' -import { ArrowRightIcon } from '../../common/components/icons' -import { Modal, ModalBody, ModalFooter, ModalHeader } from '../../common/components/Modal' -import { TextMedium } from '../../common/components/typography' -import { Colors } from '../../common/constants' - -export const ValidatorsInfo = () => { - const title = 'Nominating validators on Joystream' - const buttonName = 'Start nominating' - const [check, setCheck] = useToggle(false) - const [notShowAgain, setNotShowAgain] = useLocalStorage('ValidatorsPageCheck') - const [showModal, setShowModal] = useState(true) - const closeModal = () => { - setShowModal(false) - } - const checkModal = () => { - setNotShowAgain(check) - closeModal() - } - - if (!notShowAgain && showModal) - return ( - - - - - - - The Joystream blockchain is a PoS system relying on validators. Nominating validators allows you to - participate in the Joystream governance system and earn rewards. - - - When nominating, you are at risk of having parts of your staked funds lost if the validator malfunctions - or does a poor job, resulting in a reduced return on investment. To manage your risk, we advice you to - nominate several validators (up to 16). This allows you to spread out your risk and increase your - chances of earning rewards. You can choose how much to stake with each validator, and you can change - your staking percentages at any time. - - - To begin, review each validator's performance metrics by clicking on their name in the list. When you're - ready to nominate, add the validators you'd like to nominate to by clicking the "Nominate" button on the - list or directly on the validator’s profile. Once you've selected your validators, click the "Proceed" - button to initiate the nomination process. - - - - You can learn more about the Pioneer nomination{' '} - - system here - - . - - - - - - Do not show this again. - - - {buttonName} - - - - ) - return null -} - -const InfoModalFooter = styled(ModalFooter)` - justify-items: start; - justify-content: space-between; -`