From 286944cc9daf626606314188deb8ed75956dfe8d Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 4 Apr 2020 21:45:15 +0200 Subject: [PATCH] Disable staking actions in elections (#2516) --- .../page-accounts/src/Accounts/Account.tsx | 3 +-- .../page-accounts/src/Contacts/Address.tsx | 3 +-- .../page-parachains/src/Parachain/index.tsx | 3 +-- .../src/Actions/Account/index.tsx | 23 ++++++---------- .../page-staking/src/Actions/NewStake.tsx | 4 ++- packages/page-staking/src/Actions/index.tsx | 19 ++++++++----- packages/react-components/src/Popup.tsx | 27 +++++++++++++++++-- packages/react-components/src/styles/index.ts | 4 +++ 8 files changed, 55 insertions(+), 31 deletions(-) diff --git a/packages/page-accounts/src/Accounts/Account.tsx b/packages/page-accounts/src/Accounts/Account.tsx index 20c4d3ccf6..c04af22c35 100644 --- a/packages/page-accounts/src/Accounts/Account.tsx +++ b/packages/page-accounts/src/Accounts/Account.tsx @@ -362,9 +362,8 @@ function Account ({ address, className, filter, isFavorite, toggleFavorite }: Pr /> {(sudoKey && isMine) && ( void; rewards?: DeriveStakerReward[]; @@ -111,7 +111,7 @@ function createPayout (api: ApiPromise, payoutRewards: DeriveStakerReward[]): Su ); } -function Account ({ allStashes, className, isOwnStash, next, onUpdateType, rewards, stakingOverview, stashId }: Props): React.ReactElement { +function Account ({ allStashes, className, isInElection, isOwnStash, next, onUpdateType, rewards, stakingOverview, stashId }: Props): React.ReactElement { const { t } = useTranslation(); const { queueExtrinsic } = useContext(StatusContext); const { api } = useApi(); @@ -215,13 +215,6 @@ function Account ({ allStashes, className, isOwnStash, next, onUpdateType, rewar stashId={stashId} validatorPrefs={validatorPrefs} /> - {/* {isPayoutOpen && controllerId && ( - - )} */} {isInjectOpen && ( )} @@ -321,7 +314,7 @@ function Account ({ allStashes, className, isOwnStash, next, onUpdateType, rewar