status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
mmv 2019-11-12 15:10:30 +04:00
parent 36817ba9a3 33d8153593
commit fb3d358820
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/ConnectButton/index.jsx
View File

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

4
src/config/staging-mainnet.js
View File

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

2
src/logic/wallets/getWeb3.js
View File

@ -59,7 +59,7 @@ export const getEtherScanLink = (type: 'address' | 'tx', value: string) => {
const getInfuraUrl = () => { const getInfuraUrl = () => {
const isMainnet = process.env.REACT_APP_NETWORK === 'mainnet' 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 // With some wallets from web3connect you have to use their provider instance only for signing