feat: minor tweaks

yieldprotocol · Jun 17, 2021 · aa82dd6 · aa82dd6
1 parent ab68744
commit aa82dd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/components/YieldLiquidity.tsx b/src/components/YieldLiquidity.tsx
@@ -1,13 +1,10 @@
 import { ethers } from 'ethers';
 import { Box, ResponsiveContext, Text } from 'grommet';
 import React, { useContext, useEffect, useState } from 'react';
-import Loader from 'react-spinners/GridLoader';
 import styled from 'styled-components';
 import { UserContext } from '../contexts/UserContext';
-import { useApr } from '../hooks/aprHook';
-import { ActionType, ISeries, IUserContext } from '../types';
-import { cleanValue, nFormatter } from '../utils/displayUtils';
-import { buyBase, calculateAPR, secondsToFrom, sellBase } from '../utils/yieldMath';
+import { ISeries, IUserContext } from '../types';
+import { nFormatter } from '../utils/displayUtils';
 
 interface IYieldApr {
   input: string|undefined,
@@ -27,10 +24,9 @@ function YieldApr({ input }: IYieldApr) {
 
   /* STATE FROM CONTEXT */
   const { userState } = useContext(UserContext) as IUserContext;
-  const { activeAccount, assetMap, vaultMap, seriesMap, selectedSeriesId, selectedIlkId, selectedBaseId } = userState;
+  const { assetMap, seriesMap, selectedSeriesId, selectedBaseId } = userState;
   const selectedBase = assetMap.get(selectedBaseId!);
   const selectedSeries = seriesMap.get(selectedSeriesId!);
-  //   const selectedIlk = assetMap.get(selectedIlkId!);
 
   /* LOCAL STATE */
   const [totalLiquidity, setTotalLiquidity] = useState<string>();
@@ -42,7 +38,6 @@ function YieldApr({ input }: IYieldApr) {
       seriesMap && seriesMap.forEach((x:ISeries) => {
         if (x.baseId === baseId) total = total.add(x.totalSupply);
       });
-      console.log(ethers.utils.formatEther(total).toString());
       setTotalLiquidity(ethers.utils.formatEther(total).toString());
     }
   }, [seriesMap, selectedBase]);

diff --git a/src/hooks/borrowActions.ts b/src/hooks/borrowActions.ts
@@ -67,7 +67,6 @@ export const useBorrowActions = () => {
     const series = vault ? seriesMap.get(vault.seriesId) : seriesMap.get(selectedSeriesId);
     const ilk = vault ? assetMap.get(vault.ilkId) : assetMap.get(selectedIlkId);
 
-    console.log(selectedSeriesId);
     /* generate the reproducible txCode for tx tracking and tracing */
     const txCode = getTxCode(ActionCodes.BORROW, series.id);
 
@@ -93,15 +92,16 @@ export const useBorrowActions = () => {
       /* Include all the signatures gathered, if required */
       ...permits,
 
+      /* handle ETH deposit, if required */
+      ..._addEth(_collInput, series),
+
       /* If vault is null, build a new vault, else ignore */
       {
         operation: VAULT_OPS.BUILD,
         args: [vaultId, selectedSeriesId, selectedIlkId],
         series,
         ignore: !!vault,
       },
-      /* handle ETH deposit, if required */
-      ..._addEth(_collInput, series),
       {
         operation: VAULT_OPS.SERVE,
         args: [vaultId, account, _collInput, _input, MAX_128],