aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-10-27 07:24:16 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-10-27 07:24:16 +0800
commit0e55f76db860962e4ce06866cbfd3e058c0c2984 (patch)
tree5e60891addfead5fc3f7a310352bc0b5b2062a24
parent1880c34ce066a8e33047690ef9fb90393100abd9 (diff)
downloaddexon-sol-tools-0e55f76db860962e4ce06866cbfd3e058c0c2984.tar
dexon-sol-tools-0e55f76db860962e4ce06866cbfd3e058c0c2984.tar.gz
dexon-sol-tools-0e55f76db860962e4ce06866cbfd3e058c0c2984.tar.bz2
dexon-sol-tools-0e55f76db860962e4ce06866cbfd3e058c0c2984.tar.lz
dexon-sol-tools-0e55f76db860962e4ce06866cbfd3e058c0c2984.tar.xz
dexon-sol-tools-0e55f76db860962e4ce06866cbfd3e058c0c2984.tar.zst
dexon-sol-tools-0e55f76db860962e4ce06866cbfd3e058c0c2984.zip
fix(instant): refactor some props to use isDisabled instead of disabled
-rw-r--r--packages/instant/src/components/erc20_asset_amount_input.tsx6
-rw-r--r--packages/instant/src/components/scaling_amount_input.tsx6
-rw-r--r--packages/instant/src/components/scaling_input.tsx8
-rw-r--r--packages/instant/src/containers/selected_erc20_asset_amount_input.ts12
4 files changed, 16 insertions, 16 deletions
diff --git a/packages/instant/src/components/erc20_asset_amount_input.tsx b/packages/instant/src/components/erc20_asset_amount_input.tsx
index 9b32827e7..5abb34c2f 100644
--- a/packages/instant/src/components/erc20_asset_amount_input.tsx
+++ b/packages/instant/src/components/erc20_asset_amount_input.tsx
@@ -17,7 +17,7 @@ export interface ERC20AssetAmountInputProps {
onChange: (value?: BigNumberInput, asset?: ERC20Asset) => void;
startingFontSizePx: number;
fontColor?: ColorOption;
- disabled: boolean;
+ isDisabled: boolean;
}
export interface ERC20AssetAmountInputState {
@@ -27,7 +27,7 @@ export interface ERC20AssetAmountInputState {
export class ERC20AssetAmountInput extends React.Component<ERC20AssetAmountInputProps, ERC20AssetAmountInputState> {
public static defaultProps = {
onChange: util.boundNoop,
- disabled: false,
+ isDisabled: false,
};
constructor(props: ERC20AssetAmountInputProps) {
super(props);
@@ -37,7 +37,7 @@ export class ERC20AssetAmountInput extends React.Component<ERC20AssetAmountInput
}
public render(): React.ReactNode {
const { asset, onChange, ...rest } = this.props;
- const amountBorderBottom = this.props.disabled ? '' : `1px solid ${transparentWhite}`;
+ const amountBorderBottom = this.props.isDisabled ? '' : `1px solid ${transparentWhite}`;
return (
<Container whiteSpace="nowrap">
<Container borderBottom={amountBorderBottom} display="inline-block">
diff --git a/packages/instant/src/components/scaling_amount_input.tsx b/packages/instant/src/components/scaling_amount_input.tsx
index 8d51d27f9..cfbf3b7cc 100644
--- a/packages/instant/src/components/scaling_amount_input.tsx
+++ b/packages/instant/src/components/scaling_amount_input.tsx
@@ -8,7 +8,7 @@ import { util } from '../util/util';
import { ScalingInput } from './scaling_input';
export interface ScalingAmountInputProps {
- disabled: boolean;
+ isDisabled: boolean;
maxFontSizePx: number;
textLengthThreshold: number;
fontColor?: ColorOption;
@@ -21,7 +21,7 @@ export class ScalingAmountInput extends React.Component<ScalingAmountInputProps>
public static defaultProps = {
onChange: util.boundNoop,
onFontSizeChange: util.boundNoop,
- disabled: false,
+ isDisabled: false,
};
public render(): React.ReactNode {
const { textLengthThreshold, fontColor, maxFontSizePx, value, onFontSizeChange } = this.props;
@@ -35,7 +35,7 @@ export class ScalingAmountInput extends React.Component<ScalingAmountInputProps>
value={!_.isUndefined(value) ? value.toDisplayString() : ''}
placeholder="0.00"
emptyInputWidthCh={3.5}
- disabled={this.props.disabled}
+ isDisabled={this.props.isDisabled}
/>
);
}
diff --git a/packages/instant/src/components/scaling_input.tsx b/packages/instant/src/components/scaling_input.tsx
index 593e55035..11748b729 100644
--- a/packages/instant/src/components/scaling_input.tsx
+++ b/packages/instant/src/components/scaling_input.tsx
@@ -27,7 +27,7 @@ export interface ScalingInputProps {
placeholder?: string;
maxLength?: number;
scalingSettings: ScalingSettings;
- disabled: boolean;
+ isDisabled: boolean;
}
export interface ScalingInputState {
@@ -50,7 +50,7 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
onFontSizeChange: util.boundNoop,
maxLength: 7,
scalingSettings: defaultScalingSettings,
- disabled: false,
+ isDisabled: false,
};
public state: ScalingInputState = {
inputWidthPxAtPhaseChange: undefined,
@@ -123,7 +123,7 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
}
}
public render(): React.ReactNode {
- const { disabled, fontColor, onChange, placeholder, value, maxLength } = this.props;
+ const { isDisabled, fontColor, onChange, placeholder, value, maxLength } = this.props;
const phase = ScalingInput.getPhaseFromProps(this.props);
return (
<Input
@@ -135,7 +135,7 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
fontSize={`${this._calculateFontSize(phase)}px`}
width={this._calculateWidth(phase)}
maxLength={maxLength}
- disabled={disabled}
+ disabled={isDisabled}
/>
);
}
diff --git a/packages/instant/src/containers/selected_erc20_asset_amount_input.ts b/packages/instant/src/containers/selected_erc20_asset_amount_input.ts
index 6e1957a59..3d741ae97 100644
--- a/packages/instant/src/containers/selected_erc20_asset_amount_input.ts
+++ b/packages/instant/src/containers/selected_erc20_asset_amount_input.ts
@@ -25,7 +25,7 @@ interface ConnectedState {
assetBuyer?: AssetBuyer;
value?: BigNumberInput;
asset?: ERC20Asset;
- disabled: boolean;
+ isDisabled: boolean;
}
interface ConnectedDispatch {
@@ -36,7 +36,7 @@ interface ConnectedProps {
value?: BigNumberInput;
asset?: ERC20Asset;
onChange: (value?: BigNumberInput, asset?: ERC20Asset) => void;
- disabled: boolean;
+ isDisabled: boolean;
}
type FinalProps = ConnectedProps & SelectedERC20AssetAmountInputProps;
@@ -44,13 +44,13 @@ type FinalProps = ConnectedProps & SelectedERC20AssetAmountInputProps;
const mapStateToProps = (state: State, _ownProps: SelectedERC20AssetAmountInputProps): ConnectedState => {
const processState = state.buyOrderState.processState;
const isEnabled = processState === OrderProcessState.NONE || processState === OrderProcessState.FAILURE;
- const disabled = !isEnabled;
+ const isDisabled = !isEnabled;
const selectedAsset = state.selectedAsset;
if (_.isUndefined(selectedAsset) || selectedAsset.metaData.assetProxyId !== AssetProxyId.ERC20) {
return {
value: state.selectedAssetAmount,
- disabled,
+ isDisabled,
};
}
@@ -58,7 +58,7 @@ const mapStateToProps = (state: State, _ownProps: SelectedERC20AssetAmountInputP
assetBuyer: state.assetBuyer,
value: state.selectedAssetAmount,
asset: selectedAsset as ERC20Asset,
- disabled,
+ isDisabled,
};
};
@@ -123,7 +123,7 @@ const mergeProps = (
onChange: (value, asset) => {
connectedDispatch.updateBuyQuote(connectedState.assetBuyer, value, asset);
},
- disabled: connectedState.disabled,
+ isDisabled: connectedState.isDisabled,
};
};