From 26318a2d8f04f11f67dfd62a08a743c466909109 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 20 Jun 2020 21:12:44 +0200 Subject: [PATCH] Best only on elected (#3007) --- packages/page-staking/src/Actions/partials/Nominate.tsx | 4 ++-- packages/page-staking/src/Targets/index.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/page-staking/src/Actions/partials/Nominate.tsx b/packages/page-staking/src/Actions/partials/Nominate.tsx index b4fa21c518..c602168937 100644 --- a/packages/page-staking/src/Actions/partials/Nominate.tsx +++ b/packages/page-staking/src/Actions/partials/Nominate.tsx @@ -31,9 +31,9 @@ interface Selected { } function autoPick (targets: SortedTargets): string[] { - return (targets.validators || []).reduce((result: string[], { key, numNominators, rewardPayout }): string[] => { + return (targets.validators || []).reduce((result: string[], { isElected, isFavorite, key, numNominators, rewardPayout }): string[] => { if (result.length < MAX_NOMINATIONS) { - if (numNominators && (numNominators < MAX_PAYOUTS) && !rewardPayout.isZero()) { + if (numNominators && (numNominators < MAX_PAYOUTS) && (isElected || isFavorite) && !rewardPayout.isZero()) { result.push(key); } } diff --git a/packages/page-staking/src/Targets/index.tsx b/packages/page-staking/src/Targets/index.tsx index 827baf0f76..289e647742 100644 --- a/packages/page-staking/src/Targets/index.tsx +++ b/packages/page-staking/src/Targets/index.tsx @@ -81,8 +81,8 @@ function Targets ({ className = '', ownStashes, targets: { calcWith, lastReward, const _selectProfitable = useCallback( () => setSelected( - (validators || []).reduce((result: string[], { hasIdentity, key, rewardPayout }): string[] => { - if ((result.length < MAX_NOMINATIONS) && (withoutName || hasIdentity) && !rewardPayout.isZero()) { + (validators || []).reduce((result: string[], { hasIdentity, isElected, isFavorite, key, rewardPayout }): string[] => { + if ((result.length < MAX_NOMINATIONS) && (withoutName || hasIdentity) && (isElected || isFavorite) && !rewardPayout.isZero()) { result.push(key); }