From 598b9b973fa42ec942245c19f10309c5521117f1 Mon Sep 17 00:00:00 2001
From: nick134 <nick134-bit@proton.me>
Date: Fri, 18 Aug 2023 20:56:11 +0200
Subject: [PATCH] chore: merge recent commits

---
 components/InfoTooltip.tsx                   |  2 +-
 components/Pages/Liquidity/DepositForm.tsx   | 11 +--
 components/Pages/Liquidity/Multiplicator.tsx |  2 +-
 components/Pages/Pools/MyPoolsTable.tsx      | 73 ++++++++++----------
 4 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/components/InfoTooltip.tsx b/components/InfoTooltip.tsx
index 96ee3146..01f9345b 100644
--- a/components/InfoTooltip.tsx
+++ b/components/InfoTooltip.tsx
@@ -30,7 +30,7 @@ export const IncentiveTooltip = ({ IconSize }) => (
   <InfoTooltip
     IconSize={IconSize}
     description={
-      'The Incentive Flow Creator can close their flows anytime after the set timeframe. All unclaimed tokens will be clawed back. '
+      'The Incentive Flow Creator can close their flows anytime. All unclaimed tokens will be clawed back.'
     }
   />
 )
diff --git a/components/Pages/Liquidity/DepositForm.tsx b/components/Pages/Liquidity/DepositForm.tsx
index 2e0fc454..609d3507 100644
--- a/components/Pages/Liquidity/DepositForm.tsx
+++ b/components/Pages/Liquidity/DepositForm.tsx
@@ -127,13 +127,6 @@ const DepositForm = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [tx?.txStep])
 
