status-im/safe-react
2
0
Fork 0
mirror of https://github.com/status-im/safe-react.git synced 2025-02-20 05:28:08 +00:00
Code Issues Projects Releases Wiki Activity

WA-238 disable Withdrawn button

Browse Source
This commit is contained in:
apanizo 2018-06-04 13:26:07 +02:00
parent d7ff250c18
commit e10828e5c4
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/routes/safe/component/Safe/DailyLimit.jsx
View File

@ -10,14 +10,16 @@ import { type DailyLimit } from '~/routes/safe/store/model/dailyLimit'
type Props = { type Props = {
dailyLimit: DailyLimit, dailyLimit: DailyLimit,
onWithdrawn: () => void, onWithdrawn: () => void,
balance: string,
} }
export const WITHDRAWN_BUTTON_TEXT = 'Withdrawn' export const WITHDRAWN_BUTTON_TEXT = 'Withdrawn'
const DailyLimitComponent = ({ dailyLimit, onWithdrawn }: Props) => { const DailyLimitComponent = ({ dailyLimit, balance, onWithdrawn }: Props) => {
const limit = dailyLimit.get('value') const limit = dailyLimit.get('value')
const spentToday = dailyLimit.get('spentToday') const spentToday = dailyLimit.get('spentToday')
const disabled = spentToday >= limit
const disabled = spentToday >= limit || Number(balance) === 0
const text = `${limit} ETH (spent today: ${spentToday} ETH)` const text = `${limit} ETH (spent today: ${spentToday} ETH)`
return ( return (

2
src/routes/safe/component/Safe/index.jsx
View File

@ -71,7 +71,7 @@ class GnoSafe extends React.PureComponent<SafeProps, State> {
<Owners owners={safe.owners} /> <Owners owners={safe.owners} />
<Confirmations confirmations={safe.get('confirmations')} /> <Confirmations confirmations={safe.get('confirmations')} />
<Address address={safe.get('address')} /> <Address address={safe.get('address')} />
<DailyLimit dailyLimit={safe.get('dailyLimit')} onWithdrawn={this.onWithdrawn} /> <DailyLimit balance={balance} dailyLimit={safe.get('dailyLimit')} onWithdrawn={this.onWithdrawn} />
<MultisigTx balance={balance} onAddTx={this.onAddTx} onSeeTxs={this.onListTransactions} /> <MultisigTx balance={balance} onAddTx={this.onAddTx} onSeeTxs={this.onListTransactions} />
</List> </List>
</Col> </Col>

14
src/routes/safe/test/Safe.withdrawn.test.js
View File

@ -104,4 +104,18 @@ describe('React DOM TESTS > Withdrawn funds from safe', () => {
expect(addTxButton.props.disabled).toBe(false) expect(addTxButton.props.disabled).toBe(false)
}) })
it('Withdrawn button disabled when balance is 0', async () => {
const Safe = TestUtils.findRenderedComponentWithType(SafeDom, SafeView)
// $FlowFixMe
const buttons = TestUtils.scryRenderedComponentsWithType(Safe, Button)
const addTxButton = buttons[0]
expect(addTxButton.props.children).toEqual(WITHDRAWN_BUTTON_TEXT)
expect(addTxButton.props.disabled).toBe(true)
await addEtherTo(address, '0.1')
await sleep(1800)
expect(addTxButton.props.disabled).toBe(false)
})
}) })