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

202412 vaults fix #68

Merged
merged 2 commits into from
Dec 19, 2024
Merged

202412 vaults fix #68

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d74d9e8
fix: add status wrapper to vaults list to fix crash
ZakMooney Dec 19, 2024
b735b0c
fix: dark/light mode color fix
ZakMooney Dec 19, 2024
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
71 changes: 56 additions & 15 deletions src/components/vaults/VaultList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const VaultList = ({ vaults, vaultsLoading, listType }) => {
</Typography>

<div className="overflow-x-auto">
<table className="table ">
<table className="table">
<thead>
<tr>
<th className="hidden md:table-cell">Type</th>
Expand All @@ -108,7 +108,7 @@ const VaultList = ({ vaults, vaultsLoading, listType }) => {
</thead>
{vaultsLoading ? (null) : (
<tbody>
{sortedVaults
{sortedVaults?.length && sortedVaults
.slice(
(currentPage - 1) * itemsPerPage,
currentPage * itemsPerPage
Expand All @@ -125,11 +125,44 @@ const VaultList = ({ vaults, vaultsLoading, listType }) => {
}
})
.map(function(vault, index) {
const vaultType = ethers.decodeBytes32String(vault.status.vaultType);
const vaultHealth = computeProgressBar(
vault.status.minted,
vault.status.totalCollateralValue
);
if (!vault.status) {
return(
<tr
key={index}
className="active animate-pulse"
>
<td className="hidden md:table-cell">
<div className="rounded-full bg-base-content h-[42px] w-[42px] opacity-30"></div>
</td>
<td>
<div className="rounded-lg bg-base-content h-[12px] w-[38px] opacity-30"></div>
</td>
<td className="hidden md:table-cell">
<div className="rounded-lg bg-base-content h-[12px] w-[72px] opacity-30"></div>
</td>
<td>
<div className="rounded-lg bg-base-content h-[12px] w-[92px] opacity-30"></div>
</td>
<td className="hidden md:table-cell">
<div className="rounded-lg bg-base-content h-[12px] w-[120px] opacity-30"></div>
</td>
<td className="text-right">
<div className="rounded-lg bg-base-content h-[38px] w-[64px] opacity-30"></div>
</td>
</tr>
)
}
let vaultType = '';
if (vault?.status?.vaultType) {
vaultType = ethers.decodeBytes32String(vault?.status?.vaultType);
}
let vaultHealth = 100;
if (vault?.status) {
vaultHealth = computeProgressBar(
vault?.status?.minted,
vault?.status?.totalCollateralValue
);
}
let healthColour = 'success';
if (vaultHealth >= 30) {
healthColour = 'neutral';
Expand All @@ -140,6 +173,7 @@ const VaultList = ({ vaults, vaultsLoading, listType }) => {
if (vaultHealth >= 75) {
healthColour = 'error';
}

return(
<tr
key={index}
Expand Down Expand Up @@ -181,10 +215,10 @@ const VaultList = ({ vaults, vaultsLoading, listType }) => {
</Tooltip>
</td>
<td>
{vault.status.version ? (
`V${vault.status.version}-`
{vault?.status?.version ? (
`V${vault?.status?.version}-`
) : ('')}
{BigInt(vault.tokenId).toString()}
{BigInt(vault?.tokenId).toString()}
</td>
<td className="hidden md:table-cell">
{currencySymbol}
Expand Down Expand Up @@ -225,11 +259,18 @@ const VaultList = ({ vaults, vaultsLoading, listType }) => {
<td className="text-right">
<Link
className="btn btn-outline"
to={`/vault/${
BigInt(
vault.tokenId
).toString()
}`}
disabled={!vault.tokenId}
to={
vault?.tokenId ? (
`/vault/${
BigInt(
vault?.tokenId
).toString()
}`
) : (
`/`
)
}
>
Manage
</Link>
Expand Down
Loading