fix: Goerli testnet

Author: xnyl

src/features/chain/chainUtils.ts

@@ -1,5 +1,5 @@
 import SolanaWalletSerum from "@project-serum/sol-wallet-adapter";
-import { Chain, Filecoin } from "@renproject/chains";
+import { Chain, Filecoin, Goerli } from "@renproject/chains";
 import {
   Bitcoin,
   BitcoinBaseChain,
@@ -181,7 +181,7 @@ export const getDefaultChains = (network: RenNetwork): ChainInstanceMap => {
     [Chain.Ethereum]: getEthereumChain(network),
     [Chain.BinanceSmartChain]: getEthereumBaseChain(BinanceSmartChain, network),
     [Chain.Polygon]: getEthereumBaseChain(Polygon, network),
-    // [Chain.Goerli]: getEthereumBaseChain(Goerli, network),
+    [Chain.Goerli]: getEthereumBaseChain(Goerli, network),
     [Chain.Avalanche]: getEthereumBaseChain(Avalanche, network),
     [Chain.Arbitrum]: getEthereumBaseChain(Arbitrum, network),
     [Chain.Fantom]: getEthereumBaseChain(Fantom, network),

src/features/gateway/renJSHooks.ts

@@ -53,7 +53,7 @@ type ChainsByassetsMappingMapping = Record<
   Partial<Record<Asset, Array<Chain>>>
 >;
 
-export const useWhitelist = () => {
+export const useWhitelist = (dummy = false) => {
   const [whitelist, setWhitelist] = useState<Array<string> | null>(null);
   useEffect(() => {
     globalRenJs.provider.queryConfig().then((response) => {

src/providers/multiwallet/multiwalletConfig.ts

@@ -42,6 +42,15 @@ const isEnabled = (chain: Chain, wallet: Wallet) => {
 export const getMultiwalletConfig = (network: RenNetwork, reinit = false) => {
   return {
     chains: {
+      [Chain.Goerli]: [
+        {
+          name: Wallet.MetaMask,
+          logo: "",
+          connector: new EthereumInjectedConnector({
+            debug: env.DEV,
+            networkIdMapper: createNetworkIdMapper(Chain.Ethereum),
+          }),
+        }],
       [Chain.Ethereum]: [
         {
           name: Wallet.MetaMask,

src/utils/chainsConfig.ts

@@ -26,6 +26,7 @@ import {
   CustomSvgIconComponent,
   EmptyCircleIcon
 } from "../components/icons/RenIcons";
+import { env } from "../constants/environmentVariables";
 import { AssetChainsConfig } from "./assetsConfig";
 import {
   createNetworkConfig,
@@ -106,6 +107,12 @@ const chainsBaseConfig: Record<Chain, ChainBaseConfig> = {
       ...createNetworkConfig(RenNetwork.Testnet, 5, "Goerli Testnet"),
     },
   },
+  Goerli: {
+    Icon: chainIcon(EthereumChain),
+    fullName: "Goerli Testnet",
+    shortName: "Goerli",
+    networks: createNetworksConfig(1, 5),
+  },
   Fantom: {
     Icon: chainIcon(FantomChain),
     fullName: "Fantom",
@@ -162,12 +169,6 @@ const chainsBaseConfig: Record<Chain, ChainBaseConfig> = {
     shortName: "Solana",
     networks: createNetworksConfig(1, 2, RenNetwork.Mainnet, RenNetwork.Devnet),
   },
-  Goerli: {
-    Icon: chainIcon(EthereumChain),
-    fullName: "Goerli Testnet",
-    shortName: "Goerli",
-    networks: createNetworksConfig(1, 5),
-  },
   Catalog: unsetChainConfig,
 };
 
@@ -228,10 +229,10 @@ export const isDepositBaseChain = (chain: Chain) =>
   supportedDepositChains.includes(chain);
 
 export const supportedEthereumChains: Array<Chain> = [
-  Chain.Ethereum,
+  //TODO: hacky till Goerli became default Ethereum testnet in renJS
+  env.NETWORK === "mainnet" ? Chain.Ethereum : Chain.Goerli,
   Chain.BinanceSmartChain,
   Chain.Fantom,
-  // Chain.Goerli,
   Chain.Polygon,
   Chain.Avalanche,
   Chain.Arbitrum,