Merge pull request #139 from oceanprotocol/fix/addLiquidityEstimates

correct pool shares

src/components/organisms/AssetActions/Pool/Add/FormAdd.tsx

@@ -0,0 +1,150 @@
+import PriceUnit from '../../../../atoms/Price/PriceUnit'
+import React, { ChangeEvent, ReactElement, useEffect, useState } from 'react'
+import styles from './FormAdd.module.css'
+import Input from '../../../../atoms/Input'
+import {
+  Field,
+  FieldInputProps,
+  FormikContextType,
+  useFormikContext
+} from 'formik'
+import Button from '../../../../atoms/Button'
+import Token from '../Token'
+import CoinSelect from '../CoinSelect'
+import { FormAddLiquidity } from '.'
+import { useOcean } from '@oceanprotocol/react'
+import { Balance } from '..'
+
+export default function FormAdd({
+  content,
+  coin,
+  dtBalance,
+  dtSymbol,
+  amountMax,
+  setCoin,
+  totalPoolTokens,
+  totalBalance,
+  swapFee,
+  poolAddress
+}: {
+  content: any
+  coin: string
+  dtBalance: string
+  dtSymbol: string
+  amountMax: string
+  setCoin: (value: string) => void
+  totalPoolTokens: string
+  totalBalance: Balance
+  swapFee: string
+  poolAddress: string
+}): ReactElement {
+  const { ocean, balance } = useOcean()
+
+  // Connect with form
+  const {
+    touched,
+    setTouched,
+    handleChange,
+    setFieldValue,
+    values
+  }: FormikContextType<FormAddLiquidity> = useFormikContext()
+
+  const [newPoolTokens, setNewPoolTokens] = useState('0')
+  const [newPoolShare, setNewPoolShare] = useState('0')
+
+  useEffect(() => {
+    async function calculatePoolShares() {
+      if (!values.amount) {
+        setNewPoolTokens('0')
+        setNewPoolShare('0')
+        return
+      }
+      if (Number(values.amount) > Number(amountMax)) return
+      const poolTokens = await ocean.pool.calcPoolOutGivenSingleIn(
+        poolAddress,
+        coin === 'OCEAN' ? ocean.pool.oceanAddress : ocean.pool.dtAddress,
+        values.amount.toString()
+      )
+      setNewPoolTokens(poolTokens)
+      setNewPoolShare(
+        totalBalance &&
+          (
+            (Number(poolTokens) /
+              (Number(totalPoolTokens) + Number(poolTokens))) *
+            100
+          ).toFixed(2)
+      )
+    }
+    calculatePoolShares()
+  }, [values.amount])
+
+  return (
+    <>
+      <div className={styles.addInput}>
+        <div className={styles.userLiquidity}>
+          <div>
+            <span>Available:</span>
+            {coin === 'OCEAN' ? (
+              <PriceUnit price={balance.ocean} symbol="OCEAN" small />
+            ) : (
+              <PriceUnit price={dtBalance} symbol={dtSymbol} small />
+            )}
+          </div>
+          <div>
+            <span>Maximum:</span>
+            <PriceUnit price={amountMax} symbol={coin} small />
+          </div>
+        </div>
+        <Field name="amount">
+          {({
+            field,
+            form
+          }: {
+            field: FieldInputProps<FormAddLiquidity>
+            form: any
+          }) => (
+            <Input
+              type="number"
+              name="amount"
+              max={amountMax}
+              value={`${values.amount}`}
+              prefix={<CoinSelect dtSymbol={dtSymbol} setCoin={setCoin} />}
+              placeholder="0"
+              field={field}
+              form={form}
+              onChange={(e: ChangeEvent<HTMLInputElement>) => {
+                // Workaround so validation kicks in on first touch
+                !touched?.amount && setTouched({ amount: true })
+                handleChange(e)
+              }}
+              disabled={!ocean}
+            />
+          )}
+        </Field>
+
+        {(Number(balance.ocean) || dtBalance) > (values.amount || 0) && (
+          <Button
+            className={styles.buttonMax}
+            style="text"
+            size="small"
+            onClick={() => setFieldValue('amount', amountMax)}
+          >
+            Use Max
+          </Button>
+        )}
+      </div>
+
+      <div className={styles.output}>
+        <div>
+          <p>{content.output.titleIn}</p>
+          <Token symbol="pool shares" balance={newPoolTokens} />
+          <Token symbol="% of pool" balance={newPoolShare} />
+        </div>
+        <div>
+          <p>{content.output.titleOut}</p>
+          <Token symbol="% swap fee" balance={swapFee} />
+        </div>
+      </div>
+    </>
+  )
+}

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

@@ -1,18 +1,14 @@
 import React, { ReactElement, useState, useEffect } from 'react'
-import styles from './Add.module.css'
 import { useOcean } from '@oceanprotocol/react'
-import Header from './Header'
+import Header from '../Header'
 import { toast } from 'react-toastify'
-import Button from '../../../atoms/Button'
+import { Balance } from '..'
-import Token from './Token'
+import Actions from '../Actions'
-import { Balance } from './'
-import PriceUnit from '../../../atoms/Price/PriceUnit'
-import Actions from './Actions'
 import { graphql, useStaticQuery } from 'gatsby'
 import * as Yup from 'yup'
