diff options
author | Fabio Berger <me@fabioberger.com> | 2018-11-22 05:19:31 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-11-22 05:19:31 +0800 |
commit | 83a043e6397421db0d1d5b8059341b84eeb1e1a7 (patch) | |
tree | b7685c0285283ebce73786a2e8b0ff0996eeb243 /packages/instant/src/components/erc20_asset_amount_input.tsx | |
parent | 8175192f60e2c2827f6e7d664fbe8bf2d9ddee9c (diff) | |
parent | f46a49fd13c88dd86c9661d76bace18844642c04 (diff) | |
download | dexon-0x-contracts-master.tar.gz dexon-0x-contracts-master.tar.zst dexon-0x-contracts-master.zip |
Merge branch 'development'master
* development: (81 commits)
Publish
Updated CHANGELOGS
print out error message and stack
immediately return the patch incremented version if no changelog entries exist
Put python package above TS/JS packages
Reduce title size
reduce text side in README
Improve top-level README
Fix prettier
remove unused flag
Add CHANGELOG entry
Fix additional comments
Improve comments
Add migrations, contract-addresses and contract-artifacts to Developers home
Create migrations doc reference page
Add additional CHANGELOG to types package
Add CHANGELOG entry
Fix prettier
Fix `SimpleContractArtifact` type
Update abi-gen-wrappers
...
Diffstat (limited to 'packages/instant/src/components/erc20_asset_amount_input.tsx')
-rw-r--r-- | packages/instant/src/components/erc20_asset_amount_input.tsx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/packages/instant/src/components/erc20_asset_amount_input.tsx b/packages/instant/src/components/erc20_asset_amount_input.tsx index 520ac33d5..b825255c4 100644 --- a/packages/instant/src/components/erc20_asset_amount_input.tsx +++ b/packages/instant/src/components/erc20_asset_amount_input.tsx @@ -22,7 +22,8 @@ export interface ERC20AssetAmountInputProps { onSelectAssetClick?: (asset?: ERC20Asset) => void; startingFontSizePx: number; fontColor?: ColorOption; - isDisabled: boolean; + isInputDisabled: boolean; + canSelectOtherAsset: boolean; numberOfAssetsAvailable?: number; } @@ -50,14 +51,15 @@ export class ERC20AssetAmountInput extends React.Component<ERC20AssetAmountInput ); } private readonly _renderContentForAsset = (asset: ERC20Asset): React.ReactNode => { - const { onChange, ...rest } = this.props; - const amountBorderBottom = this.props.isDisabled ? '' : `1px solid ${transparentWhite}`; + const { onChange, isInputDisabled, ...rest } = this.props; + const amountBorderBottom = isInputDisabled ? '' : `1px solid ${transparentWhite}`; const onSymbolClick = this._generateSelectAssetClickHandler(); return ( <React.Fragment> <Container borderBottom={amountBorderBottom} display="inline-block"> <ScalingAmountInput {...rest} + isDisabled={isInputDisabled} textLengthThreshold={this._textLengthThresholdForAsset(asset)} maxFontSizePx={this.props.startingFontSizePx} onAmountChange={this._handleChange} @@ -74,11 +76,11 @@ export class ERC20AssetAmountInput extends React.Component<ERC20AssetAmountInput fontSize={`${this.state.currentFontSizePx}px`} fontColor={ColorOption.white} textTransform="uppercase" - onClick={onSymbolClick} + onClick={this.props.canSelectOtherAsset ? onSymbolClick : undefined} > {assetUtils.formattedSymbolForAsset(asset)} </Text> - {this._renderChevronIcon()} + {this.props.canSelectOtherAsset && this._renderChevronIcon()} </Flex> </Container> </React.Fragment> |