diff --git a/src/components/Header/assets/key.svg b/src/components/Header/assets/key.svg new file mode 100644 index 00000000..a1378604 --- /dev/null +++ b/src/components/Header/assets/key.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/Header/component/ProviderDisconnected/index.jsx b/src/components/Header/component/ProviderDisconnected/index.jsx index 9c3bc715..f59aee2b 100644 --- a/src/components/Header/component/ProviderDisconnected/index.jsx +++ b/src/components/Header/component/ProviderDisconnected/index.jsx @@ -1,13 +1,15 @@ // @flow import * as React from 'react' import { withStyles } from '@material-ui/core/styles' +import Dot from '@material-ui/icons/FiberManualRecord' import Paragraph from '~/components/layout/Paragraph' +import Block from '~/components/layout/Block' import Col from '~/components/layout/Col' import Img from '~/components/layout/Img' import { type Open } from '~/components/hoc/OpenHoc' -import { md } from '~/theme/variables' +import { sm, fancy } from '~/theme/variables' -const connectWallet = require('../../assets/connect-wallet.svg') +const connectWallet = require('../../assets/key.svg') type Props = Open & { classes: Object, @@ -19,20 +21,43 @@ const styles = () => ({ fontFamily: 'Montserrat, sans-serif', }, account: { - padding: `0 ${md}`, + paddingRight: sm, display: 'flex', flexDirection: 'column', justifyContent: 'center', + alignItems: 'start', flexGrow: 1, }, connect: { letterSpacing: '-0.5px', }, + logo: { + height: '15px', + width: '15px', + top: '12px', + position: 'relative', + right: '10px', + backgroundColor: '#ffffff', + borderRadius: '15px', + color: fancy, + }, + key: { + width: '38px', + height: '35px', + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + backgroundColor: '#f4f4f9', + borderRadius: '20px', + }, }) const ProviderDesconnected = ({ classes }: Props) => ( - Status connected + + Status disconnected + + Not Connected Connect Wallet diff --git a/src/components/Header/component/ProviderInfo/index.jsx b/src/components/Header/component/ProviderInfo/index.jsx index c654b713..e5f51d9f 100644 --- a/src/components/Header/component/ProviderInfo/index.jsx +++ b/src/components/Header/component/ProviderInfo/index.jsx @@ -1,15 +1,16 @@ // @flow import * as React from 'react' +import classNames from 'classnames' import { withStyles } from '@material-ui/core/styles' import Paragraph from '~/components/layout/Paragraph' import Col from '~/components/layout/Col' -import Img from '~/components/layout/Img' +import Dot from '@material-ui/icons/FiberManualRecord' import { sm } from '~/theme/variables' import Identicon from '~/components/Identicon' import { shortVersionOf } from '~/logic/wallets/ethAddresses' -const connectedLogo = require('../../assets/connected.svg') -const connectedWarning = require('../../assets/connected-error.svg') +const connectedBg = '#00c4c4' +const warningBg = '#ffc05f' type Props = { provider: string, @@ -24,15 +25,26 @@ const styles = () => ({ fontFamily: 'Montserrat, sans-serif', }, logo: { - top: '10px', + height: '15px', + width: '15px', + top: '12px', position: 'relative', - right: '13px', + right: '10px', + backgroundColor: '#ffffff', + borderRadius: '15px', + }, + connected: { + color: connectedBg, + }, + warning: { + color: warningBg, }, account: { paddingRight: sm, display: 'flex', flexDirection: 'column', - justifyContent: 'center', + justifyContent: 'left', + alignItems: 'start', flexGrow: 1, }, address: { @@ -46,13 +58,13 @@ const ProviderInfo = ({ const providerText = `${provider} [${network}]` const cutAddress = connected ? shortVersionOf(userAddress, 6) : 'Connection Error' const color = connected ? 'primary' : 'warning' - const logo = connected ? connectedLogo : connectedWarning + const logo = connected ? classes.connected : classes.warning const identiconAddress = userAddress || 'random' return ( - Connection status + {providerText} {cutAddress}