Merge pull request #290 from status-im/fix/zero-cost-offer

Fix small stuff

src/js/ui/BackButton/index.jsx

@@ -11,8 +11,11 @@ class BackButton extends Component {
     hidden: null
   };
 
-  componentDidUpdate(prevProps) {
+  componentDidMount() {
-    if (this.state.hidden === null || prevProps.location.pathname !== this.props.location.pathname) {
+    this.checkLocation();
+  }
+
+  checkLocation() {
     const hidden = !!BLACK_LIST.find(blackListedLink => {
       const starIndex = blackListedLink.indexOf('*');
       if (starIndex > -1) {
@@ -23,6 +26,11 @@ class BackButton extends Component {
     });
     this.setState({hidden});
   }
+
+  componentDidUpdate(prevProps) {
+    if (this.state.hidden === null || prevProps.location.pathname !== this.props.location.pathname) {
+     this.checkLocation();
+    }
   }
 
   render() {

src/js/wizards/Sell/6_Margin/components/MarginSelectorForm.jsx

@@ -5,7 +5,7 @@ import {FormGroup, InputGroup, InputGroupAddon, InputGroupText, Col, Row} from '
 import Input from 'react-validation/build/input';
 import {withNamespaces} from 'react-i18next';
 import Form from 'react-validation/build/form';
-import {isNumber, required, lowerEqThan, higherEqThan} from '../../../../validators';
+import {isNumber, required, lowerEqThan, higherThan} from '../../../../validators';
 import Slider from 'rc-slider/lib/Slider';
 import 'rc-slider/assets/index.css';
 import './MarginSelectorForm.scss';
@@ -29,8 +29,8 @@ class MarginSelectorForm extends Component {
         <h2>{t('sellerMarginContainer.title')}</h2>
         <FormGroup className="mb-0">
           <Row>
-            <Col xs={9}>
+            <Col md={9} sm={8} xs={7}>
-              <Slider className="mb-3 p-4" min={-100} max={100} defaultValue={0}
+              <Slider className="mb-3 p-4" min={-99} max={100} defaultValue={0}
                       onChange={(value) => this.onMarginChange(value)} value={margin}/>
             </Col>
             <Col>
@@ -42,7 +42,7 @@ class MarginSelectorForm extends Component {
                        className="form-control prepend"
                        value={margin}
                        onChange={(e) => this.onMarginChange(e.target.value)}
-                       validations={[required, isNumber, lowerEqThan.bind(null, 100), higherEqThan.bind(null, -100)]}/>
+                       validations={[required, isNumber, lowerEqThan.bind(null, 100), higherThan.bind(null, -100)]}/>
                 <InputGroupAddon addonType="append"><InputGroupText>%</InputGroupText></InputGroupAddon>
               </InputGroup>
             </Col>

src/js/wizards/Sell/6_Margin/components/__snapshots__/MarginSelectorForm.test.jsx.snap

@@ -11,6 +11,8 @@ exports[`MarginSelectorForm should render correctly 1`] = `
       tag="div"
     >
       <Col
+        md={9}
+        sm={8}
         tag="div"
         widths={
           Array [
@@ -21,7 +23,7 @@ exports[`MarginSelectorForm should render correctly 1`] = `
             "xl",
           ]
         }
-        xs={9}
+        xs={7}
       >
         <ComponentEnhancer(undefined)
           activeDotStyle={Object {}}
@@ -39,7 +41,7 @@ exports[`MarginSelectorForm should render correctly 1`] = `
           included={true}
           marks={Object {}}
           max={100}
-          min={-100}
+          min={-99}
           onAfterChange={[Function]}
           onBeforeChange={[Function]}
           onChange={[Function]}

src/js/wizards/Sell/6_Margin/index.jsx

@@ -52,7 +52,7 @@ class Margin extends Component {
   }
 
   validate(margin) {
-    if ((margin || margin === 0) && margin <= 100 && margin >= -100) {
+    if ((margin || margin === 0) && margin <= 100 && margin > -100) {
       return this.props.footer.enableNext();
     }
     this.props.footer.disableNext();