diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/Status.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/Status.tsx index cc9eefb96..f837867b4 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/Status.tsx +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Delegator/Status.tsx @@ -22,7 +22,7 @@ export default function DelegatorStatus() { const nav = useNavigate(); if (accountInfo?.type !== AccountInfoType.Delegator) { - return ; + return ; } const { accountDelegation, accountCooldowns } = accountInfo; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Result/ValidationResult.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Result/ValidationResult.tsx index 59259965a..e95a8c8c2 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Result/ValidationResult.tsx +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Result/ValidationResult.tsx @@ -20,6 +20,7 @@ import { cpStakingCooldown } from '@shared/utils/chain-parameters-helpers'; import { submittedTransactionRoute } from '@popup/popupX/constants/routes'; import Text from '@popup/popupX/shared/Text'; import { useSelectedAccountInfo } from '@popup/shared/AccountInfoListenerContext/AccountInfoListenerContext'; +import ErrorMessage from '@popup/popupX/shared/Form/ErrorMessage'; import { isRange, showCommissionRate, @@ -27,7 +28,6 @@ import { showValidatorOpenStatus, showValidatorRestake, } from '../util'; -import ErrorMessage from '@popup/popupX/shared/Form/ErrorMessage'; export type ValidationResultLocationState = { payload: ConfigureBakerPayload; diff --git a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Status/Status.tsx b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Status/Status.tsx index 871457102..2c7f8cd65 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Status/Status.tsx +++ b/packages/browser-wallet/src/popup/popupX/pages/EarningRewards/Validator/Status/Status.tsx @@ -26,7 +26,7 @@ export default function ValidatorStatus() { const chainParams = useBlockChainParametersAboveV0(); if (accountInfo?.type !== AccountInfoType.Baker) { - return ; + return ; } const { accountBaker, accountCooldowns } = accountInfo; 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 28e42990e..b064f653d 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 @@ -2,7 +2,7 @@ const t = { root: { validatorTitle: 'Validation', validatorDescription: - 'As a validator, you can participate in the network by baking blocks on the Concordium network. This requires a minimum of {{amount}} CCD and access to a dedicated node.', + 'As a validator, you can participate in the network by validating blocks on the Concordium network. This requires a minimum of {{amount}} CCD and access to a dedicated node.', validatorAction: 'Continue to validation setup', delegationTitle: 'Delegation', delegationDescription: diff --git a/packages/browser-wallet/src/popup/popupX/pages/SubmittedTransaction/SubmittedTransaction.tsx b/packages/browser-wallet/src/popup/popupX/pages/SubmittedTransaction/SubmittedTransaction.tsx index 1e125d87d..cbd8bf9e6 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/SubmittedTransaction/SubmittedTransaction.tsx +++ b/packages/browser-wallet/src/popup/popupX/pages/SubmittedTransaction/SubmittedTransaction.tsx @@ -23,6 +23,9 @@ import { DelegationStakeChangedEvent, DelegatorEvent, ConfigureDelegationSummary, + ConfigureBakerSummary, + BakerStakeChangedEvent, + BakerEvent, } from '@concordium/web-sdk'; import { useAtomValue } from 'jotai'; import { grpcClientAtom } from '@popup/store/settings'; @@ -62,6 +65,32 @@ function DelegationBody({ events }: DelegationBodyProps) { return {t('updated')}; } +type ValidatorBodyProps = BaseAccountTransactionSummary & ConfigureBakerSummary; + +function ValidatorBody({ events }: ValidatorBodyProps) { + const { t } = useTranslation('x', { keyPrefix: 'submittedTransaction.success.configureValidator' }); + + const stakeChange = events.find((e) => + [TransactionEventTag.BakerStakeIncreased, TransactionEventTag.BakerStakeDecreased].includes(e.tag) + ) as BakerStakeChangedEvent | undefined; + if (stakeChange !== undefined) { + return ( + <> + {t('changeStake')} + {formatCcdAmount(stakeChange.newStake)} + CCD + + ); + } + + const removal = events.find((e) => [TransactionEventTag.BakerRemoved].includes(e.tag)) as BakerEvent | undefined; + if (removal !== undefined) { + return {t('removed')}; + } + + return {t('updated')}; +} + type SuccessSummary = Exclude; type FailureSummary = BaseAccountTransactionSummary & FailedTransactionSummary; @@ -87,6 +116,7 @@ function Success({ tx }: SuccessProps) { )} {tx.transactionType === TransactionKindString.ConfigureDelegation && } + {tx.transactionType === TransactionKindString.ConfigureBaker && } ); } diff --git a/packages/browser-wallet/src/popup/popupX/pages/SubmittedTransaction/i18n/en.ts b/packages/browser-wallet/src/popup/popupX/pages/SubmittedTransaction/i18n/en.ts index 8d1b514a9..a17f1e5c0 100644 --- a/packages/browser-wallet/src/popup/popupX/pages/SubmittedTransaction/i18n/en.ts +++ b/packages/browser-wallet/src/popup/popupX/pages/SubmittedTransaction/i18n/en.ts @@ -5,6 +5,11 @@ const t = { removed: "You've removed your delegated stake", updated: "You've updated your delegation settings", }, + configureValidator: { + changeStake: "You've validating with", + removed: "You've stopped validating", + updated: "You've updated your delegation settings", + }, transfer: { label: "You've sent", },