Merge branch 'development' of github.com:gnosis/safe-react into 158-notifications-improvements

src/components/ConnectButton/index.jsx

@@ -1,7 +1,7 @@
 // @flow
 import React from 'react'
 import Web3Connect from 'web3connect'
-// import Torus from '@toruslabs/torus-embed'
+import Torus from '@toruslabs/torus-embed'
 import WalletConnectProvider from '@walletconnect/web3-provider'
 import Portis from '@portis/web3'
 import Squarelink from 'squarelink'
@@ -34,15 +34,15 @@ export const web3Connect = new Web3Connect.Core({
         id: SQUARELINK_CLIENT_ID,
       },
     },
-    // torus: {
-    //   package: Torus,
-    //   options: {
-    //     enableLogging: false,
-    //     buttonPosition: 'bottom-left',
-    //     buildEnv: process.env.NODE_ENV,
-    //     showTorusButton: true,
-    //   },
-    // },
+    torus: {
+      package: Torus,
+      options: {
+        enableLogging: false,
+        buttonPosition: 'bottom-left',
+        buildEnv: process.env.NODE_ENV,
+        showTorusButton: true,
+      },
+    },
   },
 })
 

src/config/staging-mainnet.js

@@ -4,8 +4,8 @@ import { TX_SERVICE_HOST, RELAY_API_URL } from '~/config/names'
 
 const stagingMainnetConfig = {
   ...stagingConfig,
-  [TX_SERVICE_HOST]: 'https://safe-transaction.mainnet.staging.gnosisdev.com/api/v1',
-  [RELAY_API_URL]: 'https://safe-relay.staging.gnosis.io/api/v1/',
+  [TX_SERVICE_HOST]: 'https://safe-transaction.mainnet.staging.gnosisdev.com/api/v1/',
+  [RELAY_API_URL]: 'https://safe-relay.gnosis.io/api/v1/',
 }
 
 export default stagingMainnetConfig

src/logic/wallets/getWeb3.js

@@ -59,7 +59,7 @@ export const getEtherScanLink = (type: 'address' | 'tx', value: string) => {
 const getInfuraUrl = () => {
   const isMainnet = process.env.REACT_APP_NETWORK === 'mainnet'
 
-  return `https://${isMainnet ? '' : 'rinkeby.'}infura.io:443/v3/${process.env.REACT_APP_INFURA_TOKEN}`
+  return `https://${isMainnet ? 'mainnet' : 'rinkeby'}.infura.io:443/v3/${process.env.REACT_APP_INFURA_TOKEN}`
 }
 
 // With some wallets from web3connect you have to use their provider instance only for signing