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

MINT-912 hotfix: Auto-select firs token in sendTokens components #440

Merged
merged 1 commit into from
Dec 25, 2017
Merged

MINT-912 hotfix: Auto-select firs token in sendTokens components #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 17 additions & 8 deletions src/components/dashboard/DepositTokens/DepositTokensForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import React, { PureComponent } from 'react'
import { connect } from 'react-redux'
import { Translate } from 'react-redux-i18n'
import { SelectField, TextField } from 'redux-form-material-ui'
import { Field, formPropTypes, formValueSelector, reduxForm } from 'redux-form/immutable'
import { change, Field, formPropTypes, formValueSelector, reduxForm } from 'redux-form/immutable'
import { DUCK_ASSETS_HOLDER } from 'redux/assetsHolder/actions'
import { DUCK_MAIN_WALLET, mainApprove, requireTIME } from 'redux/mainWallet/actions'
import { DUCK_SESSION } from 'redux/session/actions'
Expand Down Expand Up @@ -100,6 +100,13 @@ export default class DepositTokensForm extends PureComponent {
...formPropTypes,
}

componentWillReceiveProps (newProps) {
const firstAsset = newProps.assets.first()
if (!newProps.token.isFetched() && firstAsset) {
this.props.dispatch(change(FORM_DEPOSIT_TOKENS, 'symbol', firstAsset.symbol()))
}
}

handleApproveAsset = (values) => {
this.props.onSubmit(values
.set('action', ACTION_APPROVE)
Expand Down Expand Up @@ -170,13 +177,15 @@ export default class DepositTokensForm extends PureComponent {
fullWidth
{...styles}
>
{assets.items().map((item) => (
<MenuItem
key={item.id()}
value={item.symbol()}
primaryText={item.symbol()}
/>
))}
{assets
.sortBy(balance => balance.symbol())
.map((item) => (
<MenuItem
key={item.id()}
value={item.symbol()}
primaryText={item.symbol()}
/>
))}
</Field>
)
}
Expand Down
23 changes: 15 additions & 8 deletions src/components/dashboard/SendTokens/SendTokensForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import React, { PureComponent } from 'react'
import { connect } from 'react-redux'
import { Translate } from 'react-redux-i18n'
import { SelectField, Slider, TextField } from 'redux-form-material-ui'
import { Field, formPropTypes, formValueSelector, reduxForm } from 'redux-form/immutable'
import { change, Field, formPropTypes, formValueSelector, reduxForm } from 'redux-form/immutable'
import MainWallet from 'models/wallet/MainWalletModel'
import { DUCK_MAIN_WALLET, getSpendersAllowance } from 'redux/mainWallet/actions'
import AllowanceModel from 'models/wallet/AllowanceModel'
Expand Down Expand Up @@ -95,6 +95,11 @@ export default class SendTokensForm extends PureComponent {
if ((newProps.token.address() !== this.props.token.address() || newProps.recipient !== this.props.recipient) && newProps.token.isERC20()) {
this.props.dispatch(getSpendersAllowance(newProps.token.id(), newProps.recipient))
}

const firstBalance = newProps.wallet.balances().first()
if (!newProps.token.isFetched() && firstBalance) {
this.props.dispatch(change(FORM_SEND_TOKENS, 'symbol', firstBalance.id()))
}
}

checkIsContract (address): Promise {
Expand Down Expand Up @@ -148,13 +153,15 @@ export default class SendTokensForm extends PureComponent {
fullWidth
{...styles}
>
{balances.items().map((balance) => (
<MenuItem
key={balance.id()}
value={balance.id()}
primaryText={balance.symbol()}
/>
))}
{balances
.sortBy(balance => balance.symbol())
.map((balance) => (
<MenuItem
key={balance.id()}
value={balance.id()}
primaryText={balance.symbol()}
/>
))}
</Field>
)
}
Expand Down