diff --git a/src/components/Modal/index.jsx b/src/components/Modal/index.jsx index c0b237dd..def43bd7 100644 --- a/src/components/Modal/index.jsx +++ b/src/components/Modal/index.jsx @@ -26,7 +26,7 @@ const styles = () => ({ top: '120px', width: '500px', height: '530px', - borderRadius: '3px', + borderRadius: '8px', backgroundColor: '#ffffff', boxShadow: '0 0 5px 0 rgba(74, 85, 121, 0.5)', '&:focus': { diff --git a/src/routes/safe/components/Balances/Receive/index.jsx b/src/routes/safe/components/Balances/Receive/index.jsx index 34f4cfb2..d45183a0 100644 --- a/src/routes/safe/components/Balances/Receive/index.jsx +++ b/src/routes/safe/components/Balances/Receive/index.jsx @@ -3,9 +3,7 @@ import * as React from 'react' import { withStyles } from '@material-ui/core/styles' import Close from '@material-ui/icons/Close' import IconButton from '@material-ui/core/IconButton' -import OpenInNew from '@material-ui/icons/OpenInNew' import QRCode from 'qrcode.react' -import Link from '~/components/layout/Link' import Paragraph from '~/components/layout/Paragraph' import Identicon from '~/components/Identicon' import Button from '~/components/layout/Button' @@ -13,8 +11,10 @@ import Block from '~/components/layout/Block' import Row from '~/components/layout/Row' import Hairline from '~/components/layout/Hairline' import Col from '~/components/layout/Col' +import EtherscanBtn from '~/components/EtherscanBtn' +import CopyBtn from '~/components/CopyBtn' import { - lg, md, secondary, secondaryText, + sm, lg, md, secondaryText, } from '~/theme/variables' import { copyToClipboard } from '~/utils/clipboard' @@ -25,12 +25,10 @@ const styles = () => ({ maxHeight: '75px', boxSizing: 'border-box', }, - manage: { - fontSize: '24px', - }, close: { - height: '35px', - width: '35px', + height: '24px', + width: '24px', + fill: secondaryText, }, qrContainer: { backgroundColor: '#fff', @@ -38,8 +36,12 @@ const styles = () => ({ borderRadius: '6px', border: `1px solid ${secondaryText}`, }, + annotation: { + margin: lg, + marginBottom: 0, + }, safeName: { - margin: `${lg} 0 ${lg}`, + margin: `${md} 0`, }, buttonRow: { height: '84px', @@ -51,42 +53,40 @@ const styles = () => ({ }, }, addressContainer: { - marginTop: '25px', - marginBottom: '25px', + margin: `${lg} 0`, }, address: { - marginLeft: '6px', + marginLeft: sm, + marginRight: sm, }, }) -const openIconStyle = { - height: '16px', - color: secondary, -} - type Props = { onClose: () => void, classes: Object, safeName: string, safeAddress: string, - etherScanLink: string, } const Receive = ({ - classes, onClose, safeAddress, safeName, etherScanLink, + classes, onClose, safeAddress, safeName, }: Props) => ( <> - + Receive funds + + + This is the address of your Safe. Deposit funds by scanning the QR code or copying the address below. Only send + ETH and ERC-20 tokens to this address! + - - + {safeName} @@ -102,14 +102,13 @@ const Receive = ({ > {safeAddress} - - - + + - diff --git a/src/routes/safe/components/Balances/index.jsx b/src/routes/safe/components/Balances/index.jsx index 149ccc25..ee382025 100644 --- a/src/routes/safe/components/Balances/index.jsx +++ b/src/routes/safe/components/Balances/index.jsx @@ -213,12 +213,12 @@ class Balances extends React.Component { title="Receive Tokens" description="Receive Tokens Form" handleClose={this.onHide('Receive')} + paperClassName={classes.receiveModal} open={showReceive} > diff --git a/src/routes/safe/components/Balances/style.js b/src/routes/safe/components/Balances/style.js index b49a7a1a..4ba8db58 100644 --- a/src/routes/safe/components/Balances/style.js +++ b/src/routes/safe/components/Balances/style.js @@ -15,6 +15,9 @@ export const styles = (theme: Object) => ({ iconSmall: { fontSize: 16, }, + receiveModal: { + height: '544px', + }, hide: { '&:hover': { backgroundColor: '#fff3e2', diff --git a/src/routes/safe/components/Layout.jsx b/src/routes/safe/components/Layout.jsx index 41c4bb48..136d3528 100644 --- a/src/routes/safe/components/Layout.jsx +++ b/src/routes/safe/components/Layout.jsx @@ -218,6 +218,7 @@ class Layout extends React.Component { description="Receive Tokens Form" handleClose={onHide('Receive')} open={showReceive} + paperClassName={classes.receiveModal} > ({ user: { justifyContent: 'left', }, + receiveModal: { + height: '544px', + }, open: { paddingLeft: sm, width: 'auto', diff --git a/yarn.lock b/yarn.lock index 72f7f9e9..29c2ebbc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20267,4 +20267,4 @@ yauzl@^2.4.2: integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= dependencies: buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" + fd-slicer "~1.1.0" \ No newline at end of file