Merge remote-tracking branch 'origin/master'

aloelabs · Sep 26, 2024 · 82219bf · 82219bf
2 parents c67160a + e7655bb
commit 82219bf
Show file tree

Hide file tree

Showing 27 changed files with 32 additions and 36 deletions.
diff --git a/earn/src/components/markets/borrow/BorrowingWidget.tsx b/earn/src/components/markets/borrow/BorrowingWidget.tsx
@@ -234,15 +234,14 @@ export default function BorrowingWidget(props: BorrowingWidgetProps) {
 
   let borrowModal: JSX.Element | null = null;
 
-  if (selectedBorrows != null && selectedCollateral != null) {
+  const borrowEntry = selectedBorrows ? filteredBorrowEntries.find((x) => x.token.equals(selectedBorrows)) : null;
+
+  if (selectedBorrows != null && selectedCollateral != null && borrowEntry?.matchingPairs.length) {
     if (collateralIsUniswapPosition(selectedCollateral)) {
       borrowModal = (
         <BorrowModalUniswap
           isOpen={selectedBorrows != null && selectedCollateral != null}
-          selectedLendingPair={
-            // TODO: improve this
-            filteredBorrowEntries.find((x) => x.token.equals(selectedBorrows))!.matchingPairs[0]
-          }
+          selectedLendingPair={borrowEntry.matchingPairs[0]}
           selectedCollateral={selectedCollateral}
           selectedBorrow={selectedBorrows}
           setIsOpen={() => {
@@ -256,10 +255,7 @@ export default function BorrowingWidget(props: BorrowingWidgetProps) {
       borrowModal = (
         <BorrowModal
           isOpen={selectedBorrows != null && selectedCollateral != null}
-          selectedLendingPair={
-            // TODO: improve this
-            filteredBorrowEntries.find((x) => x.token.equals(selectedBorrows))!.matchingPairs[0]
-          }
+          selectedLendingPair={borrowEntry.matchingPairs[0]}
           selectedCollateral={selectedCollateral}
           selectedBorrow={selectedBorrows}
           userBalance={tokenBalances.get(selectedCollateral.address)?.gn ?? GN.zero(selectedCollateral.decimals)}

diff --git a/earn/src/components/markets/supply/SupplyTable.tsx b/earn/src/components/markets/supply/SupplyTable.tsx
@@ -315,7 +315,7 @@ export default function SupplyTable(props: SupplyTableProps) {
                       onClick={() => {
                         const hasBadDebt =
                           row.suppliedBalance > row.withdrawableBalance &&
-                          ALOE_II_BAD_DEBT_LENDERS[activeChain.id].includes(row.kitty.address.toLowerCase());
+                          ALOE_II_BAD_DEBT_LENDERS[activeChain.id]?.includes(row.kitty.address.toLowerCase());
                         setSelectedRow({ row, action: hasBadDebt ? 'recover' : 'withdraw' });
                       }}
                       disabled={row.suppliedBalance === 0}

diff --git a/shared/src/assets/svg/tokens/apecoin.svg b/shared/src/assets/svg/tokens/apecoin.svg
diff --git a/shared/src/assets/svg/tokens/badger.svg b/shared/src/assets/svg/tokens/badger.svg
diff --git a/shared/src/assets/svg/tokens/bald.svg b/shared/src/assets/svg/tokens/bald.svg
diff --git a/shared/src/assets/svg/tokens/based.svg b/shared/src/assets/svg/tokens/based.svg
diff --git a/shared/src/assets/svg/tokens/cbeth.svg b/shared/src/assets/svg/tokens/cbeth.svg
diff --git a/shared/src/assets/svg/tokens/convex.svg b/shared/src/assets/svg/tokens/convex.svg
diff --git a/shared/src/assets/svg/tokens/dai.svg b/shared/src/assets/svg/tokens/dai.svg
diff --git a/shared/src/assets/svg/tokens/degen.svg b/shared/src/assets/svg/tokens/degen.svg
diff --git a/shared/src/assets/svg/tokens/frax.svg b/shared/src/assets/svg/tokens/frax.svg
diff --git a/shared/src/assets/svg/tokens/gmx.svg b/shared/src/assets/svg/tokens/gmx.svg
diff --git a/shared/src/assets/svg/tokens/lido.svg b/shared/src/assets/svg/tokens/lido.svg
diff --git a/shared/src/assets/svg/tokens/looks.svg b/shared/src/assets/svg/tokens/looks.svg
diff --git a/shared/src/assets/svg/tokens/lyra.svg b/shared/src/assets/svg/tokens/lyra.svg
diff --git a/shared/src/assets/svg/tokens/maker.svg b/shared/src/assets/svg/tokens/maker.svg
diff --git a/shared/src/assets/svg/tokens/matic.svg b/shared/src/assets/svg/tokens/matic.svg
diff --git a/shared/src/assets/svg/tokens/perp.svg b/shared/src/assets/svg/tokens/perp.svg
diff --git a/shared/src/assets/svg/tokens/pooltogether.svg b/shared/src/assets/svg/tokens/pooltogether.svg
diff --git a/shared/src/assets/svg/tokens/rai.svg b/shared/src/assets/svg/tokens/rai.svg
diff --git a/shared/src/assets/svg/tokens/rpl.svg b/shared/src/assets/svg/tokens/rpl.svg
diff --git a/shared/src/assets/svg/tokens/snx.svg b/shared/src/assets/svg/tokens/snx.svg
diff --git a/shared/src/assets/svg/tokens/uni.svg b/shared/src/assets/svg/tokens/uni.svg
diff --git a/shared/src/assets/svg/tokens/usdbc.svg b/shared/src/assets/svg/tokens/usdbc.svg
diff --git a/shared/src/assets/svg/tokens/velo.svg b/shared/src/assets/svg/tokens/velo.svg