LaconicNetwork/mars-v2-frontend
4
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: added updatedAccount to AccountSummary (#414)

Browse Source 
Co-authored-by: Bob van der Helm <34470358+bobthebuidlr@users.noreply.github.com>
This commit is contained in:
Linkie Link 2023-09-01 11:08:57 +02:00 committed by GitHub
parent fbb4207f93
commit 5a1d02393d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/Account/AccountSummary.tsx
View File

@ -1,5 +1,5 @@
import { HTMLAttributes, useMemo } from 'react'
import classNames from 'classnames' import classNames from 'classnames'
import { HTMLAttributes, useMemo } from 'react'
import Accordion from 'components/Accordion' import Accordion from 'components/Accordion'
import AccountBalancesTable from 'components/Account/AccountBalancesTable' import AccountBalancesTable from 'components/Account/AccountBalancesTable'
@ -7,6 +7,7 @@ import AccountComposition from 'components/Account/AccountComposition'
import HealthBar from 'components/Account/HealthBar' import HealthBar from 'components/Account/HealthBar'
import Card from 'components/Card' import Card from 'components/Card'
import DisplayCurrency from 'components/DisplayCurrency' import DisplayCurrency from 'components/DisplayCurrency'
import { FormattedNumber } from 'components/FormattedNumber'
import Text from 'components/Text' import Text from 'components/Text'
import { BN_ZERO } from 'constants/math' import { BN_ZERO } from 'constants/math'
import { ORACLE_DENOM } from 'constants/oracle' import { ORACLE_DENOM } from 'constants/oracle'
@ -18,7 +19,6 @@ import usePrices from 'hooks/usePrices'
import useStore from 'store' import useStore from 'store'
import { BNCoin } from 'types/classes/BNCoin' import { BNCoin } from 'types/classes/BNCoin'
import { calculateAccountBalanceValue, calculateAccountLeverage } from 'utils/accounts' import { calculateAccountBalanceValue, calculateAccountLeverage } from 'utils/accounts'
import { formatLeverage } from 'utils/formatters'
interface Props { interface Props {
account: Account account: Account
@ -29,8 +29,11 @@ export default function AccountSummary(props: Props) {
const { data: prices } = usePrices() const { data: prices } = usePrices()
const updatedAccount = useStore((s) => s.updatedAccount) const updatedAccount = useStore((s) => s.updatedAccount)
const accountBalance = useMemo( const accountBalance = useMemo(
() => (props.account ? calculateAccountBalanceValue(props.account, prices) : BN_ZERO), () =>
[props.account, prices], props.account
? calculateAccountBalanceValue(updatedAccount ?? props.account, prices)
: BN_ZERO,
[props.account, updatedAccount, prices],
) )
const { availableAssets: borrowAvailableAssets, accountBorrowedAssets } = const { availableAssets: borrowAvailableAssets, accountBorrowedAssets } =
useBorrowMarketAssetsTableData() useBorrowMarketAssetsTableData()
@ -47,8 +50,9 @@ export default function AccountSummary(props: Props) {
const { health } = useHealthComputer(props.account) const { health } = useHealthComputer(props.account)
const { health: updatedHealth } = useHealthComputer(updatedAccount) const { health: updatedHealth } = useHealthComputer(updatedAccount)
const leverage = useMemo( const leverage = useMemo(
() => (props.account ? calculateAccountLeverage(props.account, prices) : BN_ZERO), () =>
[props.account, prices], props.account ? calculateAccountLeverage(updatedAccount ?? props.account, prices) : BN_ZERO,
[props.account, updatedAccount, prices],
) )
if (!props.account) return null if (!props.account) return null
return ( return (
@ -61,7 +65,11 @@ export default function AccountSummary(props: Props) {
/> />
</Item> </Item>
<Item label='Leverage' classes='flex-1'> <Item label='Leverage' classes='flex-1'>
<Text size='sm'>{formatLeverage(leverage.toNumber())}</Text> <FormattedNumber
className='text-sm'
amount={leverage.toNumber()}
options={{ minDecimals: 2, suffix: 'x' }}
/>
</Item> </Item>
<Item label='Account health'> <Item label='Account health'>
<HealthBar health={health} updatedHealth={updatedHealth} className='w-[184px] h-1' /> <HealthBar health={health} updatedHealth={updatedHealth} className='w-[184px] h-1' />