status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix modal window form footers

This commit is contained in:
Germán Martínez 2019-09-09 11:31:42 +02:00
parent 277bbce179
commit efdba0fd57
2 changed files with 84 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/routes/safe/components/Balances/SendModal/screens/SendCustomTx/index.jsx
View File

@ -74,8 +74,19 @@ const SendCustomTx = ({
</IconButton> </IconButton>
</Row> </Row>
<Hairline /> <Hairline />
<GnoForm onSubmit={handleSubmit} formMutators={formMutators} initialValues={initialValues}>
{(...args) => {
const mutators = args[3]
return (
<>
<Block className={classes.formContainer}> <Block className={classes.formContainer}>
<SafeInfo safeAddress={safeAddress} etherScanLink={etherScanLink} safeName={safeName} ethBalance={ethBalance} /> <SafeInfo
safeAddress={safeAddress}
etherScanLink={etherScanLink}
safeName={safeName}
ethBalance={ethBalance}
/>
<Row margin="md"> <Row margin="md">
<Col xs={1}> <Col xs={1}>
<img src={ArrowDown} alt="Arrow Down" style={{ marginLeft: '8px' }} /> <img src={ArrowDown} alt="Arrow Down" style={{ marginLeft: '8px' }} />
@ -84,12 +95,6 @@ const SendCustomTx = ({
<Hairline /> <Hairline />
</Col> </Col>
</Row> </Row>
<GnoForm onSubmit={handleSubmit} formMutators={formMutators} initialValues={initialValues}>
{(...args) => {
const mutators = args[3]
return (
<>
<Row margin="md"> <Row margin="md">
<Col xs={12}> <Col xs={12}>
<AddressInput <AddressInput
@ -143,6 +148,7 @@ const SendCustomTx = ({
/> />
</Col> </Col>
</Row> </Row>
</Block>
<Hairline /> <Hairline />
<Row align="center" className={classes.buttonRow}> <Row align="center" className={classes.buttonRow}>
<Button minWidth={140} minHeight={42} onClick={onClose}> <Button minWidth={140} minHeight={42} onClick={onClose}>
@ -163,7 +169,6 @@ const SendCustomTx = ({
) )
}} }}
</GnoForm> </GnoForm>
</Block>
</> </>
) )
} }

24
src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx
View File

@ -81,8 +81,20 @@ const SendFunds = ({
</IconButton> </IconButton>
</Row> </Row>
<Hairline /> <Hairline />
<GnoForm onSubmit={handleSubmit} formMutators={formMutators} initialValues={initialValues}>
{(...args) => {
const formState = args[2]
const mutators = args[3]
const { token } = formState.values
return (
<>
<Block className={classes.formContainer}> <Block className={classes.formContainer}>
<SafeInfo safeAddress={safeAddress} etherScanLink={etherScanLink} safeName={safeName} ethBalance={ethBalance} /> <SafeInfo
safeAddress={safeAddress}
etherScanLink={etherScanLink}
safeName={safeName}
ethBalance={ethBalance}
/>
<Row margin="md"> <Row margin="md">
<Col xs={1}> <Col xs={1}>
<img src={ArrowDown} alt="Arrow Down" style={{ marginLeft: '8px' }} /> <img src={ArrowDown} alt="Arrow Down" style={{ marginLeft: '8px' }} />
@ -91,14 +103,6 @@ const SendFunds = ({
<Hairline /> <Hairline />
</Col> </Col>
</Row> </Row>
<GnoForm onSubmit={handleSubmit} formMutators={formMutators} initialValues={initialValues}>
{(...args) => {
const formState = args[2]
const mutators = args[3]
const { token } = formState.values
return (
<>
<Row margin="md"> <Row margin="md">
<Col xs={12}> <Col xs={12}>
<AddressInput <AddressInput
@ -154,6 +158,7 @@ const SendFunds = ({
</OnChange> </OnChange>
</Col> </Col>
</Row> </Row>
</Block>
<Hairline /> <Hairline />
<Row align="center" className={classes.buttonRow}> <Row align="center" className={classes.buttonRow}>
<Button minWidth={140} minHeight={42} onClick={onClose}> <Button minWidth={140} minHeight={42} onClick={onClose}>
@ -174,7 +179,6 @@ const SendFunds = ({
) )
}} }}
</GnoForm> </GnoForm>
</Block>
</> </>
) )
} }