From 1323886c2cfccdc09cee713d8db4c801937d541f Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 24 Aug 2019 08:34:08 +0200
Subject: [PATCH] Cleanup waiting count (direct from next list) (#1527)

---
 packages/app-staking/src/Overview/Summary.tsx | 12 +++++-------
 packages/app-staking/src/Overview/index.tsx   |  5 +++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/app-staking/src/Overview/Summary.tsx b/packages/app-staking/src/Overview/Summary.tsx
index 7b3bf0e151..24a6fc5280 100644
--- a/packages/app-staking/src/Overview/Summary.tsx
+++ b/packages/app-staking/src/Overview/Summary.tsx
@@ -15,20 +15,18 @@ import { withCalls, withMulti } from '@polkadot/react-api';
 import translate from '../translate';
 
 interface Props extends I18nProps {
-  className?: string;
   allControllers: string[];
+  className?: string;
+  currentValidatorsControllersV1OrStashesV2: string[];
   lastAuthor?: string;
   lastBlock: string;
   staking_validatorCount?: BN;
-  currentValidatorsControllersV1OrStashesV2: string[];
+  next: string[];
 }
 
 class Summary extends React.PureComponent<Props> {
   public render (): React.ReactNode {
-    const { className, allControllers, lastAuthor, lastBlock, style, t, staking_validatorCount, currentValidatorsControllersV1OrStashesV2 } = this.props;
-    const waiting = allControllers.length > currentValidatorsControllersV1OrStashesV2.length
-      ? (allControllers.length - currentValidatorsControllersV1OrStashesV2.length)
-      : allControllers.length;
+    const { className, currentValidatorsControllersV1OrStashesV2, lastAuthor, lastBlock, next, style, staking_validatorCount, t } = this.props;
 
     return (
       <SummaryBox
@@ -40,7 +38,7 @@ class Summary extends React.PureComponent<Props> {
             {currentValidatorsControllersV1OrStashesV2.length}/{staking_validatorCount ? staking_validatorCount.toString() : '-'}
           </CardSummary>
           <CardSummary label={t('waiting')}>
-            {waiting}
+            {next.length}
           </CardSummary>
         </section>
         <section>
diff --git a/packages/app-staking/src/Overview/index.tsx b/packages/app-staking/src/Overview/index.tsx
index 1a647389b7..8ceba2c226 100644
--- a/packages/app-staking/src/Overview/index.tsx
+++ b/packages/app-staking/src/Overview/index.tsx
@@ -16,9 +16,9 @@ import Summary from './Summary';
 import { withApi } from '@polkadot/react-api';
 import { ApiProps } from '@polkadot/react-api/types';
 
-type Props = ApiProps & BareProps & ComponentProps & {
+interface Props extends ApiProps, BareProps, ComponentProps {
   chain_subscribeNewHead?: HeaderExtended;
-};
+}
 
 class Overview extends React.PureComponent<Props> {
   public render (): React.ReactNode {
@@ -52,6 +52,7 @@ class Overview extends React.PureComponent<Props> {
           currentValidatorsControllersV1OrStashesV2={currentValidatorsControllersV1OrStashesV2}
           lastBlock={lastBlock}
           lastAuthor={lastAuthor}
+          next={nextSorted}
         />
         <CurrentList
           currentValidatorsControllersV1OrStashesV2={currentValidatorsControllersV1OrStashesV2}