From 2ba18d2f05de60648d68da3cb5aa29b9bd6d570d Mon Sep 17 00:00:00 2001
From: Linkie Link <linkielink.dev@gmail.com>
Date: Wed, 20 Sep 2023 11:16:47 +0200
Subject: [PATCH] Max margin trade fix (#490)

* fix: margin trading fix

* fix: accountsBalancesTable fix

* fix: show detailed APR where we have the space

* fix: smallerThan not biggerThan

* fix: be more precise on the decimals

* tidy: refactor
---
 .../Account/AccountBalancesTable/index.tsx    | 12 ++++++-----
 src/components/Account/AccountComposition.tsx |  6 +++---
 src/components/AmountAndValue.tsx             |  8 ++++++--
 src/components/DisplayCurrency.tsx            | 20 +++++++++++--------
 src/components/FormattedNumber.tsx            | 12 ++++++++++-
 src/components/Portfolio/Account/Summary.tsx  | 11 +++++++---
 .../Trade/TradeModule/SwapForm/index.tsx      |  6 ++++--
 src/constants/math.ts                         |  4 ++++
 8 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/src/components/Account/AccountBalancesTable/index.tsx b/src/components/Account/AccountBalancesTable/index.tsx
index 03b26ef9..37622ab8 100644
--- a/src/components/Account/AccountBalancesTable/index.tsx
+++ b/src/components/Account/AccountBalancesTable/index.tsx
@@ -20,6 +20,7 @@ import { FormattedNumber } from 'components/FormattedNumber'
 import { SortAsc, SortDesc, SortNone } from 'components/Icons'
 import Text from 'components/Text'
 import { ASSETS } from 'constants/assets'
+import { MAX_AMOUNT_DECIMALS, MIN_AMOUNT } from 'constants/math'
 import { ORACLE_DENOM } from 'constants/oracle'
 import useCurrentAccount from 'hooks/useCurrentAccount'
 import useMarketAssets from 'hooks/useMarketAssets'
@@ -99,23 +100,24 @@ export default function Index(props: Props) {
             row.original.amount,
             getAssetByDenom(row.original.denom) ?? ASSETS[0],
           )
-          if (amount >= 0.01)
+          if (amount >= 1)
             return (
               <FormattedNumber
                 className={className}
                 amount={amount}
-                options={{ abbreviated: true }}
+                options={{ abbreviated: true, maxDecimals: MAX_AMOUNT_DECIMALS }}
                 animate
               />
             )
 
-          const formattedAmount = formatAmountToPrecision(amount, 1)
+          const formattedAmount = formatAmountToPrecision(amount, MAX_AMOUNT_DECIMALS)
           return (
             <FormattedNumber
               className={className}
-              amount={formattedAmount}
+              smallerThanThreshold={formattedAmount < MIN_AMOUNT}
+              amount={formattedAmount < MIN_AMOUNT ? MIN_AMOUNT : formattedAmount}
               options={{
-                maxDecimals: baseCurrency.decimals,
+                maxDecimals: MAX_AMOUNT_DECIMALS,
                 minDecimals: 0,
               }}
               animate
diff --git a/src/components/Account/AccountComposition.tsx b/src/components/Account/AccountComposition.tsx
index 3c4b3c61..fa21b068 100644
--- a/src/components/Account/AccountComposition.tsx
+++ b/src/components/Account/AccountComposition.tsx
@@ -6,7 +6,7 @@ import DisplayCurrency from 'components/DisplayCurrency'
 import { FormattedNumber } from 'components/FormattedNumber'
 import { ArrowRight } from 'components/Icons'
 import Text from 'components/Text'
-import { BN_ZERO } from 'constants/math'
+import { BN_ZERO, MAX_AMOUNT_DECIMALS } from 'constants/math'
 import { ORACLE_DENOM } from 'constants/oracle'
 import useBorrowMarketAssetsTableData from 'hooks/useBorrowMarketAssetsTableData'
 import useLendingMarketAssetsTableData from 'hooks/useLendingMarketAssetsTableData'
@@ -134,7 +134,7 @@ function Item(props: ItemProps) {
         {props.isPercentage ? (
           <FormattedNumber
             amount={current.toNumber()}
-            options={{ suffix: '%', minDecimals: 2, maxDecimals: 2 }}
+            options={{ suffix: '%', minDecimals: 2, maxDecimals: MAX_AMOUNT_DECIMALS }}
             className='text-sm'
             animate
           />
@@ -152,7 +152,7 @@ function Item(props: ItemProps) {
             {props.isPercentage ? (
               <FormattedNumber
                 amount={change.toNumber()}
-                options={{ suffix: '%', minDecimals: 2, maxDecimals: 2 }}
+                options={{ suffix: '%', minDecimals: 2, maxDecimals: MAX_AMOUNT_DECIMALS }}
                 className={classNames('text-sm', increase ? 'text-profit' : 'text-loss')}
                 animate
               />
diff --git a/src/components/AmountAndValue.tsx b/src/components/AmountAndValue.tsx
index eae90b8f..67fb6368 100644
--- a/src/components/AmountAndValue.tsx
+++ b/src/components/AmountAndValue.tsx
@@ -1,6 +1,8 @@
 import DisplayCurrency from 'components/DisplayCurrency'
 import { FormattedNumber } from 'components/FormattedNumber'
+import { MAX_AMOUNT_DECIMALS, MIN_AMOUNT } from 'constants/math'
 import { BNCoin } from 'types/classes/BNCoin'
+import { demagnify } from 'utils/formatters'
 
 interface Props {
   asset: Asset
@@ -8,11 +10,13 @@ interface Props {
 }
 
 export default function AmountAndValue(props: Props) {
+  const amount = demagnify(props.amount.toString(), props.asset)
   return (
     <div className='flex flex-col gap-[0.5] text-xs'>
       <FormattedNumber
-        amount={props.amount.toNumber()}
-        options={{ decimals: props.asset.decimals, abbreviated: true }}
+        amount={amount < MIN_AMOUNT ? MIN_AMOUNT : amount}
+        smallerThanThreshold={amount < MIN_AMOUNT}
+        options={{ abbreviated: true, maxDecimals: MAX_AMOUNT_DECIMALS }}
         animate
       />
       <DisplayCurrency
diff --git a/src/components/DisplayCurrency.tsx b/src/components/DisplayCurrency.tsx
index 18b4f2d8..8939deb3 100644
--- a/src/components/DisplayCurrency.tsx
+++ b/src/components/DisplayCurrency.tsx
@@ -4,13 +4,13 @@ import { useMemo } from 'react'
 import { FormattedNumber } from 'components/FormattedNumber'
 import { DEFAULT_SETTINGS } from 'constants/defaultSettings'
 import { DISPLAY_CURRENCY_KEY } from 'constants/localStore'
+import { ORACLE_DENOM } from 'constants/oracle'
 import useLocalStorage from 'hooks/useLocalStorage'
 import usePrices from 'hooks/usePrices'
 import { BNCoin } from 'types/classes/BNCoin'
 import { getDisplayCurrencies } from 'utils/assets'
 import { getCoinValue } from 'utils/formatters'
 import { BN } from 'utils/helpers'
-import { ORACLE_DENOM } from 'constants/oracle'
 
 interface Props {
   coin: BNCoin
@@ -34,12 +34,6 @@ export default function DisplayCurrency(props: Props) {
   )
 
   const isUSD = displayCurrencyAsset.id === 'USD'
-  const prefix = isUSD
-    ? `${props.isApproximation ? '~ ' : ''}$`
-    : `${props.isApproximation ? '~ ' : ''}`
-  const suffix = isUSD
-    ? ''
-    : ` ${displayCurrencyAsset.symbol ? ` ${displayCurrencyAsset.symbol}` : ''}`
 
   const amount = useMemo(() => {
     const coinValue = getCoinValue(props.coin, prices)
@@ -55,13 +49,23 @@ export default function DisplayCurrency(props: Props) {
     return coinValue.div(displayPrice).toNumber()
   }, [displayCurrency, displayCurrencyAsset.decimals, prices, props.coin])
 
+  const isLessThanACent = isUSD && amount < 0.01 && amount > 0
+  const smallerThanPrefix = isLessThanACent ? '< ' : ''
+
+  const prefix = isUSD
+    ? `${props.isApproximation ? '~ ' : smallerThanPrefix}$`
+    : `${props.isApproximation ? '~ ' : ''}`
+  const suffix = isUSD
+    ? ''
+    : ` ${displayCurrencyAsset.symbol ? ` ${displayCurrencyAsset.symbol}` : ''}`
+
   return (
     <FormattedNumber
       className={classNames(
         props.className,
         props.parentheses && 'before:content-["("] after:content-[")"]',
       )}
-      amount={amount}
+      amount={isLessThanACent ? 0.01 : amount}
       options={{
         minDecimals: isUSD ? 2 : 0,
         maxDecimals: 2,
diff --git a/src/components/FormattedNumber.tsx b/src/components/FormattedNumber.tsx
index 35728f15..798cb33c 100644
--- a/src/components/FormattedNumber.tsx
+++ b/src/components/FormattedNumber.tsx
@@ -13,6 +13,7 @@ interface Props {
   className?: string
   animate?: boolean
   parentheses?: boolean
+  smallerThanThreshold?: boolean
 }
 
 export const FormattedNumber = React.memo(
@@ -23,6 +24,15 @@ export const FormattedNumber = React.memo(
     )
     const prevAmountRef = useRef<number>(0)
 
+    let { options, smallerThanThreshold } = props
+
+    if (smallerThanThreshold) {
+      if (!options) options = { prefix: '< ' }
+      if (options.prefix && options.prefix.substring(0, 1) !== '<')
+        options.prefix = `< ${options.prefix}`
+      else options.prefix = '< '
+    }
+
     useEffect(() => {
       if (prevAmountRef.current !== props.amount) prevAmountRef.current = props.amount
     }, [props.amount])
@@ -47,7 +57,7 @@ export const FormattedNumber = React.memo(
             props.className,
           )}
         >
-          {formatValue(props.amount.toString(), props.options)}
+          {formatValue(props.amount.toString(), options)}
         </p>
       )
 
diff --git a/src/components/Portfolio/Account/Summary.tsx b/src/components/Portfolio/Account/Summary.tsx
index bed2f243..3e4de18c 100644
--- a/src/components/Portfolio/Account/Summary.tsx
+++ b/src/components/Portfolio/Account/Summary.tsx
@@ -8,6 +8,7 @@ import { Heart } from 'components/Icons'
 import Loading from 'components/Loading'
 import Text from 'components/Text'
 import TitleAndSubCell from 'components/TitleAndSubCell'
+import { MAX_AMOUNT_DECIMALS } from 'constants/math'
 import { ORACLE_DENOM } from 'constants/oracle'
 import useAccount from 'hooks/useAccount'
 import useBorrowMarketAssetsTableData from 'hooks/useBorrowMarketAssetsTableData'
@@ -70,7 +71,11 @@ function Content(props: Props) {
       },
       {
         title: (
-          <FormattedNumber className='text-xl' amount={apr.toNumber()} options={{ suffix: '%' }} />
+          <FormattedNumber
+            className='text-xl'
+            amount={apr.toNumber()}
+            options={{ suffix: '%', maxDecimals: MAX_AMOUNT_DECIMALS, minDecimals: 2 }}
+          />
         ),
         sub: STATS[3].sub,
       },
@@ -105,7 +110,7 @@ interface SkeletonProps extends Props {
 
 function Skeleton(props: SkeletonProps) {
   return (
-    <div className='flex flex-col py-8 gap-8'>
+    <div className='flex flex-col gap-8 py-8'>
       <div className='flex justify-between'>
         <Text size='2xl'>Credit Account {props.accountId}</Text>
         <div className='flex gap-1 max-w-[300px] flex-grow'>
@@ -115,7 +120,7 @@ function Skeleton(props: SkeletonProps) {
       </div>
       <div className='grid grid-cols-2 gap-4 lg:grid-cols-5 md:grid-cols-4 sm:grid-cols-3'>
         {props.stats.map((stat) => (
-          <Card key={stat.sub} className='p-6 bg-white/5 flex-grow-1 text-center'>
+          <Card key={stat.sub} className='p-6 text-center bg-white/5 flex-grow-1'>
             <TitleAndSubCell
               title={stat.title || <Loading className='w-20 h-6 mx-auto mb-2' />}
               sub={stat.sub}
diff --git a/src/components/Trade/TradeModule/SwapForm/index.tsx b/src/components/Trade/TradeModule/SwapForm/index.tsx
index c10c50b8..1ee14959 100644
--- a/src/components/Trade/TradeModule/SwapForm/index.tsx
+++ b/src/components/Trade/TradeModule/SwapForm/index.tsx
@@ -12,7 +12,7 @@ import { AvailableOrderType } from 'components/Trade/TradeModule/SwapForm/OrderT
 import TradeSummary from 'components/Trade/TradeModule/SwapForm/TradeSummary'
 import { DEFAULT_SETTINGS } from 'constants/defaultSettings'
 import { SLIPPAGE_KEY } from 'constants/localStore'
-import { BN_ZERO } from 'constants/math'
+import { BN_ZERO, MARGIN_TRADE_BUFFER } from 'constants/math'
 import useAutoLend from 'hooks/useAutoLend'
 import useCurrentAccount from 'hooks/useCurrentAccount'
 import useHealthComputer from 'hooks/useHealthComputer'
@@ -27,7 +27,7 @@ import { BNCoin } from 'types/classes/BNCoin'
 import { byDenom } from 'utils/array'
 import { defaultFee } from 'utils/constants'
 import { getCapLeftWithBuffer } from 'utils/generic'
-import { asyncThrottle, BN } from 'utils/helpers'
+import { BN, asyncThrottle } from 'utils/helpers'
 
 interface Props {
   buyAsset: Asset
@@ -108,6 +108,8 @@ export default function SwapForm(props: Props) {
   const [maxSellAmount, sellSideMarginThreshold, marginRatio] = useMemo(() => {
     const maxAmount = computeMaxSwapAmount(sellAsset.denom, buyAsset.denom, 'default')
     const maxAmountOnMargin = computeMaxSwapAmount(sellAsset.denom, buyAsset.denom, 'margin')
+      .multipliedBy(MARGIN_TRADE_BUFFER)
+      .integerValue()
     const marginRatio = maxAmount.dividedBy(maxAmountOnMargin)
 
     estimateExactIn(
diff --git a/src/constants/math.ts b/src/constants/math.ts
index 1e899593..80110d2e 100644
--- a/src/constants/math.ts
+++ b/src/constants/math.ts
@@ -2,3 +2,7 @@ import { BN } from 'utils/helpers'
 
 export const BN_ZERO = BN(0)
 export const BN_ONE = BN(1)
+
+export const MARGIN_TRADE_BUFFER = 0.9
+export const MIN_AMOUNT = 0.000001
+export const MAX_AMOUNT_DECIMALS = 6