Merge branch 'main' into feat/migrateCVXPositions

Rari-Capital · Mar 16, 2022 · 70b179c · 70b179c
2 parents 5abb55a + 65f3549
commit 70b179c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/components/pages/Fuse/FusePoolPage/BorrowList.tsx b/src/components/pages/Fuse/FusePoolPage/BorrowList.tsx
@@ -30,7 +30,7 @@ import {
   } from "hooks/rewards/usePoolIncentives";
 
   // Utils
-  import { convertMantissaToAPY } from "utils/apyUtils";
+  import { convertMantissaToAPR, convertMantissaToAPY } from "utils/apyUtils";
   import { shortUsdFormatter, smallUsdFormatter } from "utils/bigUtils";
   import { useCreateComptroller } from "utils/createComptroller";
   import { USDPricedFuseAsset } from "utils/fetchFusePoolData";
@@ -253,7 +253,7 @@ export const BorrowList = ({
 
     const tokenData = useTokenData(asset.underlyingToken);
 
-    const borrowAPY = convertMantissaToAPY(asset.borrowRatePerBlock, 365);
+    const borrowAPR = convertMantissaToAPR(asset.borrowRatePerBlock);
 
     const { t } = useTranslation();
 
@@ -335,7 +335,7 @@ export const BorrowList = ({
                 fontWeight="bold"
                 fontSize="17px"
               >
-                {borrowAPY.toFixed(2)}%
+                {borrowAPR.toFixed(2)}%
               </Text>
 
               {/* Demo Borrow Incentives */}

diff --git a/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx b/src/components/pages/Fuse/Modals/CVXMigrateModal.tsx
@@ -36,8 +36,6 @@ import { checkAllowanceAndApprove, collateralize, deposit, unstakeAndWithdrawCVX
 import { handleGenericError } from "utils/errorHandling"
 import { USDPricedFuseAsset } from "utils/fetchFusePoolData"
 
-
-
 export const CVXMigrateModal = ({
     isOpen,
     onClose,
@@ -135,6 +133,7 @@ export const CVXMigrateModal = ({
     const newTotalSupply = useTotalSupply(updatedUserAssets ?? [])
 
 
+
     /*  Unstakes and Claims all CVX Staked Positions supported by Fuse  */
     const handleUnstake = async () => {
         const { stakedBalance } = marketBalanceForAsset
@@ -148,6 +147,7 @@ export const CVXMigrateModal = ({
             }
         } catch (err) {
             setActiveStep(undefined)
+
             handleGenericError(err, toast)
         }
     }
@@ -163,6 +163,7 @@ export const CVXMigrateModal = ({
             setStep(3)
         } catch (err) {
             setActiveStep(undefined)
+
             handleGenericError(err, toast)
         }
     }
@@ -178,6 +179,7 @@ export const CVXMigrateModal = ({
             setStep(4)
         } catch (err) {
             setActiveStep(undefined)
+
             handleGenericError(err, toast)
         }
     }
@@ -192,6 +194,7 @@ export const CVXMigrateModal = ({
             setStep(5)
         } catch (err) {
             setActiveStep(undefined)
+
             handleGenericError(err, toast)
         }
     }
@@ -215,6 +218,7 @@ export const CVXMigrateModal = ({
     }, [assetIndex])
 
 
+
     return (
         <>
             <Modal isOpen={isOpen} onClose={onClose}>
@@ -227,6 +231,7 @@ export const CVXMigrateModal = ({
                                 Migrate Staked CVX Positions to Fuse
                             </Text>
                         </HStack>
+
                         <ModalCloseButton />
                     </ModalHeader>
                     <ModalBody>
@@ -284,6 +289,7 @@ export const CVXMigrateModal = ({
                                     </HStack>
                                 )}
 
+
                                 <HStack>
                                     <Text>
                                         3.)
@@ -308,6 +314,7 @@ export const CVXMigrateModal = ({
 
                                 {step === 5 && <Text>Done!</Text>}
 
+
                             </VStack>
                         </Flex>
                     </ModalBody>
@@ -365,4 +372,5 @@ const Market = ({
 
 
 
+
 export default CVXMigrateModal