From 8819a66e67a09e10a043c9b548b097ffd2c320a5 Mon Sep 17 00:00:00 2001
From: Jamie Hewitt <jamie.hewitt15@gmail.com>
Date: Wed, 11 May 2022 15:29:07 +0300
Subject: [PATCH] Remove risks warning (#1420)

* Removing risks warning from add liquidity tab

* Removing risks warning from add trade tab

* Removing isWarningAccepted state variable
---
 content/price.json                            |  6 ++--
 .../Asset/AssetActions/Pool/Add/index.tsx     | 33 ++++---------------
 .../Asset/AssetActions/Trade/FormTrade.tsx    | 32 +++++-------------
 3 files changed, 16 insertions(+), 55 deletions(-)

diff --git a/content/price.json b/content/price.json
index cfb269533..6c5fcfa49 100644
--- a/content/price.json
+++ b/content/price.json
@@ -54,8 +54,7 @@
         "titleIn": "You will receive",
         "titleOut": "Pool conversion"
       },
-      "action": "Supply",
-      "warning": "Use at your own risk. Please familiarize yourself [with the risks](https://blog.oceanprotocol.com/on-staking-on-data-in-ocean-market-3d8e09eb0a13) and the [Terms of Use](/terms)."
+      "action": "Supply"
     },
     "remove": {
       "title": "Remove Liquidity",
@@ -68,7 +67,6 @@
     }
   },
   "trade": {
-    "action": "Swap",
-    "warning": "Use at your own risk. Please familiarize yourself [with the risks](https://blog.oceanprotocol.com/on-staking-on-data-in-ocean-market-3d8e09eb0a13) and the [Terms of Use](/terms)."
+    "action": "Swap"
   }
 }
diff --git a/src/components/Asset/AssetActions/Pool/Add/index.tsx b/src/components/Asset/AssetActions/Pool/Add/index.tsx
index 5bbea309c..2be2f2b8e 100644
--- a/src/components/Asset/AssetActions/Pool/Add/index.tsx
+++ b/src/components/Asset/AssetActions/Pool/Add/index.tsx
@@ -40,7 +40,6 @@ export default function Add({
   const [amountMax, setAmountMax] = useState<string>()
   const [newPoolTokens, setNewPoolTokens] = useState('0')
   const [newPoolShare, setNewPoolShare] = useState('0')
-  const [isWarningAccepted, setIsWarningAccepted] = useState(false)
 
   // Live validation rules
   // https://github.com/jquense/yup#number
@@ -143,37 +142,17 @@ export default function Add({
         {({ isSubmitting, setSubmitting, submitForm, values, isValid }) => (
           <>
             <div className={styles.addInput}>
-              {isWarningAccepted ? (
-                <FormAdd
-                  amountMax={amountMax}
-                  setNewPoolTokens={setNewPoolTokens}
-                  setNewPoolShare={setNewPoolShare}
-                />
-              ) : (
-                content.pool.add.warning && (
-                  <Alert
-                    className={styles.warning}
-                    text={content.pool.add.warning.toString()}
-                    state="info"
-                    action={{
-                      name: 'I understand',
-                      style: 'text',
-                      handleAction: () => setIsWarningAccepted(true)
-                    }}
-                  />
-                )
-              )}
+              <FormAdd
+                amountMax={amountMax}
+                setNewPoolTokens={setNewPoolTokens}
+                setNewPoolShare={setNewPoolShare}
+              />
             </div>
 
             <Output newPoolTokens={newPoolTokens} newPoolShare={newPoolShare} />
 
             <Actions
-              isDisabled={
-                !isValid ||
-                !isWarningAccepted ||
-                !values.amount ||
-                values.amount === 0
-              }
+              isDisabled={!isValid || !values.amount || values.amount === 0}
               isLoading={isSubmitting}
               loaderMessage="Adding Liquidity..."
               successMessage="Successfully added liquidity."
diff --git a/src/components/Asset/AssetActions/Trade/FormTrade.tsx b/src/components/Asset/AssetActions/Trade/FormTrade.tsx
index 1eeef45d5..e09fd8cad 100644
--- a/src/components/Asset/AssetActions/Trade/FormTrade.tsx
+++ b/src/components/Asset/AssetActions/Trade/FormTrade.tsx
@@ -41,7 +41,6 @@ export default function FormTrade({
   const [coinFrom, setCoinFrom] = useState<string>('OCEAN')
   const [maximumBaseToken, setMaximumBaseToken] = useState('0')
   const [maximumDt, setMaximumDt] = useState('0')
-  const [isWarningAccepted, setIsWarningAccepted] = useState(false)
 
   const validationSchema: Yup.SchemaOf<FormTradeData> = Yup.object()
     .shape({
@@ -185,32 +184,17 @@ export default function FormTrade({
     >
       {({ isSubmitting, setSubmitting, submitForm, values, isValid }) => (
         <>
-          {isWarningAccepted ? (
-            <Swap
-              asset={asset}
-              balance={balance}
-              setCoin={setCoinFrom}
-              setMaximumBaseToken={setMaximumBaseToken}
-              setMaximumDt={setMaximumDt}
-              isLoading={isSubmitting}
-            />
-          ) : (
-            <div className={styles.alertWrap}>
-              <Alert
-                text={content.trade.warning}
-                state="info"
-                action={{
-                  name: 'I understand',
-                  style: 'text',
-                  handleAction: () => setIsWarningAccepted(true)
-                }}
-              />
-            </div>
-          )}
+          <Swap
+            asset={asset}
+            balance={balance}
+            setCoin={setCoinFrom}
+            setMaximumBaseToken={setMaximumBaseToken}
+            setMaximumDt={setMaximumDt}
+            isLoading={isSubmitting}
+          />
           <Actions
             isDisabled={
               !isValid ||
-              !isWarningAccepted ||
               !isAssetNetwork ||
               values.datatoken === undefined ||
               values.baseToken === undefined