diff --git a/.env.development b/.env.development index 8b83271..aa90e00 100644 --- a/.env.development +++ b/.env.development @@ -3,5 +3,5 @@ REACT_APP_BEE_HOST=http://localhost:1633 REACT_APP_BEE_DEBUG_HOST=http://localhost:1635 REACT_APP_BEE_DOCS_HOST=https://docs.ethswarm.org/docs/ REACT_APP_BEE_DISCORD_HOST=https://discord.gg/eKr9XPv7 -REACT_APP_ETHERSCAN_HOST=etherscan.io -REACT_APP_BEE_GITHUB_REPO_URL=https://api.github.com/repos/ethersphere/bee \ No newline at end of file +REACT_APP_BLOCKCHAIN_EXPLORER_URL=https://blockscout.com/xdai/mainnet +REACT_APP_BEE_GITHUB_REPO_URL=https://api.github.com/repos/ethersphere/bee diff --git a/.env.production b/.env.production index 3e3865e..4615a88 100644 --- a/.env.production +++ b/.env.production @@ -2,5 +2,5 @@ REACT_APP_BEE_HOST=http://localhost:1633 REACT_APP_BEE_DEBUG_HOST=http://localhost:1635 REACT_APP_BEE_DOCS_HOST=https://docs.ethswarm.org/docs/ REACT_APP_BEE_DISCORD_HOST=https://discord.gg/eKr9XPv7 -REACT_APP_ETHERSCAN_HOST=etherscan.io +REACT_APP_BLOCKCHAIN_EXPLORER_URL=https://blockscout.com/xdai/mainnet REACT_APP_BEE_GITHUB_REPO_URL=https://api.github.com/repos/ethersphere/bee diff --git a/src/components/CashoutModal.tsx b/src/components/CashoutModal.tsx index dc40b16..47b889c 100644 --- a/src/components/CashoutModal.tsx +++ b/src/components/CashoutModal.tsx @@ -40,7 +40,7 @@ export default function DepositModal({ peerId, uncashedAmount }: Props): ReactEl enqueueSnackbar( Successfully cashed out cheque. Transaction - + , { variant: 'success' }, ) diff --git a/src/components/EthereumAddress.tsx b/src/components/EthereumAddress.tsx index e43c6ea..bfa99e1 100644 --- a/src/components/EthereumAddress.tsx +++ b/src/components/EthereumAddress.tsx @@ -7,7 +7,6 @@ import { ReactElement } from 'react' interface Props { address: string | undefined - network?: string hideBlockie?: boolean transaction?: boolean truncate?: boolean @@ -37,9 +36,9 @@ export default function EthereumAddress(props: Props): ReactElement { } : { marginRight: '7px' } } - href={`https://${props.network}.${process.env.REACT_APP_ETHERSCAN_HOST}/${ - props.transaction ? 'tx' : 'address' - }/${props.address}`} + href={`${process.env.REACT_APP_BLOCKCHAIN_EXPLORER_URL}/${props.transaction ? 'tx' : 'address'}/${ + props.address + }`} target="_blank" rel="noreferrer" > diff --git a/src/components/EthereumAddressCard.tsx b/src/components/EthereumAddressCard.tsx index e9c99d2..f46b7a5 100644 --- a/src/components/EthereumAddressCard.tsx +++ b/src/components/EthereumAddressCard.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement } from 'react' +import { ReactElement } from 'react' import { createStyles, makeStyles } from '@material-ui/core/styles' import { Card, CardContent, Typography } from '@material-ui/core/' @@ -49,7 +49,7 @@ function EthereumAddressCard(props: Props): ReactElement { Ethereum Address - + )} @@ -64,7 +64,7 @@ function EthereumAddressCard(props: Props): ReactElement { Chequebook Contract Address - + )} diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx index eb1fee4..378557e 100644 --- a/src/components/NavBar.tsx +++ b/src/components/NavBar.tsx @@ -1,7 +1,7 @@ import { useState, ReactElement } from 'react' import { createStyles, makeStyles } from '@material-ui/core/styles' -import { Toolbar, Chip, IconButton } from '@material-ui/core/' +import { Toolbar, IconButton } from '@material-ui/core/' import { Sun, Moon } from 'react-feather' @@ -13,7 +13,6 @@ const useStyles = makeStyles(() => width: `calc(100% - ${drawerWidth}px)`, marginLeft: drawerWidth, }, - network: {}, }), ) interface Props { @@ -42,16 +41,11 @@ export default function SideBar(props: Props): ReactElement {
-
switchTheme()}> {props.themeMode === 'dark' ? : } - {/* */}
diff --git a/src/pages/status/SetupSteps/ChequebookDeployFund.tsx b/src/pages/status/SetupSteps/ChequebookDeployFund.tsx index fedc125..456fa1e 100644 --- a/src/pages/status/SetupSteps/ChequebookDeployFund.tsx +++ b/src/pages/status/SetupSteps/ChequebookDeployFund.tsx @@ -8,12 +8,7 @@ interface Props extends StatusChequebookHook { ethereumAddress?: string } -const ChequebookDeployFund = ({ - isLoading, - chequebookAddress, - chequebookBalance, - ethereumAddress, -}: Props): ReactElement | null => { +const ChequebookDeployFund = ({ isLoading, chequebookAddress, chequebookBalance }: Props): ReactElement | null => { if (isLoading) return null return ( @@ -25,10 +20,12 @@ const ChequebookDeployFund = ({ {!(chequebookAddress?.chequebookAddress && chequebookBalance?.totalBalance.toBigNumber.isGreaterThan(0)) && (
- Your chequebook is either not deployed or funded. Join{' '} - our discord channel, get verified and send a message{' '} - 
sprinkle {ethereumAddress || ''}
in the 
#faucet-request
{' '} - channel to get Goerli ETH and Goerli BZZ token. + Your chequebook is either not deployed or funded. To run the node you will need xDAI and xBZZ on the xDai + network. You may need to aquire BZZ through (e.g. bzz.exchange) and + bridge it to the xDai network through the omni bridge. To + pay the transaction fees, you will also need xDAI token. You can purchase DAI on the network and bridge it + to xDai network through the xDai Bridge. See the{' '} + official xDai website for more information.
)} @@ -36,7 +33,7 @@ const ChequebookDeployFund = ({ Chequebook Address - +
) } diff --git a/src/pages/status/SetupSteps/EthereumConnectionCheck.tsx b/src/pages/status/SetupSteps/EthereumConnectionCheck.tsx index f7a98f2..dce48f1 100644 --- a/src/pages/status/SetupSteps/EthereumConnectionCheck.tsx +++ b/src/pages/status/SetupSteps/EthereumConnectionCheck.tsx @@ -13,28 +13,24 @@ export default function EthereumConnectionCheck({ isLoading, isOk, nodeAddresses Node Address - +
) } return (

- Your Bee node must have access to the Ethereum blockchain, so that it can interact and deploy your chequebook + Your Bee node must have access to the xDai blockchain, so that it can interact and deploy your chequebook contract. You can run{' '} - - your own Goerli node + + your own xDai node - , or use a provider such as{' '} - - rpc.slock.it/goerli - {' '} - or{' '} - - Infura + , or use a provider instead - we recommend{' '} + + Getblock - . By default, Bee expects a local Goerli node at http://localhost:8545. To use a provider instead, simply change - your --swap-endpoint in your configuration file. + . By default, Bee expects a local node at http://localhost:8545. To use a provider instead, simply change the{' '} + swap-endpoint in your configuration file.

) }