Address comments and add Uniswap positions to health calcs

aloelabs · Feb 15, 2024 · c922989 · c922989
1 parent 8154475
commit c922989
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/earn/src/components/lend/BorrowingWidget.tsx b/earn/src/components/lend/BorrowingWidget.tsx
@@ -282,7 +282,7 @@ export default function BorrowingWidget(props: BorrowingWidgetProps) {
                         const hasNoCollateral =
                           account.assets.token0Raw === 0 &&
                           account.assets.token1Raw === 0 &&
-                          (account.uniswapPositions?.length || 0) === 0;
+                          (account.uniswapPositions ?? []).every((pos) => JSBI.EQ(pos.liquidity, '0'));
                         if (hasNoCollateral) return null;
                         const uniswapPosition = account.uniswapPositions?.at(0);
                         const collateral = account.assets.token0Raw > 0 ? account.token0 : account.token1;

diff --git a/earn/src/components/lend/modal/content/BorrowModalContent.tsx b/earn/src/components/lend/modal/content/BorrowModalContent.tsx
@@ -232,7 +232,7 @@ export default function BorrowModalContent(props: BorrowModalContentProps) {
   const maxBorrowsBasedOnHealth = maxBorrowAndWithdraw(
     borrower.assets,
     borrower.liabilities,
-    [], // TODO: add uniswap positions
+    borrower.uniswapPositions ?? [],
     borrower.sqrtPriceX96,
     borrower.iv,
     borrower.nSigma,
@@ -255,7 +255,7 @@ export default function BorrowModalContent(props: BorrowModalContentProps) {
   const { health: newHealth } = isHealthy(
     borrower.assets,
     newLiabilities,
-    [], // TODO: add uniswap positions
+    borrower.uniswapPositions ?? [],
     borrower.sqrtPriceX96,
     borrower.iv,
     borrower.nSigma,

diff --git a/earn/src/components/lend/modal/content/RepayModalContent.tsx b/earn/src/components/lend/modal/content/RepayModalContent.tsx
@@ -238,7 +238,7 @@ export default function RepayModalContent(props: RepayModalContentProps) {
   const { health: newHealth } = isHealthy(
     borrower.assets,
     newLiabilities,
-    [], // TODO: add uniswap positions
+    borrower.uniswapPositions ?? [],
     borrower.sqrtPriceX96,
     borrower.iv,
     borrower.nSigma,