refactor: bonds

src/pages/deibonds/swap.tsx → src/components/App/Bonds/swap.tsx

@@ -58,7 +58,7 @@ export default function SwapPage({ onSwitch }: { onSwitch: any }) {
   const debouncedAmountIn = useDebounce(amountIn, 500)
   const deiCurrency = DEI_TOKEN
   const bdeiCurrency = BDEI_TOKEN
-  const deiCurrencyBalance = useCurrencyBalance(account ?? undefined, deiCurrency)
+  const bDeiCurrencyBalance = useCurrencyBalance(account ?? undefined, bdeiCurrency)
   const { amountOut } = useSwapAmountsOut(debouncedAmountIn, deiCurrency)
 
   // Amount typed in either fields
@@ -71,9 +71,9 @@ export default function SwapPage({ onSwitch }: { onSwitch: any }) {
   }, [amountOut, deiCurrency])
 
   const insufficientBalance = useMemo(() => {
-    if (!deiAmount) return false
-    return deiCurrencyBalance?.lessThan(deiAmount)
-  }, [deiCurrencyBalance, deiAmount])
+    if (!bdeiAmount) return false
+    return bDeiCurrencyBalance?.lessThan(bdeiAmount)
+  }, [bDeiCurrencyBalance, bdeiAmount])
 
   const {
     state: redeemCallbackState,
@@ -152,7 +152,7 @@ export default function SwapPage({ onSwitch }: { onSwitch: any }) {
       return null
     }
     if (insufficientBalance) {
-      return <RedeemButton disabled>Insufficient {deiCurrency?.symbol} Balance</RedeemButton>
+      return <RedeemButton disabled>Insufficient {bdeiCurrency?.symbol} Balance</RedeemButton>
     }
     if (awaitingRedeemConfirmation) {
       return (

src/hooks/useSwapCallback.ts

@@ -41,7 +41,7 @@ export default function useSwapCallback(
 
       const methodName = 'swap'
 
-      const subtractSlippage = toBN(toHex(bdeiAmount.quotient))
+      const subtractSlippage = toBN(toHex(deiAmount.quotient))
         .multipliedBy((100 - Number(slippage)) / 100)
         .toFixed(0, 1)
 
@@ -79,8 +79,8 @@ export default function useSwapCallback(
     return {
       state: RedeemCallbackState.VALID,
       error: null,
-      callback: async function onRedeem(): Promise<string> {
-        console.log('onRedeem callback')
+      callback: async function onSwap(): Promise<string> {
+        console.log('onSwap callback')
         const call = constructCall()
         const { address, calldata, value } = call
 

src/pages/deibonds/index.tsx

@@ -1,11 +1,12 @@
 import React, { useState } from 'react'
 import styled from 'styled-components'
+
 import Hero, { HeroSubtext } from 'components/Hero'
 import Disclaimer from 'components/Disclaimer'
 import { Navigation, NavigationTypes } from 'components/StableCoin'
-import Mint from './mint'
-import Swap from './swap'
-import Redeem from './redeem'
+import Mint from 'components/App/Bonds/mint'
+import Redeem from 'components/App/Bonds/redeem'
+import Swap from 'components/App/Bonds/swap'
 
 const Container = styled.div`
   display: flex;