From bf8f8c430a8bb6bae75fe00a39a1a063aa81b292 Mon Sep 17 00:00:00 2001 From: Mikhail Mikheev Date: Thu, 7 Nov 2019 15:25:45 +0400 Subject: [PATCH] Update rinkeby tokens for integrations, remove unused provider packages --- package.json | 2 -- src/components/ConnectButton/index.jsx | 25 +++++++------------------ 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index dd658080..d262d1f0 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "precommit" ], "dependencies": { - "@arkane-network/web3-arkane-provider": "^0.2.5", "@gnosis.pm/safe-contracts": "^1.0.0", "@gnosis.pm/util-contracts": "2.0.4", "@material-ui/core": "4.6.0", @@ -47,7 +46,6 @@ "date-fns": "2.6.0", "ethereum-ens": "0.7.8", "final-form": "4.18.5", - "fortmatic": "1.0.0", "history": "4.10.1", "immortal-db": "^1.0.2", "immutable": "^4.0.0-rc.9", diff --git a/src/components/ConnectButton/index.jsx b/src/components/ConnectButton/index.jsx index df21322d..1097f761 100644 --- a/src/components/ConnectButton/index.jsx +++ b/src/components/ConnectButton/index.jsx @@ -5,14 +5,15 @@ import { connect } from 'react-redux' import Web3Connect from 'web3connect' import WalletConnectProvider from '@walletconnect/web3-provider' import Portis from '@portis/web3' -import Fortmatic from 'fortmatic' import Squarelink from 'squarelink' import Torus from '@toruslabs/torus-embed' -import Arkane from '@arkane-network/web3-arkane-provider' import Button from '~/components/layout/Button' import { fetchProvider } from '~/logic/wallets/store/actions' import { getNetwork } from '~/config' +const PORTIS_DAPP_ID = process.env.REACT_APP_NETWORK === 'mainnet' ? process.env.REACT_APP_PORTIS_ID : '852b763d-f28b-4463-80cb-846d7ec5806b' +const SQUARELINK_CLIENT_ID = process.env.REACT_APP_NETWORK === 'mainnet' ? process.env.REACT_APP_SQUARELINK_ID : '46ce08fe50913cfa1b78' + export const web3Connect = new Web3Connect.Core({ network: getNetwork().toLowerCase(), providerOptions: { @@ -25,23 +26,17 @@ export const web3Connect = new Web3Connect.Core({ portis: { package: Portis, options: { - id: process.env.REACT_APP_PORTIS_ID, - }, - }, - fortmatic: { - package: Fortmatic, - options: { - key: process.env.REACT_APP_FORTMATIC_KEY, + id: PORTIS_DAPP_ID, }, }, squarelink: { - package: Squarelink, // required + package: Squarelink, options: { - id: process.env.REACT_APP_SQUARELINK_ID, // required + id: SQUARELINK_CLIENT_ID, }, }, torus: { - package: Torus, // required + package: Torus, options: { enableLogging: false, buttonPosition: 'bottom-left', @@ -49,12 +44,6 @@ export const web3Connect = new Web3Connect.Core({ showTorusButton: true, }, }, - arkane: { - package: Arkane, // required - options: { - clientId: 'ARKANE_CLIENT_ID', // required, replace - }, - }, }, })