Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature: Collapsed Account list and expanded token balances #302

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feature: Collapsed Account list and expanded token balances #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 26 additions & 18 deletions app/components/transaction/TokenBalancesCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ export function TokenBalancesCard({ signature }: SignatureProps) {
return null;
}

return <TokenBalancesCardInner rows={rows} />
return <TokenBalancesCardInner rows={rows} />;
}

export type TokenBalancesCardInnerProps = {
rows: TokenBalanceRow[]
}

rows: TokenBalanceRow[];
};

export function TokenBalancesCardInner({ rows }: TokenBalancesCardInnerProps) {
const [expanded, setExpanded] = React.useState(true);
const { cluster, url } = useCluster();
const [tokenInfosLoading, setTokenInfosLoading] = useState(true);
const [tokenSymbols, setTokenSymbols] = useState<Map<string, string>>(new Map());
Expand All @@ -61,7 +61,7 @@ export function TokenBalancesCardInner({ rows }: TokenBalancesCardInnerProps) {
setTokenInfosLoading(false);
}
});
}, [])
}, []);

const accountRows = rows.map(({ account, delta, balance, mint }) => {
const key = account.toBase58() + mint;
Expand Down Expand Up @@ -89,20 +89,28 @@ export function TokenBalancesCardInner({ rows }: TokenBalancesCardInnerProps) {
<div className="card">
<div className="card-header">
<h3 className="card-header-title">Token Balances</h3>
<button
className={`btn btn-sm d-flex ${expanded ? 'btn-black active' : 'btn-white'}`}
onClick={() => setExpanded(e => !e)}
>
{expanded ? 'Collapse' : 'Expand'}
</button>
</div>
<div className="table-responsive mb-0">
<table className="table table-sm table-nowrap card-table">
<thead>
<tr>
<th className="text-muted">Address</th>
<th className="text-muted">Token</th>
<th className="text-muted">Change</th>
<th className="text-muted">Post Balance</th>
</tr>
</thead>
<tbody className="list">{accountRows}</tbody>
</table>
</div>
{expanded && (
<div className="table-responsive mb-0">
<table className="table table-sm table-nowrap card-table">
<thead>
<tr>
<th className="text-muted">Address</th>
<th className="text-muted">Token</th>
<th className="text-muted">Change</th>
<th className="text-muted">Post Balance</th>
</tr>
</thead>
<tbody className="list">{accountRows}</tbody>
</table>
</div>
)}
</div>
);
}
Expand Down
55 changes: 38 additions & 17 deletions app/tx/[signature]/page-client.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ function StatusCard({ signature, autoRefresh }: SignatureProps & AutoRefreshProp
const transaction = transactionWithMeta?.transaction;
const blockhash = transaction?.message.recentBlockhash;
const version = transactionWithMeta?.version;
const feePayer = transactionWithMeta?.transaction.message.accountKeys[0]?.pubkey;
const isNonce = (() => {
if (!transaction || transaction.message.instructions.length < 1) {
return false;
Expand Down Expand Up @@ -215,8 +216,9 @@ function StatusCard({ signature, autoRefresh }: SignatureProps & AutoRefreshProp
if (cluster === Cluster.MainnetBeta) {
errorLink = err.errorLink;
} else {
errorLink = `${err.errorLink}?cluster=${clusterName.toLowerCase()}${cluster === Cluster.Custom ? `&customUrl=${clusterUrl}` : ''
}`;
errorLink = `${err.errorLink}?cluster=${clusterName.toLowerCase()}${
cluster === Cluster.Custom ? `&customUrl=${clusterUrl}` : ''
}`;
}
}
}
Expand Down Expand Up @@ -318,6 +320,15 @@ function StatusCard({ signature, autoRefresh }: SignatureProps & AutoRefreshProp
</tr>
)}

{feePayer && (
<tr>
<td>Fee Payer</td>
<td className="text-lg-end">
<Address pubkey={feePayer} link />
</td>
</tr>
)}

{fee && (
<tr>
<td>Fee (SOL)</td>
Expand Down Expand Up @@ -384,6 +395,7 @@ function DetailsSection({ signature }: SignatureProps) {

function AccountsCard({ signature }: SignatureProps) {
const details = useTransactionDetails(signature);
const [expanded, setExpanded] = React.useState(false);

const transactionWithMeta = details?.data?.transactionWithMeta;
if (!transactionWithMeta) {
Expand Down Expand Up @@ -434,22 +446,31 @@ function AccountsCard({ signature }: SignatureProps) {
return (
<div className="card">
<div className="card-header">
<h3 className="card-header-title">Account Input(s)</h3>
</div>
<div className="table-responsive mb-0">
<table className="table table-sm table-nowrap card-table">
<thead>
<tr>
<th className="text-muted">#</th>
<th className="text-muted">Address</th>
<th className="text-muted">Change (SOL)</th>
<th className="text-muted">Post Balance (SOL)</th>
<th className="text-muted">Details</th>
</tr>
</thead>
<tbody className="list">{accountRows}</tbody>
</table>
<h3 className="card-header-title">Account List ({accountRows.length})</h3>
<button
className={`btn btn-sm d-flex ${expanded ? 'btn-black active' : 'btn-white'}`}
onClick={() => setExpanded(e => !e)}
>
{expanded ? 'Collapse' : 'Expand'}
</button>
</div>
{expanded && (
<div className="table-responsive mb-0">
<table className="table table-sm table-nowrap card-table">
<thead>
<tr>
<th className="text-muted">#</th>
<th className="text-muted">Address</th>
<th className="text-muted">Change (SOL)</th>
<th className="text-muted">Post Balance (SOL)</th>
<th className="text-muted">Details</th>
</tr>
</thead>

<tbody className="list">{accountRows}</tbody>
</table>
</div>
)}
</div>
);
}