919: Fix switch network button showing instead of connect button

src/components/@widgets/SwapWidget/subcomponents/ActionButtons/ActionButtons.tsx

@@ -73,8 +73,8 @@ const ActionButtons: FC<{
   // First determine the next action.
   let nextAction: ButtonActions;
   // Note that wallet is not considered "active" if connected to wrong network
-  if (isNetworkUnsupported) nextAction = ButtonActions.switchNetwork;
-  else if (!walletIsActive) nextAction = ButtonActions.connectWallet;
+  if (!walletIsActive) nextAction = ButtonActions.connectWallet;
+  else if (isNetworkUnsupported) nextAction = ButtonActions.switchNetwork;
   else if (hasError) nextAction = ButtonActions.goBack;
   else if (requiresReload) nextAction = ButtonActions.reloadPage;
   else if (hasQuote && needsApproval) nextAction = ButtonActions.approve;

src/components/TransactionsTab/TransactionsTab.tsx

@@ -12,6 +12,7 @@ import { formatUnits } from "ethers/lib/utils";
 import { AnimatePresence, useReducedMotion } from "framer-motion";
 
 import { useAppSelector } from "../../app/hooks";
+import { supportedNetworks } from "../../constants/supportedNetworks";
 import { SubmittedTransaction } from "../../entities/SubmittedTransaction/SubmittedTransaction";
 import { getSubmittedTransactionKey } from "../../entities/SubmittedTransaction/SubmittedTransactionHelpers";
 import { BalancesState } from "../../features/balances/balancesSlice";
@@ -179,7 +180,9 @@ const TransactionsTab = ({
           <WalletHeader>
             <NetworkInfoContainer>
               <NetworkName>
-                {chainNames[chainId] || t("wallet.unsupported")}
+                {isActive &&
+                  !supportedNetworks.includes(chainId) &&
+                  t("wallet.unsupported")}
               </NetworkName>
               {isActive && (
                 <Balances>

src/constants/supportedNetworks.ts

@@ -12,3 +12,5 @@ export const supportedNetworks: number[] = [
   ChainIds.BSC,
   ChainIds.RSK,
 ];
+
+export type SupportedNetwork = typeof supportedNetworks[number];

src/helpers/ethers.ts

@@ -1,7 +1,6 @@
 import { TransactionReceipt, Web3Provider } from "@ethersproject/providers";
 
 import { rpcUrls } from "../constants/rpc";
-import { SupportedChain } from "../constants/supportedChains";
 
 let cachedLibrary: Record<number, Web3Provider> = {};
 
@@ -20,7 +19,7 @@ export const clearedCachedLibrary = (): void => {
 };
 
 export const getRpcUrl = (chainId: number): string | undefined => {
-  const rpcUrl = rpcUrls[chainId as SupportedChain] as string;
+  const rpcUrl = rpcUrls[chainId];
 
   if (!rpcUrl) {
     console.error(

src/web3-connectors/chainInfo.ts

@@ -3,7 +3,7 @@ import { AddEthereumChainParameter } from "@web3-react/types";
 
 import nativeCurrency from "../constants/nativeCurrency";
 import { rpcUrls } from "../constants/rpc";
-import { SupportedChain } from "../constants/supportedChains";
+import { SupportedNetwork } from "../constants/supportedNetworks";
 
 interface NativeCurrencyTokenInfo extends TokenInfo {
   decimals: 18;
@@ -16,7 +16,7 @@ interface ChainInfo extends Partial<AddEthereumChainParameter> {
   rpcUrl: string;
 }
 
-export const chainInfo: Record<SupportedChain, ChainInfo> = {
+export const chainInfo: Record<SupportedNetwork, ChainInfo> = {
   [ChainIds.MAINNET]: {
     explorer: "https://etherscan.io/",
     label: "Ethereum",

src/web3-connectors/helpers.ts

@@ -1,6 +1,6 @@
 import { AddEthereumChainParameter, Connector } from "@web3-react/types";
 
-import { SupportedChain } from "../constants/supportedChains";
+import { SupportedNetwork } from "../constants/supportedNetworks";
 import { chainInfo } from "./chainInfo";
 import { ConnectionType, getConnection } from "./connections";
 
@@ -32,7 +32,7 @@ export const switchNetwork = async (
     return;
   }
 
-  const info = chainInfo[chainId as SupportedChain];
+  const info = chainInfo[chainId as SupportedNetwork];
   const addChainParameter: AddEthereumChainParameter = {
     chainId,
     chainName: info.nativeCurrency.name,