Merge branch 'v4' into feature/publish

next.config.js

@@ -24,6 +24,12 @@ module.exports = (phase, { defaultConfig }) => {
       )
 
       // for old ocean.js, most likely can be removed later on
+      config.plugins.push(
+        new options.webpack.IgnorePlugin({
+          resourceRegExp: /^electron$/
+        })
+      )
+
       config.resolve.fallback = {
         fs: false,
         crypto: false,

src/@hooks/useNetworkMetadata/utils.ts

@@ -1,5 +1,20 @@
 import { networkDataGaiaX } from './constants'
 
+export function getNetworkType(network: EthereumListsChain): string {
+  // HEADS UP! Hack for getting network's type main/test, without using
+  // .network field, which is innexistent on https://chainid.network/chains.json
+  // We hack in mainnet detection for moonriver.
+  if (
+    !network.name.includes('Testnet') &&
+    !network.title?.includes('Testnet') &&
+    network.name !== 'Moonbase Alpha'
+  ) {
+    return 'mainnet'
+  } else {
+    return 'testnet'
+  }
+}
+
 export function getNetworkDisplayName(
   data: EthereumListsChain,
   networkId: number
@@ -22,9 +37,15 @@ export function getNetworkDisplayName(
     case 8996:
       displayName = 'Development'
       break
+    case 3:
+      displayName = 'ETH Ropsten'
+      break
+    case 2021000:
+      displayName = 'GAIA-X Testnet'
+      break
     default:
       displayName = data
-        ? `${data.chain} ${data.network === 'mainnet' ? '' : data.network}`
+        ? `${data.chain} ${getNetworkType(data) === 'mainnet' ? '' : data.name}`
         : 'Unknown'
       break
   }
@@ -60,9 +81,7 @@ export function filterNetworksByType(
     // network data uses the `network` key wrong over in
     // https://github.com/ethereum-lists/chains/blob/master/_data/chains/eip155-1285.json
     //
-    return type === 'mainnet'
-      ? networkData.network === type || networkData.network === 'moonriver'
-      : networkData.network !== 'mainnet' && networkData.network !== 'moonriver'
+    return type === getNetworkType(networkData)
   })
   return finalNetworks
 }

src/@types/NetworkMetadata.d.ts

@@ -1,9 +1,9 @@
 interface EthereumListsChain {
   name: string
+  title?: string
   chainId: number
   shortName: string
   chain: string
-  network: string
   networkId: number
   nativeCurrency: { name: string; symbol: string; decimals: number }
   rpc: string[]