From be3b21cfea24ace46b7c42bafb793041b71aa4c1 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Mon, 4 May 2020 14:12:54 +0200
Subject: [PATCH] Align payout page loading, display (#2685)

---
 packages/apps/public/locales/en/app-staking.json | 4 ++--
 packages/apps/public/locales/en/translation.json | 4 ++--
 packages/page-staking/src/Payouts/Validator.tsx  | 2 +-
 packages/page-staking/src/Payouts/index.tsx      | 5 ++---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/apps/public/locales/en/app-staking.json b/packages/apps/public/locales/en/app-staking.json
index 35d88b89e7..ea566589ba 100644
--- a/packages/apps/public/locales/en/app-staking.json
+++ b/packages/apps/public/locales/en/app-staking.json
@@ -153,10 +153,10 @@
   "validators/nominators": "validators/nominators",
   "value bonded": "value bonded",
   "waiting": "waiting",
-  "{{count}} stakers": "{{count}} stakers",
+  "{{count}} own stashes": "{{count}} own stashes",
   "{{currency}} average": "{{currency}} average",
   "{{currency}} clipped": "{{currency}} clipped",
   "{{currency}} rewards": "{{currency}} rewards",
   "{{currency}} slashed": "{{currency}} slashed",
   "{{currency}} total": "{{currency}} total"
-}
\ No newline at end of file
+}
diff --git a/packages/apps/public/locales/en/translation.json b/packages/apps/public/locales/en/translation.json
index 54df3c9e1d..9fa5c0035f 100644
--- a/packages/apps/public/locales/en/translation.json
+++ b/packages/apps/public/locales/en/translation.json
@@ -980,7 +980,7 @@
   "your new password": "",
   "{{blocks}} blocks": "",
   "{{count}} key/value pairs encoded for submission": "",
-  "{{count}} stakers": "",
+  "{{count}} own stashes": "",
   "{{currency}} average": "",
   "{{currency}} clipped": "",
   "{{currency}} rewards": "",
@@ -996,4 +996,4 @@
   "{{threshold}}, not passing": "",
   "{{threshold}}, passing": "",
   "{{value}}x voting balance, locked for {{lock}}x enactment ({{period}} days)": ""
-}
\ No newline at end of file
+}
diff --git a/packages/page-staking/src/Payouts/Validator.tsx b/packages/page-staking/src/Payouts/Validator.tsx
index 242cfd47c4..59ef2eea2b 100644
--- a/packages/page-staking/src/Payouts/Validator.tsx
+++ b/packages/page-staking/src/Payouts/Validator.tsx
@@ -65,7 +65,7 @@ function Validator ({ className, isDisabled, payout }: Props): React.ReactElemen
         className='start'
         colSpan={2}
       >
-        <Expander summary={t('{{count}} stakers', { replace: { count: numNominators } })}>
+        <Expander summary={t('{{count}} own stashes', { replace: { count: numNominators } })}>
           {Object.entries(nominators).map(([stashId, balance]) =>
             <AddressMini
               balance={balance}
diff --git a/packages/page-staking/src/Payouts/index.tsx b/packages/page-staking/src/Payouts/index.tsx
index 0eed143373..28b2b8c598 100644
--- a/packages/page-staking/src/Payouts/index.tsx
+++ b/packages/page-staking/src/Payouts/index.tsx
@@ -165,13 +165,12 @@ function Payouts ({ className, isInElection }: Props): React.ReactElement<Props>
           />
         ))}
       </Table>
-      {api.tx.staking.payoutStakers && (
+      {api.tx.staking.payoutStakers && validators && (validators.length !== 0) && (
         <Table
-          empty={validators && t('No pending era payouts from validators')}
           header={headerValidators}
           isFixed
         >
-          {validators?.map((payout): React.ReactNode => (
+          {validators.map((payout): React.ReactNode => (
             <Validator
               isDisabled={isInElection}
               key={payout.validatorId}