From 1157e2d04b2d3bc0e713d54949f275a1da4d3188 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 4 Jul 2024 18:09:03 +0900
Subject: [PATCH] Fix: Reports rows weren't always properly sorted (Fix #6065)

---
 BTCPayServer/Views/UIReports/StoreReports.cshtml | 2 +-
 BTCPayServer/wwwroot/js/datatable.js             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BTCPayServer/Views/UIReports/StoreReports.cshtml b/BTCPayServer/Views/UIReports/StoreReports.cshtml
index 986d77686..17f79099a 100644
--- a/BTCPayServer/Views/UIReports/StoreReports.cshtml
+++ b/BTCPayServer/Views/UIReports/StoreReports.cshtml
@@ -128,7 +128,7 @@
                         <template v-else-if="srv.result.fields[columnIndex].type === 'tx_id'">
                             <vc:truncate-center text="value" is-vue="true" padding="15" classes="truncate-center-id" link="getExplorerUrl(value, row[columnIndex-1])" />
                         </template>
-                        <template v-else-if="value && ['Address', 'PaymentId'].includes(srv.result.fields[columnIndex].name)" >
+                        <template v-else-if="value && ['Address'].includes(srv.result.fields[columnIndex].name)" >
                             <vc:truncate-center text="value" is-vue="true" padding="15" classes="truncate-center-id" />
                         </template>
                         <template v-else-if="srv.result.fields[columnIndex].type === 'datetime'">{{ displayDate(value) }}</template>
diff --git a/BTCPayServer/wwwroot/js/datatable.js b/BTCPayServer/wwwroot/js/datatable.js
index 9e3237ca7..0a7df50b9 100644
--- a/BTCPayServer/wwwroot/js/datatable.js
+++ b/BTCPayServer/wwwroot/js/datatable.js
@@ -187,6 +187,7 @@
     }
 
     function createTable(summaryDefinition, fields, rows) {
+        rows = clone(rows);
         var groupIndices = summaryDefinition.groups.map(g => fields.findIndex((a) => a === g)).filter(g => g !== -1);
         var aggregatesIndices = summaryDefinition.aggregates.map(g => fields.findIndex((a) => a === g)).filter(g => g !== -1);
         aggregatesIndices = aggregatesIndices.filter(g => g !== -1);