Peter/fix interlay issues (#1300)

* chore: update monetary to latest 0.7.3 * fix: add missing translation and fix lend APY display * refactor: bring back formatting with 0 amount case covered * refactor: code review * refactor: code review
interlay · Jun 19, 2023 · 4a19226 · 4a19226 · vercel · Jun 19, 2023
1 parent 7669181
commit 4a19226
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/components/LoanPositionsTable/ApyCell.tsx b/src/components/LoanPositionsTable/ApyCell.tsx
@@ -32,7 +32,7 @@ const ApyCell = ({
 }: ApyCellProps): JSX.Element => {
   const rewardsApy = getSubsidyRewardApy(currency, rewardsPerYear, prices);
 
-  const totalApy = isBorrow ? apy.sub(rewardsApy || 0) : apy.add(rewardsApy || 0);
+  const totalApy = isBorrow ? (rewardsApy || Big(0)).sub(apy) : apy.add(rewardsApy || 0);
 
   const totalApyLabel = getApyLabel(totalApy);
 

diff --git a/src/pages/AMM/Pools/components/DepositForm/DepositOutputAssets.tsx b/src/pages/AMM/Pools/components/DepositForm/DepositOutputAssets.tsx
@@ -56,7 +56,7 @@ const DepositOutputAssets = ({ pool, values, prices }: DepositOutputAssetsProps)
   return (
     <Flex direction='column' gap='spacing4'>
       <P align='center' size='xs'>
-        {t('amm.pools.receivable_assets')}
+        {t('receivable_assets')}
       </P>
       <Dl direction='column' gap='spacing2'>
         <StyledDlGroup justifyContent='space-between'>

diff --git a/src/utils/helpers/loans.ts b/src/utils/helpers/loans.ts
@@ -11,6 +11,9 @@ const MIN_DECIMAL_NUMBER = 0.01;
 
 // MEMO: returns formatted apy or better representation of a very small apy
 const getApyLabel = (apy: Big): string => {
+  if (apy.eq(0)) {
+    return formatPercentage(0);
+  }
   const isPositive = apy.gt(0);
   const isTinyApy = isPositive ? apy.lt(MIN_DECIMAL_NUMBER) : apy.gt(-MIN_DECIMAL_NUMBER);