Merge pull request #57 from QuickSwap/issue/fix-mumbai-testnet

Fix frontend on mumbai testnet
QuickSwap · Jan 27, 2022 · b790eb8 · b790eb8
2 parents 0b7f35d + 7143a15
commit b790eb8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
@@ -1,4 +1,5 @@
 import React, { useMemo, useState } from 'react';
+import { ChainId } from '@uniswap/sdk';
 import { Link, useLocation } from 'react-router-dom';
 import { Box, Button, Typography, useMediaQuery } from '@material-ui/core';
 import cx from 'classnames';
@@ -275,9 +276,8 @@ const newTransactionsFirst = (a: TransactionDetails, b: TransactionDetails) => {
 const Header: React.FC = () => {
   const classes = useStyles();
   const { pathname } = useLocation();
-  const { account } = useActiveWeb3React();
+  const { account, chainId } = useActiveWeb3React();
   const { ENSName } = useENSName(account ?? undefined);
-  const { ethereum } = window as any;
   const [openDetailMenu, setOpenDetailMenu] = useState(false);
   const theme = useTheme();
   const allTransactions = useAllTransactions();
@@ -292,8 +292,7 @@ const Header: React.FC = () => {
   const confirmed = sortedRecentTransactions
     .filter((tx: any) => tx.receipt)
     .map((tx: any) => tx.hash);
-  const isnotMatic =
-    ethereum && ethereum.isMetaMask && Number(ethereum.chainId) !== 137;
+  const isnotMatic = chainId !== ChainId.MATIC;
   const tabletWindowSize = useMediaQuery(theme.breakpoints.down('sm'));
   const mobileWindowSize = useMediaQuery(theme.breakpoints.down('xs'));
   const toggleWalletModal = useWalletModalToggle();
@@ -464,7 +463,7 @@ const Header: React.FC = () => {
         >
           <LightIcon />
         </Box>
-        {account ? (
+        {!isnotMatic && account ? (
           <Box
             id='web3-status-connected'
             className={classes.accountDetails}

diff --git a/src/pages/LandingPage/LandingPage.tsx b/src/pages/LandingPage/LandingPage.tsx
@@ -10,7 +10,7 @@ import {
   useMediaQuery,
 } from '@material-ui/core';
 import Skeleton from '@material-ui/lab/Skeleton';
-import { Currency } from '@uniswap/sdk';
+import { Currency, ChainId } from '@uniswap/sdk';
 import { useTheme } from '@material-ui/core/styles';
 import Motif from 'assets/images/Motif.svg';
 import BuyWithFiat from 'assets/images/featured/BuywithFiat.svg';
@@ -428,9 +428,7 @@ const LandingPage: React.FC = () => {
   const [openStakeModal, setOpenStakeModal] = useState(false);
   const { palette, breakpoints } = useTheme();
   const { account, chainId } = useActiveWeb3React();
-  const { ethereum } = window as any;
-  const isnotMatic =
-    ethereum && ethereum.isMetaMask && Number(ethereum.chainId) !== 137;
+  const isnotMatic = chainId !== ChainId.MATIC;
   const mobileWindowSize = useMediaQuery(breakpoints.down('sm'));
   const { initTransak } = useInitTransak();
   const toggleWalletModal = useWalletModalToggle();

diff --git a/src/utils/useUSDCPrice.ts b/src/utils/useUSDCPrice.ts
@@ -24,7 +24,7 @@ export default function useUSDCPrice(currency?: Currency): Price | undefined {
       [
         chainId && wrapped && currencyEquals(WETH[chainId], wrapped)
           ? undefined
-          : currency,
+          : wrapped,
         chainId ? WETH[chainId] : undefined,
       ],
       [
@@ -48,11 +48,11 @@ export default function useUSDCPrice(currency?: Currency): Price | undefined {
         chainId === ChainId.MATIC ? returnTokenFromKey('USDC') : undefined,
       ],
       [
-        chainId ? returnTokenFromKey('QUICK') : undefined,
+        chainId === ChainId.MATIC ? returnTokenFromKey('QUICK') : undefined,
         chainId === ChainId.MATIC ? returnTokenFromKey('USDC') : undefined,
       ],
     ],
-    [chainId, currency, wrapped],
+    [chainId, wrapped],
   );
   const [
     [ethPairState, ethPair],

diff --git a/src/utils/wrappedCurrency.ts b/src/utils/wrappedCurrency.ts
@@ -14,7 +14,7 @@ export function wrappedCurrency(
 ): Token | undefined {
   return chainId && currency === ETHER
     ? WETH[chainId]
-    : currency instanceof Token
+    : currency instanceof Token && currency.chainId === chainId
     ? currency
     : undefined;
 }