token approval & allowance fixes

src/components/@shared/TokenApproval/index.tsx

@@ -4,7 +4,7 @@ import { useWeb3 } from '@context/Web3'
 import Decimal from 'decimal.js'
 import { getOceanConfig } from '@utils/ocean'
 import { ButtonApprove } from './ButtonApprove'
-import { Datatoken } from '@oceanprotocol/lib'
+import { allowance, approve, LoggerInstance } from '@oceanprotocol/lib'
 
 export default function TokenApproval({
   actionButton,
@@ -28,42 +28,42 @@ export default function TokenApproval({
     coin === 'OCEAN'
       ? config.oceanTokenAddress
       : ddo.services[0].datatokenAddress
-  const spender = price.address
+  const spender = price?.address
 
-  // TODO: how to check if token is approved as .allowance does not exist?
+  const checkTokenApproval = useCallback(async () => {
-  // const checkTokenApproval = useCallback(async () => {
+    if (!web3 || !tokenAddress || !spender || !isAssetNetwork || !amount) return
-  //   if (!web3 || !tokenAddress || !spender || !isAssetNetwork || !amount) return
 
-  //   const datatokenInstance = new Datatoken(web3)
+    const allowanceValue = await allowance(
-  //   const allowance = await datatokenInstance.allowance(
+      web3,
-  //     tokenAddress,
+      tokenAddress,
-  //     accountId,
+      accountId,
-  //     spender
+      spender
-  //   )
+    )
-  //   amount &&
-  //     new Decimal(amount).greaterThan(new Decimal('0')) &&
-  //     setTokenApproved(
-  //       new Decimal(allowance).greaterThanOrEqualTo(new Decimal(amount))
-  //     )
-  // }, [web3, tokenAddress, spender, accountId, amount, isAssetNetwork])
 
-  // useEffect(() => {
+    if (!allowanceValue) return
-  //   checkTokenApproval()
+
-  // }, [checkTokenApproval])
+    new Decimal(amount).greaterThan(new Decimal('0')) &&
+      setTokenApproved(
+        new Decimal(allowanceValue).greaterThanOrEqualTo(new Decimal(amount))
+      )
+  }, [web3, tokenAddress, spender, accountId, amount, isAssetNetwork])
+
+  useEffect(() => {
+    checkTokenApproval()
+  }, [checkTokenApproval])
 
   async function approveTokens(amount: string) {
     setLoading(true)
 
     try {
-      const datatokenInstance = new Datatoken(web3)
+      const tx = await approve(web3, accountId, tokenAddress, spender, amount)
-      await datatokenInstance.approve(tokenAddress, spender, amount, accountId)
+      LoggerInstance.log(`Approve tokens tx:`, tx)
-      setTokenApproved(true)
     } catch (error) {
+      LoggerInstance.error(`Approve tokens tx failed:`, error.message)
+    } finally {
+      await checkTokenApproval()
       setLoading(false)
     }
-
-    // await checkTokenApproval()
-    setLoading(false)
   }
 
   return (

src/components/Asset/AssetActions/Pool/Add/index.tsx

@@ -72,7 +72,7 @@ export default function Add({
     async function getMaximum() {
       try {
         const poolInstance = new Pool(web3, LoggerInstance)
-        const tokenInAddress = await poolInstance.getBasetoken(poolAddress)
+        const tokenInAddress = await poolInstance.getBaseToken(poolAddress)
         setTokenInAddress(tokenInAddress)
 
         const amountMaxPool = await poolInstance.getReserve(