From 5242dad140aa80b24a02c4941a7a2ef3a85ed190 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Tue, 25 Nov 2025 16:41:39 +0000
Subject: [PATCH] Better staking overview (#11930)

* some work

* more info

* history

* mostly done

* better formatting

* better staking validators page
---
 .../src/Validators/Address/index.tsx          | 30 ++++++++-----------
 .../src/Validators/CurrentList.tsx            |  4 ++-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/packages/page-staking-async/src/Validators/Address/index.tsx b/packages/page-staking-async/src/Validators/Address/index.tsx
index a32c3c3b33..a181b2b42d 100644
--- a/packages/page-staking-async/src/Validators/Address/index.tsx
+++ b/packages/page-staking-async/src/Validators/Address/index.tsx
@@ -19,7 +19,6 @@ import { BN_ZERO } from '@polkadot/util';
 
 import { useTranslation } from '../../translate.js';
 import NominatedBy from './NominatedBy.js';
-import StakeOther from './StakeOther.js';
 import Status from './Status.js';
 
 interface Props {
@@ -96,7 +95,7 @@ function Address ({ address, className = '', filterName, hasQueries, isElected,
   const [isExpanded, toggleIsExpanded] = useToggle(false);
   const { accountInfo, slashingSpans } = useAddressCalls(api, address, isMain);
 
-  const { commission, isChilled, nominators, stakeOther, stakeOwn } = useMemo(
+  const { commission, isChilled, nominators, stakeOwn, stakeTotal } = useMemo(
     () => validatorInfo
       ? expandInfo(validatorInfo, minCommission)
       : {},
@@ -154,10 +153,17 @@ function Address ({ address, className = '', filterName, hasQueries, isElected,
         </td>
         {isMain
           ? (
-            <StakeOther
-              nominators={nominators}
-              stakeOther={stakeOther}
-            />
+            <>
+              <td className='number'>
+                {stakeTotal ? <FormatBalance value={stakeTotal} /> : <span className='--tmp'>0</span>}
+              </td>
+              <td className='number'>
+                {stakeOwn ? <FormatBalance value={stakeOwn} /> : <span className='--tmp'>0</span>}
+              </td>
+              <td className='number'>
+                {nominators?.length || <span className='--tmp'>0</span>}
+              </td>
+            </>
           )
           : (
             <NominatedBy
@@ -186,21 +192,11 @@ function Address ({ address, className = '', filterName, hasQueries, isElected,
             className='columar'
             colSpan={
               isMain
-                ? 4
+                ? 6
                 : 3
             }
           >
             <Columar size='small'>
-              <Columar.Column>
-                {isMain && stakeOwn?.gtn(0) && (
-                  <>
-                    <h5>{t('own stake')}</h5>
-                    <FormatBalance
-                      value={stakeOwn}
-                    />
-                  </>
-                )}
-              </Columar.Column>
               <Columar.Column>
                 {hasQueries && (
                   <>
diff --git a/packages/page-staking-async/src/Validators/CurrentList.tsx b/packages/page-staking-async/src/Validators/CurrentList.tsx
index 72ee28bd8f..cc15075723 100644
--- a/packages/page-staking-async/src/Validators/CurrentList.tsx
+++ b/packages/page-staking-async/src/Validators/CurrentList.tsx
@@ -144,7 +144,9 @@ function CurrentList ({ className, favorites, hasQueries, isIntentions, isOwn, m
       ]
       : [
         [t('validators'), 'start', 3],
-        [t('other stake'), 'expand'],
+        [t('total stake'), 'number'],
+        [t('own stake'), 'number'],
+        [t('nominator count'), 'number'],
         [t('commission')],
         [t('last #')],
         []