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

Refactoring DailyLimit changes

This commit is contained in:
apanizo 2018-09-27 12:35:31 +02:00
parent c32d4616ed
commit aacd242da0
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/routes/safe/component/EditDailyLimit/EditDailyLimitForm/index.jsx
View File

@ -2,6 +2,7 @@
import * as React from 'react' import * as React from 'react'
import Block from '~/components/layout/Block' import Block from '~/components/layout/Block'
import Heading from '~/components/layout/Heading' import Heading from '~/components/layout/Heading'
import OpenPaper from '~/components/Stepper/OpenPaper'
import Field from '~/components/forms/Field' import Field from '~/components/forms/Field'
import TextField from '~/components/forms/TextField' import TextField from '~/components/forms/TextField'
import { composeValidators, minValue, mustBeFloat, required } from '~/components/forms/validator' import { composeValidators, minValue, mustBeFloat, required } from '~/components/forms/validator'
@ -12,8 +13,8 @@ type EditDailyLimitProps = {
dailyLimit: string, dailyLimit: string,
} }
const EditDailyLimitForm = ({ dailyLimit }: EditDailyLimitProps) => () => ( const EditDailyLimitForm = ({ dailyLimit }: EditDailyLimitProps) => (controls: React$Node) => (
<Block margin="md"> <OpenPaper controls={controls}>
<Heading tag="h2" margin="lg"> <Heading tag="h2" margin="lg">
{'Change safe\'s daily limit'} {'Change safe\'s daily limit'}
</Heading> </Heading>
@ -30,7 +31,7 @@ const EditDailyLimitForm = ({ dailyLimit }: EditDailyLimitProps) => () => (
text="Safe's daily limit" text="Safe's daily limit"
/> />
</Block> </Block>
</Block> </OpenPaper>
) )
export default EditDailyLimitForm export default EditDailyLimitForm

7
src/routes/safe/component/EditDailyLimit/Review/index.jsx
View File

@ -3,6 +3,7 @@ import * as React from 'react'
import CircularProgress from '@material-ui/core/CircularProgress' import CircularProgress from '@material-ui/core/CircularProgress'
import Block from '~/components/layout/Block' import Block from '~/components/layout/Block'
import Bold from '~/components/layout/Bold' import Bold from '~/components/layout/Bold'
import OpenPaper from '~/components/Stepper/OpenPaper'
import Heading from '~/components/layout/Heading' import Heading from '~/components/layout/Heading'
import Paragraph from '~/components/layout/Paragraph' import Paragraph from '~/components/layout/Paragraph'
import { EDIT_DAILY_LIMIT_PARAM } from '~/routes/safe/component/EditDailyLimit/EditDailyLimitForm' import { EDIT_DAILY_LIMIT_PARAM } from '~/routes/safe/component/EditDailyLimit/EditDailyLimitForm'
@ -16,8 +17,8 @@ const spinnerStyle = {
minHeight: '50px', minHeight: '50px',
} }
const Review = () => ({ values, submitting }: FormProps) => ( const Review = () => (controls: React$Node, { values, submitting }: FormProps) => (
<Block> <OpenPaper controls={controls}>
<Heading tag="h2">Review the DailyLimit operation</Heading> <Heading tag="h2">Review the DailyLimit operation</Heading>
<Paragraph align="left"> <Paragraph align="left">
<Bold>The new daily limit will be: </Bold> {values[EDIT_DAILY_LIMIT_PARAM]} <Bold>The new daily limit will be: </Bold> {values[EDIT_DAILY_LIMIT_PARAM]}
@ -25,7 +26,7 @@ const Review = () => ({ values, submitting }: FormProps) => (
<Block style={spinnerStyle}> <Block style={spinnerStyle}>
{ submitting && <CircularProgress size={50} /> } { submitting && <CircularProgress size={50} /> }
</Block> </Block>
</Block> </OpenPaper>
) )
export default Review export default Review

6
src/routes/safe/component/EditDailyLimit/index.jsx
View File

@ -3,8 +3,9 @@ import * as React from 'react'
import Stepper from '~/components/Stepper' import Stepper from '~/components/Stepper'
import { connect } from 'react-redux' import { connect } from 'react-redux'
import { type Safe } from '~/routes/safe/store/model/safe' import { type Safe } from '~/routes/safe/store/model/safe'
import { createTransaction } from '~/logic/safe/safeFrontendOperations' import { createTransaction, getSafeEthereumInstance } from '~/logic/safe/safeFrontendOperations'
import { getEditDailyLimitData, getDailyLimitAddress } from '~/logic/contracts/dailyLimitContracts' import { getEditDailyLimitData, getDailyLimitAddress } from '~/logic/contracts/dailyLimitContracts'
import { signaturesViaMetamask } from '~/config'
import EditDailyLimitForm, { EDIT_DAILY_LIMIT_PARAM } from './EditDailyLimitForm' import EditDailyLimitForm, { EDIT_DAILY_LIMIT_PARAM } from './EditDailyLimitForm'
import selector, { type SelectorProps } from './selector' import selector, { type SelectorProps } from './selector'
import actions, { type Actions } from './actions' import actions, { type Actions } from './actions'
@ -38,7 +39,8 @@ class EditDailyLimit extends React.PureComponent<Props, State> {
const safeAddress = safe.get('address') const safeAddress = safe.get('address')
const data = await getEditDailyLimitData(safeAddress, 0, Number(newDailyLimit)) const data = await getEditDailyLimitData(safeAddress, 0, Number(newDailyLimit))
const to = await getDailyLimitAddress(safeAddress) const to = await getDailyLimitAddress(safeAddress)
const nonce = Date.now() const gnosisSafe = await getSafeEthereumInstance(safeAddress)
const nonce = signaturesViaMetamask() ? await gnosisSafe.nonce() : Date.now()
await createTransaction(safe, `Change Safe's daily limit to ${newDailyLimit} [${nonce}]`, to, 0, nonce, userAddress, data) await createTransaction(safe, `Change Safe's daily limit to ${newDailyLimit} [${nonce}]`, to, 0, nonce, userAddress, data)
await this.props.fetchTransactions(safeAddress) await this.props.fetchTransactions(safeAddress)
this.setState({ done: true }) this.setState({ done: true })