-  const errorButtonMessage = () => {
-    if (tx?.error) {
-      if (tx.error.includes('sentFunds: invalid coins')) {
-        return 'Insufficient Funds'
-      }
-    }
-  }
 
   const buttonLabel = useMemo(() => {
     if (connected !== WalletStatusType.connected) {
@@ -144,9 +137,7 @@ const DepositForm = ({
       return 'Enter Amount'
     } else if (tx?.buttonLabel) {
       return tx?.buttonLabel
-    } else if (errorButtonMessage()) {
-      return errorButtonMessage()
-    }
+    } 
     return 'Deposit'
   }, [tx?.buttonLabel, tokenB.tokenSymbol, connected, amountA])
 
diff --git a/components/Pages/Liquidity/Multiplicator.tsx b/components/Pages/Liquidity/Multiplicator.tsx
index 2c1806e5..9f1f2f49 100644
--- a/components/Pages/Liquidity/Multiplicator.tsx
+++ b/components/Pages/Liquidity/Multiplicator.tsx
@@ -15,7 +15,7 @@ const incentiveDisclaimer = (incentivized) => {
       <InfoTooltip
         IconSize={'3'}
         description={
-          'This Pool is currently incentivized. After the incentivized Timeframe, the creator can clawback all unclaimed rewards at anytime. '
+          'This Pool is currently incentivized. The creator can clawback all unclaimed rewards at anytime. Claim them regularly.'
         }
       />
     )
diff --git a/components/Pages/Pools/MyPoolsTable.tsx b/components/Pages/Pools/MyPoolsTable.tsx
index 0c70d3d1..3916d4b5 100644
--- a/components/Pages/Pools/MyPoolsTable.tsx
+++ b/components/Pages/Pools/MyPoolsTable.tsx
@@ -9,90 +9,89 @@ import {
   Tfoot,
   Th,
   Thead,
-  Tr,
+  Tr
 } from '@chakra-ui/react'
 import {
   createColumnHelper,
   flexRender,
   getCoreRowModel,
-  useReactTable,
+  useReactTable
 } from '@tanstack/react-table'
 
+import { IncentiveTooltip } from '../../InfoTooltip'
 import Loader from '../../Loader'
 import Apr from './components/Apr'
+import Liquidity from './components/liquidity'
 import PoolName from './components/PoolName'
 import { Pool } from './types'
-import { IncentiveTooltip } from '../../InfoTooltip'
-import Liquidity from './components/liquidity'
 
 const columnHelper = createColumnHelper<Pool>()
 
 const columns = [
   columnHelper.accessor('pool', {
-    header: () => <Text color="brand.50">Pool</Text>,
-    cell: (info) => (
+    'header': () => <Text color="brand.50">Pool</Text>,
+    'cell': (info) => (
       <PoolName
         poolId={info.getValue()}
         token1Img={info.row.original?.token1Img}
         token2Img={info.row.original?.token2Img}
       />
-    ),
+    )
   }),
   columnHelper.accessor('price', {
-    header: () => (
+    'header': () => (
       <Text align="right" color="brand.50">
         {'RATIO'}
       </Text>
     ),
-    cell: (info) => <Text align="right">{info.getValue()}</Text>,
+    'cell': (info) => <Text align="right">{info.getValue()}</Text>
   }),
   columnHelper.accessor('apr', {
-    header: () => (
+    'header': () => (
       <Text align="right" color="brand.50">
         {'APR'}
       </Text>
     ),
-    cell: (info) =>
-      info.getValue() === 'n/a' ? (
-        <Text>{info.getValue()}</Text>
-      ) : (
-        <Apr
-          apr={info.getValue()?.toString()}
-          flows={info.row.original.flows}
-        />
-      ),
+    'cell': (info) => (info.getValue() === 'n/a' ? (
+      <Text>{info.getValue()}</Text>
+    ) : (
+      <Apr
+        apr={info.getValue()?.toString()}
+        flows={info.row.original.flows}
+      />
+    ))
   }),
   columnHelper.accessor('volume24hr', {
-    header: () => (
+    'header': () => (
       <Text align="right" color="brand.50">
         {'24hr Volume'}
       </Text>
     ),
-    cell: (info) => <Text align="right">{info.getValue()}</Text>,
+    'cell': (info) => <Text align="right">{info.getValue()}</Text>
   }),
   columnHelper.accessor('totalLiq', {
-    header: () => (
+    'header': () => (
       <Text align="right" color="brand.50">
         {'Total Liquidity'}
       </Text>
     ),
-    cell: (info) => (
+    'cell': (info) => (
       <Liquidity
         liquidity={info.getValue()?.toString()}
         infos={info.row.original}
       />
-    ),
+    )
   }),
   columnHelper.accessor('myPosition', {
-    header: () => (
+    'header': () => (
       <Text align="right" color="brand.50">
         {'My Position'}
       </Text>
     ),
-    cell: (info) => <Text align="right">${info.getValue()}</Text>,
+    'cell': (info) => <Text align="right">${info.getValue()}</Text>
   }),
   columnHelper.accessor('incentives', {
-    header: () => (
+    'header': () => (
       <HStack paddingTop={'4'}>
         <IncentiveTooltip IconSize={'3'} />
         <Text align="left" color="brand.50">
@@ -100,22 +99,22 @@ const columns = [
         </Text>
       </HStack>
     ),
-    cell: (info) => info.getValue(),
+    'cell': (info) => info.getValue()
   }),
   columnHelper.accessor('action', {
-    header: () => (
+    'header': () => (
       <Text align="left" color="brand.50">
         Action
       </Text>
     ),
-    cell: (info) => info.getValue(),
-  }),
+    'cell': (info) => info.getValue()
+  })
 ]
 
 const PoolsTable = ({
   show,
   pools,
-  isLoading,
+  isLoading
 }: {
   show: boolean
   pools: Pool[]
@@ -125,9 +124,9 @@ const PoolsTable = ({
     return null
   }
   const table = useReactTable({
-    data: pools,
+    'data': pools,
     columns,
-    getCoreRowModel: getCoreRowModel(),
+    'getCoreRowModel': getCoreRowModel()
   })
 
   if (isLoading || !pools) {
@@ -200,10 +199,8 @@ const PoolsTable = ({
                   >
                     {header.isPlaceholder
                       ? null
-                      : flexRender(
-                          header.column.columnDef.header,
-                          header.getContext()
-                        )}
+                      : flexRender(header.column.columnDef.header,
+                        header.getContext())}
                   </Th>
                 ))}
               </Tr>