Fix merge issues

deriv-com · Jan 7, 2024 · 4db4442 · 4db4442
1 parent 7e7cb49
commit 4db4442
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/src/deriv_chart/chart/data_visualization/markers/marker_area.dart b/lib/src/deriv_chart/chart/data_visualization/markers/marker_area.dart
@@ -79,7 +79,7 @@ class _MarkerAreaState extends State<MarkerArea> {
           duration: animationDuration,
           opacity: widget.markerSeries.activeMarker != null ? 0.5 : 1,
           child: CustomPaint(
-            child: Container(),
+            child: const SizedBox.shrink(),
             painter: _MarkerPainter(
                 series: widget.markerSeries,
                 epochToX: xAxis.xFromEpoch,

diff --git a/lib/src/deriv_chart/deriv_chart.dart b/lib/src/deriv_chart/deriv_chart.dart
@@ -334,6 +334,7 @@ class _DerivChartState extends State<DerivChart> {
                 dataFitEnabled: widget.dataFitEnabled,
                 opacity: widget.opacity,
                 annotations: widget.annotations,
+                chartAxisConfig: widget.chartAxisConfig,
                 showCrosshair: widget.showCrosshair,
                 indicatorsRepo: widget.indicatorsRepo ?? _indicatorsRepo,
                 maxCurrentTickOffset: widget.maxCurrentTickOffset,