-import { Field, FieldInputProps, Formik } from 'formik'
+import { Formik } from 'formik'
-import Input from '../../../atoms/Input'
+import FormAdd from './FormAdd'
-import CoinSelect from './CoinSelect'
+import styles from './index.module.css'
 
 const contentQuery = graphql`
   query PoolAddQuery {
@@ -37,7 +33,7 @@ const contentQuery = graphql`
   }
 `
 
-interface FormAddLiquidity {
+export interface FormAddLiquidity {
   amount: number
 }
 
@@ -149,104 +145,30 @@ export default function Add({
           setSubmitting(false)
         }}
       >
-        {({
+        {({ isSubmitting, submitForm }) => (
-          values,
+          <>
-          touched,
+            <FormAdd
-          setTouched,
+              coin={coin}
-          isSubmitting,
+              content={content}
-          setFieldValue,
+              dtBalance={dtBalance}
-          submitForm,
+              dtSymbol={dtSymbol}
-          handleChange
+              amountMax={amountMax}
-        }) => {
+              setCoin={setCoin}
-          const newPoolTokens =
+              totalPoolTokens={totalPoolTokens}
-            totalBalance &&
+              totalBalance={totalBalance}
-            ((values.amount / Number(totalBalance.ocean)) * 100).toFixed(2)
+              swapFee={swapFee}
+              poolAddress={poolAddress}
+            />
 
-          const newPoolShare =
+            <Actions
-            totalBalance &&
+              isLoading={isSubmitting}
-            ((Number(newPoolTokens) / Number(totalPoolTokens)) * 100).toFixed(2)
+              loaderMessage="Adding Liquidity..."
-
+              actionName={content.action}
-          return (
+              action={submitForm}
-            <>
+              txId={txId}
-              <div className={styles.addInput}>
+            />
-                <div className={styles.userLiquidity}>
+          </>
-                  <div>
+        )}
-                    <span>Available:</span>
-                    {coin === 'OCEAN' ? (
-                      <PriceUnit price={balance.ocean} symbol="OCEAN" small />
-                    ) : (
-                      <PriceUnit price={dtBalance} symbol={dtSymbol} small />
-                    )}
-                  </div>
-                  <div>
-                    <span>Maximum:</span>
-                    <PriceUnit price={amountMax} symbol={coin} small />
-                  </div>
-                </div>
-
-                <Field name="amount">
-                  {({
-                    field,
-                    form
-                  }: {
-                    field: FieldInputProps<FormAddLiquidity>
-                    form: any
-                  }) => (
-                    <Input
-                      type="number"
-                      max={amountMax}
-                      value={`${values.amount}`}
-                      prefix={
-                        <CoinSelect dtSymbol={dtSymbol} setCoin={setCoin} />
-                      }
-                      placeholder="0"
-                      field={field}
-                      form={form}
-                      onChange={(e) => {
-                        // Workaround so validation kicks in on first touch
-                        !touched?.amount && setTouched({ amount: true })
-                        handleChange(e)
-                      }}
-                      disabled={!ocean}
-                    />
-                  )}
-                </Field>
-
-                {(Number(balance.ocean) || dtBalance) >
-                  (values.amount || 0) && (
-                  <Button
-                    className={styles.buttonMax}
-                    style="text"
-                    size="small"
-                    onClick={() => setFieldValue('amount', amountMax)}
-                  >
-                    Use Max
-                  </Button>
-                )}
-              </div>
-
-              <div className={styles.output}>
-                <div>
-                  <p>{content.output.titleIn}</p>
-                  <Token symbol="pool shares" balance={newPoolTokens} />
-                  <Token symbol="% of pool" balance={newPoolShare} />
-                </div>
-                <div>
-                  <p>{content.output.titleOut}</p>
-                  <Token symbol="% swap fee" balance={swapFee} />
-                </div>
-              </div>
-
-              <Actions
-                isLoading={isSubmitting}
-                loaderMessage="Adding Liquidity..."
-                actionName={content.action}
-                action={submitForm}
-                txId={txId}
-              />
-            </>
-          )
-        }}
       </Formik>
     </>
   )

src/components/organisms/AssetActions/Pool/Remove.module.css

@@ -1,11 +1,11 @@
 .removeInput {
-  composes: addInput from './Add.module.css';
+  composes: addInput from './Add/FormAdd.module.css';
   padding-left: calc(var(--spacer) * 2);
   padding-right: calc(var(--spacer) * 2);
 }
 
 .userLiquidity {
-  composes: userLiquidity from './Add.module.css';
+  composes: userLiquidity from './Add/FormAdd.module.css';
   max-width: 12rem;
   margin-top: -1rem;
   margin-left: auto;
@@ -55,7 +55,7 @@
 }
 
 .output {
-  composes: output from './Add.module.css';
+  composes: output from './Add/FormAdd.module.css';
 }
 
 .output [class*='token'] {

src/components/organisms/AssetActions/Pool/index.tsx

@@ -4,7 +4,6 @@ import { DDO, Logger } from '@oceanprotocol/lib'
 import styles from './index.module.css'
 import stylesActions from './Actions.module.css'
 import PriceUnit from '../../../atoms/Price/PriceUnit'
-import Loader from '../../../atoms/Loader'
 import Button from '../../../atoms/Button'
 import Add from './Add'
 import Remove from './Remove'