Fix inconsistent legend coloring in custom reports (#4162)

* fix inconsistent legend colouring in custom reports * note * Update VRT --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
actualbudget · Jan 15, 2025 · 5fc3e2e · 5fc3e2e
1 parent 97b28ca
commit 5fc3e2e
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 5 deletions.
diff --git a/...ustom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-1-chromium-linux.png b/...ustom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-1-chromium-linux.png
diff --git a/...ustom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-2-chromium-linux.png b/...ustom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-2-chromium-linux.png
diff --git a/...ustom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-3-chromium-linux.png b/...ustom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-3-chromium-linux.png
diff --git a/...stom-reports-Switches-to-Line-Graph-and-checks-the-visuals-1-chromium-linux.png b/...stom-reports-Switches-to-Line-Graph-and-checks-the-visuals-1-chromium-linux.png
diff --git a/...stom-reports-Switches-to-Line-Graph-and-checks-the-visuals-2-chromium-linux.png b/...stom-reports-Switches-to-Line-Graph-and-checks-the-visuals-2-chromium-linux.png
diff --git a/...stom-reports-Switches-to-Line-Graph-and-checks-the-visuals-3-chromium-linux.png b/...stom-reports-Switches-to-Line-Graph-and-checks-the-visuals-3-chromium-linux.png
diff --git a/...alidates-that-show-legend-button-shows-the-legend-side-bar-1-chromium-linux.png b/...alidates-that-show-legend-button-shows-the-legend-side-bar-1-chromium-linux.png
diff --git a/...alidates-that-show-legend-button-shows-the-legend-side-bar-2-chromium-linux.png b/...alidates-that-show-legend-button-shows-the-legend-side-bar-2-chromium-linux.png
diff --git a/...alidates-that-show-legend-button-shows-the-legend-side-bar-3-chromium-linux.png b/...alidates-that-show-legend-button-shows-the-legend-side-bar-3-chromium-linux.png
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts
@@ -277,18 +277,18 @@ export function createCustomSpreadsheet({
       filterEmptyRows({ showEmpty, data: i, balanceTypeOp }),
     );
 
+    const sortedCalcDataFiltered = [...calcDataFiltered].sort(
+      sortData({ balanceTypeOp, sortByOp }),
+    );
+
     const legend = calculateLegend(
       intervalData,
-      calcDataFiltered,
+      sortedCalcDataFiltered,
       groupBy,
       graphType,
       balanceTypeOp,
     );
 
-    const sortedCalcDataFiltered = [...calcDataFiltered].sort(
-      sortData({ balanceTypeOp, sortByOp }),
-    );
-
     setData({
       data: sortedCalcDataFiltered,
       intervalData,

diff --git a/upcoming-release-notes/4162.md b/upcoming-release-notes/4162.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [matt-fidd]
+---
+
+Fix inconsistent legend coloring in custom reports