-
Notifications
You must be signed in to change notification settings - Fork 60
Create priced button component - Closes #583 #585
Changes from 2 commits
9140892
7678e16
90bfb50
2fd1c3d
49f2878
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
import React from 'react'; | ||
import Button from 'react-toolbox/lib/button'; | ||
import { fromRawLsk } from '../../utils/lsk'; | ||
import styles from './pricedButton.css'; | ||
|
||
const PricedButton = (props) => { | ||
const hasFunds = props.balance >= props.fee; | ||
return ( | ||
<div className='primary-button'> | ||
{ | ||
props.fee && | ||
<span className={`${styles.fee} ${hasFunds ? '' : styles.error}`}> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Prefer parentheses around There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe it is a better solution to change There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
{ | ||
hasFunds ? `Fee: ${fromRawLsk(props.fee)} LSK` : | ||
`Not enough credit to pay ${fromRawLsk(props.fee)} LSK fee` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
} | ||
</span> | ||
} | ||
<Button label={props.label} | ||
primary={true} raised={true} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Prefer separate lines for separate props. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
className={`next-button ${props.customClassName}`} | ||
disabled={props.disabled || (props.fee && !hasFunds)} | ||
onClick={props.onClick.bind(this)}/> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is binding doing anything here? Seems like it should be the responsibility of whatever is passing the function down. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. binding is the repressibility of presentational component. I believe it's the right place for it. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What are you expecting the value of There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
</div> | ||
); | ||
}; | ||
|
||
export default PricedButton; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
import React from 'react'; | ||
import chai, { expect } from 'chai'; | ||
import sinonChai from 'sinon-chai'; | ||
import sinon from 'sinon'; | ||
import { shallow } from 'enzyme'; | ||
import chaiEnzyme from 'chai-enzyme'; | ||
import Button from 'react-toolbox/lib/button'; | ||
import PricedButton from './index'; | ||
|
||
chai.use(sinonChai); | ||
chai.use(chaiEnzyme()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you guys do this in every file? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
describe('DialogElement', () => { | ||
let wrapper; | ||
const props = { | ||
fee: 5e8, | ||
onClick: sinon.spy(), | ||
}; | ||
const insufficientBalance = 0; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Prefer the largest possible insufficient balance. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
const sufficientBalance = 6e8; | ||
|
||
it('renders <Button /> component from react-toolbox', () => { | ||
wrapper = shallow(<PricedButton {...props} balance={sufficientBalance} />); | ||
expect(wrapper.find(Button)).to.have.length(1); | ||
}); | ||
|
||
describe('Sufficient credit', () => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
beforeEach(() => { | ||
wrapper = shallow(<PricedButton {...props} balance={sufficientBalance} />); | ||
}); | ||
|
||
it('renders a span saying "Fee: 5 LSK"', () => { | ||
expect(wrapper.find('span').text()).to.be.equal('Fee: 5 LSK'); | ||
}); | ||
|
||
it('allows to click on Button', () => { | ||
wrapper.find(Button).simulate('click'); | ||
expect(props.onClick).to.have.been.calledWith(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Prefer There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This component is not supposed to pass anything to it's click handler. what's the difference? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This component is not passing anything. this is about the difference of calling with different arguments. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. replaced with |
||
}); | ||
}); | ||
|
||
describe('Insufficient credit', () => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
beforeEach(() => { | ||
wrapper = shallow(<PricedButton {...props} balance={insufficientBalance} />); | ||
}); | ||
|
||
it('renders a span saying "Not enough credit to pay 5 LSK fee"', () => { | ||
expect(wrapper.find('span').text()).to.be.equal('Not enough credit to pay 5 LSK fee'); | ||
}); | ||
|
||
it('sets the disabled attribute of the button', () => { | ||
const buttonProps = wrapper.find(Button).props(); | ||
expect(buttonProps.disabled).to.be.equal(true); | ||
}); | ||
}); | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
.fee { | ||
font-size: 12px; | ||
line-height: 14px; | ||
color: grey; | ||
text-align: right; | ||
margin: 0 16px; | ||
transition: all 0.3s cubic-bezier(0.55, 0, 0.55, 0.2); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Space between selectors. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
.error { | ||
color: #dd2c00 !important; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there a way to avoid the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No need. Preferred is that states override modules. https://smacss.com/ |
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
export default { | ||
setSecondPassphrase: 5e8, | ||
send: 1e7, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Prefer There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
registerDelegate: 25e8, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. added |
||
vote: 1e8, | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A pattern I like is to destructure props out here for less verbosity in the component body.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done