diff --git a/src/components/AddressInfo/index.tsx b/src/components/AddressInfo/index.tsx
index 44aba892f9..99f94a0903 100644
--- a/src/components/AddressInfo/index.tsx
+++ b/src/components/AddressInfo/index.tsx
@@ -6,7 +6,6 @@ import Identicon from 'src/components/Identicon'
 import Block from 'src/components/layout/Block'
 import Bold from 'src/components/layout/Bold'
 import Paragraph from 'src/components/layout/Paragraph'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import { border, xs } from 'src/theme/variables'
 import styled from 'styled-components'
 
@@ -60,7 +59,7 @@ const AddressInfo = ({ ethBalance, safeAddress, safeName }: Props): React.ReactE
             {safeAddress}
           </Paragraph>
           <CopyBtn content={safeAddress} />
-          <EtherscanBtn type={ExplorerTypes.Address} value={safeAddress} />
+          <EtherscanBtn value={safeAddress} />
         </div>
         {ethBalance && (
           <StyledBlock>
diff --git a/src/components/App/ReceiveModal.tsx b/src/components/App/ReceiveModal.tsx
index 6aa6c4d575..6281a4b43f 100644
--- a/src/components/App/ReceiveModal.tsx
+++ b/src/components/App/ReceiveModal.tsx
@@ -13,7 +13,6 @@ import Col from 'src/components/layout/Col'
 import Hairline from 'src/components/layout/Hairline'
 import Paragraph from 'src/components/layout/Paragraph'
 import Row from 'src/components/layout/Row'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import { lg, md, screenSm, secondaryText, sm } from 'src/theme/variables'
 import { copyToClipboard } from 'src/utils/clipboard'
 
@@ -116,7 +115,7 @@ const ReceiveModal = ({ onClose, safeAddress, safeName }: Props) => {
             {safeAddress}
           </Paragraph>
           <CopyBtn content={safeAddress} />
-          <EtherscanBtn type={ExplorerTypes.Address} value={safeAddress} />
+          <EtherscanBtn value={safeAddress} />
         </Block>
       </Col>
       <Hairline />
diff --git a/src/components/ConnectButton/index.tsx b/src/components/ConnectButton/index.tsx
index a719776f04..a520594bf8 100644
--- a/src/components/ConnectButton/index.tsx
+++ b/src/components/ConnectButton/index.tsx
@@ -3,15 +3,16 @@ import React from 'react'
 
 import Button from 'src/components/layout/Button'
 import { getNetworkId } from 'src/config'
+import { ETHEREUM_NETWORK } from 'src/config/networks/network.d'
 import { getWeb3, setWeb3 } from 'src/logic/wallets/getWeb3'
 import { fetchProvider } from 'src/logic/wallets/store/actions'
 import transactionDataCheck from 'src/logic/wallets/transactionDataCheck'
 import { getSupportedWallets } from 'src/logic/wallets/utils/walletList'
 import { store } from 'src/store'
+import { BLOCKNATIVE_KEY } from 'src/utils/constants'
 
-const isMainnet = process.env.REACT_APP_NETWORK === 'mainnet'
-
-const BLOCKNATIVE_API_KEY = isMainnet ? process.env.REACT_APP_BLOCKNATIVE_KEY : '7fbb9cee-7e97-4436-8770-8b29a9a8814c'
+const networkId = getNetworkId()
+const BLOCKNATIVE_API_KEY = BLOCKNATIVE_KEY[networkId] ?? BLOCKNATIVE_KEY[ETHEREUM_NETWORK.RINKEBY]
 
 let lastUsedAddress = ''
 let providerName
@@ -20,7 +21,7 @@ const wallets = getSupportedWallets()
 
 export const onboard = Onboard({
   dappId: BLOCKNATIVE_API_KEY,
-  networkId: getNetworkId(),
+  networkId: networkId,
   subscriptions: {
     wallet: (wallet) => {
       if (wallet.provider) {
diff --git a/src/components/EtherscanBtn/index.tsx b/src/components/EtherscanBtn/index.tsx
index 294e8473b0..f760948943 100644
--- a/src/components/EtherscanBtn/index.tsx
+++ b/src/components/EtherscanBtn/index.tsx
@@ -6,8 +6,8 @@ import React from 'react'
 import EtherscanOpenIcon from './img/etherscan-open.svg'
 
 import Img from 'src/components/layout/Img'
-import { ExplorerTypes, getExplorerLink } from 'src/logic/wallets/getWeb3'
 import { xs } from 'src/theme/variables'
+import { getExplorerInfo } from 'src/config'
 
 const useStyles = makeStyles({
   container: {
@@ -30,26 +30,23 @@ const useStyles = makeStyles({
 interface EtherscanBtnProps {
   className?: string
   increaseZindex?: boolean
-  type: ExplorerTypes
   value: string
 }
 
-const EtherscanBtn = ({
-  className = '',
-  increaseZindex = false,
-  type,
-  value,
-}: EtherscanBtnProps): React.ReactElement => {
+const EtherscanBtn = ({ className = '', increaseZindex = false, value }: EtherscanBtnProps): React.ReactElement => {
   const classes = useStyles()
   const customClasses = increaseZindex ? { popper: classes.increasedPopperZindex } : {}
 
+  const explorerInfo = getExplorerInfo(value)
+  const { url } = explorerInfo()
+
   return (
     <Tooltip classes={customClasses} placement="top" title="Show details on Etherscan">
       <a
         aria-label="Show details on Etherscan"
         className={cn(classes.container, className)}
         onClick={(event) => event.stopPropagation()}
-        href={getExplorerLink(type, value)}
+        href={url}
         rel="noopener noreferrer"
         target="_blank"
       >
diff --git a/src/components/EtherscanLink/index.tsx b/src/components/EtherscanLink/index.tsx
index 59585b9ee7..e37beeefea 100644
--- a/src/components/EtherscanLink/index.tsx
+++ b/src/components/EtherscanLink/index.tsx
@@ -1,7 +1,6 @@
 import { makeStyles } from '@material-ui/core/styles'
 import cn from 'classnames'
 import React from 'react'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 
 import { styles } from './style'
 
@@ -18,11 +17,10 @@ interface EtherscanLinkProps {
   className?: string
   cut?: number
   knownAddress?: boolean
-  type: ExplorerTypes
   value: string
 }
 
-const EtherscanLink = ({ className, cut, knownAddress, type, value }: EtherscanLinkProps): React.ReactElement => {
+const EtherscanLink = ({ className, cut, knownAddress, value }: EtherscanLinkProps): React.ReactElement => {
   const classes = useStyles()
 
   return (
@@ -31,7 +29,7 @@ const EtherscanLink = ({ className, cut, knownAddress, type, value }: EtherscanL
         {cut ? shortVersionOf(value, cut) : value}
       </Span>
       <CopyBtn className={cn(classes.button, classes.firstButton)} content={value} />
-      <EtherscanBtn className={classes.button} type={type} value={value} />
+      <EtherscanBtn className={classes.button} value={value} />
       {knownAddress !== undefined ? <EllipsisTransactionDetails address={value} knownAddress={knownAddress} /> : null}
     </Block>
   )
diff --git a/src/config/index.ts b/src/config/index.ts
index d790d2a11b..5c9223eddb 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -1,12 +1,6 @@
 import networks from 'src/config/networks'
-import {
-  EnvironmentSettings,
-  ETHEREUM_NETWORK,
-  NetworkSettings,
-  SafeFeatures,
-} from 'src/config/networks/network.d'
-import { checksumAddress } from 'src/utils/checksumAddress'
-import { GOOGLE_ANALYTICS_ID, NETWORK, APP_ENV, NODE_ENV, ETHERSCAN_API_KEY } from 'src/utils/constants'
+import { EnvironmentSettings, ETHEREUM_NETWORK, NetworkSettings, SafeFeatures } from 'src/config/networks/network.d'
+import { APP_ENV, ETHERSCAN_API_KEY, GOOGLE_ANALYTICS_ID, INFURA_TOKEN, NETWORK, NODE_ENV } from 'src/utils/constants'
 import { ensureOnce } from 'src/utils/singleton'
 import memoize from 'lodash.memoize'
 
@@ -67,7 +61,15 @@ export const getRelayUrl = (): string | undefined => getConfig()?.relayApiUrl
 
 export const getGnosisSafeAppsUrl = (): string => getConfig()?.safeAppsUrl
 
-export const getRpcServiceUrl = (): string => getConfig()?.rpcServiceUrl
+export const getRpcServiceUrl = (): string => {
+  const usesInfuraRPC = [ETHEREUM_NETWORK.MAINNET, ETHEREUM_NETWORK.RINKEBY].includes(getNetworkId())
+
+  if (usesInfuraRPC) {
+    return getConfig()?.rpcServiceUrl + INFURA_TOKEN
+  }
+
+  return getConfig()?.rpcServiceUrl
+}
 
 export const getNetworkExplorerInfo = (): { name: string; url: string; apiUrl: string } => ({
   name: getConfig()?.networkExplorerName,
@@ -87,15 +89,7 @@ export const getAllTransactionsUriFrom = (safeAddress: string) => `safes/${safeA
 
 export const getSafeCreationTxUri = (safeAddress: string) => `safes/${safeAddress}/creation/`
 
-export const getGoogleAnalyticsTrackingID = (): string => GOOGLE_ANALYTICS_ID[getNetworkName()]
-
-export const buildSafeCreationTxUrl = (safeAddress: string) => {
-  const host = getTxServiceUrl()
-  const address = checksumAddress(safeAddress)
-  const base = getSafeCreationTxUri(address)
-
-  return `${host}${base}`
-}
+export const getGoogleAnalyticsTrackingID = (): string => GOOGLE_ANALYTICS_ID[getNetworkId()]
 
 const fetchContractABI = memoize(
   async (url: string, contractAddress: string, apiKey?: string) => {
diff --git a/src/logic/contracts/safeContracts.ts b/src/logic/contracts/safeContracts.ts
index 68d971f92b..5d1aa9086f 100644
--- a/src/logic/contracts/safeContracts.ts
+++ b/src/logic/contracts/safeContracts.ts
@@ -1,17 +1,17 @@
-import { AbiItem } from 'web3-utils'
-import contract from 'truffle-contract'
-import Web3 from 'web3'
-import ProxyFactorySol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafeProxyFactory.json'
 import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
 import SafeProxy from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafeProxy.json'
-import { ensureOnce } from 'src/utils/singleton'
+import ProxyFactorySol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafeProxyFactory.json'
 import memoize from 'lodash.memoize'
-import { getWeb3, getNetworkIdFrom } from 'src/logic/wallets/getWeb3'
-import { calculateGasOf, calculateGasPrice } from 'src/logic/wallets/ethTransactions'
-import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
+
+import { ETHEREUM_NETWORK } from 'src/config/networks/network.d'
 import { isProxyCode } from 'src/logic/contracts/historicProxyCode'
-import { GnosisSafeProxyFactory } from 'src/types/contracts/GnosisSafeProxyFactory.d';
+import { ZERO_ADDRESS } from 'src/logic/wallets/ethAddresses'
+import { calculateGasOf, calculateGasPrice } from 'src/logic/wallets/ethTransactions'
+import { getWeb3, getNetworkIdFrom } from 'src/logic/wallets/getWeb3'
 import { GnosisSafe } from 'src/types/contracts/GnosisSafe.d'
+import { GnosisSafeProxyFactory } from 'src/types/contracts/GnosisSafeProxyFactory.d'
+import Web3 from 'web3'
+import { AbiItem } from 'web3-utils'
 
 export const SENTINEL_ADDRESS = '0x0000000000000000000000000000000000000001'
 export const MULTI_SEND_ADDRESS = '0x8d29be29923b68abfdd21e541b9374737b49cdad'
@@ -20,24 +20,39 @@ export const DEFAULT_FALLBACK_HANDLER_ADDRESS = '0xd5D82B6aDDc9027B22dCA772Aa68D
 export const SAFE_MASTER_COPY_ADDRESS_V10 = '0xb6029EA3B2c51D09a50B53CA8012FeEB05bDa35A'
 
 
-let proxyFactoryMaster
-let safeMaster
-
-const createGnosisSafeContract = (web3: Web3) => {
-  const gnosisSafe = contract(GnosisSafeSol)
-  gnosisSafe.setProvider(web3.currentProvider)
-
-  return gnosisSafe
+let proxyFactoryMaster: GnosisSafeProxyFactory
+let safeMaster: GnosisSafe
+
+/**
+ * Creates a Contract instance of the GnosisSafe contract
+ * @param {Web3} web3
+ * @param {ETHEREUM_NETWORK} networkId
+ */
+const createGnosisSafeContract = (web3: Web3, networkId: ETHEREUM_NETWORK) => {
+  const networks = GnosisSafeSol.networks
+  // TODO: this may not be the most scalable approach,
+  //  but up until v1.2.0 the address is the same for all the networks.
+  //  So, if we can't find the network in the Contract artifact, we fallback to MAINNET.
+  const contractAddress = networks[networkId]?.address ?? networks[ETHEREUM_NETWORK.MAINNET].address
+  return new web3.eth.Contract(GnosisSafeSol.abi as AbiItem[], contractAddress) as unknown as GnosisSafe
 }
 
-const createProxyFactoryContract = (web3: Web3, networkId: number): GnosisSafeProxyFactory => {
-  const contractAddress = ProxyFactorySol.networks[networkId].address
-  const proxyFactory = new web3.eth.Contract(ProxyFactorySol.abi as AbiItem[], contractAddress) as unknown as GnosisSafeProxyFactory
-
-  return proxyFactory
+/**
+ * Creates a Contract instance of the GnosisSafeProxyFactory contract
+ * @param {Web3} web3
+ * @param {ETHEREUM_NETWORK} networkId
+ */
+const createProxyFactoryContract = (web3: Web3, networkId: ETHEREUM_NETWORK): GnosisSafeProxyFactory => {
+  const networks = ProxyFactorySol.networks
+  // TODO: this may not be the most scalable approach,
+  //  but up until v1.2.0 the address is the same for all the networks.
+  //  So, if we can't find the network in the Contract artifact, we fallback to MAINNET.
+  const contractAddress = networks[networkId]?.address ?? networks[ETHEREUM_NETWORK.MAINNET].address
+  return new web3.eth.Contract(ProxyFactorySol.abi as AbiItem[], contractAddress) as unknown as GnosisSafeProxyFactory
 }
 
 export const getGnosisSafeContract = memoize(createGnosisSafeContract)
+
 const getCreateProxyFactoryContract = memoize(createProxyFactoryContract)
 
 const instantiateMasterCopies = async () => {
@@ -47,25 +62,11 @@ const instantiateMasterCopies = async () => {
   // Create ProxyFactory Master Copy
   proxyFactoryMaster = getCreateProxyFactoryContract(web3, networkId)
 
-  // Initialize Safe master copy
-  const GnosisSafe = getGnosisSafeContract(web3)
-  safeMaster = await GnosisSafe.deployed()
-}
-
-// ONLY USED IN TEST ENVIRONMENT
-const createMasterCopies = async () => {
-  const web3 = getWeb3()
-  const accounts = await web3.eth.getAccounts()
-  const userAccount = accounts[0]
-
-  const ProxyFactory = getCreateProxyFactoryContract(web3, 4441)
-  proxyFactoryMaster = await ProxyFactory.deploy({ data: GnosisSafeSol.bytecode }).send({ from: userAccount, gas: 5000000 })
-
-  const GnosisSafe = getGnosisSafeContract(web3)
-  safeMaster = await GnosisSafe.new({ from: userAccount, gas: '7000000' })
+  // Create Safe Master copy
+  safeMaster = getGnosisSafeContract(web3, networkId)
 }
 
-export const initContracts = process.env.NODE_ENV === 'test' ? ensureOnce(createMasterCopies) : instantiateMasterCopies
+export const initContracts = instantiateMasterCopies
 
 export const getSafeMasterContract = async () => {
   await initContracts()
@@ -74,11 +75,11 @@ export const getSafeMasterContract = async () => {
 }
 
 export const getSafeDeploymentTransaction = (safeAccounts, numConfirmations) => {
-  const gnosisSafeData = safeMaster.contract.methods
+  const gnosisSafeData = safeMaster.methods
     .setup(safeAccounts, numConfirmations, ZERO_ADDRESS, '0x', DEFAULT_FALLBACK_HANDLER_ADDRESS, ZERO_ADDRESS, 0, ZERO_ADDRESS)
     .encodeABI()
 
-  return proxyFactoryMaster.methods.createProxy(safeMaster.address, gnosisSafeData)
+  return proxyFactoryMaster.methods.createProxy(safeMaster.options.address, gnosisSafeData)
 }
 
 export const estimateGasForDeployingSafe = async (
@@ -86,13 +87,13 @@ export const estimateGasForDeployingSafe = async (
   numConfirmations,
   userAccount,
 ) => {
-  const gnosisSafeData = await safeMaster.contract.methods
+  const gnosisSafeData = await safeMaster.methods
     .setup(safeAccounts, numConfirmations, ZERO_ADDRESS, '0x', DEFAULT_FALLBACK_HANDLER_ADDRESS, ZERO_ADDRESS, 0, ZERO_ADDRESS)
     .encodeABI()
   const proxyFactoryData = proxyFactoryMaster.methods
-    .createProxy(safeMaster.address, gnosisSafeData)
+    .createProxy(safeMaster.options.address, gnosisSafeData)
     .encodeABI()
-  const gas = await calculateGasOf(proxyFactoryData, userAccount, proxyFactoryMaster.address)
+  const gas = await calculateGasOf(proxyFactoryData, userAccount, proxyFactoryMaster.options.address)
   const gasPrice = await calculateGasPrice()
 
   return gas * parseInt(gasPrice, 10)
diff --git a/src/logic/safe/store/actions/fetchSafeCreationTx.ts b/src/logic/safe/store/actions/fetchSafeCreationTx.ts
index d0e79de406..6504d22600 100644
--- a/src/logic/safe/store/actions/fetchSafeCreationTx.ts
+++ b/src/logic/safe/store/actions/fetchSafeCreationTx.ts
@@ -1,7 +1,7 @@
 import axios from 'axios'
 import { List } from 'immutable'
 
-import { buildSafeCreationTxUrl } from 'src/config'
+import { buildSafeCreationTxUrl } from 'src/logic/safe/utils/buildSafeCreationTxUrl'
 import { addOrUpdateTransactions } from './transactions/addOrUpdateTransactions'
 import { makeTransaction } from 'src/logic/safe/store/models/transaction'
 import { TransactionTypes, TransactionStatus } from 'src/logic/safe/store/models/types/transaction'
diff --git a/src/logic/safe/utils/buildSafeCreationTxUrl.ts b/src/logic/safe/utils/buildSafeCreationTxUrl.ts
new file mode 100644
index 0000000000..19554e563a
--- /dev/null
+++ b/src/logic/safe/utils/buildSafeCreationTxUrl.ts
@@ -0,0 +1,10 @@
+import { getTxServiceUrl, getSafeCreationTxUri } from 'src/config'
+import { checksumAddress } from 'src/utils/checksumAddress'
+
+export const buildSafeCreationTxUrl = (safeAddress: string): string => {
+  const host = getTxServiceUrl()
+  const address = checksumAddress(safeAddress)
+  const base = getSafeCreationTxUri(address)
+
+  return `${host}${base}`
+}
diff --git a/src/logic/safe/utils/safeVersion.ts b/src/logic/safe/utils/safeVersion.ts
index 25618a557b..de6fc60b03 100644
--- a/src/logic/safe/utils/safeVersion.ts
+++ b/src/logic/safe/utils/safeVersion.ts
@@ -60,7 +60,7 @@ export const getCurrentMasterContractLastVersion = async (): Promise<string> =>
   const safeMaster = await getSafeMasterContract()
   let safeMasterVersion
   try {
-    safeMasterVersion = await safeMaster.VERSION()
+    safeMasterVersion = await safeMaster.methods.VERSION().call()
   } catch (err) {
     // Default in case that it's not possible to obtain the version from the contract, returns a hardcoded value or an
     // env variable
diff --git a/src/logic/wallets/getWeb3.ts b/src/logic/wallets/getWeb3.ts
index 0b303d660e..c6c61ab4c4 100644
--- a/src/logic/wallets/getWeb3.ts
+++ b/src/logic/wallets/getWeb3.ts
@@ -2,12 +2,11 @@ import Web3 from 'web3'
 import { provider as Provider } from 'web3-core'
 import { ContentHash } from 'web3-eth-ens'
 
-import { getNetworkId } from 'src/config'
-import { ETHEREUM_NETWORK } from 'src/config/networks/network.d'
-import { NETWORK } from 'src/utils/constants'
 import { sameAddress } from './ethAddresses'
 import { EMPTY_DATA } from './ethTransactions'
 import { ProviderProps } from './store/model/provider'
+import { NODE_ENV } from 'src/utils/constants'
+import { getRpcServiceUrl } from 'src/config'
 
 export const WALLET_PROVIDER = {
   SAFE: 'SAFE',
@@ -27,58 +26,11 @@ export const WALLET_PROVIDER = {
   TREZOR: 'TREZOR',
 }
 
-export enum ExplorerTypes {
-  Tx = 'tx',
-  Address = 'address',
-}
-
-export const getEtherScanLink = (network: ETHEREUM_NETWORK, type: ExplorerTypes, value: string): string =>
-  `https://${
-    network === ETHEREUM_NETWORK.MAINNET ? '' : `${ETHEREUM_NETWORK[network].toLowerCase()}.`
-  }etherscan.io/${type}/${value}`
-
-export const getExplorerLink = (type: ExplorerTypes, value: string): string => {
-  const network = getNetworkId()
-
-  switch (network) {
-    case ETHEREUM_NETWORK.MAINNET:
-      return getEtherScanLink(ETHEREUM_NETWORK.MAINNET, type, value)
-    case ETHEREUM_NETWORK.RINKEBY:
-      return getEtherScanLink(ETHEREUM_NETWORK.RINKEBY, type, value)
-    case ETHEREUM_NETWORK.ENERGY_WEB_CHAIN:
-      return `https://explorer.energyweb.org/${type}/${value}`
-    case ETHEREUM_NETWORK.VOLTA:
-      return `https://volta-explorer.energyweb.org/${type}/${value}`
-    default:
-      return getEtherScanLink(network, type, value)
-  }
-}
-
-export const getInfuraUrl = (network: ETHEREUM_NETWORK): string =>
-  `https://${network === ETHEREUM_NETWORK.MAINNET ? 'mainnet' : 'rinkeby'}.infura.io:443/v3/${
-    process.env.REACT_APP_INFURA_TOKEN
-  }`
-
-export const getRPCUrl = (network: ETHEREUM_NETWORK): string => {
-  switch (network) {
-    case ETHEREUM_NETWORK.MAINNET:
-      return getInfuraUrl(network)
-    case ETHEREUM_NETWORK.RINKEBY:
-      return getInfuraUrl(network)
-    case ETHEREUM_NETWORK.ENERGY_WEB_CHAIN:
-      return 'https://rpc.energyweb.org'
-    case ETHEREUM_NETWORK.VOLTA:
-      return 'https://volta-rpc.energyweb.org'
-    default:
-      return ''
-  }
-}
-
 // With some wallets from web3connect you have to use their provider instance only for signing
 // And our own one to fetch data
 export const web3ReadOnly = new Web3(
   process.env.NODE_ENV !== 'test'
-    ? new Web3.providers.HttpProvider(getRPCUrl(ETHEREUM_NETWORK[NETWORK] ?? ETHEREUM_NETWORK.RINKEBY))
+    ? new Web3.providers.HttpProvider(getRpcServiceUrl())
     : window.web3?.currentProvider || 'ws://localhost:8545',
 )
 
@@ -92,7 +44,7 @@ export const resetWeb3 = (): void => {
 export const getAccountFrom = async (web3Provider: Web3): Promise<string | null> => {
   const accounts = await web3Provider.eth.getAccounts()
 
-  if (process.env.NODE_ENV === 'test' && window.testAccountIndex) {
+  if (NODE_ENV === 'test' && window.testAccountIndex) {
     return accounts[window.testAccountIndex]
   }
 
diff --git a/src/logic/wallets/utils/walletList.ts b/src/logic/wallets/utils/walletList.ts
index 8fcf755c3e..1939a1c3d8 100644
--- a/src/logic/wallets/utils/walletList.ts
+++ b/src/logic/wallets/utils/walletList.ts
@@ -1,22 +1,25 @@
-import { getInfuraUrl, getRPCUrl } from '../getWeb3'
-import { getNetworkId } from 'src/config'
+import { WalletInitOptions } from 'bnc-onboard/dist/src/interfaces'
 
-const isMainnet = process.env.REACT_APP_NETWORK === 'mainnet'
+import { getNetworkId, getRpcServiceUrl } from 'src/config'
+import { ETHEREUM_NETWORK } from 'src/config/networks/network.d'
+import { FORTMATIC_KEY, PORTIS_ID } from 'src/utils/constants'
 
-const PORTIS_DAPP_ID = isMainnet ? process.env.REACT_APP_PORTIS_ID : '852b763d-f28b-4463-80cb-846d7ec5806b'
-// const SQUARELINK_CLIENT_ID = isMainnet ? process.env.REACT_APP_SQUARELINK_ID : '46ce08fe50913cfa1b78'
-const FORTMATIC_API_KEY = isMainnet ? process.env.REACT_APP_FORTMATIC_KEY : 'pk_test_CAD437AA29BE0A40'
+const networkId = getNetworkId()
+const PORTIS_DAPP_ID = PORTIS_ID[networkId] ?? PORTIS_ID[ETHEREUM_NETWORK.RINKEBY]
+const FORTMATIC_API_KEY = FORTMATIC_KEY[networkId] ?? FORTMATIC_KEY[ETHEREUM_NETWORK.RINKEBY]
 
-const network = getNetworkId()
-const infuraUrl = getInfuraUrl(network)
+type Wallet = WalletInitOptions & {
+  desktop: boolean
+}
 
-const wallets = [
+const rpcUrl = getRpcServiceUrl()
+const wallets: Wallet[] = [
   { walletName: 'metamask', preferred: true, desktop: false },
   {
     walletName: 'walletConnect',
     preferred: true,
-    infuraKey: process.env.REACT_APP_INFURA_TOKEN,
-    rpc: { [network]: getRPCUrl(network) },
+    // as stated in the documentation, `infuraKey` is not mandatory if rpc is provided
+    rpc: { [networkId]: rpcUrl },
     desktop: true,
     bridge: 'https://safe-walletconnect.gnosis.io/',
   },
@@ -26,13 +29,13 @@ const wallets = [
     preferred: true,
     email: 'safe@gnosis.io',
     desktop: true,
-    rpcUrl: infuraUrl,
+    rpcUrl,
   },
   {
     walletName: 'ledger',
     desktop: true,
     preferred: true,
-    rpcUrl: infuraUrl,
+    rpcUrl,
     LedgerTransport: (window as any).TransportNodeHid,
   },
   { walletName: 'trust', preferred: true, desktop: false },
@@ -51,16 +54,18 @@ const wallets = [
   { walletName: 'torus', desktop: true },
   { walletName: 'unilogin', desktop: true },
   { walletName: 'coinbase', desktop: false },
-  { walletName: 'walletLink', rpcUrl: infuraUrl, desktop: false },
+  { walletName: 'walletLink', rpcUrl, desktop: false },
   { walletName: 'opera', desktop: false },
   { walletName: 'operaTouch', desktop: false },
 ]
 
-export const getSupportedWallets = () => {
+export const getSupportedWallets = (): WalletInitOptions[] => {
   const { isDesktop } = window as any
   /* eslint-disable no-unused-vars */
 
-  if (isDesktop) return wallets.filter((wallet) => wallet.desktop).map(({ desktop, ...rest }) => rest)
+  if (isDesktop) {
+    return wallets.filter((wallet) => wallet.desktop).map(({ desktop, ...rest }) => rest)
+  }
 
   return wallets.map(({ desktop, ...rest }) => rest)
 }
diff --git a/src/routes/load/components/DetailsForm/index.tsx b/src/routes/load/components/DetailsForm/index.tsx
index 66a198b994..1524f9e122 100644
--- a/src/routes/load/components/DetailsForm/index.tsx
+++ b/src/routes/load/components/DetailsForm/index.tsx
@@ -73,7 +73,7 @@ export const safeFieldsValidation = async (values): Promise<Record<string, strin
     `0x${proxyAddressFromStorage.substr(proxyAddressFromStorage.length - 40)}`,
   )
   const safeMaster = await getSafeMasterContract()
-  const masterCopy = safeMaster.address
+  const masterCopy = safeMaster.options.address
   const sameMasterCopy =
     checksummedProxyAddress === masterCopy || checksummedProxyAddress === SAFE_MASTER_COPY_ADDRESS_V10
   if (!sameMasterCopy) {
diff --git a/src/routes/load/components/OwnerList/index.tsx b/src/routes/load/components/OwnerList/index.tsx
index a7919100b1..ab34fa7dd8 100644
--- a/src/routes/load/components/OwnerList/index.tsx
+++ b/src/routes/load/components/OwnerList/index.tsx
@@ -21,7 +21,6 @@ import { addressBookSelector } from 'src/logic/addressBook/store/selectors'
 
 import { formatAddressListToAddressBookNames } from 'src/logic/addressBook/utils'
 import { getGnosisSafeInstanceAt } from 'src/logic/contracts/safeContracts'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import { FIELD_LOAD_ADDRESS, THRESHOLD } from 'src/routes/load/components/fields'
 import { getOwnerAddressBy, getOwnerNameBy } from 'src/routes/open/components/fields'
 import { styles } from './styles'
@@ -113,7 +112,7 @@ const OwnerListComponent = (props) => {
                       {address}
                     </Paragraph>
                     <CopyBtn content={address} />
-                    <EtherscanBtn type={ExplorerTypes.Address} value={address} />
+                    <EtherscanBtn value={address} />
                   </Row>
                 </Col>
               </Row>
diff --git a/src/routes/load/components/ReviewInformation/index.tsx b/src/routes/load/components/ReviewInformation/index.tsx
index 7c728bcf04..2c5ba0759a 100644
--- a/src/routes/load/components/ReviewInformation/index.tsx
+++ b/src/routes/load/components/ReviewInformation/index.tsx
@@ -12,7 +12,6 @@ import Paragraph from 'src/components/layout/Paragraph'
 import Row from 'src/components/layout/Row'
 import OpenPaper from 'src/components/Stepper/OpenPaper'
 import { shortVersionOf } from 'src/logic/wallets/ethAddresses'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import { FIELD_LOAD_ADDRESS, FIELD_LOAD_NAME, THRESHOLD } from 'src/routes/load/components/fields'
 import { getNumOwnersFrom, getOwnerAddressBy, getOwnerNameBy } from 'src/routes/open/components/fields'
 import { getAccountsFrom } from 'src/routes/open/utils/safeDataExtractor'
@@ -77,7 +76,7 @@ const ReviewComponent = ({ userAddress, values }: Props): React.ReactElement =>
                   {shortVersionOf(safeAddress, 4)}
                 </Paragraph>
                 <CopyBtn content={safeAddress} />
-                <EtherscanBtn type={ExplorerTypes.Address} value={safeAddress} />
+                <EtherscanBtn value={safeAddress} />
               </Row>
             </Block>
             <Block margin="lg">
@@ -122,7 +121,7 @@ const ReviewComponent = ({ userAddress, values }: Props): React.ReactElement =>
                           {address}
                         </Paragraph>
                         <CopyBtn content={address} />
-                        <EtherscanBtn type={ExplorerTypes.Address} value={address} />
+                        <EtherscanBtn value={address} />
                       </Block>
                     </Block>
                   </Col>
diff --git a/src/routes/open/components/ReviewInformation/index.tsx b/src/routes/open/components/ReviewInformation/index.tsx
index f76792b79b..2ed3dff91e 100644
--- a/src/routes/open/components/ReviewInformation/index.tsx
+++ b/src/routes/open/components/ReviewInformation/index.tsx
@@ -13,7 +13,7 @@ import Row from 'src/components/layout/Row'
 import OpenPaper from 'src/components/Stepper/OpenPaper'
 import { estimateGasForDeployingSafe } from 'src/logic/contracts/safeContracts'
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
-import { ExplorerTypes, getWeb3 } from 'src/logic/wallets/getWeb3'
+import { getWeb3 } from 'src/logic/wallets/getWeb3'
 import { getAccountsFrom, getNamesFrom } from 'src/routes/open/utils/safeDataExtractor'
 
 import { FIELD_CONFIRMATIONS, FIELD_NAME, getNumOwnersFrom } from '../fields'
@@ -118,7 +118,7 @@ const ReviewComponent = ({ userAccount, values }: ReviewComponentProps) => {
                           {addresses[index]}
                         </Paragraph>
                         <CopyBtn content={addresses[index]} />
-                        <EtherscanBtn type={ExplorerTypes.Address} value={addresses[index]} />
+                        <EtherscanBtn value={addresses[index]} />
                       </Block>
                     </Block>
                   </Col>
diff --git a/src/routes/open/container/Open.tsx b/src/routes/open/container/Open.tsx
index 360d388438..9b98eac323 100644
--- a/src/routes/open/container/Open.tsx
+++ b/src/routes/open/container/Open.tsx
@@ -22,6 +22,7 @@ import { loadFromStorage, removeFromStorage, saveToStorage } from 'src/utils/sto
 import { userAccountSelector } from 'src/logic/wallets/store/selectors'
 import { SafeRecordProps } from 'src/logic/safe/store/models/safe'
 import { addOrUpdateSafe } from 'src/logic/safe/store/actions/addOrUpdateSafe'
+import { PromiEvent, TransactionReceipt } from 'web3-core'
 
 const SAFE_PENDING_CREATION_STORAGE_KEY = 'SAFE_PENDING_CREATION_STORAGE_KEY'
 
@@ -60,7 +61,7 @@ export const createSafe = (values, userAccount) => {
 
   const deploymentTx = getSafeDeploymentTransaction(ownerAddresses, confirmations)
 
-  const promiEvent = deploymentTx.send({ from: userAccount, value: 0 })
+  const promiEvent = deploymentTx.send({ from: userAccount })
 
   promiEvent
     .once('transactionHash', (txHash) => {
@@ -68,7 +69,7 @@ export const createSafe = (values, userAccount) => {
     })
     .then(async (receipt) => {
       await checkReceiptStatus(receipt.transactionHash)
-      const safeAddress = receipt.events.ProxyCreation.returnValues.proxy
+      const safeAddress = receipt.events?.ProxyCreation.returnValues.proxy
       const safeProps = await getSafeProps(safeAddress, name, ownersNames, ownerAddresses)
       // returning info for testing purposes, in app is fully async
       return { safeAddress: safeProps.address, safeTx: receipt }
@@ -83,7 +84,7 @@ export const createSafe = (values, userAccount) => {
 const Open = (): React.ReactElement => {
   const [loading, setLoading] = useState(false)
   const [showProgress, setShowProgress] = useState(false)
-  const [creationTxPromise, setCreationTxPromise] = useState()
+  const [creationTxPromise, setCreationTxPromise] = useState<PromiEvent<TransactionReceipt>>()
   const [safeCreationPendingInfo, setSafeCreationPendingInfo] = useState<any>()
   const [safePropsFromUrl, setSafePropsFromUrl] = useState()
   const userAccount = useSelector(userAccountSelector)
diff --git a/src/routes/opening/components/Footer.tsx b/src/routes/opening/components/Footer.tsx
index bd531c1edb..8f213484c4 100644
--- a/src/routes/opening/components/Footer.tsx
+++ b/src/routes/opening/components/Footer.tsx
@@ -2,10 +2,10 @@ import React, { SyntheticEvent } from 'react'
 import styled from 'styled-components'
 
 import Button from 'src/components/layout/Button'
-import { getExplorerLink, ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import { connected } from 'src/theme/variables'
+import { getExplorerInfo } from 'src/config'
 
-const EtherScanLink = styled.a`
+const ExplorerLink = styled.a`
   color: ${connected};
 `
 
@@ -13,24 +13,31 @@ const ButtonWithMargin = styled(Button)`
   margin-right: 16px;
 `
 
-export const GenericFooter = ({ safeCreationTxHash }: { safeCreationTxHash: string }) => (
-  <span>
-    <p>This process should take a couple of minutes.</p>
-    <p>
-      Follow the progress on{' '}
-      <EtherScanLink
-        aria-label="Show on Etherscan"
-        href={getExplorerLink(ExplorerTypes.Tx, safeCreationTxHash)}
-        rel="noopener noreferrer"
-        target="_blank"
-        data-testid="safe-create-etherscan-link"
-      >
-        Etherscan.io
-      </EtherScanLink>
-      .
-    </p>
-  </span>
-)
+export const GenericFooter = ({ safeCreationTxHash }: { safeCreationTxHash: string }) => {
+  const explorerInfo = getExplorerInfo(safeCreationTxHash)
+  const { url, alt } = explorerInfo()
+  const match = /(http|https):\/\/(\w+\.\w+)\/.*/i.exec(url)
+  const explorerDomain = match !== null ? match[2] : 'Network Explorer'
+
+  return (
+    <span>
+      <p>This process should take a couple of minutes.</p>
+      <p>
+        Follow the progress on{' '}
+        <ExplorerLink
+          aria-label={alt}
+          href={url}
+          rel="noopener noreferrer"
+          target="_blank"
+          data-testid="safe-create-explorer-link"
+        >
+          {explorerDomain}
+        </ExplorerLink>
+        .
+      </p>
+    </span>
+  )
+}
 
 export const ContinueFooter = ({
   continueButtonDisabled,
diff --git a/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/ReviewCustomTx/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/ReviewCustomTx/index.tsx
index 4b8129ee4b..4b6ffa401e 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/ReviewCustomTx/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/ReviewCustomTx/index.tsx
@@ -20,7 +20,7 @@ import { TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions'
 import { estimateTxGasCosts } from 'src/logic/safe/transactions/gasNew'
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
 import { getEthAsToken } from 'src/logic/tokens/utils/tokenHelpers'
-import { ExplorerTypes, getWeb3 } from 'src/logic/wallets/getWeb3'
+import { getWeb3 } from 'src/logic/wallets/getWeb3'
 import SafeInfo from 'src/routes/safe/components/Balances/SendModal/SafeInfo'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 import { sm } from 'src/theme/variables'
@@ -122,7 +122,7 @@ const ReviewCustomTx = ({ onClose, onPrev, tx }: Props): React.ReactElement => {
                 {tx.contractAddress}
               </Paragraph>
               <CopyBtn content={tx.contractAddress as string} />
-              <EtherscanBtn type={ExplorerTypes.Address} value={tx.contractAddress as string} />
+              <EtherscanBtn value={tx.contractAddress as string} />
             </Block>
           </Col>
         </Row>
diff --git a/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/SendCustomTx/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/SendCustomTx/index.tsx
index e53bca0d60..2599f4f358 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/SendCustomTx/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/SendCustomTx/index.tsx
@@ -25,7 +25,6 @@ import Paragraph from 'src/components/layout/Paragraph'
 import Row from 'src/components/layout/Row'
 import ScanQRModal from 'src/components/ScanQRModal'
 import { safeSelector } from 'src/logic/safe/store/selectors'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import SafeInfo from 'src/routes/safe/components/Balances/SendModal/SafeInfo'
 import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
 import { sm } from 'src/theme/variables'
@@ -178,7 +177,7 @@ const SendCustomTx: React.FC<Props> = ({ initialValues, onClose, onNext, contrac
                             </Paragraph>
                           </Block>
                           <CopyBtn content={selectedEntry.address} />
-                          <EtherscanBtn type={ExplorerTypes.Address} value={selectedEntry.address} />
+                          <EtherscanBtn value={selectedEntry.address} />
                         </Block>
                       </Col>
                     </Row>
diff --git a/src/routes/safe/components/Balances/SendModal/screens/ReviewCollectible/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/ReviewCollectible/index.tsx
index b9783e58a3..7a77be83b8 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/ReviewCollectible/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/ReviewCollectible/index.tsx
@@ -27,7 +27,7 @@ import {
 } from 'src/logic/tokens/store/actions/fetchTokens'
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
 import { SAFE_TRANSFER_FROM_WITHOUT_DATA_HASH } from 'src/logic/tokens/utils/tokenHelpers'
-import { ExplorerTypes, getWeb3 } from 'src/logic/wallets/getWeb3'
+import { getWeb3 } from 'src/logic/wallets/getWeb3'
 import SafeInfo from 'src/routes/safe/components/Balances/SendModal/SafeInfo'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 import { sm } from 'src/theme/variables'
@@ -135,7 +135,7 @@ const ReviewCollectible = ({ closeSnackbar, enqueueSnackbar, onClose, onPrev, tx
                 {tx.recipientAddress}
               </Paragraph>
               <CopyBtn content={tx.recipientAddress} />
-              <EtherscanBtn type={ExplorerTypes.Address} value={tx.recipientAddress} />
+              <EtherscanBtn value={tx.recipientAddress} />
             </Block>
           </Col>
         </Row>
diff --git a/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.tsx
index 0fe167da22..f9e1ff3035 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/index.tsx
@@ -24,7 +24,7 @@ import { getHumanFriendlyToken } from 'src/logic/tokens/store/actions/fetchToken
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
 import { ETH_ADDRESS } from 'src/logic/tokens/utils/tokenHelpers'
 import { EMPTY_DATA } from 'src/logic/wallets/ethTransactions'
-import { ExplorerTypes, getWeb3 } from 'src/logic/wallets/getWeb3'
+import { getWeb3 } from 'src/logic/wallets/getWeb3'
 import SafeInfo from 'src/routes/safe/components/Balances/SendModal/SafeInfo'
 import { setImageToPlaceholder } from 'src/routes/safe/components/Balances/utils'
 import { extendedSafeTokensSelector } from 'src/routes/safe/container/selector'
@@ -149,7 +149,7 @@ const ReviewTx = ({ closeSnackbar, enqueueSnackbar, onClose, onPrev, tx }) => {
                 {tx.recipientAddress}
               </Paragraph>
               <CopyBtn content={tx.recipientAddress} />
-              <EtherscanBtn type={ExplorerTypes.Address} value={tx.recipientAddress} />
+              <EtherscanBtn value={tx.recipientAddress} />
             </Block>
           </Col>
         </Row>
diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/index.tsx
index 22ca6d03ca..833f4e9956 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/SendCollectible/index.tsx
@@ -19,7 +19,6 @@ import WhenFieldChanges from 'src/components/WhenFieldChanges'
 import { addressBookSelector } from 'src/logic/addressBook/store/selectors'
 import { getNameFromAddressBook } from 'src/logic/addressBook/utils'
 import { nftTokensSelector, safeActiveSelectorMap } from 'src/logic/collectibles/store/selectors'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import SafeInfo from 'src/routes/safe/components/Balances/SendModal/SafeInfo'
 import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
 import CollectibleSelectField from 'src/routes/safe/components/Balances/SendModal/screens/SendCollectible/CollectibleSelectField'
@@ -172,7 +171,7 @@ const SendCollectible = ({
                             </Paragraph>
                           </Block>
                           <CopyBtn content={selectedEntry.address} />
-                          <EtherscanBtn type={ExplorerTypes.Address} value={selectedEntry.address} />
+                          <EtherscanBtn value={selectedEntry.address} />
                         </Block>
                       </Col>
                     </Row>
diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx
index 4d1ea8e3b1..8ccd275e05 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.tsx
@@ -23,7 +23,6 @@ import Row from 'src/components/layout/Row'
 import { ScanQRWrapper } from 'src/components/ScanQRModal/ScanQRWrapper'
 import { addressBookSelector } from 'src/logic/addressBook/store/selectors'
 import { getNameFromAddressBook } from 'src/logic/addressBook/utils'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 
 import SafeInfo from 'src/routes/safe/components/Balances/SendModal/SafeInfo'
 import AddressBookInput from 'src/routes/safe/components/Balances/SendModal/screens/AddressBookInput'
@@ -185,7 +184,7 @@ const SendFunds = ({
                             </Paragraph>
                           </Block>
                           <CopyBtn content={selectedEntry.address} />
-                          <EtherscanBtn type={ExplorerTypes.Address} value={selectedEntry.address} />
+                          <EtherscanBtn value={selectedEntry.address} />
                         </Block>
                       </Col>
                     </Row>
diff --git a/src/routes/safe/components/Settings/Advanced/RemoveModuleModal.tsx b/src/routes/safe/components/Settings/Advanced/RemoveModuleModal.tsx
index 9b33f83324..cfe23ac0fa 100644
--- a/src/routes/safe/components/Settings/Advanced/RemoveModuleModal.tsx
+++ b/src/routes/safe/components/Settings/Advanced/RemoveModuleModal.tsx
@@ -14,13 +14,13 @@ import Link from 'src/components/layout/Link'
 import Paragraph from 'src/components/layout/Paragraph'
 import Row from 'src/components/layout/Row'
 import Modal from 'src/components/Modal'
+import { getExplorerInfo } from 'src/config'
 import { getGnosisSafeInstanceAt } from 'src/logic/contracts/safeContracts'
 import createTransaction from 'src/logic/safe/store/actions/createTransaction'
 
 import { ModulePair } from 'src/logic/safe/store/models/safe'
 import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
 import { TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions'
-import { ExplorerTypes, getExplorerLink } from 'src/logic/wallets/getWeb3'
 import { md, secondary } from 'src/theme/variables'
 import styled from 'styled-components'
 
@@ -49,6 +49,9 @@ const RemoveModuleModal = ({ onClose, selectedModule }: RemoveModuleModal): Reac
   const safeAddress = useSelector(safeParamAddressFromStateSelector) as string
   const dispatch = useDispatch()
 
+  const explorerInfo = getExplorerInfo(selectedModule[0])
+  const { url } = explorerInfo()
+
   const removeSelectedModule = async (): Promise<void> => {
     try {
       const safeInstance = await getGnosisSafeInstanceAt(safeAddress)
@@ -101,11 +104,7 @@ const RemoveModuleModal = ({ onClose, selectedModule }: RemoveModuleModal): Reac
                   <Paragraph color="disabled" noMargin size="md">
                     {selectedModule[0]}
                   </Paragraph>
-                  <Link
-                    className={classes.modalOpen}
-                    target="_blank"
-                    to={getExplorerLink(ExplorerTypes.Address, selectedModule[0])}
-                  >
+                  <Link className={classes.modalOpen} target="_blank" to={url}>
                     <OpenInNew style={openIconStyle} />
                   </Link>
                 </Block>
diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/index.tsx b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/index.tsx
index cd5a6cb9ac..1f659eba39 100644
--- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/index.tsx
+++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/index.tsx
@@ -18,7 +18,7 @@ import { getGnosisSafeInstanceAt } from 'src/logic/contracts/safeContracts'
 import { safeNameSelector, safeOwnersSelector, safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
 import { estimateTxGasCosts } from 'src/logic/safe/transactions/gasNew'
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
-import { ExplorerTypes, getWeb3 } from 'src/logic/wallets/getWeb3'
+import { getWeb3 } from 'src/logic/wallets/getWeb3'
 
 import { styles } from './style'
 
@@ -118,7 +118,7 @@ const ReviewAddOwner = ({ classes, onClickBack, onClose, onSubmit, values }) =>
                           {owner.address}
                         </Paragraph>
                         <CopyBtn content={owner.address} />
-                        <EtherscanBtn type={ExplorerTypes.Address} value={owner.address} />
+                        <EtherscanBtn value={owner.address} />
                       </Block>
                     </Block>
                   </Col>
@@ -146,7 +146,7 @@ const ReviewAddOwner = ({ classes, onClickBack, onClose, onSubmit, values }) =>
                       {values.ownerAddress}
                     </Paragraph>
                     <CopyBtn content={values.ownerAddress} />
-                    <EtherscanBtn type={ExplorerTypes.Address} value={values.ownerAddress} />
+                    <EtherscanBtn value={values.ownerAddress} />
                   </Block>
                 </Block>
               </Col>
diff --git a/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/index.tsx b/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/index.tsx
index 1d0794ea9c..6d750aed04 100644
--- a/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/index.tsx
+++ b/src/routes/safe/components/Settings/ManageOwners/EditOwnerModal/index.tsx
@@ -23,7 +23,6 @@ import { NOTIFICATIONS } from 'src/logic/notifications'
 import enqueueSnackbar from 'src/logic/notifications/store/actions/enqueueSnackbar'
 import editSafeOwner from 'src/logic/safe/store/actions/editSafeOwner'
 import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import { sm } from 'src/theme/variables'
 
 import { styles } from './style'
@@ -94,7 +93,7 @@ const EditOwnerComponent = ({ isOpen, onClose, ownerAddress, selectedOwnerName }
                     {ownerAddress}
                   </Paragraph>
                   <CopyBtn content={safeAddress} />
-                  <EtherscanBtn type={ExplorerTypes.Address} value={safeAddress} />
+                  <EtherscanBtn value={safeAddress} />
                 </Block>
               </Row>
             </Block>
diff --git a/src/routes/safe/components/Settings/ManageOwners/OwnerAddressTableCell/index.tsx b/src/routes/safe/components/Settings/ManageOwners/OwnerAddressTableCell/index.tsx
index 4bd3d8d22e..0caf445ca6 100644
--- a/src/routes/safe/components/Settings/ManageOwners/OwnerAddressTableCell/index.tsx
+++ b/src/routes/safe/components/Settings/ManageOwners/OwnerAddressTableCell/index.tsx
@@ -7,7 +7,6 @@ import Block from 'src/components/layout/Block'
 import Paragraph from 'src/components/layout/Paragraph'
 import { getValidAddressBookName } from 'src/logic/addressBook/utils'
 import { useWindowDimensions } from 'src/logic/hooks/useWindowDimensions'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 
 type OwnerAddressTableCellProps = {
   address: string
@@ -37,7 +36,7 @@ const OwnerAddressTableCell = (props: OwnerAddressTableCellProps): React.ReactEl
       {showLinks ? (
         <div style={{ marginLeft: 10, flexShrink: 1, minWidth: 0 }}>
           {userName && getValidAddressBookName(userName)}
-          <EtherScanLink knownAddress={knownAddress} type={ExplorerTypes.Address} value={address} cut={cut} />
+          <EtherScanLink knownAddress={knownAddress} value={address} cut={cut} />
         </div>
       ) : (
         <Paragraph style={{ marginLeft: 10 }}>{address}</Paragraph>
diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.tsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.tsx
index f3ab823304..3ab15c42a6 100644
--- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.tsx
+++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/index.tsx
@@ -13,7 +13,6 @@ import Col from 'src/components/layout/Col'
 import Hairline from 'src/components/layout/Hairline'
 import Paragraph from 'src/components/layout/Paragraph'
 import Row from 'src/components/layout/Row'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 
 import { styles } from './style'
 
@@ -54,7 +53,7 @@ const CheckOwner = ({ classes, onClose, onSubmit, ownerAddress, ownerName }) =>
                   {ownerAddress}
                 </Paragraph>
                 <CopyBtn content={ownerAddress} />
-                <EtherscanBtn type={ExplorerTypes.Address} value={ownerAddress} />
+                <EtherscanBtn value={ownerAddress} />
               </Block>
             </Block>
           </Col>
diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.tsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.tsx
index f10e362041..0a9b13b336 100644
--- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.tsx
+++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/index.tsx
@@ -18,7 +18,7 @@ import { getGnosisSafeInstanceAt, SENTINEL_ADDRESS } from 'src/logic/contracts/s
 import { safeNameSelector, safeOwnersSelector, safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
 import { estimateTxGasCosts } from 'src/logic/safe/transactions/gasNew'
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
-import { ExplorerTypes, getWeb3 } from 'src/logic/wallets/getWeb3'
+import { getWeb3 } from 'src/logic/wallets/getWeb3'
 
 import { styles } from './style'
 
@@ -120,7 +120,7 @@ const ReviewRemoveOwner = ({ classes, onClickBack, onClose, onSubmit, ownerAddre
                               {owner.address}
                             </Paragraph>
                             <CopyBtn content={owner.address} />
-                            <EtherscanBtn type={ExplorerTypes.Address} value={owner.address} />
+                            <EtherscanBtn value={owner.address} />
                           </Block>
                         </Block>
                       </Col>
@@ -149,7 +149,7 @@ const ReviewRemoveOwner = ({ classes, onClickBack, onClose, onSubmit, ownerAddre
                       {ownerAddress}
                     </Paragraph>
                     <CopyBtn content={ownerAddress} />
-                    <EtherscanBtn type={ExplorerTypes.Address} value={ownerAddress} />
+                    <EtherscanBtn value={ownerAddress} />
                   </Block>
                 </Block>
               </Col>
diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/index.tsx b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/index.tsx
index a66965cc87..c808f411df 100644
--- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/index.tsx
+++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/index.tsx
@@ -21,7 +21,6 @@ import Paragraph from 'src/components/layout/Paragraph'
 import Row from 'src/components/layout/Row'
 import { ScanQRWrapper } from 'src/components/ScanQRModal/ScanQRWrapper'
 import { safeOwnersSelector } from 'src/logic/safe/store/selectors'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 
 import { styles } from './style'
 
@@ -95,7 +94,7 @@ const OwnerForm = ({ classes, onClose, onSubmit, ownerAddress, ownerName }) => {
                           {ownerAddress}
                         </Paragraph>
                         <CopyBtn content={ownerAddress} />
-                        <EtherscanBtn type={ExplorerTypes.Address} value={ownerAddress} />
+                        <EtherscanBtn value={ownerAddress} />
                       </Block>
                     </Block>
                   </Col>
diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/index.tsx b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/index.tsx
index 3b1ce84db6..1b1e475243 100644
--- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/index.tsx
+++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/index.tsx
@@ -23,7 +23,7 @@ import {
 } from 'src/logic/safe/store/selectors'
 import { estimateTxGasCosts } from 'src/logic/safe/transactions/gasNew'
 import { formatAmount } from 'src/logic/tokens/utils/formatAmount'
-import { ExplorerTypes, getWeb3 } from 'src/logic/wallets/getWeb3'
+import { getWeb3 } from 'src/logic/wallets/getWeb3'
 
 import { styles } from './style'
 
@@ -124,7 +124,7 @@ const ReviewRemoveOwner = ({ classes, onClickBack, onClose, onSubmit, ownerAddre
                               {owner.address}
                             </Paragraph>
                             <CopyBtn content={owner.address} />
-                            <EtherscanBtn type={ExplorerTypes.Address} value={owner.address} />
+                            <EtherscanBtn value={owner.address} />
                           </Block>
                         </Block>
                       </Col>
@@ -153,7 +153,7 @@ const ReviewRemoveOwner = ({ classes, onClickBack, onClose, onSubmit, ownerAddre
                       {ownerAddress}
                     </Paragraph>
                     <CopyBtn content={ownerAddress} />
-                    <EtherscanBtn type={ExplorerTypes.Address} value={ownerAddress} />
+                    <EtherscanBtn value={ownerAddress} />
                   </Block>
                 </Block>
               </Col>
@@ -178,7 +178,7 @@ const ReviewRemoveOwner = ({ classes, onClickBack, onClose, onSubmit, ownerAddre
                       {values.ownerAddress}
                     </Paragraph>
                     <CopyBtn content={values.ownerAddress} />
-                    <EtherscanBtn type={ExplorerTypes.Address} value={values.ownerAddress} />
+                    <EtherscanBtn value={values.ownerAddress} />
                   </Block>
                 </Block>
               </Col>
diff --git a/src/routes/safe/components/Settings/RemoveSafeModal/index.tsx b/src/routes/safe/components/Settings/RemoveSafeModal/index.tsx
index 35edc8dd72..5524ecd31d 100644
--- a/src/routes/safe/components/Settings/RemoveSafeModal/index.tsx
+++ b/src/routes/safe/components/Settings/RemoveSafeModal/index.tsx
@@ -5,6 +5,7 @@ import OpenInNew from '@material-ui/icons/OpenInNew'
 import classNames from 'classnames'
 import React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
+import { getExplorerInfo } from 'src/config'
 
 import { styles } from './style'
 
@@ -17,7 +18,6 @@ import Hairline from 'src/components/layout/Hairline'
 import Link from 'src/components/layout/Link'
 import Paragraph from 'src/components/layout/Paragraph'
 import Row from 'src/components/layout/Row'
-import { getExplorerLink, ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import removeSafe from 'src/logic/safe/store/actions/removeSafe'
 import { safeNameSelector, safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
 import { md, secondary } from 'src/theme/variables'
@@ -34,7 +34,8 @@ const RemoveSafeComponent = ({ isOpen, onClose }) => {
   const safeAddress = useSelector(safeParamAddressFromStateSelector) as string
   const safeName = useSelector(safeNameSelector)
   const dispatch = useDispatch()
-  const etherScanLink = getExplorerLink(ExplorerTypes.Address, safeAddress)
+  const explorerInfo = getExplorerInfo(safeAddress)
+  const { url } = explorerInfo()
 
   return (
     <Modal
@@ -67,7 +68,7 @@ const RemoveSafeComponent = ({ isOpen, onClose }) => {
                 <Paragraph color="disabled" noMargin size="md">
                   {safeAddress}
                 </Paragraph>
-                <Link className={classes.open} target="_blank" to={etherScanLink}>
+                <Link className={classes.open} target="_blank" to={url}>
                   <OpenInNew style={openIconStyle} />
                 </Link>
               </Block>
diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/IncomingTxDescription/index.tsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/IncomingTxDescription/index.tsx
index 6ab5fc723f..532ce9ac18 100644
--- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/IncomingTxDescription/index.tsx
+++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/IncomingTxDescription/index.tsx
@@ -6,7 +6,6 @@ import EtherscanLink from 'src/components/EtherscanLink'
 import Block from 'src/components/layout/Block'
 import Bold from 'src/components/layout/Bold'
 import { getNameFromAddressBookSelector } from 'src/logic/addressBook/store/selectors'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import OwnerAddressTableCell from 'src/routes/safe/components/Settings/ManageOwners/OwnerAddressTableCell'
 import { getIncomingTxAmount } from 'src/routes/safe/components/Transactions/TxsTable/columns'
 import { lg, md } from 'src/theme/variables'
@@ -29,7 +28,7 @@ const TransferDescription = ({ from, txFromName, value = '' }) => (
     {txFromName ? (
       <OwnerAddressTableCell address={from} knownAddress showLinks userName={txFromName} />
     ) : (
-      <EtherscanLink knownAddress={false} type={ExplorerTypes.Address} value={from} />
+      <EtherscanLink knownAddress={false} value={from} />
     )}
   </Block>
 )
diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/SettingsDescription.tsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/SettingsDescription.tsx
index 6075415789..ccaf06fe80 100644
--- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/SettingsDescription.tsx
+++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/SettingsDescription.tsx
@@ -6,7 +6,6 @@ import Bold from 'src/components/layout/Bold'
 import Paragraph from 'src/components/layout/Paragraph'
 
 import { getNameFromAddressBookSelector } from 'src/logic/addressBook/store/selectors'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import OwnerAddressTableCell from 'src/routes/safe/components/Settings/ManageOwners/OwnerAddressTableCell'
 import { SAFE_METHODS_NAMES, SafeMethods } from 'src/routes/safe/store/models/types/transactions.d'
 
@@ -30,7 +29,7 @@ const RemovedOwner = ({ removedOwner }: RemovedOwnerProps): React.ReactElement =
       {ownerChangedName ? (
         <OwnerAddressTableCell address={removedOwner} knownAddress showLinks userName={ownerChangedName} />
       ) : (
-        <EtherscanLink knownAddress={false} type={ExplorerTypes.Address} value={removedOwner} />
+        <EtherscanLink knownAddress={false} value={removedOwner} />
       )}
     </Block>
   )
@@ -49,7 +48,7 @@ const AddedOwner = ({ addedOwner }: AddedOwnerProps): React.ReactElement => {
       {ownerChangedName ? (
         <OwnerAddressTableCell address={addedOwner} knownAddress showLinks userName={ownerChangedName} />
       ) : (
-        <EtherscanLink knownAddress={false} type={ExplorerTypes.Address} value={addedOwner} />
+        <EtherscanLink knownAddress={false} value={addedOwner} />
       )}
     </Block>
   )
@@ -75,7 +74,7 @@ interface AddModuleProps {
 const AddModule = ({ module }: AddModuleProps): React.ReactElement => (
   <Block data-testid={TRANSACTIONS_DESC_ADD_MODULE_TEST_ID}>
     <Bold>Add module:</Bold>
-    <EtherscanLink value={module} knownAddress={false} type={ExplorerTypes.Address} />
+    <EtherscanLink value={module} knownAddress={false} />
   </Block>
 )
 
@@ -86,7 +85,7 @@ interface RemoveModuleProps {
 const RemoveModule = ({ module }: RemoveModuleProps): React.ReactElement => (
   <Block data-testid={TRANSACTIONS_DESC_REMOVE_MODULE_TEST_ID}>
     <Bold>Remove module:</Bold>
-    <EtherscanLink value={module} knownAddress={false} type={ExplorerTypes.Address} />
+    <EtherscanLink value={module} knownAddress={false} />
   </Block>
 )
 
diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/TransferDescription.tsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/TransferDescription.tsx
index 1128d07103..afc5f2c13c 100644
--- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/TransferDescription.tsx
+++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/TransferDescription.tsx
@@ -4,7 +4,6 @@ import EtherscanLink from 'src/components/EtherscanLink'
 import Block from 'src/components/layout/Block'
 import Bold from 'src/components/layout/Bold'
 import { getNameFromAddressBookSelector } from 'src/logic/addressBook/store/selectors'
-import { ExplorerTypes } from 'src/logic/wallets/getWeb3'
 import OwnerAddressTableCell from 'src/routes/safe/components/Settings/ManageOwners/OwnerAddressTableCell'
 
 import { TRANSACTIONS_DESC_SEND_TEST_ID } from './index'
@@ -22,7 +21,7 @@ const TransferDescription = ({ amount = '', recipient }: TransferDescriptionProp
       {recipientName ? (
         <OwnerAddressTableCell address={recipient} knownAddress showLinks userName={recipientName} />
       ) : (
-        <EtherscanLink knownAddress={false} type={ExplorerTypes.Address} value={recipient} />
+        <EtherscanLink knownAddress={false} value={recipient} />
       )}
     </Block>
   )
diff --git a/src/test/builder/safe.redux.builder.ts b/src/test/builder/safe.redux.builder.ts
index cf6f297ba6..8a44555ae7 100644
--- a/src/test/builder/safe.redux.builder.ts
+++ b/src/test/builder/safe.redux.builder.ts
@@ -89,9 +89,7 @@ export const aMinedSafe = async (
     form[getOwnerAddressBy(i)] = accounts[i]
   }
 
-  const openSafeProps = await createSafe(form, accounts[0])
-
-  return openSafeProps.safeAddress
+  return createSafe(form, accounts[0]).then((receipt) => receipt.events?.ProxyCreation.returnValues.proxy)
 }
 
 export default aSafe
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 44fb98ee27..cb56ff7b04 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -1,14 +1,37 @@
+import { ETHEREUM_NETWORK } from 'src/config/networks/network.d'
+
 export const APP_ENV = process.env.REACT_APP_ENV
 export const NODE_ENV = process.env.NODE_ENV
 export const NETWORK = process.env.REACT_APP_NETWORK?.toUpperCase() || 'RINKEBY'
+export const INTERCOM_ID = APP_ENV === 'production' ? process.env.REACT_APP_INTERCOM_ID : 'plssl1fl'
 export const GOOGLE_ANALYTICS_ID = {
-  RINKEBY: process.env.REACT_APP_GOOGLE_ANALYTICS_ID_RINKEBY,
-  MAINNET: process.env.REACT_APP_GOOGLE_ANALYTICS_ID_MAINNET,
+  [ETHEREUM_NETWORK.RINKEBY]: process.env.REACT_APP_GOOGLE_ANALYTICS_ID_RINKEBY,
+  [ETHEREUM_NETWORK.MAINNET]: process.env.REACT_APP_GOOGLE_ANALYTICS_ID_MAINNET,
+  [ETHEREUM_NETWORK.XDAI]: process.env.REACT_APP_GOOGLE_ANALYTICS_ID_XDAI,
 }
-export const INTERCOM_ID = process.env.REACT_APP_ENV === 'production' ? process.env.REACT_APP_INTERCOM_ID : 'plssl1fl'
-export const PORTIS_ID = process.env.REACT_APP_PORTIS_ID
-export const SQUARELINK_ID = process.env.REACT_APP_SQUARELINK_ID
-export const FORTMATIC_KEY = process.env.REACT_APP_FORTMATIC_KEY
+export const PORTIS_ID = {
+  [ETHEREUM_NETWORK.RINKEBY]: '852b763d-f28b-4463-80cb-846d7ec5806b',
+  [ETHEREUM_NETWORK.MAINNET]: process.env.REACT_APP_PORTIS_ID,
+  [ETHEREUM_NETWORK.XDAI]: process.env.REACT_APP_PORTIS_ID,
+}
+export const FORTMATIC_KEY = {
+  [ETHEREUM_NETWORK.RINKEBY]: 'pk_test_CAD437AA29BE0A40',
+  [ETHEREUM_NETWORK.MAINNET]: process.env.REACT_APP_FORTMATIC_KEY,
+  [ETHEREUM_NETWORK.XDAI]: process.env.REACT_APP_FORTMATIC_KEY,
+}
+export const BLOCKNATIVE_KEY = {
+  [ETHEREUM_NETWORK.RINKEBY]: '7fbb9cee-7e97-4436-8770-8b29a9a8814c',
+  [ETHEREUM_NETWORK.MAINNET]: process.env.REACT_APP_BLOCKNATIVE_KEY,
+  [ETHEREUM_NETWORK.XDAI]: process.env.REACT_APP_BLOCKNATIVE_KEY,
+}
+/*
+ * Not being used
+export const SQUARELINK_ID = {
+  [ETHEREUM_NETWORK.RINKEBY]: '46ce08fe50913cfa1b78',
+  [ETHEREUM_NETWORK.MAINNET]: process.env.REACT_APP_SQUARELINK_ID,
+  [ETHEREUM_NETWORK.XDAI]: process.env.REACT_APP_SQUARELINK_ID,
+}
+ */
 export const INFURA_TOKEN = process.env.REACT_APP_INFURA_TOKEN || ''
 export const LATEST_SAFE_VERSION = process.env.REACT_APP_LATEST_SAFE_VERSION || '1.1.1'
 export const APP_VERSION = process.env.REACT_APP_APP_VERSION || 'not-defined'
@@ -18,3 +41,4 @@ export const TIMEOUT = process.env.NODE_ENV === 'test' ? 1500 : 5000
 export const ETHERSCAN_API_KEY = process.env.REACT_APP_ETHERSCAN_API_KEY
 export const EXCHANGE_RATE_URL = 'https://api.exchangeratesapi.io/latest'
 export const EXCHANGE_RATE_URL_FALLBACK = 'https://api.coinbase.com/v2/exchange-rates'
+export const IPFS_GATEWAY = process.env.REACT_APP_IPFS_GATEWAY