aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 14:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Improve the responsivity of the Reporting page (#6846) (#6841)

Browse Source
This commit is contained in:
Nicolas Dorier
2025-07-17 15:43:32 +09:00
committed by GitHub
parent e83a12d995
commit cd42f1a53d
32 changed files with 887 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
BTCPayServer/Controllers/UIWalletsController.cs
View File

@@ -76,6 +76,7 @@ namespace BTCPayServer.Controllers
private readonly DefaultRulesCollection _defaultRules;
private readonly Dictionary<PaymentMethodId, ICheckoutModelExtension> _paymentModelExtensions;
private readonly TransactionLinkProviders _transactionLinkProviders;
private readonly InvoiceRepository _invoiceRepository;
private readonly PullPaymentHostedService _pullPaymentHostedService;
private readonly WalletHistogramService _walletHistogramService;
@@ -109,6 +110,7 @@ namespace BTCPayServer.Controllers
Dictionary<PaymentMethodId, ICheckoutModelExtension> paymentModelExtensions,
IStringLocalizer stringLocalizer,
TransactionLinkProviders transactionLinkProviders,
InvoiceRepository invoiceRepository,
DisplayFormatter displayFormatter)
{
_pendingTransactionService = pendingTransactionService;
@@ -118,6 +120,7 @@ namespace BTCPayServer.Controllers
_handlers = handlers;
_paymentModelExtensions = paymentModelExtensions;
_transactionLinkProviders = transactionLinkProviders;
_invoiceRepository = invoiceRepository;
Repository = repo;
WalletRepository = walletRepository;
RateFetcher = rateProvider;
@@ -621,6 +624,7 @@ namespace BTCPayServer.Controllers
var model = new ListTransactionsViewModel { Skip = skip, Count = count };
model.PendingTransactions = await _pendingTransactionService.GetPendingTransactions(walletId.CryptoCode, walletId.StoreId);
model.Rates = GetCurrentStore().GetStoreBlob().GetTrackedRates().ToList();
model.Labels.AddRange(
(await WalletRepository.GetWalletLabels(walletId))
@@ -663,6 +667,8 @@ namespace BTCPayServer.Controllers
var labels = _labelService.CreateTransactionTagModels(transactionInfo, Request);
vm.Tags.AddRange(labels);
vm.Comment = transactionInfo.Comment;
vm.InvoiceId = transactionInfo.Attachments.FirstOrDefault(a => a.Type == WalletObjectData.Types.Invoice)?.Id;
vm.WalletRateBook = transactionInfo.Rates;
}
if (labelFilter == null ||
@@ -670,6 +676,28 @@ namespace BTCPayServer.Controllers
model.Transactions.Add(vm);
}
var trackedCurrencies = GetCurrentStore().GetStoreBlob().GetTrackedRates();
var rates = await _invoiceRepository.GetRatesOfInvoices(model.Transactions.Select(r => r.InvoiceId).Where(r => r is not null).ToHashSet());
foreach (var vm in model.Transactions)
{
if (vm.InvoiceId is null)
continue;
rates.TryGetValue(vm.InvoiceId, out var book);
vm.InvoiceRateBook = book;
}
foreach (var vm in model.Transactions)
{
var book = vm.InvoiceRateBook ?? new();
if (vm.WalletRateBook is not null)
book.AddRates(vm.WalletRateBook);
foreach (var trackedCurrency in trackedCurrencies)
{
var exists = book.TryGetRate(new CurrencyPair(network.CryptoCode, trackedCurrency), out var rate);
vm.Rates.Add(exists ? _displayFormatter.Currency(rate, trackedCurrency) : null);
}
}
model.Total = preFiltering ? null : model.Transactions.Count;
// if we couldn't filter at the db level, we need to apply skip and count
if (!preFiltering)