From 2c01ff467b607a8daa47b8d700a874739ddb4aab Mon Sep 17 00:00:00 2001
From: Jesse Pinho <jesse@jessepinho.com>
Date: Wed, 21 Feb 2024 14:31:05 -0800
Subject: [PATCH 1/3] Move <Card> into <ValidatorsTable />

---
 apps/webapp/src/components/staking/layout.tsx |  7 +-
 .../components/staking/validators-table.tsx   | 88 +++++++++++--------
 2 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/apps/webapp/src/components/staking/layout.tsx b/apps/webapp/src/components/staking/layout.tsx
index f71fa3bd7f..97c6c36ec4 100644
--- a/apps/webapp/src/components/staking/layout.tsx
+++ b/apps/webapp/src/components/staking/layout.tsx
@@ -1,4 +1,3 @@
-import { Card, CardContent } from '@penumbra-zone/ui';
 import { EduInfoCard } from '../shared/edu-panels/edu-info-card';
 import { EduPanel } from '../shared/edu-panels/content';
 import { ValidatorsTable } from './validators-table';
@@ -7,11 +6,7 @@ export const StakingLayout = () => {
   return (
     <div className='grid gap-6 md:grid-cols-3 md:gap-4 xl:gap-5'>
       <div className='col-span-2'>
-        <Card gradient>
-          <CardContent>
-            <ValidatorsTable />
-          </CardContent>
-        </Card>
+        <ValidatorsTable />
       </div>
 
       <div>
diff --git a/apps/webapp/src/components/staking/validators-table.tsx b/apps/webapp/src/components/staking/validators-table.tsx
index cd2b7a1a62..38c3eb37cd 100644
--- a/apps/webapp/src/components/staking/validators-table.tsx
+++ b/apps/webapp/src/components/staking/validators-table.tsx
@@ -1,4 +1,15 @@
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@penumbra-zone/ui';
+import {
+  Card,
+  CardContent,
+  CardHeader,
+  CardTitle,
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@penumbra-zone/ui';
 import { getValidator } from '@penumbra-zone/types';
 import { useValidatorInfos } from './use-validator-infos';
 import { Oval } from 'react-loader-spinner';
@@ -14,41 +25,48 @@ export const ValidatorsTable = () => {
   const showValidators = !showError && !showLoading;
 
   return (
-    <Table className='w-full'>
-      <TableHeader>
-        <TableRow>
-          {HEADERS.map(header => (
-            <TableHead key={header}>{header}</TableHead>
-          ))}
-        </TableRow>
-      </TableHeader>
-      <TableBody>
-        {showError && (
-          <TableRow>
-            <TableCell colSpan={HEADERS.length}>
-              There was an error loading validators. Please reload the page.
-            </TableCell>
-          </TableRow>
-        )}
+    <Card>
+      <CardHeader>
+        <CardTitle>Active validators</CardTitle>
+      </CardHeader>
+      <CardContent>
+        <Table className='w-full'>
+          <TableHeader>
+            <TableRow>
+              {HEADERS.map(header => (
+                <TableHead key={header}>{header}</TableHead>
+              ))}
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {showError && (
+              <TableRow>
+                <TableCell colSpan={HEADERS.length}>
+                  There was an error loading validators. Please reload the page.
+                </TableCell>
+              </TableRow>
+            )}
 
-        {showLoading && (
-          <TableRow>
-            <TableCell colSpan={HEADERS.length} className='flex gap-4'>
-              <Oval width={16} height={16} color='white' secondaryColor='white' />
-            </TableCell>
-          </TableRow>
-        )}
+            {showLoading && (
+              <TableRow>
+                <TableCell colSpan={HEADERS.length} className='flex gap-4'>
+                  <Oval width={16} height={16} color='white' secondaryColor='white' />
+                </TableCell>
+              </TableRow>
+            )}
 
-        {showValidators &&
-          validatorInfos.map(validatorInfo => (
-            <ValidatorInfoRow
-              key={getValidator(validatorInfo).name}
-              loading={loading}
-              validatorInfo={validatorInfo}
-              votingPowerByValidatorInfo={votingPowerByValidatorInfo}
-            />
-          ))}
-      </TableBody>
-    </Table>
+            {showValidators &&
+              validatorInfos.map(validatorInfo => (
+                <ValidatorInfoRow
+                  key={getValidator(validatorInfo).name}
+                  loading={loading}
+                  validatorInfo={validatorInfo}
+                  votingPowerByValidatorInfo={votingPowerByValidatorInfo}
+                />
+              ))}
+          </TableBody>
+        </Table>
+      </CardContent>
+    </Card>
   );
 };

From 6d8b64af1085303a00f39ba9cbfec8d12cf81e49 Mon Sep 17 00:00:00 2001
From: Jesse Pinho <jesse@jessepinho.com>
Date: Wed, 21 Feb 2024 14:44:11 -0800
Subject: [PATCH 2/3] Rename type/helper

---
 apps/webapp/src/components/dashboard/assets-table.tsx | 9 +++------
 apps/webapp/src/fetchers/balances/by-account.ts       | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/apps/webapp/src/components/dashboard/assets-table.tsx b/apps/webapp/src/components/dashboard/assets-table.tsx
index 5ba8e1b32c..e2634ae875 100644
--- a/apps/webapp/src/components/dashboard/assets-table.tsx
+++ b/apps/webapp/src/components/dashboard/assets-table.tsx
@@ -2,20 +2,17 @@ import { LoaderFunction, useLoaderData } from 'react-router-dom';
 import { throwIfExtNotInstalled } from '../../utils/is-connected.ts';
 import { AddressIcon } from '@penumbra-zone/ui/components/ui/address-icon';
 import { AddressComponent } from '@penumbra-zone/ui/components/ui/address-component';
-import {
-  AccountGroupedBalances,
-  getBalancesByAccount,
-} from '../../fetchers/balances/by-account.ts';
+import { BalancesByAccount, getBalancesByAccount } from '../../fetchers/balances/by-account.ts';
 import { Table, TableBody, TableCell, TableRow } from '@penumbra-zone/ui';
 import { ValueViewComponent } from '@penumbra-zone/ui/components/ui/tx/view/value.tsx';
 
-export const AssetsLoader: LoaderFunction = async (): Promise<AccountGroupedBalances[]> => {
+export const AssetsLoader: LoaderFunction = async (): Promise<BalancesByAccount[]> => {
   throwIfExtNotInstalled();
   return await getBalancesByAccount();
 };
 
 export default function AssetsTable() {
-  const data = useLoaderData() as AccountGroupedBalances[];
+  const data = useLoaderData() as BalancesByAccount[];
 
   if (data.length === 0) {
     return (
diff --git a/apps/webapp/src/fetchers/balances/by-account.ts b/apps/webapp/src/fetchers/balances/by-account.ts
index d25fc5c8f0..a6eca539f9 100644
--- a/apps/webapp/src/fetchers/balances/by-account.ts
+++ b/apps/webapp/src/fetchers/balances/by-account.ts
@@ -4,16 +4,13 @@ import {
 } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/keys/v1/keys_pb';
 import { AssetBalance, getAssetBalances } from './index.ts';
 
-export interface AccountGroupedBalances {
+export interface BalancesByAccount {
   index: AddressIndex;
   address: Address;
   balances: AssetBalance[];
 }
 
-const groupByAccount = (
-  acc: AccountGroupedBalances[],
-  curr: AssetBalance,
-): AccountGroupedBalances[] => {
+const groupByAccount = (acc: BalancesByAccount[], curr: AssetBalance): BalancesByAccount[] => {
   if (curr.address.addressView.case !== 'decoded') throw new Error('address is not decoded');
   if (!curr.address.addressView.value.address) throw new Error('no address in address view');
   if (!curr.address.addressView.value.index) throw new Error('no index in address view');
@@ -34,7 +31,7 @@ const groupByAccount = (
   return acc;
 };
 
-export const getBalancesByAccount = async (): Promise<AccountGroupedBalances[]> => {
+export const getBalancesByAccount = async (): Promise<BalancesByAccount[]> => {
   const balances = await getAssetBalances();
   return balances.reduce(groupByAccount, []);
 };

From 63c962cfbdc1fd2d87a1d366e94c4e8fc8c4eb1c Mon Sep 17 00:00:00 2001
From: Jesse Pinho <jesse@jessepinho.com>
Date: Wed, 21 Feb 2024 15:07:55 -0800
Subject: [PATCH 3/3] Show unstaked tokens on Validators page

---
 apps/webapp/src/components/root-router.tsx    |  3 +-
 .../components/staking/accounts/account.tsx   | 42 +++++++++++++++++++
 .../src/components/staking/accounts/index.tsx | 15 +++++++
 apps/webapp/src/components/staking/layout.tsx | 19 ++++++++-
 4 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 apps/webapp/src/components/staking/accounts/account.tsx
 create mode 100644 apps/webapp/src/components/staking/accounts/index.tsx

diff --git a/apps/webapp/src/components/root-router.tsx b/apps/webapp/src/components/root-router.tsx
index 94f976ca65..5fadd0ffef 100644
--- a/apps/webapp/src/components/root-router.tsx
+++ b/apps/webapp/src/components/root-router.tsx
@@ -12,7 +12,7 @@ import { Receive } from './send/receive.tsx';
 import { ErrorBoundary } from './shared/error-boundary.tsx';
 import { SwapLayout } from './swap/layout.tsx';
 import { SwapLoader } from './swap/swap-loader.tsx';
-import { StakingLayout } from './staking/layout.tsx';
+import { StakingLayout, StakingLoader } from './staking/layout.tsx';
 
 export const rootRouter = createHashRouter([
   {
@@ -73,6 +73,7 @@ export const rootRouter = createHashRouter([
       },
       {
         path: PagePath.STAKING,
+        loader: StakingLoader,
         element: <StakingLayout />,
       },
     ],
diff --git a/apps/webapp/src/components/staking/accounts/account.tsx b/apps/webapp/src/components/staking/accounts/account.tsx
new file mode 100644
index 0000000000..464687080c
--- /dev/null
+++ b/apps/webapp/src/components/staking/accounts/account.tsx
@@ -0,0 +1,42 @@
+import { getDisplayDenomFromView } from '@penumbra-zone/types';
+import {
+  Card,
+  CardContent,
+  CardHeader,
+  CardTitle,
+  Table,
+  TableBody,
+  TableCell,
+  TableRow,
+} from '@penumbra-zone/ui';
+import { BalancesByAccount } from '../../../fetchers/balances/by-account';
+import { ValueViewComponent } from '@penumbra-zone/ui/components/ui/tx/view/value';
+import { useMemo } from 'react';
+
+export const Account = ({ account }: { account: BalancesByAccount }) => {
+  const unstakedBalance = useMemo(
+    () => account.balances.find(balance => getDisplayDenomFromView(balance.value) === 'penumbra'),
+    [account.balances],
+  );
+
+  if (!unstakedBalance) return null;
+
+  return (
+    <Card gradient>
+      <CardHeader>
+        <CardTitle>Account #{account.index.account}</CardTitle>
+      </CardHeader>
+      <CardContent>
+        <Table>
+          <TableBody>
+            <TableRow>
+              <TableCell>
+                <ValueViewComponent view={unstakedBalance.value} />
+              </TableCell>
+            </TableRow>
+          </TableBody>
+        </Table>
+      </CardContent>
+    </Card>
+  );
+};
diff --git a/apps/webapp/src/components/staking/accounts/index.tsx b/apps/webapp/src/components/staking/accounts/index.tsx
new file mode 100644
index 0000000000..696ad6b381
--- /dev/null
+++ b/apps/webapp/src/components/staking/accounts/index.tsx
@@ -0,0 +1,15 @@
+import { useLoaderData } from 'react-router-dom';
+import { BalancesByAccount } from '../../../fetchers/balances/by-account';
+import { Account } from './account';
+
+export const Accounts = () => {
+  const balancesByAccount = useLoaderData() as BalancesByAccount[];
+
+  return (
+    <>
+      {balancesByAccount.map(account => (
+        <Account account={account} key={account.index.account} />
+      ))}
+    </>
+  );
+};
diff --git a/apps/webapp/src/components/staking/layout.tsx b/apps/webapp/src/components/staking/layout.tsx
index 97c6c36ec4..6ae6aaf810 100644
--- a/apps/webapp/src/components/staking/layout.tsx
+++ b/apps/webapp/src/components/staking/layout.tsx
@@ -1,11 +1,26 @@
+import { LoaderFunction } from 'react-router-dom';
+import { BalancesByAccount, getBalancesByAccount } from '../../fetchers/balances/by-account';
+import { throwIfExtNotInstalled } from '../../utils/is-connected';
 import { EduInfoCard } from '../shared/edu-panels/edu-info-card';
 import { EduPanel } from '../shared/edu-panels/content';
 import { ValidatorsTable } from './validators-table';
+import { Accounts } from './accounts';
+import { cn } from '@penumbra-zone/ui/lib/utils';
+
+export const StakingLoader: LoaderFunction = async (): Promise<BalancesByAccount[]> => {
+  throwIfExtNotInstalled();
+  const balancesByAccount = await getBalancesByAccount();
+  return balancesByAccount;
+};
+
+const GAPS = 'gap-6 md:gap-4 xl:gap-5';
 
 export const StakingLayout = () => {
   return (
-    <div className='grid gap-6 md:grid-cols-3 md:gap-4 xl:gap-5'>
-      <div className='col-span-2'>
+    <div className={cn('grid md:grid-cols-3', GAPS)}>
+      <div className={cn('col-span-2 flex flex-col', GAPS)}>
+        <Accounts />
+
         <ValidatorsTable />
       </div>