From 4e53f59a9cf530b69f928a7c34a7de2db724643a Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 3 Aug 2019 23:10:45 +0900 Subject: [PATCH] Implement label filter --- BTCPayServer/Controllers/WalletsController.cs | 6 ++++-- BTCPayServer/Views/Wallets/WalletTransactions.cshtml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/BTCPayServer/Controllers/WalletsController.cs b/BTCPayServer/Controllers/WalletsController.cs index 83d3de0d3..9651d225d 100644 --- a/BTCPayServer/Controllers/WalletsController.cs +++ b/BTCPayServer/Controllers/WalletsController.cs @@ -227,7 +227,7 @@ namespace BTCPayServer.Controllers [Route("{walletId}")] public async Task WalletTransactions( [ModelBinder(typeof(WalletIdModelBinder))] - WalletId walletId) + WalletId walletId, string labelFilter = null) { DerivationSchemeSettings paymentMethod = await GetDerivationSchemeSettings(walletId); if (paymentMethod == null) @@ -243,7 +243,6 @@ namespace BTCPayServer.Controllers foreach (var tx in transactions.UnconfirmedTransactions.Transactions.Concat(transactions.ConfirmedTransactions.Transactions).ToArray()) { var vm = new ListTransactionsViewModel.TransactionViewModel(); - model.Transactions.Add(vm); vm.Id = tx.TransactionId.ToString(); vm.Link = string.Format(CultureInfo.InvariantCulture, paymentMethod.Network.BlockExplorerLink, vm.Id); vm.Timestamp = tx.Timestamp; @@ -258,6 +257,9 @@ namespace BTCPayServer.Controllers model.Labels.AddRange(labels); vm.Comment = transactionInfo.Comment; } + + if (labelFilter == null || vm.Labels.Any(l => l.Value.Equals(labelFilter, StringComparison.OrdinalIgnoreCase))) + model.Transactions.Add(vm); } model.Transactions = model.Transactions.OrderByDescending(t => t.Timestamp).ToList(); return View(model); diff --git a/BTCPayServer/Views/Wallets/WalletTransactions.cshtml b/BTCPayServer/Views/Wallets/WalletTransactions.cshtml index 1cdaa6a66..a91448681 100644 --- a/BTCPayServer/Views/Wallets/WalletTransactions.cshtml +++ b/BTCPayServer/Views/Wallets/WalletTransactions.cshtml @@ -64,7 +64,7 @@ @foreach (var label in transaction.Labels) { - @label.Value + @label.Value }