Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: check user balance #860

Merged
merged 4 commits into from
Feb 25, 2019
Merged

fix: check user balance #860

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7126b92
fix: check user balance
nachomazzara Feb 25, 2019
b99f3b1
fix: feedback
nachomazzara Feb 25, 2019
c0b5b87
fix: translation
nachomazzara Feb 25, 2019
1a9d814
fix: prettier
nachomazzara Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Translation/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"insufficient_funds":
"The bidder has insufficient funds to pay for the bid",
"list_asset": "Place a bid for the {asset_name}",
"not_enough": "You don't have enough MANA in your account",
"please_authorize":
"You need to go to {settings_link} and authorize the Bid contract to use MANA on your behalf before you can place a bid.",
"price_placeholder": "Price in MANA for this {asset_name}",
Expand Down
6 changes: 3 additions & 3 deletions webapp/src/components/AcceptBidAssetPage/AcceptBidAssetPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ export default class AcceptBidAssetPage extends React.PureComponent {
const { bidderHasBalance } = this.state
const { assetType, bid } = this.props

const bidIsOpen = isOpen(bid)
const isBidOpen = isOpen(bid)

switch (assetType) {
case ASSET_TYPES.parcel:
return (
<AcceptBidParcelPage
{...this.props}
isOpen={bidIsOpen}
isOpen={isBidOpen}
handleConfirm={this.handleConfirm}
bidderHasBalance={bidderHasBalance}
/>
Expand All @@ -90,7 +90,7 @@ export default class AcceptBidAssetPage extends React.PureComponent {
return (
<AcceptBidEstatePage
{...this.props}
isOpen={bidIsOpen}
isOpen={isBidOpen}
handleConfirm={this.handleConfirm}
bidderHasBalance={bidderHasBalance}
/>
Expand Down
5 changes: 5 additions & 0 deletions webapp/src/components/BidAssetPage/BidAssetForm.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.BidForm.ui.form .field>label {
text-transform: capitalize;
}

.BidForm.ui.form .field>label.warning{
color: var(--error);
text-transform: none;
}
21 changes: 15 additions & 6 deletions webapp/src/components/BidAssetPage/BidAssetForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
import addDays from 'date-fns/add_days'
import dateFnsFormat from 'date-fns/format'
import differenceInDays from 'date-fns/difference_in_days'
import { Form, Button, Input, Message } from 'semantic-ui-react'
import { Form, Button, Input, Message, Icon } from 'semantic-ui-react'
import { t } from '@dapps/modules/translation/utils'

import { assetType, bidType } from 'components/types'
Expand Down Expand Up @@ -34,7 +34,8 @@ export default class BidAssetForm extends React.PureComponent {
isTxIdle: PropTypes.bool,
isDisabled: PropTypes.bool,
onBid: PropTypes.func.isRequired,
onCancel: PropTypes.func.isRequired
onCancel: PropTypes.func.isRequired,
balance: PropTypes.number.isRequired
}

constructor(props) {
Expand All @@ -55,8 +56,8 @@ export default class BidAssetForm extends React.PureComponent {
const price = sanitizePrice(e.currentTarget.value)

this.setState({
price,
formErrors: []
formErrors: [],
price
})
}

Expand Down Expand Up @@ -136,9 +137,11 @@ export default class BidAssetForm extends React.PureComponent {
}

render() {
const { isTxIdle, assetName, isDisabled, onCancel } = this.props
const { isTxIdle, assetName, isDisabled, onCancel, balance } = this.props
const { price, expiresAt, formErrors } = this.state

const canBid = price <= balance

return (
<Form
className="BidForm"
Expand All @@ -156,6 +159,12 @@ export default class BidAssetForm extends React.PureComponent {
required={true}
onChange={this.handlePriceChange}
/>
{price > balance ? (
<label className="warning">
<Icon name="warning sign" />
{t('asset_bid.not_enough')}
</label>
) : null}
</Form.Field>
<Form.Field>
<label>{t('asset_bid.expiration')}</label>
Expand All @@ -180,7 +189,7 @@ export default class BidAssetForm extends React.PureComponent {
<Button
type="submit"
primary={true}
disabled={isTxIdle || isDisabled || price <= 0}
disabled={isTxIdle || isDisabled || price <= 0 || !canBid}
>
{t('global.submit')}
</Button>
Expand Down
16 changes: 9 additions & 7 deletions webapp/src/components/BidAssetPage/BidEstatePage/BidEstatePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { t, T } from '@dapps/modules/translation/utils'
import { locations } from 'locations'
import { isOpen } from 'shared/listing'
import BidAssetForm from '../BidAssetForm'
import { authorizationType, bidType } from 'components/types'
import { authorizationType, bidType, walletType } from 'components/types'
import Estate from 'components/Estate'
import EstateName from 'components/EstateName'
import TxStatus from 'components/TxStatus'
Expand All @@ -22,13 +22,14 @@ export default class BidEstatePage extends React.PureComponent {
isTxIdle: PropTypes.bool.isRequired,
onBid: PropTypes.func.isRequired,
onCancel: PropTypes.func.isRequired,
isAllowed: PropTypes.bool.isRequired
isAllowed: PropTypes.bool.isRequired,
wallet: walletType
}

render() {
const { id, bid, isTxIdle, onBid, onCancel, isAllowed } = this.props
const { id, bid, isTxIdle, onBid, onCancel, isAllowed, wallet } = this.props

const bidIsOpen = isOpen(bid)
const isBidOpen = isOpen(bid)

return (
<Estate id={id} ownerNotAllowed>
Expand Down Expand Up @@ -59,7 +60,7 @@ export default class BidEstatePage extends React.PureComponent {
title={
<T
id={
bidIsOpen
isBidOpen
? 'asset_bid.update_asset'
: 'asset_bid.list_asset'
}
Expand All @@ -69,7 +70,7 @@ export default class BidEstatePage extends React.PureComponent {
subtitle={
<T
id={
bidIsOpen
isBidOpen
? 'asset_bid.set_new_asset_price'
: 'asset_bid.set_asset_price'
}
Expand All @@ -81,11 +82,12 @@ export default class BidEstatePage extends React.PureComponent {
<BidAssetForm
asset={estate}
assetName={t('name.estate')}
bid={bidIsOpen ? bid : null}
bid={isBidOpen ? bid : null}
isTxIdle={isTxIdle}
onBid={onBid}
onCancel={onCancel}
isDisabled={!isAllowed}
balance={wallet.mana}
/>
<TxStatus.Asset
asset={estate}
Expand Down
16 changes: 9 additions & 7 deletions webapp/src/components/BidAssetPage/BidParcelPage/BidParcelPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { locations } from 'locations'
import { isOpen } from 'shared/listing'
import { splitCoordinate } from 'shared/coordinates'
import BidAssetForm from '../BidAssetForm'
import { authorizationType, bidType } from 'components/types'
import { authorizationType, bidType, walletType } from 'components/types'
import Parcel from 'components/Parcel'
import ParcelModal from 'components/ParcelModal'
import TxStatus from 'components/TxStatus'
Expand All @@ -24,14 +24,15 @@ export default class BidParcelPage extends React.PureComponent {
isLoading: PropTypes.bool.isRequired,
onBid: PropTypes.func.isRequired,
onCancel: PropTypes.func.isRequired,
isAllowed: PropTypes.bool.isRequired
isAllowed: PropTypes.bool.isRequired,
wallet: walletType
}

render() {
const { id, bid, isTxIdle, onBid, onCancel, isAllowed } = this.props
const { id, bid, isTxIdle, onBid, onCancel, isAllowed, wallet } = this.props

const [x, y] = splitCoordinate(id)
const bidIsOpen = isOpen(bid)
const isBidOpen = isOpen(bid)

return (
<Parcel x={x} y={y} ownerNotAllowed>
Expand Down Expand Up @@ -63,7 +64,7 @@ export default class BidParcelPage extends React.PureComponent {
title={
<T
id={
bidIsOpen
isBidOpen
? 'asset_bid.update_asset'
: 'asset_bid.list_asset'
}
Expand All @@ -73,7 +74,7 @@ export default class BidParcelPage extends React.PureComponent {
subtitle={
<T
id={
bidIsOpen
isBidOpen
? 'asset_bid.set_new_asset_price'
: 'asset_bid.set_asset_price'
}
Expand All @@ -87,11 +88,12 @@ export default class BidParcelPage extends React.PureComponent {
<BidAssetForm
asset={parcel}
assetName={t('name.parcel')}
bid={bidIsOpen ? bid : null}
bid={isBidOpen ? bid : null}
isTxIdle={isTxIdle}
onBid={onBid}
onCancel={onCancel}
isDisabled={!isAllowed}
balance={wallet.mana}
/>
<TxStatus.Asset
asset={parcel}
Expand Down