Skip to content

Fix balance display for uninitialized accounts #16

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

Merged
whichnode merged 1 commit into from
May 14, 2025
Merged

Fix balance display for uninitialized accounts #16

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
16 changes: 10 additions & 6 deletions web-app/src/modules/core/routes/Account/Account.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ const Account: FC<Props> = ({ accountAddress }) => {
// Correct balance display for un-migrated V7 slow wallets:
// If it's a slow wallet and not initialized then display unlocked as zero and balance as correct,
// add a note that account is not initialized
// Also all uninitialized accounts should be displayed as if they were slow wallets.
!account.initialized && ( <div>Note: this account has not been initialized</div> )
}

Expand All @@ -107,7 +108,7 @@ const Account: FC<Props> = ({ accountAddress }) => {
<div className="col-span-12 md:col-span-3 mt-5 gap-5">
<div className="overflow-hidden rounded-lg bg-white px-4 py-5 shadow sm:p-6">
<dt className="truncate text-sm font-medium text-gray-500">
{account.slowWallet ? <>Unlocked Balance</> : <>Balance</>}
{account.slowWallet || !account.initialized ? <>Unlocked Balance</> : <>Balance</>}
</dt>
<dd className="mt-1 md:text-2xl font-semibold tracking-tight text-gray-900">
{account.slowWallet ? (
Expand All @@ -117,27 +118,30 @@ const Account: FC<Props> = ({ accountAddress }) => {
<LibraAmount>{new Decimal(0)}</LibraAmount>
)
) : (
<LibraAmount>{new Decimal(data.account.balance)}</LibraAmount>
account.initialized ? (
<LibraAmount>{new Decimal(data.account.balance)}</LibraAmount>
) : (
<LibraAmount>{new Decimal(0)}</LibraAmount>
)
)}
</dd>
</div>
</div>
)}
{data.account.balance && account.slowWallet && (
{data.account.balance && (account.slowWallet || !account.initialized) && (
<div className="col-span-12 md:col-span-3 mt-5 gap-5">
<div className="overflow-hidden rounded-lg bg-white px-4 py-5 shadow sm:p-6">
<dt className="truncate text-sm font-medium text-gray-500">Locked</dt>
<dd className="mt-1 text-3xl font-semibold tracking-tight text-gray-900">
{account.initialized ? (
{account.initialized && account.slowWallet ? (
<LibraAmount>
{new Decimal(data.account.balance).minus(
new Decimal(account.slowWallet.unlocked),
)}
</LibraAmount>
</LibraAmount>
) : (
<LibraAmount>{new Decimal(data.account.balance)}</LibraAmount>
)

}
</dd>
</div>
Expand Down