Merge pull request #2120 from binary-com/dev

dev to beta
binary-com · Nov 11, 2019 · bce5645 · bce5645
2 parents 596afe5 + 1679a66
commit bce5645
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/botPage/view/Dialogs/Chart.js b/src/botPage/view/Dialogs/Chart.js
@@ -42,7 +42,8 @@ class ChartContent extends PureComponent {
         this.listeners = [];
         this.chartId = 'binary-bot-chart';
         this.state = {
-            granularity: null,
+            chartType  : 'mountain',
+            granularity: 0,
             symbol     : 'R_100',
             barrierType: undefined,
             high       : undefined,
@@ -121,7 +122,7 @@ class ChartContent extends PureComponent {
     renderControls = () => (
         <React.Fragment>
             <CrosshairToggle />
-            <ChartTypes />
+            <ChartTypes enabled={true} onChange={chartType => this.setState({ chartType })} />
             <Timeperiod enabled={true} onChange={granularity => this.setState({ granularity })} />
             <StudyLegend />
             <DrawTools />
@@ -151,6 +152,7 @@ class ChartContent extends PureComponent {
         return (
             <SmartChart
                 id={this.chartId}
+                chartType={this.state.chartType}
                 granularity={this.state.granularity}
                 symbol={this.state.symbol}
                 isMobile={true}

diff --git a/src/indexPage/react-components/footer.jsx b/src/indexPage/react-components/footer.jsx
@@ -123,7 +123,7 @@ const Footer = () => (
                                 {translate(['Trading binary options may not be suitable for everyone, so please ensure that you fully understand the risks involved. Your losses can exceed your initial deposit and you do not own or have any interest in the underlying asset.'])}
                             </p>
                             <p className='eu-only invisible'>
-                                {translate(['CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. Between 74-89% of retail investor accounts lose money when trading CFDs. You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money.'])}
+                                {translate(['CFDs are complex instruments and come with a high risk of losing money rapidly due to leverage. 78.6% of retail investor accounts lose money when trading CFDs. You should consider whether you understand how CFDs work and whether you can afford to take the high risk of losing your money.'])}
                             </p>
                         </div>
                     </div>