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

Do not prefilter if label filter in transaction view

Browse Source
This commit is contained in:
nicolas.dorier
2022-07-06 13:00:23 +09:00
parent 9ec2052428
commit 67abc107c5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
BTCPayServer/Controllers/UIWalletsController.cs
View File

@@ -281,7 +281,10 @@ namespace BTCPayServer.Controllers
var wallet = _walletProvider.GetWallet(paymentMethod.Network); var wallet = _walletProvider.GetWallet(paymentMethod.Network);
var walletBlobAsync = WalletRepository.GetWalletInfo(walletId); var walletBlobAsync = WalletRepository.GetWalletInfo(walletId);
var walletTransactionsInfoAsync = WalletRepository.GetWalletTransactionsInfo(walletId); var walletTransactionsInfoAsync = WalletRepository.GetWalletTransactionsInfo(walletId);
var transactions = await wallet.FetchTransactionHistory(paymentMethod.AccountDerivation, skip, count);
// We can't filter at the database level if we need to apply label filter
var preFiltering = string.IsNullOrEmpty(labelFilter);
var transactions = await wallet.FetchTransactionHistory(paymentMethod.AccountDerivation, preFiltering ? skip : null, preFiltering ? count : null);
var walletBlob = await walletBlobAsync; var walletBlob = await walletBlobAsync;
var walletTransactionsInfo = await walletTransactionsInfoAsync; var walletTransactionsInfo = await walletTransactionsInfoAsync;
var model = new ListTransactionsViewModel { Skip = skip, Count = count }; var model = new ListTransactionsViewModel { Skip = skip, Count = count };
@@ -326,7 +329,7 @@ namespace BTCPayServer.Controllers
} }
model.Total = model.Transactions.Count; model.Total = model.Transactions.Count;
model.Transactions = model.Transactions.OrderByDescending(t => t.Timestamp).Skip(skip).Take(count) model.Transactions = model.Transactions.Skip(skip).Take(count)
.ToList(); .ToList();
} }