Merge pull request #515 from primitivefinance/develop

Kovan support to prod
primitivefinance · Mar 13, 2021 · 147c910 · 147c910 · vercel · Mar 13, 2021
2 parents 6e3626a + 6572e89
commit 147c910
Show file tree

Hide file tree

Showing 20 changed files with 345 additions and 334 deletions.
diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/styles": "^4.10.0",
     "@metamask/onboarding": "^1.0.0",
-    "@primitivefi/sdk": "1.4.1",
-    "@primitivefi/v1-connectors": "2.2.0",
+    "@primitivefi/sdk": "1.4.2",
+    "@primitivefi/v1-connectors": "2.2.1",
     "@reduxjs/toolkit": "^1.4.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
@@ -66,7 +66,7 @@
     ]
   },
   "devDependencies": {
-    "@primitivefi/contracts": "0.4.4",
+    "@primitivefi/contracts": "0.6.0",
     "@sushiswap/sdk": "5.0.0-canary.3",
     "@types/jest": "^26.0.7",
     "@types/node": "^14.0.26",

diff --git a/src/components/Liquidity/LiquidityTable/LiquidityTableRow/LiquidityTableRow.tsx b/src/components/Liquidity/LiquidityTable/LiquidityTableRow/LiquidityTableRow.tsx
@@ -250,7 +250,6 @@ const LiquidityTableRow: React.FC<LiquidityTableRowProps> = ({
   const handleOnClick = useCallback(() => {
     //setProvide(true)
     setToggle(!toggle)
-    console.log(toggle)
     onClick()
   }, [toggle, item])
 
@@ -259,7 +258,6 @@ const LiquidityTableRow: React.FC<LiquidityTableRowProps> = ({
     onClick()
   }
   const nodeRef = useClickAway(() => {
-    console.log(toggle)
     setToggle(!toggle)
     onClick()
   })

diff --git a/src/components/Market/BalanceCard/index.tsx b/src/components/Market/BalanceCard/index.tsx
@@ -17,6 +17,7 @@ import { useItem } from '@/state/order/hooks'
 
 import useTokenBalance from '@/hooks/useTokenBalance'
 import { mintTestTokens, WETH9, Operation, STABLECOINS } from '@primitivefi/sdk'
+import { ChainId } from '@sushiswap/sdk'
 
 import { formatEther } from 'ethers/lib/utils'
 const fetcher = (library) => (...args) => {
@@ -31,7 +32,10 @@ const BalanceCard: React.FC = () => {
   const { item } = useItem()
   const addTransaction = useTransactionAdder()
   const { library, account, chainId } = useWeb3React()
-  const daiBal = useTokenBalance(STABLECOINS[chainId].address)
+  const daiBal =
+    chainId === ChainId.KOVAN
+      ? '0'
+      : useTokenBalance(STABLECOINS[chainId].address)
   const wethBal = useTokenBalance(WETH9[chainId].address)
 
   const [ethBal, setEth] = useState('')
@@ -85,7 +89,7 @@ const BalanceCard: React.FC = () => {
   return (
     <>
       <CustomCard>
-        {chainId === 4 ? (
+        {chainId === 4 || chainId === 42 ? (
           <>
             <Spacer size="sm" />
             <Button
@@ -99,12 +103,12 @@ const BalanceCard: React.FC = () => {
 
         <LineItem label={`DAI Balance`} data={daiBal} />
         <Spacer size="sm" />
-        {balance.token.symbol === 'WETH' ? (
+        {balance?.token.symbol === 'WETH' ? (
           <LineItem label={`ETH Balance`} data={formatEther(ethBal)} />
         ) : (
           <LineItem
-            label={`${balance.token.symbol} Balance`}
-            data={formatEther(balance.raw.toString())}
+            label={`${balance?.token.symbol} Balance`}
+            data={formatEther(balance ? balance?.raw.toString() : '0')}
           />
         )}
       </CustomCard>

diff --git a/src/components/Market/OrderCard/components/AddLiquidity/AddLiquidity.tsx b/src/components/Market/OrderCard/components/AddLiquidity/AddLiquidity.tsx
@@ -529,7 +529,20 @@ const AddLiquidity: React.FC = () => {
         ) : (
           <>
             {isApproved() ? (
-              <> </>
+              <>
+                {' '}
+                <Button
+                  disabled={
+                    !isApproved() ||
+                    !parsedUnderlyingAmount?.gt(0) ||
+                    (hasLiquidity ? null : !parsedOptionAmount?.gt(0))
+                  }
+                  full
+                  size="sm"
+                  onClick={handleSubmitClick}
+                  text={`Add Liquidity`}
+                />
+              </>
             ) : (
               <>
                 <Button
@@ -541,18 +554,6 @@ const AddLiquidity: React.FC = () => {
                 />
               </>
             )}
-
-            <Button
-              disabled={
-                !isApproved() ||
-                !parsedUnderlyingAmount?.gt(0) ||
-                (hasLiquidity ? null : !parsedOptionAmount?.gt(0))
-              }
-              full
-              size="sm"
-              onClick={handleSubmitClick}
-              text={`Add Liquidity`}
-            />
           </>
         )}
       </Box>