(Feature) [xDai] Use generic config

src/components/App/index.tsx

@@ -16,8 +16,8 @@ import CookiesBanner from 'src/components/CookiesBanner'
 import Notifier from 'src/components/Notifier'
 import Backdrop from 'src/components/layout/Backdrop'
 import Img from 'src/components/layout/Img'
-import { getNetwork } from 'src/config'
-import { ETHEREUM_NETWORK } from 'src/logic/wallets/getWeb3'
+import { getNetworkId } from 'src/config'
+import { ETHEREUM_NETWORK } from 'src/config/networks/network.d'
 import { networkSelector } from 'src/logic/wallets/store/selectors'
 import { SAFELIST_ADDRESS, WELCOME_ADDRESS } from 'src/routes/routes'
 import { safeNameSelector, safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
@@ -26,7 +26,7 @@ import SendModal from 'src/routes/safe/components/Balances/SendModal'
 import { useLoadSafe } from 'src/logic/safe/hooks/useLoadSafe'
 import { useSafeScheduledUpdates } from 'src/logic/safe/hooks/useSafeScheduledUpdates'
 import useSafeActions from 'src/logic/safe/hooks/useSafeActions'
-import { currentCurrencySelector, safeFiatBalancesTotalSelector } from 'src/logic/currencyValues/store/selectors/index'
+import { currentCurrencySelector, safeFiatBalancesTotalSelector } from 'src/logic/currencyValues/store/selectors'
 import { formatAmountInUsFormat } from 'src/logic/tokens/utils/formatAmount'
 import { grantedSelector } from 'src/routes/safe/container/selector'
 
@@ -55,7 +55,7 @@ const Frame = styled.div`
   max-width: 100%;
 `
 
-const desiredNetwork = getNetwork()
+const desiredNetwork = getNetworkId()
 
 const useStyles = makeStyles(notificationStyles)
 

src/components/AppLayout/Header/components/NetworkLabel.tsx

@@ -3,11 +3,11 @@ import * as React from 'react'
 
 import Col from 'src/components/layout/Col'
 import Paragraph from 'src/components/layout/Paragraph'
-import { getNetwork } from 'src/config'
-import { ETHEREUM_NETWORK } from 'src/logic/wallets/getWeb3'
+import { getNetworkId } from 'src/config'
+import { ETHEREUM_NETWORK } from 'src/config/networks/network.d'
 import { border, md, screenSm, sm, xs } from 'src/theme/variables'
 
-const interfaceNetwork = getNetwork()
+const interfaceNetwork = getNetworkId()
 const formatNetwork = (network: number): string =>
   ETHEREUM_NETWORK[network][0].toUpperCase() + ETHEREUM_NETWORK[network].substring(1).toLowerCase()
 

src/components/AppLayout/Header/components/ProviderDetails/UserDetails.tsx

@@ -14,7 +14,7 @@ import Paragraph from 'src/components/layout/Paragraph'
 import Row from 'src/components/layout/Row'
 import { background, connected as connectedBg, lg, md, sm, warning, xs } from 'src/theme/variables'
 import { upperFirst } from 'src/utils/css'
-import { ETHEREUM_NETWORK } from 'src/logic/wallets/getWeb3'
+import { ETHEREUM_NETWORK } from 'src/config/networks/network.d'
 
 const dot = require('../../assets/dotRinkeby.svg')
 const walletIcon = require('../../assets/wallet.svg')

src/components/AppLayout/Header/components/ProviderInfo/ProviderAccessible.tsx

@@ -1,8 +1,8 @@
 import { makeStyles } from '@material-ui/core/styles'
 import * as React from 'react'
 import { EthHashInfo, Text } from '@gnosis.pm/safe-react-components'
-import { ETHEREUM_NETWORK } from 'src/logic/wallets/getWeb3'
 
+import { ETHEREUM_NETWORK } from 'src/config/networks/network.d'
 import NetworkLabel from '../NetworkLabel'
 import CircleDot from 'src/components/AppLayout/Header/components/CircleDot'
 import Col from 'src/components/layout/Col'

src/components/AppLayout/Sidebar/SafeHeader/index.tsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import { ETHEREUM_NETWORK } from 'src/logic/wallets/getWeb3'
 import styled from 'styled-components'
 import {
   Icon,
@@ -12,7 +11,7 @@ import {
   EtherscanButton,
 } from '@gnosis.pm/safe-react-components'
 
-import { getNetwork } from 'src/config'
+import { getNetworkName } from 'src/config'
 import FlexSpacer from 'src/components/FlexSpacer'
 
 export const TOGGLE_SIDEBAR_BTN_TESTID = 'TOGGLE_SIDEBAR_BTN'
@@ -129,7 +128,7 @@ const SafeHeader = ({
           <Icon size="sm" type="qrCode" tooltip="Show QR" />
         </UnStyledButton>
         <CopyToClipboardBtn textToCopy={address} />
-        <EtherscanButton value={address} network={ETHEREUM_NETWORK[getNetwork()]} />
+        <EtherscanButton value={address} network={getNetworkName()} />
       </IconContainer>
 
       {granted ? null : (

src/components/ConnectButton/index.tsx

@@ -2,7 +2,7 @@ import Onboard from 'bnc-onboard'
 import React from 'react'
 
 import Button from 'src/components/layout/Button'
-import { getNetwork } from 'src/config'
+import { getNetworkId } from 'src/config'
 import { getWeb3, setWeb3 } from 'src/logic/wallets/getWeb3'
 import { fetchProvider } from 'src/logic/wallets/store/actions'
 import transactionDataCheck from 'src/logic/wallets/transactionDataCheck'
@@ -20,7 +20,7 @@ const wallets = getSupportedWallets()
 
 export const onboard = Onboard({
   dappId: BLOCKNATIVE_API_KEY,
-  networkId: getNetwork(),
+  networkId: getNetworkId(),
   subscriptions: {
     wallet: (wallet) => {
       if (wallet.provider) {

src/components/SafeListSidebar/SafeList/index.tsx

@@ -3,13 +3,12 @@ import ListItem from '@material-ui/core/ListItem'
 import { makeStyles } from '@material-ui/core/styles'
 import { EthHashInfo, Icon, Text, ButtonLink } from '@gnosis.pm/safe-react-components'
 import * as React from 'react'
-import { ETHEREUM_NETWORK } from 'src/logic/wallets/getWeb3'
 import styled from 'styled-components'
 
 import { SafeRecord } from 'src/logic/safe/store/models/safe'
 import { DefaultSafe } from 'src/routes/safe/store/reducer/types/safe'
 import { SetDefaultSafe } from 'src/logic/safe/store/actions/setDefaultSafe'
-import { getNetwork } from 'src/config'
+import { getNetworkName } from 'src/config'
 import DefaultBadge from './DefaultBadge'
 import Hairline from 'src/components/layout/Hairline'
 import Link from 'src/components/layout/Link'
@@ -115,7 +114,7 @@ const SafeList = ({ currentSafe, defaultSafe, onSafeClick, safes, setDefaultSafe
                   name={safe.name}
                   showIdenticon
                   shortenHash={4}
-                  network={ETHEREUM_NETWORK[getNetwork()]}
+                  network={getNetworkName()}
                 />
 
                 <AddressDetails>

src/config/__tests__/config.test.ts

@@ -0,0 +1,136 @@
+import { ETHEREUM_NETWORK } from 'src/config/networks/network.d'
+import { default as networks } from 'src/config/networks'
+
+const { mainnet, xdai } = networks
+
+describe('Config Services', () => {
+  beforeEach(() => {
+    jest.resetModules()
+  })
+
+  it(`should load 'test' network config`, () => {
+    // Given
+    jest.mock('src/utils/constants', () => ({
+      NODE_ENV: 'test',
+    }))
+    const { getNetworkInfo } = require('src/config')
+
+    // When
+    const networkInfo = getNetworkInfo()
+
+    // Then
+    expect(networkInfo.id).toBe(ETHEREUM_NETWORK.LOCAL)
+  })
+
+  it(`should load 'mainnet' network config`, () => {
+    // Given
+    jest.mock('src/utils/constants', () => ({
+      NODE_ENV: '',
+      NETWORK: 'MAINNET',
+    }))
+    const { getNetworkInfo } = require('src/config')
+
+    // When
+    const networkInfo = getNetworkInfo()
+
+    // Then
+    expect(networkInfo.id).toBe(ETHEREUM_NETWORK.MAINNET)
+  })
+
+  it(`should load 'mainnet.dev' network config`, () => {
+    // Given
+    jest.mock('src/utils/constants', () => ({
+      NODE_ENV: '',
+      NETWORK: 'MAINNET',
+    }))
+    const { getTxServiceUrl, getGnosisSafeAppsUrl } = require('src/config')
+    const TX_SERVICE_URL = mainnet.environment.dev?.txServiceUrl
+    const SAFE_APPS_URL = mainnet.environment.dev?.safeAppsUrl
+
+    // When
+    const txServiceUrl = getTxServiceUrl()
+    const safeAppsUrl = getGnosisSafeAppsUrl()
+
+    // Then
+    expect(TX_SERVICE_URL).toBe(txServiceUrl)
+    expect(SAFE_APPS_URL).toBe(safeAppsUrl)
+  })
+
+  it(`should load 'mainnet.staging' network config`, () => {
+    // Given
+    jest.mock('src/utils/constants', () => ({
+      NODE_ENV: 'production',
+      NETWORK: 'MAINNET',
+    }))
+    const { getTxServiceUrl, getGnosisSafeAppsUrl } = require('src/config')
+    const TX_SERVICE_URL = mainnet.environment.staging?.txServiceUrl
+    const SAFE_APPS_URL = mainnet.environment.staging?.safeAppsUrl
+
+    // When
+    const txServiceUrl = getTxServiceUrl()
+    const safeAppsUrl = getGnosisSafeAppsUrl()
+
+    // Then
+    expect(TX_SERVICE_URL).toBe(txServiceUrl)
+    expect(SAFE_APPS_URL).toBe(safeAppsUrl)
+  })
+
+  it(`should load 'mainnet.production' network config`, () => {
+    // Given
+    jest.mock('src/utils/constants', () => ({
+      NODE_ENV: 'production',
+      NETWORK: 'MAINNET',
+      APP_ENV: 'production'
+    }))
+    const { getTxServiceUrl, getGnosisSafeAppsUrl } = require('src/config')
+    const TX_SERVICE_URL = mainnet.environment.production.txServiceUrl
+    const SAFE_APPS_URL = mainnet.environment.production.safeAppsUrl
+
+    // When
+    const txServiceUrl = getTxServiceUrl()
+    const safeAppsUrl = getGnosisSafeAppsUrl()
+
+    // Then
+    expect(TX_SERVICE_URL).toBe(txServiceUrl)
+    expect(SAFE_APPS_URL).toBe(safeAppsUrl)
+  })
+
+  it(`should load 'xdai.production' network config`, () => {
+    // Given
+    jest.mock('src/utils/constants', () => ({
+      NODE_ENV: 'production',
+      NETWORK: 'XDAI',
+      APP_ENV: 'production'
+    }))
+    const { getTxServiceUrl, getGnosisSafeAppsUrl } = require('src/config')
+    const TX_SERVICE_URL = xdai.environment.production.txServiceUrl
+    const SAFE_APPS_URL = xdai.environment.production.safeAppsUrl
+
+    // When
+    const txServiceUrl = getTxServiceUrl()
+    const safeAppsUrl = getGnosisSafeAppsUrl()
+
+    // Then
+    expect(TX_SERVICE_URL).toBe(txServiceUrl)
+    expect(SAFE_APPS_URL).toBe(safeAppsUrl)
+  })
+
+  it(`should default to 'xdai.production' network config if no environment is found`, () => {
+    // Given
+    jest.mock('src/utils/constants', () => ({
+      NODE_ENV: '',
+      NETWORK: 'XDAI',
+    }))
+    const { getTxServiceUrl, getGnosisSafeAppsUrl } = require('src/config')
+    const TX_SERVICE_URL = xdai.environment.production.txServiceUrl
+    const SAFE_APPS_URL = xdai.environment.production.safeAppsUrl
+
+    // When
+    const txServiceUrl = getTxServiceUrl()
+    const safeAppsUrl = getGnosisSafeAppsUrl()
+
+    // Then
+    expect(TX_SERVICE_URL).toBe(txServiceUrl)
+    expect(SAFE_APPS_URL).toBe(safeAppsUrl)
+  })
+})