From eacef13b5a5d28ea079cfb0f2a4c832747d3d05d Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Tue, 23 Aug 2022 19:34:11 -0500
Subject: [PATCH] Fix date range filter in BSQ Supply screen.

---
 .../components/chart/ChartViewModel.java      | 20 +++++++------------
 .../dao/economy/supply/dao/DaoChartView.java  |  6 +++++-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/components/chart/ChartViewModel.java b/desktop/src/main/java/bisq/desktop/components/chart/ChartViewModel.java
index 00297a494b..8add418b6f 100644
--- a/desktop/src/main/java/bisq/desktop/components/chart/ChartViewModel.java
+++ b/desktop/src/main/java/bisq/desktop/components/chart/ChartViewModel.java
@@ -157,19 +157,10 @@ public abstract class ChartViewModel<T extends ChartDataModel> extends Activatab
         }
     }
 
-    void initBounds(List<XYChart.Data<Number, Number>> data1,
-                    List<XYChart.Data<Number, Number>> data2) {
-        Tuple2<Double, Double> xMinMaxTradeFee = getMinMax(data1);
-        Tuple2<Double, Double> xMinMaxCompensationRequest = getMinMax(data2);
-
-        lowerBound = Math.min(xMinMaxTradeFee.first, xMinMaxCompensationRequest.first);
-        upperBound = Math.max(xMinMaxTradeFee.second, xMinMaxCompensationRequest.second);
-    }
-
     void initBounds(List<XYChart.Data<Number, Number>> data) {
-        Tuple2<Double, Double> xMinMaxTradeFee = getMinMax(data);
-        lowerBound = xMinMaxTradeFee.first;
-        upperBound = xMinMaxTradeFee.second;
+        Tuple2<Double, Double> xMinMaxDate = getMinMaxDatesFromSeries(data);
+        lowerBound = xMinMaxDate.first;
+        upperBound = xMinMaxDate.second;
     }
 
 
@@ -246,7 +237,10 @@ public abstract class ChartViewModel<T extends ChartDataModel> extends Activatab
                 .collect(Collectors.toList());
     }
 
-    private Tuple2<Double, Double> getMinMax(List<XYChart.Data<Number, Number>> chartData) {
+    private Tuple2<Double, Double> getMinMaxDatesFromSeries(List<XYChart.Data<Number, Number>> chartData) {
+        if (chartData.size() == 0) {
+            return new Tuple2<>(0D, 0D);
+        }
         long min = Long.MAX_VALUE, max = 0;
         for (XYChart.Data<Number, ?> data : chartData) {
             long value = data.getXValue().longValue();
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/economy/supply/dao/DaoChartView.java b/desktop/src/main/java/bisq/desktop/main/dao/economy/supply/dao/DaoChartView.java
index 66d0beecd1..69716abb3c 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/economy/supply/dao/DaoChartView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/economy/supply/dao/DaoChartView.java
@@ -122,7 +122,11 @@ public class DaoChartView extends ChartView<DaoChartViewModel> {
 
     @Override
     protected void initBoundsForTimelineNavigation() {
-        setBoundsForTimelineNavigation(seriesTotalBurned.getData());
+        if (seriesSupplyChange.getData().size() > 0) {
+            setBoundsForTimelineNavigation(seriesSupplyChange.getData());
+        } else {
+            setBoundsForTimelineNavigation(seriesTotalBurned.getData());
+        }
     }