Merge dev to master

src/connectors/utils.ts

@@ -20,12 +20,12 @@ const allNonMetamaskFlags: NonMetaMaskFlag[] = [
   'isTrust',
 ];
 export const getIsMetaMaskWallet = () => {
-  const { ethereum } = window as any;
+  const { ethereum, web3 } = window as any;
 
   return Boolean(
     ethereum &&
       ethereum.isMetaMask &&
-      ethereum._metamask &&
+      web3 &&
       (ethereum.detected && ethereum.detected.length > 0
         ? ethereum.detected.find(
             (provider: any) =>

src/hooks/useStakerHandlers.ts

@@ -13,26 +13,17 @@ import {
 } from '../state/transactions/hooks';
 import { useActiveWeb3React } from 'hooks';
 import JSBI from 'jsbi';
-import { GAS_PRICE_MULTIPLIER } from './useGasPrice';
 import { TransactionResponse } from '@ethersproject/providers';
 import { FarmingType } from '../models/enums';
 import { useTranslation } from 'react-i18next';
 import { toHex } from 'lib/src/utils/calldata';
-import { useAppSelector } from 'state';
 import { useV3StakeData } from 'state/farms/hooks';
 import { calculateGasMargin } from 'utils';
 
 export function useFarmingHandlers() {
   const { chainId, account, provider } = useActiveWeb3React();
   const { t } = useTranslation();
 
-  const gasPrice = useAppSelector((state) => {
-    if (!state.application.gasPrice.fetched) return 36;
-    return state.application.gasPrice.override
-      ? 36
-      : state.application.gasPrice.fetched;
-  });
-
   const addTransaction = useTransactionAdder();
   const finalizeTransaction = useTransactionFinalizer();
 
@@ -140,7 +131,6 @@ export function useFarmingHandlers() {
               result = await farmingCenterContract.callStatic.multicall(
                 callDatas,
                 {
-                  gasPrice: gasPrice * GAS_PRICE_MULTIPLIER,
                   gasLimit: 350000,
                 },
               );
@@ -235,7 +225,6 @@ export function useFarmingHandlers() {
       addTransaction,
       chainId,
       finalizeTransaction,
-      gasPrice,
       provider,
       updateV3Stake,
       t,

src/hooks/useV3ApproveCallback.ts

@@ -16,7 +16,6 @@ import {
 import { useTokenContract } from './useContract';
 import { useActiveWeb3React } from 'hooks';
 import { useTokenAllowance } from './useTokenAllowance';
-import { useAppSelector } from 'state';
 import { calculateGasMargin } from 'utils';
 
 export enum ApprovalState {
@@ -42,13 +41,6 @@ export function useApproveCallback(
   );
   const pendingApproval = useHasPendingApproval(token?.address, spender);
 
-  const gasPrice = useAppSelector((state) => {
-    if (!state.application.gasPrice.fetched) return 36;
-    return state.application.gasPrice.override
-      ? 36
-      : state.application.gasPrice.fetched;
-  });
-
   // check the current approval status
   const approvalState: ApprovalState = useMemo(() => {
     if (!amountToApprove || !spender) return ApprovalState.UNKNOWN;

src/hooks/v3/useSwapCallback.ts

@@ -10,8 +10,6 @@ import { calculateGasMargin, isAddress, isZero, shortenAddress } from 'utils';
 import useENS from 'hooks/useENS';
 import { SWAP_ROUTER_ADDRESSES } from 'constants/v3/addresses';
 import { useActiveWeb3React } from 'hooks';
-import { useAppSelector } from 'state';
-import { GAS_PRICE_MULTIPLIER } from 'hooks/useGasPrice';
 import { SwapRouter } from 'lib/src/swapRouter';
 import useTransactionDeadline from 'hooks/useTransactionDeadline';
 import { getTradeVersion } from 'utils/v3/getTradeVersion';
@@ -222,13 +220,6 @@ export function useSwapCallback(
 
   const addTransaction = useTransactionAdder();
 
-  const gasPrice = useAppSelector((state) => {
-    if (!state.application.gasPrice.fetched) return 36;
-    return state.application.gasPrice.override
-      ? 36
-      : state.application.gasPrice.fetched;
-  });
-
   const { address: recipientAddress } = useENS(recipientAddressOrName);
   const recipient =
     recipientAddressOrName === null ? account : recipientAddress;
@@ -318,10 +309,7 @@ export function useSwapCallback(
         );
 
         // a successful estimation is a bignumber gas estimate and the next call is also a bignumber gas estimate
-        let bestCallOption:
-          | SuccessfulCall
-          | SwapCallEstimate
-          | undefined = estimatedCalls.find(
+        const bestCallOption = estimatedCalls.find(
           (el, ix, list): el is SuccessfulCall =>
             'gasEstimate' in el &&
             (ix === list.length - 1 || 'gasEstimate' in list[ix + 1]),
@@ -334,14 +322,9 @@ export function useSwapCallback(
           );
           if (errorCalls.length > 0)
             throw errorCalls[errorCalls.length - 1].error;
-          const firstNoErrorCall = estimatedCalls.find<SwapCallEstimate>(
-            (call): call is SwapCallEstimate => !('error' in call),
+          throw new Error(
+            'Unexpected error. Could not estimate gas for the swap.',
           );
-          if (!firstNoErrorCall)
-            throw new Error(
-              'Unexpected error. Could not estimate gas for the swap.',
-            );
-          bestCallOption = firstNoErrorCall;
         }
 
         const {
@@ -355,9 +338,7 @@ export function useSwapCallback(
             to: address,
             data: calldata,
             // let the wallet try if we can't estimate the gas
-            ...('gasEstimate' in bestCallOption
-              ? { gasLimit: calculateGasMargin(bestCallOption.gasEstimate) }
-              : { gasPrice: gasPrice * GAS_PRICE_MULTIPLIER }),
+            gasLimit: calculateGasMargin(bestCallOption.gasEstimate),
             ...(value && !isZero(value) ? { value } : {}),
           })
           .then((response) => {
@@ -413,7 +394,6 @@ export function useSwapCallback(
     recipient,
     recipientAddressOrName,
     swapCalls,
-    gasPrice,
     addTransaction,
   ]);
 }

src/pages/LandingPage/LandingPage.tsx

@@ -336,9 +336,9 @@ const LandingPage: React.FC = () => {
           <h3>{t('faqs')}</h3>
           <Box className='featureDivider' />
         </Box>
-        <Box className=''>
+        <Box>
           {faqs.map((val, i) => (
-            <Accordion key={`accordation-{i}`}>
+            <Accordion key={`accordation-${i}`}>
               <AccordionSummary
                 expandIcon={<ExpandMoreOutlined />}
                 aria-controls='panel1a-content'

src/pages/PoolsPage/v3/MyLiquidityPoolsV3/components/PositionListItemDetails/index.tsx

@@ -21,7 +21,6 @@ import useIsTickAtLimit from 'hooks/v3/useIsTickAtLimit';
 import { formatTickPrice } from 'utils/v3/formatTickPrice';
 import usePrevious from 'hooks/usePrevious';
 import ReactGA from 'react-ga';
-import { useAppSelector } from 'state/hooks';
 import {
   FARMING_CENTER,
   NONFUNGIBLE_POSITION_MANAGER_ADDRESSES,
@@ -66,13 +65,6 @@ export default function PositionListItemDetails({
     false,
   );
 
-  const gasPrice = useAppSelector((state) => {
-    if (!state.application.gasPrice.fetched) return 36;
-    return state.application.gasPrice.override
-      ? 36
-      : state.application.gasPrice.fetched;
-  });
-
   const { tokenId } = positionDetails || {};
 
   const prevPositionDetails = usePrevious({ ...positionDetails });

src/state/application/actions.ts

@@ -91,11 +91,6 @@ export const updateTokenDetails = createAction<TokenDetail>(
   'application/updateTokenDetail',
 );
 
-export const updateGasPrice = createAction<{
-  fetched: number | null;
-  override: boolean;
-}>('application/updateGasPrice');
-
 export const updateIsV2 = createAction<boolean>('application/updateIsV2');
 
 export const updateUDDomain = createAction<string | undefined>(

src/state/application/reducer.ts

@@ -1,5 +1,4 @@
 import { createReducer, nanoid } from '@reduxjs/toolkit';
-import { ChainId } from '@uniswap/sdk';
 import {
   addPopup,
   PopupContent,
@@ -16,7 +15,6 @@ import {
   updateBookmarkPairs,
   updateTokenDetails,
   updateMaticPrice,
-  updateGasPrice,
   updateIsV2,
   updateUDDomain,
 } from './actions';
@@ -58,7 +56,6 @@ export interface ApplicationState {
   readonly analyticToken: any;
   readonly tokenChartData: any;
   readonly tokenDetails: TokenDetail[];
-  readonly gasPrice: { fetched: number | null; override: boolean };
   readonly isV2: boolean | undefined;
   readonly udDomain: string | undefined;
 }
@@ -75,7 +72,6 @@ const initialState: ApplicationState = {
   analyticToken: null,
   tokenChartData: null,
   tokenDetails: [],
-  gasPrice: { fetched: 70, override: true },
   isV2: undefined,
   udDomain: undefined,
 };
@@ -93,9 +89,6 @@ export default createReducer(initialState, (builder) =>
         );
       }
     })
-    .addCase(updateGasPrice, (state, action) => {
-      state.gasPrice = action.payload;
-    })
     .addCase(setOpenModal, (state, action) => {
       state.openModal = action.payload;
     })