blockworks-foundation
/
mango-v4-ui
mirror of https://github.com/blockworks-foundation/mango-v4-ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use scaled weight and fix rounding

This commit is contained in:
saml33 2023-07-18 13:09:57 +10:00
parent d22c659541
commit 5505647524
2 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
components/TokenList.tsx
View File

@ -160,8 +160,12 @@ const TokenList = () => {
initContributions.find((val) => val.asset === bank.name)
?.contribution || 0
const assetWeight = bank.initAssetWeight.toNumber()
const liabWeight = bank.initLiabWeight.toNumber()
const assetWeight = bank
.scaledInitAssetWeight(bank.price)
.toFixed(2)
const liabWeight = bank
.scaledInitLiabWeight(bank.price)
.toFixed(2)
return (
<TrBody key={bank.name}>
@ -182,14 +186,17 @@ const TokenList = () => {
</Td>
<Td className="text-right">
<p>
<FormatNumericValue value={collateralValue} isUsd />
<FormatNumericValue
value={collateralValue}
decimals={2}
isUsd
/>
</p>
<p className="text-sm text-th-fgd-4">
<FormatNumericValue
value={
collateralValue >= 0 ? assetWeight : liabWeight
collateralValue <= -0.01 ? liabWeight : assetWeight
}
decimals={2}
/>
x
</p>
@ -299,8 +306,10 @@ const MobileTokenListItem = ({ bank }: { bank: BankWithBalance }) => {
initContributions.find((val) => val.asset === tokenBank.name)
?.contribution || 0
const assetWeight = tokenBank.initAssetWeight.toNumber()
const liabWeight = tokenBank.initLiabWeight.toNumber()
const assetWeight = tokenBank
.scaledInitAssetWeight(tokenBank.price)
.toFixed(2)
const liabWeight = tokenBank.scaledInitLiabWeight(tokenBank.price).toFixed(2)
return (
<Disclosure>
@ -358,12 +367,17 @@ const MobileTokenListItem = ({ bank }: { bank: BankWithBalance }) => {
</p>
</Tooltip>
<p className="font-mono text-th-fgd-2">
<FormatNumericValue value={collateralValue} isUsd />
<FormatNumericValue
value={collateralValue}
decimals={2}
isUsd
/>
<span className="text-th-fgd-3">
{' '}
<FormatNumericValue
value={collateralValue >= 0 ? assetWeight : liabWeight}
decimals={2}
value={
collateralValue <= -0.01 ? liabWeight : assetWeight
}
/>
x
</span>

34
components/shared/BalancesTable.tsx
View File

@ -87,8 +87,10 @@ const BalancesTable = () => {
initContributions.find((val) => val.asset === bank.name)
?.contribution || 0
const assetWeight = bank.initAssetWeight.toNumber()
const liabWeight = bank.initLiabWeight.toNumber()
const assetWeight = bank
.scaledInitAssetWeight(bank.price)
.toFixed(2)
const liabWeight = bank.scaledInitLiabWeight(bank.price).toFixed(2)
return (
<TrBody key={bank.name} className="text-sm">
@ -111,12 +113,17 @@ const BalancesTable = () => {
</Td>
<Td className="text-right">
<p>
<FormatNumericValue value={collateralValue} isUsd />
<FormatNumericValue
value={collateralValue}
decimals={2}
isUsd
/>
</p>
<p className="text-sm text-th-fgd-4">
<FormatNumericValue
value={collateralValue >= 0 ? assetWeight : liabWeight}
decimals={2}
value={
collateralValue <= -0.01 ? liabWeight : assetWeight
}
/>
x
</p>
@ -145,8 +152,8 @@ const BalancesTable = () => {
initContributions.find((val) => val.asset === bank.name)
?.contribution || 0
const assetWeight = bank.initAssetWeight.toNumber()
const liabWeight = bank.initLiabWeight.toNumber()
const assetWeight = bank.scaledInitAssetWeight(bank.price).toFixed(2)
const liabWeight = bank.scaledInitLiabWeight(bank.price).toFixed(2)
return (
<Disclosure key={bank.name}>
@ -200,16 +207,19 @@ const BalancesTable = () => {
</p>
</Tooltip>
<p className="font-mono text-th-fgd-2">
<FormatNumericValue value={collateralValue} isUsd />
<FormatNumericValue
value={collateralValue}
decimals={2}
isUsd
/>
<span className="text-th-fgd-3">
{' '}
<FormatNumericValue
value={
collateralValue >= 0
? assetWeight
: liabWeight
collateralValue <= -0.01
? liabWeight
: assetWeight
}
decimals={2}
/>
x
</span>