diff --git a/packages/browser-wallet/src/popup/popupX/constants/routes.ts b/packages/browser-wallet/src/popup/popupX/constants/routes.ts index dab5219b0..a642ed8a3 100644 --- a/packages/browser-wallet/src/popup/popupX/constants/routes.ts +++ b/packages/browser-wallet/src/popup/popupX/constants/routes.ts @@ -160,14 +160,26 @@ export const relativeRoutes = { /** Routes related to staking for the currently selected account */ earn: { path: 'earn', - /** Validation related routes */ + /** Validation section */ validator: { path: 'baker', - intro: { - path: 'intro', - }, + /** Configure new validator */ register: { path: 'register', + config: { + backTitle: i18n.t('x:earn.validator.register.backTitle'), + }, + /** Flow for constructing the transaction */ + configure: { + config: { + backTitle: i18n.t('x:earn.validator.register.backTitle'), + }, + path: 'configure', + }, + }, + /** Configure existing delegator */ + update: { + path: 'update', }, openPool: { path: 'openPool', diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/BakerKeys/index.ts b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/BakerKeys/index.ts deleted file mode 100644 index a634dd3c4..000000000 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/BakerKeys/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as BakerKeys } from './BakerKeys'; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Intro/index.ts b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Intro/index.ts deleted file mode 100644 index 4c41fc7f0..000000000 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Intro/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as BakerIntro } from './BakerIntro'; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/OpenPool/index.ts b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/OpenPool/index.ts deleted file mode 100644 index 5069781b8..000000000 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/OpenPool/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as OpenPool } from './OpenPool'; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Register/index.ts b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Register/index.ts deleted file mode 100644 index fd3511dab..000000000 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Register/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as RegisterBaker } from './RegisterBaker'; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/Intro/DelegatorIntro.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/Intro/DelegatorIntro.tsx index 701343610..a2d3386d7 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/Intro/DelegatorIntro.tsx +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/Intro/DelegatorIntro.tsx @@ -4,15 +4,16 @@ import { useNavigate } from 'react-router-dom'; import Page from '@popup/popupX/shared/Page'; import { Trans, useTranslation } from 'react-i18next'; import ExternalLink from '@popup/popupX/shared/ExternalLink'; +import { absoluteRoutes } from '@popup/popupX/constants/routes'; -type Props = { onDoneRoute: string }; - -export default function DelegatorIntro({ onDoneRoute }: Props) { +export default function DelegatorIntro() { const nav = useNavigate(); const { t } = useTranslation('x', { keyPrefix: 'earn.delegator.intro' }); return ( - nav(onDoneRoute, { replace: true })}> + nav(absoluteRoutes.settings.earn.delegator.register.configure.path, { replace: true })} + > diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/EarningRewards.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/EarningRewards.tsx index 89a09f99f..f1fa085ae 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/EarningRewards.tsx +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/EarningRewards.tsx @@ -41,7 +41,7 @@ export default function EarningRewards() { {t('validatorDescription', { amount: displayAsCcd(bakingThreshold, false) })} - +
{t('validatorAction')} diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Intro/BakerIntro.scss b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Intro/ValidatorIntro.scss similarity index 77% rename from packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Intro/BakerIntro.scss rename to packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Intro/ValidatorIntro.scss index 090dba05d..0a1859d96 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Intro/BakerIntro.scss +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Intro/ValidatorIntro.scss @@ -1,4 +1,4 @@ -.baker-intro-container { +.validator-intro-container { display: flex; flex-direction: column; height: 100%; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Intro/BakerIntro.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Intro/ValidatorIntro.tsx similarity index 80% rename from packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Intro/BakerIntro.tsx rename to packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Intro/ValidatorIntro.tsx index 888b6271e..2962f1511 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Intro/BakerIntro.tsx +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Intro/ValidatorIntro.tsx @@ -6,12 +6,14 @@ import Page from '@popup/popupX/shared/Page'; import Text from '@popup/popupX/shared/Text'; import { Trans, useTranslation } from 'react-i18next'; -export default function BakerIntro() { +export default function ValidatorIntro() { const nav = useNavigate(); const { t } = useTranslation('x', { keyPrefix: 'earn.validator.intro' }); return ( - - nav(absoluteRoutes.settings.earn.validator.register.path, { replace: true })}> + + nav(absoluteRoutes.settings.earn.validator.register.configure.path, { replace: true })} + > diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Intro/index.ts b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Intro/index.ts new file mode 100644 index 000000000..c9cef1193 --- /dev/null +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Intro/index.ts @@ -0,0 +1 @@ +export { default } from './ValidatorIntro'; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/BakerKeys/BakerKeys.scss b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Keys/ValidatorKeys.scss similarity index 95% rename from packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/BakerKeys/BakerKeys.scss rename to packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Keys/ValidatorKeys.scss index b84ff3080..31a0c3b09 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/BakerKeys/BakerKeys.scss +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Keys/ValidatorKeys.scss @@ -1,10 +1,10 @@ -.baker-keys-container { +.validator-keys-container { .capture__main_small { color: $color-white; word-wrap: break-word; } - .baker-keys { + .validator-keys { &__title { display: flex; justify-content: space-between; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/BakerKeys/BakerKeys.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Keys/ValidatorKeys.tsx similarity index 60% rename from packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/BakerKeys/BakerKeys.tsx rename to packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Keys/ValidatorKeys.tsx index dbf1a9f55..91d87d8cb 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/BakerKeys/BakerKeys.tsx +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Keys/ValidatorKeys.tsx @@ -1,41 +1,41 @@ import React from 'react'; import ExportIcon from '@assets/svgX/sign-out.svg'; -export default function BakerKeys() { +export default function ValidatorKeys() { return ( -
-
- Baker keys +
+
+ Validator keys on Accout 1 / 6gk...k7o
- Your new baker keys have been generated. Before you can continue, you must export and save them. The - keys will have to be added to the baker node. Besides exporting the keys, you will have to finish and - submit the transaction afterwards for the baker to be registered. + Your new validator keys have been generated. Before you can continue, you must export and save them. The + keys will have to be added to the validator node. Besides exporting the keys, you will have to finish + and submit the transaction afterwards for the validator to be registered. -
-
+
+
Election verify key 474564hhfjdjde5f8f9g7fnsnsjs9e7g8f7fs64d3s3f6vb90f9d8d8dd66d
-
+
Signature verify key 9f6g5e6g8gh9g9r7d4fghgfdx76gv5b4hg4fd5sxs9cvbn9m9nhgf77dfgh
-
+
Aggregation verify key 4f84fg3gb6d9s9s3s1d46gg9grf7jmf9xc5c7s5x3vn80b8c6x5x4f84fg3gb6d9s9s3s1d46gg9grf7jmf9xc5c7s5x3vn80b8c6x5x4f84fg3gb6d9s9s3s1d46gg9grf7jmf9xc5c7s5x3vn80b8c6x5x4f84fg3gb6d9s9s3s1d46gg9grf7jmf9xc5c7s5x3vn80b8c6x5xdjd9f7g66673
-
+
- Export baker keys + Export validator keys
); diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Keys/index.ts b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Keys/index.ts new file mode 100644 index 000000000..e78b30365 --- /dev/null +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Keys/index.ts @@ -0,0 +1 @@ +export { default } from './ValidatorKeys'; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/OpenPool/OpenPool.scss b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/OpenPool/OpenPool.scss similarity index 100% rename from packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/OpenPool/OpenPool.scss rename to packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/OpenPool/OpenPool.scss diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/OpenPool/OpenPool.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/OpenPool/OpenPool.tsx similarity index 91% rename from packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/OpenPool/OpenPool.tsx rename to packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/OpenPool/OpenPool.tsx index b350004a7..095cf52da 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/OpenPool/OpenPool.tsx +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/OpenPool/OpenPool.tsx @@ -15,7 +15,7 @@ export default function OpenPool() {
- You have the option to open your baker as a pool for others to delegate their CCD to. + You have the option to open your validator as a pool for others to delegate their CCD to. If you choose to open your pool, other people will be able to delegate CCDs to your baking pool. diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/OpenPool/index.ts b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/OpenPool/index.ts new file mode 100644 index 000000000..e8ed40072 --- /dev/null +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/OpenPool/index.ts @@ -0,0 +1 @@ +export { default } from './OpenPool'; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Register/RegisterBaker.scss b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Register/RegisterValidator.scss similarity index 97% rename from packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Register/RegisterBaker.scss rename to packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Register/RegisterValidator.scss index 79560d90f..8b337a1d9 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Register/RegisterBaker.scss +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Register/RegisterValidator.scss @@ -1,10 +1,10 @@ -.register-baker-container { +.register-validator-container { display: flex; flex-direction: column; height: 100%; padding-bottom: rem(32px); - .register-baker { + .register-validator { &__title { display: flex; align-items: baseline; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Register/RegisterBaker.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Register/RegisterValidator.tsx similarity index 73% rename from packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Register/RegisterBaker.tsx rename to packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Register/RegisterValidator.tsx index 7698bc4f5..14d2dd0b5 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Baker/Register/RegisterBaker.tsx +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Register/RegisterValidator.tsx @@ -2,14 +2,14 @@ import React from 'react'; import Button from '@popup/popupX/shared/Button'; import { ToggleCheckbox } from '@popup/popupX/shared/Form/ToggleCheckbox'; -export default function RegisterBaker() { +export default function RegisterValidator() { return ( -
-
- Register Baker +
+
+ Register validator on Accout 1 / 6gk...k7o
-
+
Token
@@ -29,14 +29,14 @@ export default function RegisterBaker() { 12.200,29 CCD – 18.500,04 CCD
-
-
+
+
Auto add rewards
- Set to automatically add baking rewards to baker stake. amounts will be at disposal on your account - balance at each pay day. + Set to automatically add baking rewards to validator stake. amounts will be at disposal on your + account balance at each pay day.
diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Register/index.ts b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Register/index.ts new file mode 100644 index 000000000..2b3bd0963 --- /dev/null +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Register/index.ts @@ -0,0 +1 @@ +export { default } from './RegisterValidator'; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Status.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Status.tsx new file mode 100644 index 000000000..adbcf1901 --- /dev/null +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Status.tsx @@ -0,0 +1,74 @@ +import React from 'react'; +import { AccountInfoType } from '@concordium/web-sdk'; +import { absoluteRoutes } from '@popup/popupX/constants/routes'; +import Button from '@popup/popupX/shared/Button'; +import Card from '@popup/popupX/shared/Card'; +import Page from '@popup/popupX/shared/Page'; +import { useTranslation } from 'react-i18next'; +import { useSelectedAccountInfo } from '@popup/shared/AccountInfoListenerContext/AccountInfoListenerContext'; +import { Navigate, useNavigate } from 'react-router-dom'; +import AccountCooldowns from '../AccountCooldowns'; +import { showRestake, showValidatorAmount, showValidatorOpenStatus } from './util'; + +export default function ValidatorStatus() { + const { t } = useTranslation('x', { keyPrefix: 'earn.validator' }); + const accountInfo = useSelectedAccountInfo(); + const nav = useNavigate(); + + if (accountInfo?.type !== AccountInfoType.Baker) { + return ; + } + + const { accountBaker, accountCooldowns } = accountInfo; + + if (accountBaker.version === 0) { + return null; + } + + return ( + + + + + + + + + + + + + + + + + + + + + + nav(absoluteRoutes.settings.earn.delegator.update.path)} + /> + nav(absoluteRoutes.settings.earn.delegator.stop.path)} + /> + + + ); +} diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/util.ts b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/util.ts new file mode 100644 index 000000000..b29ae2e61 --- /dev/null +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/util.ts @@ -0,0 +1,26 @@ +import { CcdAmount, OpenStatusText } from '@concordium/web-sdk'; +import { formatCcdAmount } from '@popup/popupX/shared/utils/helpers'; +import i18n from '@popup/shell/i18n'; + +export function showValidatorAmount(amount: CcdAmount.Type): string { + return `${formatCcdAmount(amount)} CCD`; +} + +export function showValidatorOpenStatus(status: OpenStatusText): string { + switch (status) { + case OpenStatusText.OpenForAll: + return i18n.t('x:earn.validator.values.openStatus.open'); + case OpenStatusText.ClosedForAll: + return i18n.t('x:earn.validator.values.openStatus.closed'); + case OpenStatusText.ClosedForNew: + return i18n.t('x:earn.validator.values.openStatus.closedNew'); + default: + throw new Error('Unsupported status'); + } +} + +export function showRestake(value: boolean): string { + return value + ? i18n.t('x:earn.validator.values.restake.validation') + : i18n.t('x:earn.validator.values.restake.public'); +} diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/i18n/en.ts b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/i18n/en.ts index c40b23b60..8f7e4e3e0 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/i18n/en.ts +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/i18n/en.ts @@ -14,7 +14,7 @@ const t = { inactiveStake: { label: 'Inactive stake', description: - 'You don’t receive rewards from this part of stake now, this amount will be at disposal after cooldown period.', + 'You don’t receive rewards from this part of the stake now. This amount will be at your disposal after the cooldown period.', }, cooldown: { label: 'Cooldown time:', @@ -45,7 +45,7 @@ const t = { }, '2': { title: 'Delegation models', - body: "There are two staking models that a delegator can choose:
  • Delegating to a specific pool
  • Passive delegation
A staking pool is managed by an individual validator running a node, so the rewards depend on that validator's performance.\n\nSince passive delegation doesn't go to a specific pool, it mitigates the risk of a single validator performing badly, however, the rewards are lower.\n\nFor more info, visit our <1>documentation website", + body: "There are two staking models that a delegator can choose:
  • Delegating to a specific pool
  • Passive delegation
A staking pool is managed by an individual validator running a node, so the rewards depend on that validator's performance.\n\nSince passive delegation doesn't go to a specific pool, it mitigates the risk of a single validator performing badly. However, the rewards are lower.\n\nFor more info, visit our <1>documentation website", }, '3': { title: 'Staking pools', @@ -89,9 +89,9 @@ const t = { errorNotValidator: 'The specified ID is not a validator pool', }, validatorDelegationDescription: - 'If you don’t already know which validator pool you want to delegate an amount to, you can look for on <1>here.', + 'If you don’t already know which validator pool you want to delegate an amount to, you can look for one <1>here.', passiveDelegationDescription: - 'Passive delegation is an alternative to delegation to a specific validator pool that has lower rewards. With passive delegation you do not have to worry about the uptime or quality of a baker node.\nFor more info you can visit <1>developer.concordium.software', + 'Passive delegation is an alternative to delegation to a specific validator pool that has lower rewards. With passive delegation, you do not have to worry about the uptime or quality of a baker node.\nFor more info, you can visit <1>developer.concordium.software', buttonContinue: 'Continue', }, stake: { @@ -138,6 +138,28 @@ const t = { }, }, validator: { + values: { + openStatus: { + label: 'Delegation pool status', + open: 'Open for delegation', + closed: 'Closed for delegation', + closedNew: 'Closed for new delegators', + }, + amount: { label: 'Validator stake' }, + id: { label: 'Validator ID' }, + restake: { + label: 'Rewards will be', + validation: 'Added to validator stake', + public: 'Added to public balance', + }, + metadataUrl: { label: 'Metadata URL' }, + }, + status: { + title: 'Your validation is registered', + backTitle: 'to Main page', + buttonUpdate: 'Update', + buttonStop: 'Stop', + }, intro: { '1': { title: 'Become a validator', @@ -152,6 +174,10 @@ const t = { body: 'You have the option when adding a validator to open a staking pool or not. A staking pool allows others who want to earn rewards to do so without the need to run a node or become a validator themselves.\n\nTo do this they delegate an amount to your staking pool which then increases your total stake and your chances of winning the lottery to bake a block. At each pay day the rewards will be distributed to you and your delegators.\n\nYou can also choose not to open a pool, in which case only your own stake applies toward the lottery. You can always open or close a pool later.', }, }, + register: { + title: 'Register validator', + backTitle: 'Earning rewards', + }, }, }; diff --git a/packages/browser-wallet/src/popup/popupX/shell/Routes.tsx b/packages/browser-wallet/src/popup/popupX/shell/Routes.tsx index 1db811f46..010ce1ba9 100644 --- a/packages/browser-wallet/src/popup/popupX/shell/Routes.tsx +++ b/packages/browser-wallet/src/popup/popupX/shell/Routes.tsx @@ -19,10 +19,8 @@ import About from '@popup/popupX/pages/About'; import { IdSubmitted, IdCardsInfo, RequestIdentity, SetupPassword, Welcome } from '@popup/popupX/pages/Onboarding'; import ConnectedSites from '@popup/popupX/pages/ConnectedSites'; import EarningRewards from '@popup/popupX/pages/EarningRewards'; -import { BakerIntro } from '@popup/popupX/pages/EarningRewards/Baker/Intro'; -import { RegisterBaker } from '@popup/popupX/pages/EarningRewards/Baker/Register'; -import { OpenPool } from '@popup/popupX/pages/EarningRewards/Baker/OpenPool'; -import { BakerKeys } from '@popup/popupX/pages/EarningRewards/Baker/BakerKeys'; +import ValidatorIntro from '@popup/popupX/pages/EarningRewards/Validator/Intro'; +import RegisterValidator from '@popup/popupX/pages/EarningRewards/Validator/Register'; import PrivateKey from '@popup/popupX/pages/PrivateKey'; import { RestoreIntro, RestoreResult } from '@popup/popupX/pages/Restore'; import { MessagePromptHandlersType } from '@popup/shared/utils/message-prompt-handlers'; @@ -37,6 +35,7 @@ import { UpdateDelegatorTransactionFlow, } from '../pages/EarningRewards/Delegator/TransactionFlow'; import DelegatorStatus from '../pages/EarningRewards/Delegator/Status'; +import ValidatorStatus from '../pages/EarningRewards/Validator/Status'; export default function Routes({ messagePromptHandlers }: { messagePromptHandlers: MessagePromptHandlersType }) { const { handleConnectionResponse } = messagePromptHandlers; @@ -105,25 +104,19 @@ export default function Routes({ messagePromptHandlers }: { messagePromptHandler } /> - } path={relativeRoutes.settings.earn.validator.intro.path} /> - } - path={relativeRoutes.settings.earn.validator.register.path} - /> - } path={relativeRoutes.settings.earn.validator.openPool.path} /> - } path={relativeRoutes.settings.earn.validator.keys.path} /> + } /> + + } /> + } + /> + } /> - - } - /> + } /> } diff --git a/packages/browser-wallet/src/popup/popupX/styles/_elements.scss b/packages/browser-wallet/src/popup/popupX/styles/_elements.scss index c7a48be41..8934c441f 100644 --- a/packages/browser-wallet/src/popup/popupX/styles/_elements.scss +++ b/packages/browser-wallet/src/popup/popupX/styles/_elements.scss @@ -19,10 +19,10 @@ @import '../pages/TransactionDetails/TransactionDetails'; @import '../pages/EarningRewards/EarningRewards'; @import '../pages/EarningRewards/AccountCooldowns/AccountCooldowns'; -@import '../pages/EarningRewards/Baker/Intro/BakerIntro'; -@import '../pages/EarningRewards/Baker/Register/RegisterBaker'; -@import '../pages/EarningRewards/Baker/OpenPool/OpenPool'; -@import '../pages/EarningRewards/Baker/BakerKeys/BakerKeys'; +@import '../pages/EarningRewards/Validator/Intro/ValidatorIntro'; +@import '../pages/EarningRewards/Validator/Register/RegisterValidator'; +@import '../pages/EarningRewards/Validator/OpenPool/OpenPool'; +@import '../pages/EarningRewards/Validator/Keys/ValidatorKeys'; @import '../pages/EarningRewards/Delegator/Intro/DelegatorIntro'; @import '../pages/EarningRewards/Delegator/Type/DelegationType'; @import '../pages/EarningRewards/Delegator/Stake/DelegatorStake';