From e6896d1ee149deec50619443f269f2cb04b5dd05 Mon Sep 17 00:00:00 2001 From: mmv Date: Mon, 11 Nov 2019 17:45:15 +0400 Subject: [PATCH 1/4] fix mainnet url for infura --- src/logic/wallets/getWeb3.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logic/wallets/getWeb3.js b/src/logic/wallets/getWeb3.js index 1dd5edd4..dea07326 100644 --- a/src/logic/wallets/getWeb3.js +++ b/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 From 4c5c7790d9385cd5f8715e288f8f473b1f587c2d Mon Sep 17 00:00:00 2001 From: mmv Date: Mon, 11 Nov 2019 18:48:13 +0400 Subject: [PATCH 2/4] Update relay url for staging mainnet --- src/config/staging-mainnet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/staging-mainnet.js b/src/config/staging-mainnet.js index b0334d84..9404c390 100644 --- a/src/config/staging-mainnet.js +++ b/src/config/staging-mainnet.js @@ -5,7 +5,7 @@ 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/', + [RELAY_API_URL]: 'https://safe-relay.gnosis.io/api/v1/', } export default stagingMainnetConfig From eee95bfa9da1e828404327eaef13c725e270e629 Mon Sep 17 00:00:00 2001 From: mmv Date: Mon, 11 Nov 2019 19:11:38 +0400 Subject: [PATCH 3/4] Update staging tx history service url --- src/config/staging-mainnet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/staging-mainnet.js b/src/config/staging-mainnet.js index 9404c390..559b1ece 100644 --- a/src/config/staging-mainnet.js +++ b/src/config/staging-mainnet.js @@ -4,7 +4,7 @@ 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', + [TX_SERVICE_HOST]: 'https://safe-transaction.mainnet.staging.gnosisdev.com/api/v1/', [RELAY_API_URL]: 'https://safe-relay.gnosis.io/api/v1/', } From dbbf8ddb0bbd547d345ea2ee1685f02140177c09 Mon Sep 17 00:00:00 2001 From: mmv Date: Tue, 12 Nov 2019 12:24:48 +0400 Subject: [PATCH 4/4] try to enable torus --- src/components/ConnectButton/index.jsx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/ConnectButton/index.jsx b/src/components/ConnectButton/index.jsx index ca726dad..7665536a 100644 --- a/src/components/ConnectButton/index.jsx +++ b/src/components/ConnectButton/index.jsx @@ -2,7 +2,7 @@ import React from 'react' import { connect } from 'react-redux' 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' @@ -35,15 +35,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, + }, + }, }, })