Merge pull request #63 from studydefi/swap-collateral-enhance

Swap collateral 100%
studydefi · Apr 8, 2020 · 4be7b45 · 4be7b45 · vercel · Apr 8, 2020
2 parents d5c2b3f + 456578b
commit 4be7b45
Show file tree

Hide file tree

Showing 57 changed files with 60,041 additions and 60,369 deletions.
diff --git a/packages/frontend/features/swap-tokens/SwapConfirm.tsx b/packages/frontend/features/swap-tokens/SwapConfirm.tsx
@@ -52,16 +52,6 @@ const SwapConfirm = ({
           <Icon name="Launch" color={outline ? "primary" : "white"} ml="2" />
         </Flex>
       </MyButton>
-      {thingToSwap === "collateral" && (
-        <>
-          <Text fontSize="0" color="#999" fontWeight="bold" mt="2">
-            Due to nature of slippages:
-          </Text>
-          <Text fontSize="0" color="#999">
-            MAX: 95% (90% recommended)
-          </Text>
-        </>
-      )}
 
       <Modal isOpen={isOpen}>
         <Card width={"640px"} p={0}>

diff --git a/packages/frontend/features/swap-tokens/useIsAmountAvailable.ts b/packages/frontend/features/swap-tokens/useIsAmountAvailable.ts
@@ -3,7 +3,7 @@ import CompoundPositions from "../../containers/CompoundPositions";
 const useIsAmountAvailable = (
   amount: string,
   tokenStr: string,
-  thingToSwap: string,
+  thingToSwap: string
 ) => {
   const { compoundPositions } = CompoundPositions.useContainer();
 
@@ -17,7 +17,7 @@ const useIsAmountAvailable = (
   const canSwapAmount =
     thingToSwap === "debt"
       ? parseFloat(tokenBalance.borrow)
-      : 0.95 * parseFloat(tokenBalance.supply);
+      : parseFloat(tokenBalance.supply);
 
   const result = parseFloat(amount) <= canSwapAmount;
 

diff --git a/packages/frontend/features/swap-tokens/useSwap.ts b/packages/frontend/features/swap-tokens/useSwap.ts
@@ -52,7 +52,7 @@ const useSwap = (thingToSwap, fromTokenStr, toTokenStr, amountToSwap) => {
       let tx = null;
 
       try {
-        await swapDebt(
+        tx = await swapDebt(
           ADDRESS_MAP[fromTokenStr],
           ADDRESS_MAP[toTokenStr],
           amount