From c140cdc82c02ac6a2259500d2845e607d34d5db2 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Mon, 24 Jan 2022 11:46:58 +0000
Subject: [PATCH] restore submit methods, token approval workaround

---
 .../@shared/TokenApproval/index.tsx           | 44 +++++++++++--------
 .../Asset/AssetActions/Pool/Add/index.tsx     | 17 +++----
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/components/@shared/TokenApproval/index.tsx b/src/components/@shared/TokenApproval/index.tsx
index 2b0094843..2a87e4362 100644
--- a/src/components/@shared/TokenApproval/index.tsx
+++ b/src/components/@shared/TokenApproval/index.tsx
@@ -4,6 +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'
 
 export default function TokenApproval({
   actionButton,
@@ -19,7 +20,7 @@ export default function TokenApproval({
   const { ddo, price, isAssetNetwork } = useAsset()
   const [tokenApproved, setTokenApproved] = useState(false)
   const [loading, setLoading] = useState(false)
-  const { accountId } = useWeb3()
+  const { web3, accountId } = useWeb3()
 
   const config = getOceanConfig(ddo.chainId)
 
@@ -29,34 +30,39 @@ export default function TokenApproval({
       : ddo.services[0].datatokenAddress
   const spender = price.address
 
-  const checkTokenApproval = useCallback(async () => {
-    // if (!tokenAddress || !spender || !isAssetNetwork || !amount) return
-    // const allowance = await ocean.datatokens.allowance(
-    //   tokenAddress,
-    //   accountId,
-    //   spender
-    // )
-    // amount &&
-    //   new Decimal(amount).greaterThan(new Decimal('0')) &&
-    //   setTokenApproved(
-    //     new Decimal(allowance).greaterThanOrEqualTo(new Decimal(amount))
-    //   )
-  }, [tokenAddress, spender, accountId, amount, isAssetNetwork])
+  // TODO: how to check if token is approved as .allowance does not exist?
+  // const checkTokenApproval = useCallback(async () => {
+  //   if (!web3 || !tokenAddress || !spender || !isAssetNetwork || !amount) return
 
-  useEffect(() => {
-    checkTokenApproval()
-  }, [checkTokenApproval])
+  //   const datatokenInstance = new Datatoken(web3)
+  //   const allowance = await datatokenInstance.allowance(
+  //     tokenAddress,
+  //     accountId,
+  //     spender
+  //   )
+  //   amount &&
+  //     new Decimal(amount).greaterThan(new Decimal('0')) &&
+  //     setTokenApproved(
+  //       new Decimal(allowance).greaterThanOrEqualTo(new Decimal(amount))
+  //     )
+  // }, [web3, tokenAddress, spender, accountId, amount, isAssetNetwork])
+
+  // useEffect(() => {
+  //   checkTokenApproval()
+  // }, [checkTokenApproval])
 
   async function approveTokens(amount: string) {
     setLoading(true)
 
     try {
-      // await ocean.datatokens.approve(tokenAddress, spender, amount, accountId)
+      const datatokenInstance = new Datatoken(web3)
+      await datatokenInstance.approve(tokenAddress, spender, amount, accountId)
+      setTokenApproved(true)
     } catch (error) {
       setLoading(false)
     }
 
-    await checkTokenApproval()
+    // await checkTokenApproval()
     setLoading(false)
   }
 
diff --git a/src/components/Asset/AssetActions/Pool/Add/index.tsx b/src/components/Asset/AssetActions/Pool/Add/index.tsx
index b83a9e768..853af5070 100644
--- a/src/components/Asset/AssetActions/Pool/Add/index.tsx
+++ b/src/components/Asset/AssetActions/Pool/Add/index.tsx
@@ -86,7 +86,6 @@ export default function Add({
     async function getMaximum() {
       const poolInstance = new Pool(web3, LoggerInstance)
       const baseTokenAddress = await poolInstance.getBasetoken(poolAddress)
-
       const tokenInAddress = coin === 'OCEAN' ? baseTokenAddress : dtAddress
       setTokenInAddress(tokenInAddress)
 
@@ -123,15 +122,17 @@ export default function Add({
   // Submit
   async function handleAddLiquidity(amount: number, resetForm: () => void) {
     const poolInstance = new Pool(web3, LoggerInstance)
+    const minPoolAmountOut = '0' // ? TODO: how to get?
 
     try {
-      // const result = await poolInstance.joinPool(
-      //   accountId,
-      //   poolAddress,
-      //   poolAmountOut,
-      //   amountMax
-      // )
-      // setTxId(result?.transactionHash)
+      const result = await poolInstance.joinswapExternAmountIn(
+        accountId,
+        poolAddress,
+        tokenInAddress,
+        `${amount}`,
+        minPoolAmountOut
+      )
+      setTxId(result?.transactionHash)
       // resetForm()
       fetchAllData()
     } catch (error) {