Fix merge issues

deriv-com · Mar 8, 2024 · da51929 · da51929
1 parent df5f4ac
commit da51929
Show file tree

Hide file tree

Showing 3 changed files with 3 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/chart/main_chart.dart b/lib/src/deriv_chart/chart/main_chart.dart
@@ -13,6 +13,7 @@ import 'package:deriv_chart/src/deriv_chart/chart/x_axis/x_axis_model.dart';
 import 'package:deriv_chart/src/models/chart_config.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import '../drawing_tool_chart/drawing_tool_chart.dart';
 import 'basic_chart.dart';
 import 'multiple_animated_builder.dart';
 import 'data_visualization/annotations/chart_annotation.dart';

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,