upd: updated smartcharts (#3277)

Daniil-Deriv · web-flow · commit 6cf0ce2f138d · 2021-05-25T17:04:52.000+04:00
diff --git a/gulp/bundle.js b/gulp/bundle.js
@@ -31,7 +31,7 @@ gulp.task(
 gulp.task(
     'copy-js',
     gulp.parallel(done => {
-        gulp.src(['./node_modules/smartcharts-beta/dist/*.smartcharts.*']).pipe(gulp.dest('www/js/'));
+        gulp.src(['./node_modules/@deriv/deriv-charts/dist/*.smartcharts.*']).pipe(gulp.dest('www/js/'));
         done();
     })
 );
@@ -41,7 +41,7 @@ gulp.task(
     gulp.parallel(done => {
         gulp.src([
             'node_modules/jquery-ui-css/jquery-ui.min.css',
-            './node_modules/smartcharts-beta/dist/smartcharts.css',
+            './node_modules/@deriv/deriv-charts/dist/smartcharts.css',
         ])
             .pipe(concatCss('bundle.css'))
             .pipe(rev())
diff --git a/package.json b/package.json
@@ -115,6 +115,6 @@
     "pako": "^1.0.11",
     "react-render-html": "^0.6.0",
     "react-transition-group": "^4.0.1",
-    "smartcharts-beta": "^0.8.0-betam.11"
+    "@deriv/deriv-charts": "0.3.16"
   }
 }
diff --git a/src/botPage/view/Dialogs/Chart.js b/src/botPage/view/Dialogs/Chart.js
@@ -1,12 +1,13 @@
 import {
-    SmartChart,
+    ChartMode,
+    DrawTools,
     setSmartChartsPublicPath,
+    Share,
+    SmartChart,
     StudyLegend,
+    ToolbarWidget,
     Views,
-    DrawTools,
-    Share,
-    ChartMode,
-} from 'smartcharts-beta';
+} from '@deriv/deriv-charts';
 import React, { PureComponent } from 'react';
 import { translate } from '../../../common/i18n';
 import Dialog from './Dialog';
@@ -116,8 +117,8 @@ class ChartContent extends PureComponent {
 
     renderTopWidgets = () => <span />;
 
-    renderControls = () => (
-        <React.Fragment>
+    renderToolbarWidgets = () => (
+        <ToolbarWidget>
             <ChartMode
                 onChartType={chartType => this.setState({ chartType })}
                 onGranularity={granularity => this.setState({ granularity })}
@@ -126,7 +127,7 @@ class ChartContent extends PureComponent {
             <DrawTools />
             <Views searchInputClassName="data-hj-whitelist" />
             <Share />
-        </React.Fragment>
+        </ToolbarWidget>
     );
 
     render() {
@@ -149,8 +150,9 @@ class ChartContent extends PureComponent {
         return (
             <SmartChart
                 barriers={barriers}
-                chartControlsWidgets={this.renderControls}
+                chartControlsWidgets={null}
                 chartType={this.state.chartType}
+                enabledChartFooter={false}
                 granularity={this.state.granularity}
                 id={this.chartId}
                 isMobile={false}
@@ -159,6 +161,7 @@ class ChartContent extends PureComponent {
                 requestSubscribe={this.requestSubscribe.bind(this)}
                 settings={this.settings}
                 symbol={this.state.symbol}
+                toolbarWidget={this.renderToolbarWidgets}
                 topWidgets={this.renderTopWidgets}
             />
         );

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,6 @@`
`115`	`115`	`"pako": "^1.0.11",`
`116`	`116`	`"react-render-html": "^0.6.0",`
`117`	`117`	`"react-transition-group": "^4.0.1",`
`118`		`- "smartcharts-beta": "^0.8.0-betam.11"`
	`118`	`+ "@deriv/deriv-charts": "0.3.16"`
`119`	`119`	`}`
`120`	`120`	`}`