diff --git a/packages/page-accounts/src/Accounts/Account.tsx b/packages/page-accounts/src/Accounts/Account.tsx
index bc9d02153c..2c4ea36603 100644
--- a/packages/page-accounts/src/Accounts/Account.tsx
+++ b/packages/page-accounts/src/Accounts/Account.tsx
@@ -234,37 +234,33 @@ function Account ({ account: { address, meta }, className = '', delegation, filt
- {t('Set on-chain identity')}
-
+ />
),
isFunction(api.api.tx.identity?.setSubs) && identity?.display && !isHardware && (
- {t('Set on-chain sub-identities')}
-
+ />
),
isFunction(api.api.tx.democracy?.unlock) && democracyUnlockTx && (
- {t('Clear expired democracy locks')}
-
+ />
),
isFunction(api.api.tx.vesting?.vest) && vestingVestTx && (
- {t('Unlock vested amount')}
-
+ />
)
], t('Identity')),
createMenuGroup('deriveGroup', [
@@ -272,19 +268,17 @@ function Account ({ account: { address, meta }, className = '', delegation, filt
- {t('Derive account via derivation path')}
-
+ />
),
isHardware && (
- {t('Show address on hardware device')}
-
+ />
)
], t('Derive')),
createMenuGroup('backupGroup', [
@@ -292,28 +286,25 @@ function Account ({ account: { address, meta }, className = '', delegation, filt
- {t('Create a backup file for this account')}
-
+ />
),
!(isExternal || isHardware || isInjected || isMultisig || isDevelopment) && (
- {t("Change this account's password")}
-
+ />
),
!(isInjected || isDevelopment) && (
- {t('Forget this account')}
-
+ />
)
], t('Backup')),
isFunction(api.api.tx.recovery?.createRecovery) && createMenuGroup('reoveryGroup', [
@@ -321,67 +312,59 @@ function Account ({ account: { address, meta }, className = '', delegation, filt
- {t('Make recoverable')}
-
+ />
),
- {t('Initiate recovery for another')}
-
+ />
], t('Recovery')),
isFunction(api.api.tx.multisig?.asMulti) && isMultisig && createMenuGroup('multisigGroup', [
- {t('Multisig approvals')}
-
+ />
], t('Multisig')),
isFunction(api.api.query.democracy?.votingOf) && delegation?.accountDelegated && createMenuGroup('undelegateGroup', [
- {t('Change democracy delegation')}
- ,
+ />,
- {t('Undelegate')}
-
+ />
], t('Undelegate')),
createMenuGroup('delegateGroup', [
isFunction(api.api.query.democracy?.votingOf) && !delegation?.accountDelegated && (
-
- {t('Delegate democracy votes')}
-
+ />
),
isFunction(api.api.query.proxy?.proxies) && (
- {proxy?.[0].length
+ label={proxy?.[0].length
? t('Manage proxies')
: t('Add proxy')
}
-
+ onClick={toggleProxyOverview}
+ />
)
], t('Delegate')),
isEditable && !api.isDevelopment && createMenuGroup('genesisGroup', [
diff --git a/packages/page-addresses/src/Contacts/Address.tsx b/packages/page-addresses/src/Contacts/Address.tsx
index 1d8254b98f..7a46c5e73c 100644
--- a/packages/page-addresses/src/Contacts/Address.tsx
+++ b/packages/page-addresses/src/Contacts/Address.tsx
@@ -144,10 +144,9 @@ function Address ({ address, className = '', filter, isFavorite, toggleFavorite
}
>
diff --git a/packages/page-staking/src/Actions/Account/index.tsx b/packages/page-staking/src/Actions/Account/index.tsx
index 25e79937b5..35c0862d8f 100644
--- a/packages/page-staking/src/Actions/Account/index.tsx
+++ b/packages/page-staking/src/Actions/Account/index.tsx
@@ -305,56 +305,48 @@ function Account ({ allSlashes, className = '', info: { controllerId, destinatio
}
diff --git a/packages/react-components/src/Menu/Item.tsx b/packages/react-components/src/Menu/Item.tsx
index 210c5fd035..c9623ce8a9 100644
--- a/packages/react-components/src/Menu/Item.tsx
+++ b/packages/react-components/src/Menu/Item.tsx
@@ -8,7 +8,7 @@ import styled from 'styled-components';
import Icon from '../Icon';
-function Item ({ children, className = '', icon, isDisabled, onClick }: ItemProps): React.ReactElement {
+function Item ({ children, className = '', icon, isDisabled, label, onClick }: ItemProps): React.ReactElement {
const _onClick = useCallback(
(): void => {
!isDisabled && onClick && onClick();
@@ -27,7 +27,7 @@ function Item ({ children, className = '', icon, isDisabled, onClick }: ItemProp
icon={icon}
/>
)}
- {children}
+ {label}{children}
);
}
diff --git a/packages/react-components/src/Menu/types.ts b/packages/react-components/src/Menu/types.ts
index b9903b19f8..5193ed4d1b 100644
--- a/packages/react-components/src/Menu/types.ts
+++ b/packages/react-components/src/Menu/types.ts
@@ -14,6 +14,7 @@ export interface ItemProps {
className?: string;
icon?: IconName;
isDisabled?: boolean;
+ label?: React.ReactNode;
onClick?: () => void | Promise | null;
}