Merge pull request #1680 from QuickSwap/dev2

Author: sameepsi

src/assets/images/algebra-logo.png

@@ -20,6 +20,7 @@ import { HypeLabAds } from 'components';
 import LockLiquidity from './lpLock/LockLiquidity';
 import { useParams } from 'react-router-dom';
 import { SingleTokenSupplyLiquidity } from './SingleToken/SupplyLiquidity';
+import AlgebraLogo from 'assets/images/algebra-logo.png';
 
 const YourLiquidityPools = lazy(() => import('./YourLiquidityPools'));
 const MyLiquidityPoolsV3 = lazy(() => import('./v3/MyLiquidityPoolsV3'));
@@ -77,7 +78,7 @@ const PoolsPage: React.FC = () => {
   }, [showPools]);
 
   return (
-    <Box width='100%' mb={3}>
+    <Box mb={3} p={3}>
       {isMobile ? (
         <>
           <Box mt={2} className='pageHeading'>
@@ -92,6 +93,19 @@ const PoolsPage: React.FC = () => {
               </Box>
             )}
           </Box>
+          <Box
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              gap: '4px',
+              justifyContent: 'end',
+            }}
+          >
+            <p>
+              <span>{t('poweredBy')}</span>
+            </p>
+            <img src={AlgebraLogo} alt='poweredby' style={{ width: '72px' }} />
+          </Box>
           {showVersion && (
             <Box my={2}>
               <VersionToggle />
@@ -108,6 +122,18 @@ const PoolsPage: React.FC = () => {
               </Box>
             )}
           </Box>
+          <Box
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              gap: '4px',
+            }}
+          >
+            <p>
+              <span>{t('poweredBy')}</span>
+            </p>
+            <img src={AlgebraLogo} alt='poweredby' style={{ width: '72px' }} />
+          </Box>
         </Box>
       )}
       {/* <Box margin='24px auto'>

src/pages/PoolsPage/PoolsPage.tsx

@@ -286,6 +286,7 @@ export function AddLiquidityButton({
     amountToWrap,
     wrappingETH,
   ]);
+  console.log('------isReady:', isReady)
 
   const onAddLiquidity = () => {
     if (expertMode) {

src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/AddLiquidityButton/index.tsx

@@ -13,6 +13,7 @@ import { useActiveWeb3React } from 'hooks';
 import { useUSDCValue } from 'hooks/v3/useUSDCPrice';
 import {
   NONFUNGIBLE_POSITION_MANAGER_ADDRESSES,
+  NONFUNGIBLE_POSITION_V4_MANAGER_ADDRESSES,
   UNI_NFT_POSITION_MANAGER_ADDRESS,
 } from 'constants/v3/addresses';
 import { halfAmountSpend, maxAmountSpend } from 'utils/v3/maxAmountSpend';
@@ -26,6 +27,7 @@ import { GlobalConst } from 'constants/index';
 import { useTranslation } from 'react-i18next';
 import { getGammaPairsForTokens } from 'utils';
 import { useSteerPeripheryContract } from 'hooks/useContract';
+import { useIsV4 } from 'state/application/hooks';
 
 interface IEnterAmounts {
   currencyA: Currency | undefined;
@@ -42,6 +44,7 @@ export function EnterAmounts({
 }: IEnterAmounts) {
   const { t } = useTranslation();
   const { chainId } = useActiveWeb3React();
+  const { isV4 } = useIsV4();
   const preset = useActivePreset();
 
   const { independentField, typedValue } = useV3MintState();
@@ -133,8 +136,10 @@ export function EnterAmounts({
     if (mintInfo.feeTier && mintInfo.feeTier.id.includes('uni')) {
       return UNI_NFT_POSITION_MANAGER_ADDRESS[chainId];
     }
-    return NONFUNGIBLE_POSITION_MANAGER_ADDRESSES[chainId];
-  }, [chainId, mintInfo.feeTier]);
+    return isV4
+      ? NONFUNGIBLE_POSITION_V4_MANAGER_ADDRESSES[chainId]
+      : NONFUNGIBLE_POSITION_MANAGER_ADDRESSES[chainId];
+  }, [chainId, mintInfo.feeTier, isV4]);
 
   const steerPeripheryContract = useSteerPeripheryContract();
   const [approvalA, approveACallback] = useApproveCallback(

src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/EnterAmounts/index.tsx

@@ -283,12 +283,10 @@ const SwapMain: React.FC = () => {
               justifyContent: 'end',
             }}
           >
-            <p style={{ fontSize: '12px' }}>Powered by</p>
-            <img
-              src={AlgebraLogo}
-              alt='poweredby'
-              style={{ width: '26%', marginBottom: '2px' }}
-            />
+            <p>
+              <span>{t('poweredBy')}</span>
+            </p>
+            <img src={AlgebraLogo} alt='poweredby' style={{ width: '72px' }} />
           </Box>
         )}
       </Box>