aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Agosti <francesco.agosti93@gmail.com>2018-12-07 04:02:25 +0800
committerGitHub <noreply@github.com>2018-12-07 04:02:25 +0800
commitaa4fcebdc71fa58b12dc12ab03d7697444416c09 (patch)
treebf53c695f13754a9c11479a8506ac8c12a6e8ae4
parentdcad94df4c8f4587020267362ffb911f4a3caa01 (diff)
parentac166ce32e9b98b8789a47e232268f3121489457 (diff)
downloaddexon-0x-contracts-aa4fcebdc71fa58b12dc12ab03d7697444416c09.tar.gz
dexon-0x-contracts-aa4fcebdc71fa58b12dc12ab03d7697444416c09.tar.zst
dexon-0x-contracts-aa4fcebdc71fa58b12dc12ab03d7697444416c09.zip
Merge pull request #1399 from 0xProject/feature/website/disable-slider-if-no-address-configurator
[website] Disable slider when no affiliate info
-rw-r--r--packages/website/ts/pages/instant/code_demo.tsx2
-rw-r--r--packages/website/ts/pages/instant/config_generator.tsx5
-rw-r--r--packages/website/ts/pages/instant/fee_percentage_slider.tsx5
3 files changed, 11 insertions, 1 deletions
diff --git a/packages/website/ts/pages/instant/code_demo.tsx b/packages/website/ts/pages/instant/code_demo.tsx
index 1bc1980e7..a3b5fe847 100644
--- a/packages/website/ts/pages/instant/code_demo.tsx
+++ b/packages/website/ts/pages/instant/code_demo.tsx
@@ -77,7 +77,7 @@ const customStyle = {
color: '#c994ff',
},
'hljs-meta': {
- color: '#aa573c',
+ color: '#61f5ff',
},
'hljs-built_in': {
color: '#aa573c',
diff --git a/packages/website/ts/pages/instant/config_generator.tsx b/packages/website/ts/pages/instant/config_generator.tsx
index fe70ef04c..fbeeeaeaf 100644
--- a/packages/website/ts/pages/instant/config_generator.tsx
+++ b/packages/website/ts/pages/instant/config_generator.tsx
@@ -79,6 +79,11 @@ export class ConfigGenerator extends React.Component<ConfigGeneratorProps, Confi
<FeePercentageSlider
value={value.affiliateInfo.feePercentage}
onChange={this._handleAffiliatePercentageChange}
+ isDisabled={
+ _.isUndefined(value.affiliateInfo) ||
+ _.isUndefined(value.affiliateInfo.feeRecipient) ||
+ _.isEmpty(value.affiliateInfo.feeRecipient)
+ }
/>
</ConfigGeneratorSection>
</Container>
diff --git a/packages/website/ts/pages/instant/fee_percentage_slider.tsx b/packages/website/ts/pages/instant/fee_percentage_slider.tsx
index 4c92883cb..d76cee58f 100644
--- a/packages/website/ts/pages/instant/fee_percentage_slider.tsx
+++ b/packages/website/ts/pages/instant/fee_percentage_slider.tsx
@@ -31,10 +31,14 @@ injectGlobal`
margin-left: -60%;
}
}
+ .rc-slider-disabled {
+ background-color: inherit !important;
+ }
`;
export interface FeePercentageSliderProps {
value: number;
+ isDisabled: boolean;
onChange: (value: number) => void;
}
@@ -42,6 +46,7 @@ export class FeePercentageSlider extends React.Component<FeePercentageSliderProp
public render(): React.ReactNode {
return (
<SliderWithTooltip
+ disabled={this.props.isDisabled}
min={0}
max={0.05}
step={0.0025}