Fix Wrong Wallet Network Label (#1163)

* Fix network label

* rename component

* use interfaceNetwork as a default parameter

Co-authored-by: Mati Dastugue <mdastugu@amazon.com>
Co-authored-by: Mikhail <mmvsha73@gmail.com>
This commit is contained in:
Mati Dastugue 2020-07-28 04:54:19 -03:00 committed by GitHub
parent 8091a9dc77
commit 91a85ae9ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 8 deletions

View File

@ -6,8 +6,8 @@ import Paragraph from 'src/components/layout/Paragraph'
import { getNetwork } from 'src/config' import { getNetwork } from 'src/config'
import { border, md, screenSm, sm, xs } from 'src/theme/variables' import { border, md, screenSm, sm, xs } from 'src/theme/variables'
const network = getNetwork() const interfaceNetwork = getNetwork()
const formattedNetwork = network[0].toUpperCase() + network.substring(1).toLowerCase() const formatNetwork = (network: string): string => network[0].toUpperCase() + network.substring(1).toLowerCase()
const useStyles = makeStyles({ const useStyles = makeStyles({
container: { container: {
@ -31,8 +31,13 @@ const useStyles = makeStyles({
}, },
}) })
const EarlyAccessLabel = () => { interface NetworkLabelProps {
network?: string
}
const NetworkLabel = ({ network = interfaceNetwork }: NetworkLabelProps): React.ReactElement => {
const classes = useStyles() const classes = useStyles()
const formattedNetwork = formatNetwork(network)
return ( return (
<Col className={classes.container} middle="xs" start="xs"> <Col className={classes.container} middle="xs" start="xs">
@ -43,4 +48,4 @@ const EarlyAccessLabel = () => {
) )
} }
export default EarlyAccessLabel export default NetworkLabel

View File

@ -63,10 +63,11 @@ const useStyles = makeStyles({
interface ProviderInfoProps { interface ProviderInfoProps {
connected: boolean connected: boolean
provider: string provider: string
network: string
userAddress: string userAddress: string
} }
const ProviderInfo = ({ connected, provider, userAddress }: ProviderInfoProps): React.ReactElement => { const ProviderInfo = ({ connected, provider, userAddress, network }: ProviderInfoProps): React.ReactElement => {
const classes = useStyles() const classes = useStyles()
const cutAddress = connected ? shortVersionOf(userAddress, 4) : 'Connection Error' const cutAddress = connected ? shortVersionOf(userAddress, 4) : 'Connection Error'
const color = connected ? 'primary' : 'warning' const color = connected ? 'primary' : 'warning'
@ -95,7 +96,7 @@ const ProviderInfo = ({ connected, provider, userAddress }: ProviderInfoProps):
</div> </div>
</Col> </Col>
<Col className={classes.networkLabel} layout="column" start="sm"> <Col className={classes.networkLabel} layout="column" start="sm">
<NetworkLabel /> <NetworkLabel network={network} />
</Col> </Col>
</> </>
) )

View File

@ -55,13 +55,13 @@ class HeaderComponent extends React.PureComponent<any, any> {
getProviderInfoBased = () => { getProviderInfoBased = () => {
const { hasError } = this.state const { hasError } = this.state
const { available, loaded, provider, userAddress } = this.props const { available, loaded, provider, userAddress, network } = this.props
if (hasError || !loaded) { if (hasError || !loaded) {
return <ProviderDisconnected /> return <ProviderDisconnected />
} }
return <ProviderAccessible connected={available} provider={provider} userAddress={userAddress} /> return <ProviderAccessible connected={available} provider={provider} network={network} userAddress={userAddress} />
} }
getProviderDetailsBased = () => { getProviderDetailsBased = () => {