fix pos item topups lnurl

fixes #5170

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.BGold.cs

@@ -16,7 +16,7 @@ namespace BTCPayServer
                 DefaultRateRules = new[]
                 {
                     "BTG_X = BTG_BTC * BTC_X",
-                    "BTG_BTC = bitfinex(BTG_BTC)",
+                    "BTG_BTC = exmo(BTG_BTC)",
                 },
                 CryptoImagePath = "imlegacy/btg.svg",
                 LightningImagePath = "imlegacy/btg-lightning.svg",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcore.cs

@@ -17,7 +17,7 @@ namespace BTCPayServer
                 DefaultRateRules = new[]
                 {
                                 "BTX_X = BTX_BTC * BTC_X",
-                                "BTX_BTC = hitbtc(BTX_BTC)"
+                                "BTX_BTC = graviex(BTX_BTC)"
                 },
                 CryptoImagePath = "imlegacy/bitcore.svg",
                 LightningImagePath = "imlegacy/bitcore-lightning.svg",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Chaincoin.cs

@@ -1,32 +0,0 @@
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitChaincoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("CHC");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Chaincoin",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet
-                    ? "https://explorer.chaincoin.org/Explorer/Transaction/{0}"
-                    : "https://test.explorer.chaincoin.org/Explorer/Transaction/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                    {
-                        "CHC_X = CHC_BTC * BTC_X",
-                        "CHC_BTC = txbit(CHC_X)"
-                    },
-                CryptoImagePath = "imlegacy/chaincoin.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                //https://github.com/satoshilabs/slips/blob/master/slip-0044.md
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("711'")
-                    : new KeyPath("1'")
-            });
-        }
-    }
-}
-

BTCPayServer.Common/Altcoins/Liquid/BTCPayNetworkProvider.LiquidAssets.cs

@@ -63,6 +63,7 @@ namespace BTCPayServer
                     "LCAD_CAD = 1",
                     "LCAD_X = CAD_BTC * BTC_X",
                     "LCAD_BTC = bylls(CAD_BTC)",
+                    "CAD_BTC = LCAD_BTC"
                 },
                 AssetId = new uint256("0e99c1a6da379d1f4151fb9df90449d40d0608f6cb33a5bcbfc8c265f42bab0a"),
                 DisplayName = "Liquid CAD",

BTCPayServer.Common/Altcoins/Monero/RPC/JsonRpcClient.cs

@@ -45,10 +45,10 @@ namespace BTCPayServer.Services.Altcoins.Monero.RPC
             httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Basic",
                 Convert.ToBase64String(Encoding.Default.GetBytes($"{_username}:{_password}")));
 
-            var rawResult = await _httpClient.SendAsync(httpRequest, cts);
-
-            var rawJson = await rawResult.Content.ReadAsStringAsync();
+            HttpResponseMessage rawResult = await _httpClient.SendAsync(httpRequest, cts);
             rawResult.EnsureSuccessStatusCode();
+            var rawJson = await rawResult.Content.ReadAsStringAsync();
+            
             JsonRpcResult<TResponse> response;
             try
             {

BTCPayServer.Common/BTCPayNetworkProvider.cs

@@ -56,7 +56,6 @@ namespace BTCPayServer
             InitViacoin();
             InitMonero();
             InitZcash();
-            InitChaincoin();
             // InitArgoneum();//their rate source is down 9/15/20.
             // InitMonetaryUnit(); Not supported from Bittrex from 11/23/2022, dead shitcoin
 

BTCPayServer.Rating/Extensions.cs

@@ -15,7 +15,7 @@ namespace BTCPayServer.Rating
                 while (true)
                 {
                     var rounded = decimal.Round(value, divisibility, MidpointRounding.AwayFromZero);
-                    if ((Math.Abs(rounded - value) / value) < 0.001m)
+                    if ((Math.Abs(rounded - value) / value) < 0.01m)
                     {
                         value = rounded;
                         break;

BTCPayServer.Rating/Providers/ExchangeRateHostRateProvider.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Rating;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Services.Rates;
+
+
+public class ExchangeRateHostRateProvider : IRateProvider
+{
+    public RateSourceInfo RateSourceInfo => new("exchangeratehost", "Yadio", "https://api.exchangerate.host/latest?base=BTC");
+    private readonly HttpClient _httpClient;
+    public ExchangeRateHostRateProvider(HttpClient httpClient)
+    {
+        _httpClient = httpClient ?? new HttpClient();
+    }
+
+    public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
+    {
+        var response = await _httpClient.GetAsync(RateSourceInfo.Url, cancellationToken);
+        response.EnsureSuccessStatusCode();
+        var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
+        if(jobj["success"].Value<bool>() is not true || !jobj["base"].Value<string>().Equals("BTC", StringComparison.InvariantCulture))
+            throw new Exception("exchangerate.host returned a non success response or the base currency was not the requested one (BTC)");
+        var results = (JObject) jobj["rates"] ;
+        //key value is currency code to rate value
+        var list = new List<PairRate>();
+        foreach (var item in results)
+        {
+            string name = item.Key;
+            var value = item.Value.Value<decimal>();
+            list.Add(new PairRate(new CurrencyPair("BTC", name), new BidAsk(value)));
+        }
+
+        return list.ToArray();
+    }
+}

BTCPayServer.Rating/Providers/FreeCurrencyRatesRateProvider.cs

@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Rating;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Services.Rates;
+
+public class FreeCurrencyRatesRateProvider : IRateProvider
+{
+    public RateSourceInfo RateSourceInfo => new("free-currency-rates", "Free Currency Rates", "https://cdn.jsdelivr.net/gh/fawazahmed0/currency-api@1/latest/currencies/btc.min.json");
+    private readonly HttpClient _httpClient;
+    public FreeCurrencyRatesRateProvider(HttpClient httpClient)
+    {
+        _httpClient = httpClient ?? new HttpClient();
+    }
+
+    public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
+    {
+        var response = await _httpClient.GetAsync(RateSourceInfo.Url, cancellationToken);
+        response.EnsureSuccessStatusCode();
+        var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
+        var results = (JObject) jobj["btc"] ;
+        //key value is currency code to rate value
+        var list = new List<PairRate>();
+        foreach (var item in results)
+        {
+            string name = item.Key;
+            var value = item.Value.Value<decimal>();
+            list.Add(new PairRate(new CurrencyPair("BTC", name), new BidAsk(value)));
+        }
+
+        return list.ToArray();
+    }
+}

BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs

@@ -669,7 +669,7 @@ donation:
                 Assert.Equal("Wanna tip?", vmview.CustomTipText);
                 Assert.Equal("15,18,20", string.Join(',', vmview.CustomTipPercentages));
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 0, null, null, null, null, "orange").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 0, choiceKey: "orange").Result);
 
                 //
                 var invoices = await user.BitPay.GetInvoicesAsync();
@@ -678,7 +678,7 @@ donation:
                 Assert.Equal("CAD", orangeInvoice.Currency);
                 Assert.Equal("orange", orangeInvoice.ItemDesc);
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 0, null, null, null, null, "apple").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 0, choiceKey: "apple").Result);
 
                 invoices = user.BitPay.GetInvoices();
                 var appleInvoice = invoices.SingleOrDefault(invoice => invoice.ItemCode.Equals("apple"));
@@ -687,7 +687,7 @@ donation:
 
                 // testing custom amount
                 var action = Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 6.6m, null, null, null, null, "donation").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 6.6m, choiceKey: "donation").Result);
                 Assert.Equal(nameof(UIInvoiceController.Checkout), action.ActionName);
                 invoices = user.BitPay.GetInvoices();
                 var donationInvoice = invoices.Single(i => i.Price == 6.6m);
@@ -760,20 +760,20 @@ noninventoryitem:
                 await tester.WaitForEvent<AppInventoryUpdaterHostedService.UpdateAppInventory>(() =>
                 {
                     Assert.IsType<RedirectToActionResult>(publicApps
-                        .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "inventoryitem").Result);
+                        .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "inventoryitem").Result);
                     return Task.CompletedTask;
                 });
 
                 //we already bought all available stock so this should fail
                 await Task.Delay(100);
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "inventoryitem").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "inventoryitem").Result);
 
                 //inventoryitem has unlimited items available
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "noninventoryitem").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "noninventoryitem").Result);
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "noninventoryitem").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "noninventoryitem").Result);
 
                 //verify invoices where created
                 invoices = user.BitPay.GetInvoices();
@@ -809,9 +809,9 @@ normal:
                 vmpos.Template = AppService.SerializeTemplate(MigrationStartupTask.ParsePOSYML(vmpos.Template));
                 Assert.IsType<RedirectToActionResult>(pos.UpdatePointOfSale(app.Id, vmpos).Result);
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "btconly").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "btconly").Result);
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, null, null, null, null, "normal").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Cart, 1, choiceKey: "normal").Result);
                 invoices = user.BitPay.GetInvoices();
                 var normalInvoice = invoices.Single(invoice => invoice.ItemCode == "normal");
                 var btcOnlyInvoice = invoices.Single(invoice => invoice.ItemCode == "btconly");
@@ -865,7 +865,7 @@ g:
                 Assert.Contains(items, item => item.Id == "g" && item.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Topup);
                 
                 Assert.IsType<RedirectToActionResult>(publicApps
-                    .ViewPointOfSale(app.Id, PosViewType.Static, null, null, null, null, null, "g").Result);
+                    .ViewPointOfSale(app.Id, PosViewType.Static, choiceKey: "g").Result);
                 invoices = user.BitPay.GetInvoices();
                 var topupInvoice = invoices.Single(invoice => invoice.ItemCode == "g");
                 Assert.Equal(0, topupInvoice.Price);

BTCPayServer.Tests/Extensions.cs

@@ -122,6 +122,13 @@ retry:
             driver.ExecuteJavaScript($"document.getElementById('{element}').{funcName}()");
         }
 
+        public static void WaitWalletTransactionsLoaded(this IWebDriver driver)
+        {
+            var wait = new WebDriverWait(driver, SeleniumTester.ImplicitWait);
+            wait.UntilJsIsReady();
+            wait.Until(d => d.WaitForElement(By.CssSelector("#WalletTransactions[data-loaded='true']")));
+        }
+
         public static IWebElement WaitForElement(this IWebDriver driver, By selector)
         {
             var wait = new WebDriverWait(driver, SeleniumTester.ImplicitWait);

BTCPayServer.Tests/FastTests.cs

@@ -1145,6 +1145,45 @@ namespace BTCPayServer.Tests
             Assert.Equal("000000161", m.OrderId);
         }
 
+        [Fact]
+        public void CanParseOldPosAppData()
+        {
+            var data = new JObject()
+            {
+                ["price"] = 1.64m
+            }.ToString();
+            Assert.Equal(1.64m, JsonConvert.DeserializeObject<PosAppCartItem>(data).Price);
+
+            data = new JObject()
+            {
+                ["price"] = new JObject()
+                {
+                    ["value"] = 1.65m
+                }
+            }.ToString();
+            Assert.Equal(1.65m, JsonConvert.DeserializeObject<PosAppCartItem>(data).Price);
+            data = new JObject()
+            {
+                ["price"] = new JObject()
+                {
+                    ["value"] = "1.6305"
+                }
+            }.ToString();
+            Assert.Equal(1.6305m, JsonConvert.DeserializeObject<PosAppCartItem>(data).Price);
+
+            data = new JObject()
+            {
+                ["price"] = new JObject()
+                {
+                    ["value"] = null
+                }
+            }.ToString();
+            Assert.Equal(0.0m, JsonConvert.DeserializeObject<PosAppCartItem>(data).Price);
+
+            var o = JObject.Parse(JsonConvert.SerializeObject(new PosAppCartItem() { Price = 1.356m }));
+            Assert.Equal(1.356m, o["price"].Value<decimal>());
+        }
+
         [Fact]
         public void CanParseCurrencyValue()
         {

BTCPayServer.Tests/GreenfieldAPITests.cs

@@ -1074,6 +1074,22 @@ namespace BTCPayServer.Tests
             var lnrURLs = await unauthenticated.GetPullPaymentLNURL(test4.Id);
             Assert.IsType<string>(lnrURLs.LNURLBech32);
             Assert.IsType<string>(lnrURLs.LNURLUri);
+            Assert.Equal(12.303228134m, test4.Amount);
+            Assert.Equal("BTC", test4.Currency);
+            
+            // Test with SATS denomination values
+            var testSats = await client.CreatePullPayment(storeId, new Client.Models.CreatePullPaymentRequest()
+            {
+                Name = "Test SATS",
+                Amount = 21000,
+                Currency = "SATS",
+                PaymentMethods = new[] { "BTC", "BTC-LightningNetwork", "BTC_LightningLike" }
+            });
+            lnrURLs = await unauthenticated.GetPullPaymentLNURL(testSats.Id);
+            Assert.IsType<string>(lnrURLs.LNURLBech32);
+            Assert.IsType<string>(lnrURLs.LNURLUri);
+            Assert.Equal(21000, testSats.Amount);
+            Assert.Equal("SATS", testSats.Currency);
 
             //permission test around auto approved pps and payouts
             var nonApproved = await acc.CreateClient(Policies.CanCreateNonApprovedPullPayments);
@@ -2615,7 +2631,7 @@ namespace BTCPayServer.Tests
             for (int i = 0; i < invoices.Length; i++)
             {
                 pm[i] = Assert.Single(await client.GetInvoicePaymentMethods(user.StoreId, (await invoices[i]).Id));
-                Assert.False(pm[i].AdditionalData.HasValues);
+                Assert.True(pm[i].AdditionalData.HasValues);
             }
 
             // Pay them all at once

BTCPayServer.Tests/POSTests.cs

@@ -135,10 +135,10 @@ donation:
             Assert.Equal("donation", vmview.Items[1].Title);
             // orange is available
             Assert.IsType<RedirectToActionResult>(publicApps
-                .ViewPointOfSale(app.Id, PosViewType.Cart, 0, null, null, null, null, "orange").Result);
+                .ViewPointOfSale(app.Id, PosViewType.Cart, 0, choiceKey: "orange").Result);
             // apple is not found
             Assert.IsType<NotFoundResult>(publicApps
-                .ViewPointOfSale(app.Id, PosViewType.Cart, 0, null, null, null, null, "apple").Result);
+                .ViewPointOfSale(app.Id, PosViewType.Cart, 0, choiceKey: "apple").Result);
         }
     }
 }

BTCPayServer.Tests/SeleniumTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Buffers;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
@@ -961,11 +962,13 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.CssSelector("label[for='DefaultView_Cart']")).Click();
             s.Driver.FindElement(By.CssSelector(".template-item:nth-of-type(1) .btn-primary")).Click();
             s.Driver.FindElement(By.Id("BuyButtonText")).SendKeys("Take my money");
+            s.Driver.FindElement(By.Id("EditorCategories-ts-control")).SendKeys("Drinks");
             s.Driver.FindElement(By.Id("SaveItemChanges")).Click();
             s.Driver.FindElement(By.Id("ToggleRawEditor")).Click();
 
             var template = s.Driver.FindElement(By.Id("Template")).GetAttribute("value");
-            Assert.Contains("\"buyButtonText\":\"Take my money\"", template);
+            Assert.Contains("\"buyButtonText\": \"Take my money\"", template);
+            Assert.Matches("\"categories\": \\[\n\\s+\"Drinks\"\n\\s+\\]", template);
 
             s.Driver.FindElement(By.Id("SaveSettings")).Click();
             Assert.Contains("App updated", s.FindAlertMessage().Text);
@@ -979,6 +982,14 @@ namespace BTCPayServer.Tests
             Assert.True(s.Driver.PageSource.Contains("Tea shop"), "Unable to create PoS");
             Assert.True(s.Driver.PageSource.Contains("Cart"), "PoS not showing correct default view");
             Assert.True(s.Driver.PageSource.Contains("Take my money"), "PoS not showing correct default view");
+            Assert.Equal(5, s.Driver.FindElements(By.CssSelector(".card-deck .card:not(.d-none)")).Count);
+
+            var drinks = s.Driver.FindElement(By.CssSelector("label[for='Category-Drinks']"));
+            Assert.Equal("Drinks", drinks.Text);
+            drinks.Click();
+            Assert.Single(s.Driver.FindElements(By.CssSelector(".card-deck .card:not(.d-none)")));
+            s.Driver.FindElement(By.CssSelector("label[for='Category-*']")).Click();
+            Assert.Equal(5, s.Driver.FindElements(By.CssSelector(".card-deck .card:not(.d-none)")).Count);
 
             s.Driver.Url = posBaseUrl + "/static";
             Assert.False(s.Driver.PageSource.Contains("Cart"), "Static PoS not showing correct view");
@@ -1145,12 +1156,13 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("ArchivePaymentRequest")).Click();
             Assert.Contains("The payment request has been archived", s.FindAlertMessage().Text);
             Assert.DoesNotContain("Pay123", s.Driver.PageSource);
-            s.Driver.FindElement(By.Id("SearchDropdownToggle")).Click();
-            s.Driver.FindElement(By.Id("SearchIncludeArchived")).Click();
+            s.Driver.FindElement(By.Id("StatusOptionsToggle")).Click();
+            s.Driver.WaitForElement(By.Id("StatusOptionsIncludeArchived")).Click();
             Assert.Contains("Pay123", s.Driver.PageSource);
 
             // unarchive (from list)
-            s.Driver.FindElement(By.Id($"ToggleArchival-{payReqId}")).Click();
+            s.Driver.FindElement(By.Id($"ToggleActions-{payReqId}")).Click();
+            s.Driver.WaitForElement(By.Id($"ToggleArchival-{payReqId}")).Click();
             Assert.Contains("The payment request has been unarchived", s.FindAlertMessage().Text);
             Assert.Contains("Pay123", s.Driver.PageSource);
         }
@@ -1441,7 +1453,7 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("CancelWizard")).Click();
 
             // Check the label is applied to the tx
-
+            s.Driver.WaitWalletTransactionsLoaded();
             Assert.Equal("label2", s.Driver.FindElement(By.XPath("//*[@id=\"WalletTransactionsList\"]//*[contains(@class, 'transaction-label')]")).Text);
 
             //change the wallet and ensure old address is not there and generating a new one does not result in the prev one
@@ -1492,7 +1504,9 @@ namespace BTCPayServer.Tests
 
             // Check the tx sent earlier arrived
             s.Driver.FindElement(By.Id($"StoreNav-Wallet{cryptoCode}")).Click();
-            Assert.Contains(tx.ToString(), s.Driver.PageSource);
+            s.Driver.WaitWalletTransactionsLoaded();
+            s.Driver.FindElement(By.PartialLinkText(tx.ToString()));
+
             var walletTransactionUri = new Uri(s.Driver.Url);
 
             // Send to bob
@@ -1618,9 +1632,8 @@ namespace BTCPayServer.Tests
 
             // Transactions list is empty 
             s.Driver.FindElement(By.Id($"StoreNav-Wallet{cryptoCode}")).Click();
-            Assert.Contains("There are no transactions yet.", s.Driver.PageSource);
-            s.Driver.AssertElementNotFound(By.Id("ExportDropdownToggle"));
-            s.Driver.AssertElementNotFound(By.Id("ActionsDropdownToggle"));
+            s.Driver.WaitWalletTransactionsLoaded();
+            Assert.Contains("There are no transactions yet", s.Driver.FindElement(By.Id("WalletTransactions")).Text);
         }
 
         [Fact]
@@ -1748,7 +1761,6 @@ namespace BTCPayServer.Tests
                 Assert.Contains(labels, element => element.Text == "pull-payment");
             });
             
-
             s.GoToStore(s.StoreId, StoreNavPages.Payouts);
             s.Driver.FindElement(By.Id($"{PayoutState.InProgress}-view")).Click();
             ReadOnlyCollection<IWebElement> txs;
@@ -1932,8 +1944,7 @@ namespace BTCPayServer.Tests
 
             Assert.Contains(PayoutState.AwaitingPayment.GetStateString(), s.Driver.PageSource);
 
-            //lnurl-w support check
-
+            // LNURL Withdraw support check with BTC denomination
             s.GoToStore(s.StoreId, StoreNavPages.PullPayments);
             s.Driver.FindElement(By.Id("NewPullPayment")).Click();
             s.Driver.FindElement(By.Id("Name")).SendKeys("PP1");
@@ -2001,6 +2012,42 @@ namespace BTCPayServer.Tests
 
                 Assert.Contains(PayoutState.AwaitingApproval.GetStateString(), s.Driver.PageSource);
             });
+            
+            // LNURL Withdraw support check with SATS denomination
+            s.GoToStore(s.StoreId, StoreNavPages.PullPayments);
+            s.Driver.FindElement(By.Id("NewPullPayment")).Click();
+            s.Driver.FindElement(By.Id("Name")).SendKeys("PP SATS");
+            s.Driver.SetCheckbox(By.Id("AutoApproveClaims"), true);
+            s.Driver.FindElement(By.Id("Amount")).Clear();
+            s.Driver.FindElement(By.Id("Amount")).SendKeys("21021");
+            s.Driver.FindElement(By.Id("Currency")).Clear();
+            s.Driver.FindElement(By.Id("Currency")).SendKeys("SATS" + Keys.Enter);
+            s.FindAlertMessage(StatusMessageModel.StatusSeverity.Success);
+            s.Driver.FindElement(By.LinkText("View")).Click();
+            s.Driver.FindElement(By.CssSelector("#lnurlwithdraw-button")).Click();
+            lnurl = new Uri(LNURL.LNURL.Parse(s.Driver.FindElement(By.Id("qr-code-data-input")).GetAttribute("value"), out _).ToString().Replace("https", "http"));
+            s.Driver.FindElement(By.CssSelector("button[data-bs-dismiss='modal']")).Click();
+            var amount = new LightMoney(21021, LightMoneyUnit.Satoshi);
+            info = Assert.IsType<LNURLWithdrawRequest>(await LNURL.LNURL.FetchInformation(lnurl, s.Server.PayTester.HttpClient));
+            Assert.Equal(amount, info.MaxWithdrawable);
+            Assert.Equal(amount, info.CurrentBalance);
+            info = Assert.IsType<LNURLWithdrawRequest>(await LNURL.LNURL.FetchInformation(info.BalanceCheck, s.Server.PayTester.HttpClient));
+            Assert.Equal(amount, info.MaxWithdrawable);
+            Assert.Equal(amount, info.CurrentBalance);
+
+            bolt2 = (await s.Server.CustomerLightningD.CreateInvoice(
+                amount,
+                $"LNurl w payout test {DateTime.UtcNow.Ticks}",
+                TimeSpan.FromHours(1), CancellationToken.None));
+            response = await info.SendRequest(bolt2.BOLT11, s.Server.PayTester.HttpClient);
+            await TestUtils.EventuallyAsync(async () =>
+            {
+                s.Driver.Navigate().Refresh();
+                Assert.Contains(bolt2.BOLT11, s.Driver.PageSource);
+
+                Assert.Contains(PayoutState.Completed.GetStateString(), s.Driver.PageSource);
+                Assert.Equal(LightningInvoiceStatus.Paid, (await s.Server.CustomerLightningD.GetInvoice(bolt2.Id)).Status);
+            });
         }
 
         [Fact]
@@ -2040,6 +2087,145 @@ namespace BTCPayServer.Tests
             }
         }
 
+        [Fact]
+        [Trait("Selenium", "Selenium")]
+        [Trait("Lightning", "Lightning")]
+        public async Task CanUsePOSKeypad()
+        {
+            using var s = CreateSeleniumTester();
+            s.Server.ActivateLightning();
+            await s.StartAsync();
+
+            await s.Server.EnsureChannelsSetup();
+
+            s.RegisterNewUser(true);
+            s.CreateNewStore();
+            s.GoToStore();
+            s.AddLightningNode(LightningConnectionType.CLightning, false);
+            s.Driver.FindElement(By.Id("StoreNav-CreatePointOfSale")).Click();
+            s.Driver.FindElement(By.Id("AppName")).SendKeys(Guid.NewGuid().ToString());
+            s.Driver.FindElement(By.Id("Create")).Click();
+            TestUtils.Eventually(() => Assert.Contains("App successfully created", s.FindAlertMessage().Text));
+            s.Driver.FindElement(By.CssSelector("label[for='DefaultView_Light']")).Click();
+            s.Driver.FindElement(By.Id("Currency")).SendKeys("EUR");
+            s.Driver.FindElement(By.Id("CustomTipPercentages")).Clear();
+            s.Driver.FindElement(By.Id("CustomTipPercentages")).SendKeys("10,21");
+            s.Driver.FindElement(By.Id("SaveSettings")).Click();
+            Assert.Contains("App updated", s.FindAlertMessage().Text);
+            s.Driver.FindElement(By.Id("ViewApp")).Click();
+            var windows = s.Driver.WindowHandles;
+            Assert.Equal(2, windows.Count);
+            s.Driver.SwitchTo().Window(windows[1]);
+            s.Driver.WaitForElement(By.ClassName("keypad"));
+            
+            // basic checks
+            Assert.Contains("EUR", s.Driver.FindElement(By.Id("Currency")).Text);
+            Assert.Contains("0,00", s.Driver.FindElement(By.Id("Amount")).Text);
+            Assert.Equal("", s.Driver.FindElement(By.Id("Calculation")).Text);
+            Assert.True(s.Driver.FindElement(By.Id("ModeTablist-amount")).Selected);
+            Assert.False(s.Driver.FindElement(By.Id("ModeTablist-discount")).Enabled);
+            Assert.False(s.Driver.FindElement(By.Id("ModeTablist-tip")).Enabled);
+            
+            // Amount: 1234,56
+            s.Driver.FindElement(By.CssSelector(".keypad [data-key='1']")).Click();
+            s.Driver.FindElement(By.CssSelector(".keypad [data-key='2']")).Click();
+            s.Driver.FindElement(By.CssSelector(".keypad [data-key='3']")).Click();
+            s.Driver.FindElement(By.CssSelector(".keypad [data-key='4']")).Click();
+            s.Driver.FindElement(By.CssSelector(".keypad [data-key='.']")).Click();
+            s.Driver.FindElement(By.CssSelector(".keypad [data-key='5']")).Click();
+            s.Driver.FindElement(By.CssSelector(".keypad [data-key='6']")).Click();
+            Assert.Equal("1.234,56", s.Driver.FindElement(By.Id("Amount")).Text);
+            Assert.True(s.Driver.FindElement(By.Id("ModeTablist-discount")).Enabled);
+            Assert.True(s.Driver.FindElement(By.Id("ModeTablist-tip")).Enabled);
+            Assert.Equal("", s.Driver.FindElement(By.Id("Calculation")).Text);
+            
+            // Discount: 10%
+            s.Driver.FindElement(By.CssSelector("label[for='ModeTablist-discount']")).Click();
+            s.Driver.FindElement(By.CssSelector(".keypad [data-key='1']")).Click();
+            s.Driver.FindElement(By.CssSelector(".keypad [data-key='0']")).Click();
+            Assert.Contains("1.111,10", s.Driver.FindElement(By.Id("Amount")).Text);
+            Assert.Contains("10% discount", s.Driver.FindElement(By.Id("Discount")).Text);
+            Assert.Contains("1.234,56 € - 123,46 € (10%)", s.Driver.FindElement(By.Id("Calculation")).Text);
+            
+            // Tip: 10%
+            s.Driver.FindElement(By.CssSelector("label[for='ModeTablist-tip']")).Click();
+            s.Driver.WaitForElement(By.Id("Tip-Custom"));
+            s.Driver.FindElement(By.Id("Tip-10")).Click();
+            Assert.Contains("1.222,21", s.Driver.FindElement(By.Id("Amount")).Text);
+            Assert.Contains("1.234,56 € - 123,46 € (10%) + 111,11 € (10%)", s.Driver.FindElement(By.Id("Calculation")).Text);
+            
+            // Pay
+            s.Driver.FindElement(By.Id("pay-button")).Click();
+            s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
+            s.Driver.FindElement(By.Id("DetailsToggle")).Click();
+            s.Driver.WaitForElement(By.Id("PaymentDetails-TotalFiat"));
+            Assert.Contains("1 222,21 €", s.Driver.FindElement(By.Id("PaymentDetails-TotalFiat")).Text);
+        }
+
+        [Fact]
+        [Trait("Selenium", "Selenium")]
+        [Trait("Lightning", "Lightning")]
+        public async Task CanUsePOSCart()
+        {
+            using var s = CreateSeleniumTester();
+            s.Server.ActivateLightning();
+            await s.StartAsync();
+
+            await s.Server.EnsureChannelsSetup();
+
+            s.RegisterNewUser(true);
+            s.CreateNewStore();
+            s.GoToStore();
+            s.AddLightningNode(LightningConnectionType.CLightning, false);
+            s.Driver.FindElement(By.Id("StoreNav-CreatePointOfSale")).Click();
+            s.Driver.FindElement(By.Id("AppName")).SendKeys(Guid.NewGuid().ToString());
+            s.Driver.FindElement(By.Id("Create")).Click();
+            Assert.Contains("App successfully created", s.FindAlertMessage().Text);
+            s.Driver.FindElement(By.CssSelector("label[for='DefaultView_Cart']")).Click();
+            s.Driver.FindElement(By.Id("Currency")).SendKeys("EUR");
+            s.Driver.FindElement(By.Id("ShowCustomAmount")).Click();
+            s.Driver.FindElement(By.Id("SaveSettings")).Click();
+            Assert.Contains("App updated", s.FindAlertMessage().Text);
+            s.Driver.FindElement(By.Id("ViewApp")).Click();
+            var windows = s.Driver.WindowHandles;
+            Assert.Equal(2, windows.Count);
+            s.Driver.SwitchTo().Window(windows[1]);
+            s.Driver.WaitForElement(By.Id("js-cart-list"));
+            Assert.Empty(s.Driver.FindElements(By.CssSelector("#js-cart-list tbody tr")));
+            Assert.Equal("0,00 €", s.Driver.FindElement(By.Id("CartTotal")).Text);
+            Assert.False(s.Driver.FindElement(By.Id("CartClear")).Displayed);
+            
+            // Select and clear
+            s.Driver.FindElement(By.CssSelector(".card.js-add-cart:nth-child(1)")).Click();
+            Assert.Single(s.Driver.FindElements(By.CssSelector("#js-cart-list tbody tr")));
+            s.Driver.FindElement(By.Id("CartClear")).Click();
+            Assert.Empty(s.Driver.FindElements(By.CssSelector("#js-cart-list tbody tr")));
+            Thread.Sleep(250);
+            
+            // Select items
+            s.Driver.FindElement(By.CssSelector(".card.js-add-cart:nth-child(2)")).Click();
+            Thread.Sleep(250);
+            s.Driver.FindElement(By.CssSelector(".card.js-add-cart:nth-child(1)")).Click();
+            Thread.Sleep(250);
+            Assert.Equal(2, s.Driver.FindElements(By.CssSelector("#js-cart-list tbody tr")).Count);
+            Assert.Equal("2,00 €", s.Driver.FindElement(By.Id("CartTotal")).Text);
+            
+            // Custom amount
+            s.Driver.FindElement(By.Id("CartCustomAmount")).SendKeys("1.5");
+            s.Driver.FindElement(By.Id("CartTotal")).Click();
+            Assert.Equal("3,50 €", s.Driver.FindElement(By.Id("CartTotal")).Text);
+            s.Driver.FindElement(By.Id("js-cart-confirm")).Click();
+            
+            // Pay
+            Assert.Equal("3,50 €", s.Driver.FindElement(By.Id("CartSummaryTotal")).Text);
+            s.Driver.FindElement(By.Id("js-cart-pay")).Click();
+            
+            s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
+            s.Driver.FindElement(By.Id("DetailsToggle")).Click();
+            s.Driver.WaitForElement(By.Id("PaymentDetails-TotalFiat"));
+            Assert.Contains("3,50 €", s.Driver.FindElement(By.Id("PaymentDetails-TotalFiat")).Text);
+        }
+
         [Fact]
         [Trait("Selenium", "Selenium")]
         [Trait("Lightning", "Lightning")]
@@ -2269,7 +2455,7 @@ namespace BTCPayServer.Tests
 
             var addresses = s.Driver.FindElements(By.ClassName("lightning-address-value"));
             Assert.Equal(2, addresses.Count);
-
+            var callbacks = new List<Uri>();
             foreach (IWebElement webElement in addresses)
             {
                 var value = webElement.GetAttribute("value");
@@ -2287,6 +2473,7 @@ namespace BTCPayServer.Tests
                         lnaddress2 = m["text/identifier"];
                         Assert.Equal(2, request.MinSendable.ToDecimal(LightMoneyUnit.Satoshi));
                         Assert.Equal(10, request.MaxSendable.ToDecimal(LightMoneyUnit.Satoshi));
+                        callbacks.Add(request.Callback);
                         break;
 
                     case { } v when v.StartsWith(lnaddress1):
@@ -2294,6 +2481,7 @@ namespace BTCPayServer.Tests
                         lnaddress1 = m["text/identifier"];
                         Assert.Equal(1, request.MinSendable.ToDecimal(LightMoneyUnit.Satoshi));
                         Assert.Equal(6.12m, request.MaxSendable.ToDecimal(LightMoneyUnit.BTC));
+                        callbacks.Add(request.Callback);
                         break;
                     default:
                         Assert.False(true, "Should have matched");
@@ -2301,7 +2489,19 @@ namespace BTCPayServer.Tests
                 }
             }
             var repo = s.Server.PayTester.GetService<InvoiceRepository>();
+
             var invoices = await repo.GetInvoices(new InvoiceQuery() { StoreId = new[] { s.StoreId } });
+            // Resolving a ln address shouldn't create any btcpay invoice.
+            // This must be done because some NOST clients resolve ln addresses preemptively without user interaction
+            Assert.Empty(invoices);
+
+            // Calling the callbacks should create the invoices
+            foreach (var callback in callbacks)
+            {
+                using var r = await s.Server.PayTester.HttpClient.GetAsync(callback);
+                await r.Content.ReadAsStringAsync();
+            }
+            invoices = await repo.GetInvoices(new InvoiceQuery() { StoreId = new[] { s.StoreId } });
             Assert.Equal(2, invoices.Length);
             var emailSuffix = $"@{s.Server.PayTester.HostName}:{s.Server.PayTester.Port}";
             foreach (var i in invoices)

BTCPayServer.Tests/ThirdPartyTests.cs

@@ -290,9 +290,9 @@ retry:
         }
 
         [Fact]
-        public void CanGetRateCryptoCurrenciesByDefault()
+        public async Task CanGetRateCryptoCurrenciesByDefault()
         {
-            string[] brokenShitcoins = { "BTX_USD", "CHC_USD" };
+            string[] brokenShitcoins = { };
             var provider = new BTCPayNetworkProvider(ChainName.Mainnet);
             var factory = FastTests.CreateBTCPayRateFactory();
             var fetcher = new RateFetcher(factory);
@@ -305,17 +305,37 @@ retry:
             var result = fetcher.FetchRates(pairs, rules, default);
             foreach ((CurrencyPair key, Task<RateResult> value) in result)
             {
-                var rateResult = value.GetAwaiter().GetResult();
-                if (key.ToString() == "BTG_USD")
-                    continue; // shitcoin not supported by bitfinex anymore
+                var rateResult = await value;
                 TestLogs.LogInformation($"Testing {key}");
                 if (brokenShitcoins.Contains(key.ToString()))
                     continue;
                 Assert.True(rateResult.BidAsk != null, $"Impossible to get the rate {rateResult.EvaluatedRule}");
             }
+
+            var b = new StoreBlob();
+            foreach (var k in StoreBlob.RecommendedExchanges)
+            {
+                b.DefaultCurrency = k.Key;
+                rules = b.GetDefaultRateRules(provider);
+                pairs =
+                    provider.GetAll()
+                        .Select(c => new CurrencyPair(c.CryptoCode, k.Key))
+                        .ToHashSet();
+                result = fetcher.FetchRates(pairs, rules, default);
+                foreach ((CurrencyPair key, Task<RateResult> value) in result)
+                {
+                    var rateResult = await value;
+                    TestLogs.LogInformation($"Testing {key} when default currency is {k.Key}");
+                    if (brokenShitcoins.Contains(key.ToString()))
+                        continue;
+                    Assert.True(rateResult.BidAsk != null, $"Impossible to get the rate {rateResult.EvaluatedRule}");
+                }
+            }
+
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public async Task CheckJsContent()
         {
             // This test verify that no malicious js is added in the minified files.
@@ -324,47 +344,63 @@ retry:
             var actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "bootstrap", "bootstrap.bundle.min.js").Trim();
             var version = Regex.Match(actual, "Bootstrap v([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
             var expected = (await (await client.GetAsync($"https://cdn.jsdelivr.net/npm/bootstrap@{version}/dist/js/bootstrap.bundle.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "clipboard.js", "clipboard.js");
             expected = (await (await client.GetAsync("https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.8/clipboard.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "vuejs", "vue.min.js").Trim();
             version = Regex.Match(actual, "Vue\\.js v([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
             expected = (await (await client.GetAsync($"https://cdnjs.cloudflare.com/ajax/libs/vue/{version}/vue.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "i18next", "i18next.min.js").Trim();
             expected = (await (await client.GetAsync("https://cdnjs.cloudflare.com/ajax/libs/i18next/22.0.6/i18next.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "i18next", "i18nextHttpBackend.min.js").Trim();
             expected = (await (await client.GetAsync("https://cdnjs.cloudflare.com/ajax/libs/i18next-http-backend/2.0.1/i18nextHttpBackend.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "i18next", "vue-i18next.js").Trim();
             expected = (await (await client.GetAsync("https://unpkg.com/@panter/vue-i18next@0.15.2/dist/vue-i18next.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "vue-qrcode", "vue-qrcode.min.js").Trim();
             version = Regex.Match(actual, "vue-qrcode v([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
             expected = (await (await client.GetAsync($"https://unpkg.com/@chenfengyuan/vue-qrcode@{version}/dist/vue-qrcode.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "tom-select", "tom-select.complete.min.js").Trim();
             expected = (await (await client.GetAsync($"https://cdn.jsdelivr.net/npm/tom-select@2.2.2/dist/js/tom-select.complete.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "dom-confetti", "dom-confetti.min.js").Trim();
             version = Regex.Match(actual, "Original file: /npm/dom-confetti@([0-9]+.[0-9]+.[0-9]+)/lib/main.js").Groups[1].Value;
             expected = (await (await client.GetAsync($"https://cdn.jsdelivr.net/npm/dom-confetti@{version}/lib/main.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "vue-sortable", "sortable.min.js").Trim();
             version = Regex.Match(actual, "Sortable ([0-9]+.[0-9]+.[0-9]+) ").Groups[1].Value;
             expected = (await (await client.GetAsync($"https://unpkg.com/sortablejs@{version}/Sortable.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
+
+            actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "bootstrap-vue", "bootstrap-vue.min.js").Trim();
+            version = Regex.Match(actual, "BootstrapVue ([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
+            expected = (await (await client.GetAsync($"https://cdnjs.cloudflare.com/ajax/libs/bootstrap-vue/{version}/bootstrap-vue.min.js")).Content.ReadAsStringAsync()).Trim();
+            EqualJsContent(expected, actual);
+
+            actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "vue-sanitize-directive", "vue-sanitize-directive.umd.min.js").Trim();
+            version = Regex.Match(actual, "Original file: /npm/vue-sanitize-directive@([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
+            expected = (await (await client.GetAsync($"https://cdn.jsdelivr.net/npm/vue-sanitize-directive@{version}/dist/vue-sanitize-directive.umd.min.js")).Content.ReadAsStringAsync()).Trim();
+            EqualJsContent(expected, actual);
+        }
+
+        private void EqualJsContent(string expected, string actual)
+        {
+            if (expected != actual)
+                 Assert.Equal(expected, actual.ReplaceLineEndings("\n"));
         }
 
         string GetFileContent(params string[] path)

BTCPayServer.Tests/UnitTest1.cs

@@ -39,6 +39,7 @@ using BTCPayServer.Plugins.PayButton;
 using BTCPayServer.Plugins.PointOfSale;
 using BTCPayServer.Plugins.PointOfSale.Controllers;
 using BTCPayServer.Security.Bitpay;
+using BTCPayServer.Security.Greenfield;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Invoices;
@@ -718,7 +719,7 @@ namespace BTCPayServer.Tests
                 btcDerivationScheme.GetDerivation(new KeyPath("0/90")).ScriptPubKey, Money.Coins(1.0m));
             tester.ExplorerNode.Generate(1);
             var transactions = Assert.IsType<ListTransactionsViewModel>(Assert
-                .IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model);
+                .IsType<ViewResult>(walletController.WalletTransactions(walletId, loadTransactions: true).Result).Model);
             Assert.Empty(transactions.Transactions);
 
             Assert.IsType<RedirectToActionResult>(walletController.WalletRescan(walletId, rescan).Result);
@@ -747,7 +748,7 @@ namespace BTCPayServer.Tests
             Assert.NotNull(rescan.TimeOfScan);
             Assert.Equal(1, rescan.LastSuccess.Found);
             transactions = Assert.IsType<ListTransactionsViewModel>(Assert
-                .IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model);
+                .IsType<ViewResult>(walletController.WalletTransactions(walletId, loadTransactions: true).Result).Model);
             var tx = Assert.Single(transactions.Transactions);
             Assert.Equal(tx.Id, txId.ToString());
 
@@ -762,7 +763,7 @@ namespace BTCPayServer.Tests
                 await walletController.ModifyTransaction(walletId, tx.Id, addcomment: "hello"));
 
             transactions = Assert.IsType<ListTransactionsViewModel>(Assert
-                .IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model);
+                .IsType<ViewResult>(walletController.WalletTransactions(walletId, loadTransactions: true).Result).Model);
             tx = Assert.Single(transactions.Transactions);
 
             Assert.Equal("hello", tx.Comment);
@@ -774,7 +775,7 @@ namespace BTCPayServer.Tests
                 await walletController.ModifyTransaction(walletId, tx.Id, removelabel: "test2"));
 
             transactions = Assert.IsType<ListTransactionsViewModel>(Assert
-                .IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model);
+                .IsType<ViewResult>(walletController.WalletTransactions(walletId, loadTransactions: true).Result).Model);
             tx = Assert.Single(transactions.Transactions);
 
             Assert.Equal("hello", tx.Comment);
@@ -1984,6 +1985,7 @@ namespace BTCPayServer.Tests
             var user = tester.NewAccount();
             user.GrantAccess(true);
             user.RegisterDerivationScheme("BTC");
+            var btcpayClient = await user.CreateClient();
 
             DateTimeOffset expiration = DateTimeOffset.UtcNow + TimeSpan.FromMinutes(21);
 
@@ -2064,6 +2066,20 @@ namespace BTCPayServer.Tests
 
             var zeroInvoicePM = await greenfield.GetInvoicePaymentMethods(user.StoreId, zeroInvoice.Id);
             Assert.Empty(zeroInvoicePM);
+
+            var invoice6 = await btcpayClient.CreateInvoice(user.StoreId,
+                new CreateInvoiceRequest()
+                {
+                    Amount = GreenfieldConstants.MaxAmount,
+                    Currency = "USD"
+                });
+            var repo = tester.PayTester.GetService<InvoiceRepository>();
+            var entity = (await repo.GetInvoice(invoice6.Id));
+            Assert.Equal((decimal)ulong.MaxValue, entity.Price);
+            entity.GetPaymentMethods().First().Calculate();
+            // Shouldn't be possible as we clamp the value, but existing invoice may have that
+            entity.Price = decimal.MaxValue;
+            entity.GetPaymentMethods().First().Calculate();
         }
 
         [Fact(Timeout = LongRunningTestTimeout)]

BTCPayServer.Tests/docker-compose.altcoins.yml

@@ -224,7 +224,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.16.2-beta
+    image: btcpayserver/lnd:v0.16.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -259,7 +259,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.16.2-beta
+    image: btcpayserver/lnd:v0.16.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"

BTCPayServer.Tests/docker-compose.yml

@@ -211,7 +211,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.16.2-beta
+    image: btcpayserver/lnd:v0.16.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -248,7 +248,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.16.2-beta
+    image: btcpayserver/lnd:v0.16.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"

BTCPayServer/BTCPayServer.csproj

@@ -48,7 +48,7 @@
     <PackageReference Include="YamlDotNet" Version="8.0.0" />
     <PackageReference Include="BIP78.Sender" Version="0.2.2" />
     <PackageReference Include="BTCPayServer.Hwi" Version="2.0.2" />
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.4.26" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.4.28" />
     <PackageReference Include="CsvHelper" Version="15.0.5" />
     <PackageReference Include="Dapper" Version="2.0.123" />
     <PackageReference Include="Fido2" Version="2.0.2" />

BTCPayServer/Components/AppTopItems/AppTopItems.cs

@@ -40,7 +40,7 @@ public class AppTopItems : ViewComponent
         var app = HttpContext.GetAppData();
         var entries = await _appService.GetItemStats(app);
         vm.SalesCount = entries.Select(e => e.SalesCount).ToList();
-        vm.Entries = entries.ToList();
+        vm.Entries = entries.Take(5).ToList();
         vm.AppType = app.AppType;
         vm.AppUrl = await appBaseType.ConfigureLink(app);
         vm.Name = app.Name;

BTCPayServer/Components/StoreRecentInvoices/Default.cshtml

@@ -3,6 +3,7 @@
 @using BTCPayServer.Services
 @using BTCPayServer.Services.Invoices
 @inject DisplayFormatter DisplayFormatter
+@inject PaymentMethodHandlerDictionary PaymentMethodHandlerDictionary
 @model BTCPayServer.Components.StoreRecentInvoices.StoreRecentInvoicesViewModel
 
 <div class="widget store-recent-invoices" id="StoreRecentInvoices-@Model.Store.Id">
@@ -51,19 +52,41 @@
                         <a asp-controller="UIInvoice" asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId" class="text-break">@invoice.InvoiceId</a>
                     </td>
                     <td>
-                        <span class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
-                            @invoice.Status.Status.ToModernStatus().ToString()
-                            @if (invoice.Status.ExceptionStatus != InvoiceExceptionStatus.None)
+                        <div class="d-flex align-items-center gap-2">
+                            @if (invoice.Details.Archived)
                             {
-                                @($"({invoice.Status.ExceptionStatus.ToString()})")
+                                <span class="badge bg-warning">archived</span>
                             }
-                        </span>
-                        @if (invoice.HasRefund)
-                        {
-                            <span class="badge bg-warning">
-                                Refund
+                            <span class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
+                                @invoice.Status.Status.ToModernStatus().ToString()
+                                @if (invoice.Status.ExceptionStatus != InvoiceExceptionStatus.None)
+                                {
+                                    @($"({invoice.Status.ExceptionStatus.ToString()})")
+                                }
                             </span>
-                        }
+                            @foreach (var paymentMethodId in invoice.Details.Payments.Select(payment => payment.GetPaymentMethodId()).Distinct())
+                            {
+                                var image = PaymentMethodHandlerDictionary[paymentMethodId]?.GetCryptoImage(paymentMethodId);
+                                var badge = paymentMethodId.PaymentType.GetBadge();
+                                if (!string.IsNullOrEmpty(image) || !string.IsNullOrEmpty(badge))
+                                {
+                                    <span class="d-inline-flex align-items-center gap-1">
+                                        @if (!string.IsNullOrEmpty(image))
+                                        {
+                                            <img src="@Context.Request.GetRelativePathOrAbsolute(image)" alt="@paymentMethodId.PaymentType.ToString()" style="height:1.5em" />
+                                        }
+                                        @if (!string.IsNullOrEmpty(badge))
+                                        {
+                                            @badge
+                                        }
+                                    </span>
+                                }
+                            }
+                            @if (invoice.HasRefund)
+                            {
+                                <span class="badge bg-warning">Refund</span>
+                            }
+                        </div>
                     </td>
                     <td class="text-end">
                         <span data-sensitive>@DisplayFormatter.Currency(invoice.Amount, invoice.Currency)</span>

BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoiceViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.Services.Invoices;
 
 namespace BTCPayServer.Components.StoreRecentInvoices;
@@ -11,5 +12,7 @@ public class StoreRecentInvoiceViewModel
     public string Currency { get; set; }
     public InvoiceState Status { get; set; }
     public DateTimeOffset Date { get; set; }
+
+    public InvoiceDetailsModel Details { get; set; }
     public bool HasRefund { get; set; }
 }

BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs

@@ -3,11 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
+using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
+using NBitcoin;
 
 namespace BTCPayServer.Components.StoreRecentInvoices;
 
@@ -53,17 +55,22 @@ public class StoreRecentInvoices : ViewComponent
         });
 
         vm.Invoices = (from invoice in invoiceEntities
-                       let state = invoice.GetInvoiceState()
-                       select new StoreRecentInvoiceViewModel
-                       {
-                           Date = invoice.InvoiceTime,
-                           Status = state,
-                           HasRefund = invoice.Refunds.Any(),
-                           InvoiceId = invoice.Id,
-                           OrderId = invoice.Metadata.OrderId ?? string.Empty,
-                           Amount = invoice.Price,
-                           Currency = invoice.Currency
-                       }).ToList();
+            let state = invoice.GetInvoiceState()
+            select new StoreRecentInvoiceViewModel
+            {
+                Date = invoice.InvoiceTime, 
+                Status = state, 
+                HasRefund = invoice.Refunds.Any(), 
+                InvoiceId = invoice.Id,
+                OrderId = invoice.Metadata.OrderId ?? string.Empty, 
+                Amount = invoice.Price,
+                Currency = invoice.Currency,
+                Details = new InvoiceDetailsModel
+                {
+                    Archived = invoice.Archived,
+                    Payments = invoice.GetPayments(false) 
+                }
+           }).ToList();
 
         return View(vm);
     }

BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactions.cs

@@ -58,7 +58,7 @@ public class StoreRecentTransactions : ViewComponent
         {
             var network = derivationSettings.Network;
             var wallet = _walletProvider.GetWallet(network);
-            var allTransactions = await wallet.FetchTransactionHistory(derivationSettings.AccountDerivation, 0, 5, TimeSpan.FromDays(31.0));
+            var allTransactions = await wallet.FetchTransactionHistory(derivationSettings.AccountDerivation, 0, 5, TimeSpan.FromDays(31.0), cancellationToken: this.HttpContext.RequestAborted);
             var walletTransactionsInfo = await _walletRepository.GetWalletTransactionsInfo(vm.WalletId, allTransactions.Select(t => t.TransactionId.ToString()).ToArray());
 
             transactions = allTransactions

BTCPayServer/Controllers/GreenField/GreenfieldInvoiceController.cs

@@ -12,6 +12,7 @@ using BTCPayServer.Data;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Payments;
 using BTCPayServer.Rating;
+using BTCPayServer.Security.Greenfield;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Rates;
@@ -183,6 +184,10 @@ namespace BTCPayServer.Controllers.Greenfield
             {
                 ModelState.AddModelError(nameof(request.Amount), "The amount should be 0 or more.");
             }
+            if (request.Amount > GreenfieldConstants.MaxAmount)
+            {
+                ModelState.AddModelError(nameof(request.Amount), $"The amount should less than {GreenfieldConstants.MaxAmount}.");
+            }
             request.Checkout ??= new CreateInvoiceRequest.CheckoutOptions();
             if (request.Checkout.PaymentMethods?.Any() is true)
             {

BTCPayServer/Controllers/GreenField/GreenfieldPaymentRequestsController.cs

@@ -255,7 +255,9 @@ namespace BTCPayServer.Controllers.Greenfield
                 Email = blob.Email,
                 AllowCustomPaymentAmounts = blob.AllowCustomPaymentAmounts,
                 EmbeddedCSS = blob.EmbeddedCSS,
-                CustomCSSLink = blob.CustomCSSLink
+                CustomCSSLink = blob.CustomCSSLink,
+                FormResponse = blob.FormResponse,
+                FormId = blob.FormId
             };
         }
 

BTCPayServer/Controllers/GreenField/GreenfieldPullPaymentController.cs

@@ -255,16 +255,15 @@ namespace BTCPayServer.Controllers.Greenfield
                 return PullPaymentNotFound();
 
             var blob = pp.GetBlob();
-            var pms = blob.SupportedPaymentMethods.FirstOrDefault(id => id.PaymentType == LightningPaymentType.Instance && _networkProvider.DefaultNetwork.CryptoCode == id.CryptoCode);
-            if (pms is not null && blob.Currency.Equals(pms.CryptoCode, StringComparison.InvariantCultureIgnoreCase))
+            if (_pullPaymentService.SupportsLNURL(blob))
             {
                 var lnurlEndpoint = new Uri(Url.Action("GetLNURLForPullPayment", "UILNURL", new
                 {
                     cryptoCode = _networkProvider.DefaultNetwork.CryptoCode,
-                    pullPaymentId = pullPaymentId
+                    pullPaymentId
                 }, Request.Scheme, Request.Host.ToString())!);
 
-                return base.Ok(new PullPaymentLNURL()
+                return base.Ok(new PullPaymentLNURL
                 {
                     LNURLBech32 = LNURL.LNURL.EncodeUri(lnurlEndpoint, "withdrawRequest", true).ToString(),
                     LNURLUri = LNURL.LNURL.EncodeUri(lnurlEndpoint, "withdrawRequest", false).ToString()

BTCPayServer/Controllers/GreenField/GreenfieldStoreOnChainWalletsController.cs

@@ -182,7 +182,8 @@ namespace BTCPayServer.Controllers.Greenfield
             [FromQuery] TransactionStatus[]? statusFilter = null,
             [FromQuery] string? labelFilter = null,
             [FromQuery] int skip = 0,
-            [FromQuery] int limit = int.MaxValue
+            [FromQuery] int limit = int.MaxValue,
+            CancellationToken cancellationToken = default
         )
         {
             if (IsInvalidWalletRequest(cryptoCode, out var network,
@@ -197,7 +198,7 @@ namespace BTCPayServer.Controllers.Greenfield
             if (statusFilter?.Any() is true || !string.IsNullOrWhiteSpace(labelFilter))
                 preFiltering = false;
             var txs = await wallet.FetchTransactionHistory(derivationScheme.AccountDerivation, preFiltering ? skip : 0,
-                preFiltering ? limit : int.MaxValue);
+                preFiltering ? limit : int.MaxValue, cancellationToken: cancellationToken);
             if (!preFiltering)
             {
                 var filteredList = new List<TransactionHistoryLine>(txs.Count);

BTCPayServer/Controllers/GreenField/GreenfieldStoresController.cs

@@ -129,6 +129,7 @@ namespace BTCPayServer.Controllers.Greenfield
                 //we do not include EmailSettings in this model and instead opt to set it in stores/storeid/email endpoints
                 //we do not include PaymentMethodCriteria because moving the CurrencyValueJsonConverter to the Client csproj is hard and requires a refactor (#1571 & #1572)
                 NetworkFeeMode = storeBlob.NetworkFeeMode,
+                DefaultCurrency = storeBlob.DefaultCurrency,
                 RequiresRefundEmail = storeBlob.RequiresRefundEmail,
                 CheckoutType = storeBlob.CheckoutType,
                 Receipt = InvoiceDataBase.ReceiptOptions.Merge(storeBlob.ReceiptOptions, null),

BTCPayServer/Controllers/UIAppsController.cs

@@ -1,6 +1,9 @@
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Constants;
+using BTCPayServer.Abstractions.Contracts;
+using BTCPayServer.Abstractions.Extensions;
 using BTCPayServer.Abstractions.Models;
 using BTCPayServer.Client;
 using BTCPayServer.Data;
@@ -8,6 +11,7 @@ using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -21,17 +25,20 @@ namespace BTCPayServer.Controllers
         public UIAppsController(
             UserManager<ApplicationUser> userManager,
             StoreRepository storeRepository,
+            IFileService fileService,
             AppService appService,
             IHtmlHelper html)
         {
             _userManager = userManager;
             _storeRepository = storeRepository;
+            _fileService = fileService;
             _appService = appService;
             Html = html;
         }
 
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly StoreRepository _storeRepository;
+        private readonly IFileService _fileService;
         private readonly AppService _appService;
 
         public string CreatedAppId { get; set; }
@@ -184,13 +191,50 @@ namespace BTCPayServer.Controllers
             return RedirectToAction(nameof(UIStoresController.Dashboard), "UIStores", new { storeId = app.StoreDataId });
         }
 
+        [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
+        [HttpPost("{appId}/upload-file")]
+        [IgnoreAntiforgeryToken]
+        public async Task<IActionResult> FileUpload(IFormFile file)
+        {
+            var app = GetCurrentApp();
+            var userId = GetUserId();
+            if (app is null || userId is null)
+                return NotFound();
+
+            if (!file.ContentType.StartsWith("image/", StringComparison.InvariantCulture))
+            {
+                return Json(new { error = "The file needs to be an image" });
+            }
+            if (file.Length > 500_000)
+            {
+                return Json(new { error = "The image file size should be less than 0.5MB" });
+            }
+            var formFile = await file.Bufferize();
+            if (!FileTypeDetector.IsPicture(formFile.Buffer, formFile.FileName))
+            {
+                return Json(new { error = "The file needs to be an image" });
+            }
+            try
+            {
+                var storedFile = await _fileService.AddFile(file, userId);
+                var fileId = storedFile.Id;
+                var fileUrl = await _fileService.GetFileUrl(Request.GetAbsoluteRootUri(), fileId);
+                return Json(new { fileId, fileUrl });
+            }
+            catch (Exception e)
+            {
+                return Json(new { error = $"Could not save file: {e.Message}" });
+            }
+        }
+
         async Task<string> GetStoreDefaultCurrentIfEmpty(string storeId, string currency)
         {
             if (string.IsNullOrWhiteSpace(currency))
             {
-                currency = (await _storeRepository.FindStore(storeId)).GetStoreBlob().DefaultCurrency;
+                var store = await _storeRepository.FindStore(storeId);
+                currency = store?.GetStoreBlob().DefaultCurrency;
             }
-            return currency.Trim().ToUpperInvariant();
+            return currency?.Trim().ToUpperInvariant();
         }
 
         private string GetUserId() => _userManager.GetUserId(User);

BTCPayServer/Controllers/UIInvoiceController.UI.cs

@@ -172,7 +172,7 @@ namespace BTCPayServer.Controllers
         }
 
         [HttpGet("i/{invoiceId}/receipt")]
-        public async Task<IActionResult> InvoiceReceipt(string invoiceId)
+        public async Task<IActionResult> InvoiceReceipt(string invoiceId, [FromQuery] bool print = false)
         {
             var i = await _InvoiceRepository.GetInvoice(invoiceId);
             if (i is null)
@@ -255,7 +255,7 @@ namespace BTCPayServer.Controllers
             vm.Payments = receipt.ShowPayments is false ? null : payments;
             vm.AdditionalData = PosDataParser.ParsePosData(receiptData);
 
-            return View(vm);
+            return View(print ? "InvoiceReceiptPrint" : "InvoiceReceipt", vm);
         }
 
         private string? GetTransactionLink(PaymentMethodId paymentMethodId, string txId)
@@ -456,7 +456,7 @@ namespace BTCPayServer.Controllers
                             model.Title = "How much to refund?";
                             model.RefundStep = RefundSteps.SelectRate;
                             
-                            if (isPaidOver)
+                            if (!isPaidOver)
                             {
                                 ModelState.AddModelError(nameof(model.SelectedRefundOption), "Invoice is not overpaid");
                             }
@@ -466,7 +466,7 @@ namespace BTCPayServer.Controllers
                             }
                             if (!ModelState.IsValid)
                             {
-                                return this.CreateValidationError(ModelState);
+                                return View("_RefundModal", model);
                             }
                     
                             createPullPayment.Currency = paymentMethodId.CryptoCode;

BTCPayServer/Controllers/UIInvoiceController.cs

@@ -17,6 +17,7 @@ using BTCPayServer.Payments;
 using BTCPayServer.Payments.Bitcoin;
 using BTCPayServer.Rating;
 using BTCPayServer.Security;
+using BTCPayServer.Security.Greenfield;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Invoices;
@@ -127,6 +128,14 @@ namespace BTCPayServer.Controllers
             {
                 throw new BitpayHttpException(400, "The expirationTime is set too soon");
             }
+            if (entity.Price < 0.0m)
+            {
+                throw new BitpayHttpException(400, "The price should be 0 or more.");
+            }
+            if (entity.Price > GreenfieldConstants.MaxAmount)
+            {
+                throw new BitpayHttpException(400, $"The price should less than {GreenfieldConstants.MaxAmount}.");
+            }
             entity.Metadata.OrderId = invoice.OrderId;
             entity.Metadata.PosDataLegacy = invoice.PosData;
             entity.ServerUrl = serverUrl;
@@ -278,6 +287,7 @@ namespace BTCPayServer.Controllers
             if (string.IsNullOrEmpty(entity.Currency))
                 entity.Currency = storeBlob.DefaultCurrency;
             entity.Currency = entity.Currency.Trim().ToUpperInvariant();
+            entity.Price = Math.Min(GreenfieldConstants.MaxAmount, entity.Price);
             entity.Price = Math.Max(0.0m, entity.Price);
             var currencyInfo = _CurrencyNameTable.GetNumberFormatInfo(entity.Currency, false);
             if (currencyInfo != null)

BTCPayServer/Controllers/UILNURLController.cs

@@ -3,6 +3,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Constants;
@@ -109,24 +110,24 @@ namespace BTCPayServer
             }
 
             var blob = pp.GetBlob();
-            if (!blob.Currency.Equals(cryptoCode, StringComparison.InvariantCultureIgnoreCase))
+            if (!_pullPaymentHostedService.SupportsLNURL(blob))
             {
                 return NotFound();
             }
 
+            var unit = blob.Currency == "SATS" ? LightMoneyUnit.Satoshi : LightMoneyUnit.BTC;
             var progress = _pullPaymentHostedService.CalculatePullPaymentProgress(pp, DateTimeOffset.UtcNow);
-
             var remaining = progress.Limit - progress.Completed - progress.Awaiting;
             var request = new LNURLWithdrawRequest
             {
-                MaxWithdrawable = LightMoney.FromUnit(remaining, LightMoneyUnit.BTC),
+                MaxWithdrawable = LightMoney.FromUnit(remaining, unit),
                 K1 = pullPaymentId,
                 BalanceCheck = new Uri(Request.GetCurrentUrl()),
-                CurrentBalance = LightMoney.FromUnit(remaining, LightMoneyUnit.BTC),
+                CurrentBalance = LightMoney.FromUnit(remaining, unit),
                 MinWithdrawable =
                     LightMoney.FromUnit(
                         Math.Min(await _lightningLikePayoutHandler.GetMinimumPayoutAmount(pmi, null), remaining),
-                        LightMoneyUnit.BTC),
+                        unit),
                 Tag = "withdrawRequest",
                 Callback = new Uri(Request.GetCurrentUrl()),
                 // It's not `pp.GetBlob().Description` because this would be HTML
@@ -154,13 +155,13 @@ namespace BTCPayServer
                 return NotFound();
             }
 
-            var claimResponse = await _pullPaymentHostedService.Claim(new ClaimRequest()
+            var claimResponse = await _pullPaymentHostedService.Claim(new ClaimRequest
             {
                 Destination = new BoltInvoiceClaimDestination(pr, result),
                 PaymentMethodId = pmi,
                 PullPaymentId = pullPaymentId,
                 StoreId = pp.StoreId,
-                Value = result.MinimumAmount.ToDecimal(LightMoneyUnit.BTC)
+                Value = result.MinimumAmount.ToDecimal(unit)
             });
 
             if (claimResponse.Result != ClaimRequest.ClaimResult.Ok)
@@ -295,7 +296,8 @@ namespace BTCPayServer
 
             var createInvoice = new CreateInvoiceRequest()
             {
-                Amount = item?.Price.Value,
+                Amount =  item?.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Topup? null:  item?.Price,
+                
                 Currency = currencyCode,
                 Checkout = new InvoiceDataBase.CheckoutOptions()
                 {
@@ -373,13 +375,52 @@ namespace BTCPayServer
                 return NotFound("Unknown username");
 
             var store = await _storeRepository.FindStore(lightningAddressSettings.StoreDataId);
+            var cryptoCode = "BTC";
             if (store is null)
                 return NotFound("Unknown username");
+            if (GetLNUrlPaymentMethodId(cryptoCode, store, out var lnUrlMethod) is null)
+                return NotFound("LNUrl not available for store");
 
             var blob = lightningAddressSettings.GetBlob();
 
-            return await GetLNURLRequest(
-               "BTC",
+            var lnurlRequest = new LNURLPayRequest()
+            {
+                Tag = "payRequest",
+                MinSendable = blob?.Min is decimal min ? new LightMoney(min, LightMoneyUnit.Satoshi) : null,
+                MaxSendable = blob?.Max is decimal max ? new LightMoney(max, LightMoneyUnit.Satoshi) : null,
+                CommentAllowed = lnUrlMethod.LUD12Enabled ? 2000 : 0
+            };
+            NormalizeSendable(lnurlRequest);
+
+            var lnUrlMetadata = new Dictionary<string, string>()
+            {
+                ["text/identifier"] = $"{username}@{Request.Host}"
+            };
+            SetLNUrlDescriptionMetadata(lnUrlMetadata, store, store.GetStoreBlob(), null);
+            lnurlRequest.Metadata =
+                JsonConvert.SerializeObject(lnUrlMetadata.Select(kv => new[] { kv.Key, kv.Value }));
+
+            lnurlRequest.Callback = new Uri(_linkGenerator.GetUriByAction(
+                        action: nameof(GetLNURLForLightningAddress),
+                        controller: "UILNURL",
+                        values: new { cryptoCode, username }, Request.Scheme, Request.Host, Request.PathBase));
+
+            lnurlRequest = await _pluginHookService.ApplyFilter("modify-lnurlp-request", lnurlRequest) as LNURLPayRequest;
+            return Ok(lnurlRequest);
+        }
+
+        [HttpGet("pay/lnaddress/{username}")]
+        [EnableCors(CorsPolicies.All)]
+        [IgnoreAntiforgeryToken]
+        public async Task<IActionResult> GetLNURLForLightningAddress(string cryptoCode, string username, [FromQuery] long? amount = null, string comment = null)
+        {
+            var lightningAddressSettings = await _lightningAddressService.ResolveByAddress(username);
+            if (lightningAddressSettings is null || username is null)
+                return NotFound("Unknown username");
+            var blob = lightningAddressSettings.GetBlob();
+            var store = await _storeRepository.FindStore(lightningAddressSettings.StoreDataId);
+            var result = await GetLNURLRequest(
+               cryptoCode,
                store,
                store.GetStoreBlob(),
                new CreateInvoiceRequest()
@@ -396,31 +437,44 @@ namespace BTCPayServer
                {
                    { "text/identifier", $"{username}@{Request.Host}" }
                });
+            if (result is not OkObjectResult ok || ok.Value is not LNURLPayRequest payRequest)
+                return result;
+            var invoiceId = payRequest.Callback.AbsoluteUri.Split('/').Last();
+            return await GetLNURLForInvoice(invoiceId, cryptoCode, amount, comment);
         }
 
 
-        [HttpGet("pay")]
+        [HttpGet("{storeId}/pay")]
         [EnableCors(CorsPolicies.All)]
         [IgnoreAntiforgeryToken]
         public async Task<IActionResult> GetLNUrlForStore(
             string cryptoCode,
             string storeId,
-            string currencyCode = null)
+            string currency = null, 
+            string orderId = null, 
+            decimal? amount = null)
         {
-            var store = this.HttpContext.GetStoreData();
+            var store = await _storeRepository.FindStore(storeId);
             if (store is null)
                 return NotFound();
 
-            var blob = store.GetStoreBlob();
+			var blob = store.GetStoreBlob();
             if (!blob.AnyoneCanInvoice)
                 return NotFound("'Anyone can invoice' is turned off");
+            var metadata = new InvoiceMetadata();
+            if (!string.IsNullOrEmpty(orderId))
+            {
+                metadata.OrderId = orderId;
+            }
             return await GetLNURLRequest(
                 cryptoCode,
                 store,
                 blob,
                 new CreateInvoiceRequest
                 {
-                    Currency = currencyCode
+                    Amount = amount,
+                    Metadata = metadata.ToJObject(),
+                    Currency = currency
                 });
         }
 
@@ -482,11 +536,7 @@ namespace BTCPayServer
 
             if (!lnUrlMetadata.ContainsKey("text/plain"))
             {
-                var invoiceDescription = blob.LightningDescriptionTemplate
-                        .Replace("{StoreName}", store.StoreName ?? "", StringComparison.OrdinalIgnoreCase)
-                        .Replace("{ItemDescription}", i.Metadata.ItemDesc ?? "", StringComparison.OrdinalIgnoreCase)
-                        .Replace("{OrderId}", i.Metadata.OrderId ?? "", StringComparison.OrdinalIgnoreCase);
-                lnUrlMetadata.Add("text/plain", invoiceDescription);
+                SetLNUrlDescriptionMetadata(lnUrlMetadata, store, blob, i.Metadata);
             }
 
             lnurlRequest.Tag = "payRequest";
@@ -503,12 +553,7 @@ namespace BTCPayServer
                     lnurlRequest.MaxSendable = lnurlRequest.MinSendable;
             }
 
-            // We don't think BTCPay handle well 0 sats payments, just in case make it minimum one sat.
-            if (lnurlRequest.MinSendable is null || lnurlRequest.MinSendable < LightMoney.Satoshis(1.0m))
-                lnurlRequest.MinSendable = LightMoney.Satoshis(1.0m);
-
-            if (lnurlRequest.MaxSendable is null)
-                lnurlRequest.MaxSendable = LightMoney.FromUnit(6.12m, LightMoneyUnit.BTC);
+            NormalizeSendable(lnurlRequest);
 
             lnurlRequest = await _pluginHookService.ApplyFilter("modify-lnurlp-request", lnurlRequest) as LNURLPayRequest;
             if (paymentMethodDetails.PayRequest is null)
@@ -524,6 +569,25 @@ namespace BTCPayServer
             return lnurlRequest;
         }
 
+        private void SetLNUrlDescriptionMetadata(Dictionary<string, string> lnUrlMetadata, Data.StoreData store, StoreBlob blob, InvoiceMetadata invoiceMetadata)
+        {
+            var invoiceDescription = blob.LightningDescriptionTemplate
+                        .Replace("{StoreName}", store.StoreName ?? "", StringComparison.OrdinalIgnoreCase)
+                        .Replace("{ItemDescription}", invoiceMetadata?.ItemDesc ?? "", StringComparison.OrdinalIgnoreCase)
+                        .Replace("{OrderId}", invoiceMetadata?.OrderId ?? "", StringComparison.OrdinalIgnoreCase);
+            lnUrlMetadata.Add("text/plain", invoiceDescription);
+        }
+
+        private static void NormalizeSendable(LNURLPayRequest lnurlRequest)
+        {
+            // We don't think BTCPay handle well 0 sats payments, just in case make it minimum one sat.
+            if (lnurlRequest.MinSendable is null || lnurlRequest.MinSendable < LightMoney.Satoshis(1.0m))
+                lnurlRequest.MinSendable = LightMoney.Satoshis(1.0m);
+
+            if (lnurlRequest.MaxSendable is null)
+                lnurlRequest.MaxSendable = LightMoney.FromUnit(6.12m, LightMoneyUnit.BTC);
+        }
+
         PaymentMethodId GetLNUrlPaymentMethodId(string cryptoCode, Data.StoreData store, out LNURLPaySupportedPaymentMethod lnUrlSettings)
         {
             lnUrlSettings = null;

BTCPayServer/Controllers/UIManageController.APIKeys.cs

@@ -506,57 +506,57 @@ namespace BTCPayServer.Controllers
             {
                 public static readonly Dictionary<string, (string Title, string Description)> PermissionDescriptions = new Dictionary<string, (string Title, string Description)>()
                 {
-                    {Policies.Unrestricted, ("Unrestricted access", "The app will have unrestricted access to your account.")},
-                    {Policies.CanViewUsers, ("View users", "The app will be able to see all users on this server.")},
-                    {Policies.CanCreateUser, ("Create new users", "The app will be able to create new users on this server.")},
-                    {Policies.CanManageUsers, ("Manage users", "The app will be able to create/delete API keys for users.")},
-                    {Policies.CanDeleteUser, ("Delete user", "The app will be able to delete the user to whom it is assigned. Admin users can delete any user without this permission.")},
-                    {Policies.CanModifyStoreSettings, ("Modify your stores", "The app will be able to manage invoices on all your stores and modify their settings.")},
-                    {$"{Policies.CanModifyStoreSettings}:", ("Manage selected stores", "The app will be able to manage invoices on the selected stores and modify their settings.")},
-                    {Policies.CanViewCustodianAccounts, ("View exchange accounts linked to your stores", "The app will be able to see exchange accounts linked to your stores.")},
-                    {$"{Policies.CanViewCustodianAccounts}:", ("View exchange accounts linked to selected stores", "The app will be able to see exchange accounts linked to the selected stores.")},
-                    {Policies.CanManageCustodianAccounts, ("Manage exchange accounts linked to your stores", "The app will be able to modify exchange accounts linked to your stores.")},
-                    {$"{Policies.CanManageCustodianAccounts}:", ("Manage exchange accounts linked to selected stores", "The app will be able to modify exchange accounts linked to selected stores.")},
-                    {Policies.CanDepositToCustodianAccounts, ("Deposit funds to exchange accounts linked to your stores", "The app will be able to deposit funds to your exchange accounts.")},
-                    {$"{Policies.CanDepositToCustodianAccounts}:", ("Deposit funds to exchange accounts linked to selected stores", "The app will be able to deposit funds to selected store's exchange accounts.")},
-                    {Policies.CanWithdrawFromCustodianAccounts, ("Withdraw funds from exchange accounts to your store", "The app will be able to withdraw funds from your exchange accounts to your store.")},
-                    {$"{Policies.CanWithdrawFromCustodianAccounts}:", ("Withdraw funds from selected store's exchange accounts", "The app will be able to withdraw funds from your selected store's exchange accounts.")},
-                    {Policies.CanTradeCustodianAccount, ("Trade funds on your store's exchange accounts", "The app will be able to trade funds on your store's exchange accounts.")},
-                    {$"{Policies.CanTradeCustodianAccount}:", ("Trade funds on selected store's exchange accounts", "The app will be able to trade funds on selected store's exchange accounts.")},
-                    {Policies.CanModifyStoreWebhooks, ("Modify stores webhooks", "The app will modify the webhooks of all your stores.")},
-                    {$"{Policies.CanModifyStoreWebhooks}:", ("Modify selected stores' webhooks", "The app will modify the webhooks of the selected stores.")},
-                    {Policies.CanViewStoreSettings, ("View your stores", "The app will be able to view stores settings.")},
-                    {$"{Policies.CanViewStoreSettings}:", ("View your stores", "The app will be able to view the selected stores' settings.")},
-                    {Policies.CanModifyServerSettings, ("Manage your server", "The app will have total control on the server settings of your server.")},
-                    {Policies.CanViewProfile, ("View your profile", "The app will be able to view your user profile.")},
-                    {Policies.CanModifyProfile, ("Manage your profile", "The app will be able to view and modify your user profile.")},
-                    {Policies.CanManageNotificationsForUser, ("Manage your notifications", "The app will be able to view and modify your user notifications.")},
-                    {Policies.CanViewNotificationsForUser, ("View your notifications", "The app will be able to view your user notifications.")},
-                    {Policies.CanCreateInvoice, ("Create an invoice", "The app will be able to create new invoices.")},
-                    {$"{Policies.CanCreateInvoice}:", ("Create an invoice", "The app will be able to create new invoices on the selected stores.")},
-                    {Policies.CanViewInvoices, ("View invoices", "The app will be able to view invoices.")},
-                    {Policies.CanModifyInvoices, ("Modify invoices", "The app will be able to modify and view invoices.")},
-                    {$"{Policies.CanViewInvoices}:", ("View invoices", "The app will be able to view invoices on the selected stores.")},
-                    {$"{Policies.CanModifyInvoices}:", ("Modify invoices", "The app will be able to modify and view invoices on the selected stores.")},
-                    {Policies.CanModifyPaymentRequests, ("Modify your payment requests", "The app will be able to view, modify, delete and create new payment requests on all your stores.")},
-                    {$"{Policies.CanModifyPaymentRequests}:", ("Manage selected stores' payment requests", "The app will be able to view, modify, delete and create new payment requests on the selected stores.")},
-                    {Policies.CanViewPaymentRequests, ("View your payment requests", "The app will be able to view payment requests.")},
-                    {$"{Policies.CanViewPaymentRequests}:", ("View your payment requests", "The app will be able to view the selected stores' payment requests.")},
-                    {Policies.CanManagePullPayments, ("Manage your pull payments", "The app will be able to view, modify, delete and create pull payments on all your stores.")},
-                    {$"{Policies.CanManagePullPayments}:", ("Manage selected stores' pull payments", "The app will be able to view, modify, delete and create new pull payments on the selected stores.")},
-                    {Policies.CanCreatePullPayments, ("Create pull payments", "The app will be able to create pull payments on all your stores.")},
-                    {$"{Policies.CanCreatePullPayments}:", ("Create pull payments in selected stores", "The app will be able to create new pull payments on the selected stores.")},
-                    {Policies.CanCreateNonApprovedPullPayments, ("Create non-approved pull payments", "The app will be able to create pull payments without automatic approval on all your stores.")},
-                    {$"{Policies.CanCreateNonApprovedPullPayments}:", ("Create non-approved pull payments in selected stores", "The app will be able to view, modify, delete and create pull payments without automatic approval on the selected stores.")},
-                    {Policies.CanUseInternalLightningNode, ("Use the internal lightning node", "The app will be able to  use the internal BTCPay Server lightning node to create BOLT11 invoices, connect to other nodes, open new channels and pay BOLT11 invoices.")},
-                    {Policies.CanViewLightningInvoiceInternalNode, ("View invoices from internal lightning node", "The app will be able to use the internal BTCPay Server lightning node to view BOLT11 invoices.")},
-                    {Policies.CanCreateLightningInvoiceInternalNode, ("Create invoices with internal lightning node", "The app will be able to use the internal BTCPay Server lightning node to create BOLT11 invoices.")},
-                    {Policies.CanUseLightningNodeInStore, ("Use the lightning nodes associated with your stores", "The app will be able to use the lightning nodes connected to all your stores to create BOLT11 invoices, connect to other nodes, open new channels and pay BOLT11 invoices.")},
-                    {Policies.CanViewLightningInvoiceInStore, ("View the lightning invoices associated with your stores", "The app will be able to view the lightning invoices connected to all your stores.")},
-                    {Policies.CanCreateLightningInvoiceInStore, ("Create invoices from the lightning nodes associated with your stores", "The app will be able to use the lightning nodes connected to all your stores to create BOLT11 invoices.")},
-                    {$"{Policies.CanUseLightningNodeInStore}:", ("Use the lightning nodes associated with your stores", "The app will be able to use the lightning nodes connected to the selected stores to create BOLT11 invoices, connect to other nodes, open new channels and pay BOLT11 invoices.")},
-                    {$"{Policies.CanViewLightningInvoiceInStore}:", ("View the lightning invoices associated with your stores", "The app will be able to view the lightning invoices connected to the selected stores.")},
-                    {$"{Policies.CanCreateLightningInvoiceInStore}:", ("Create invoices from the lightning nodes associated with your stores", "The app will be able to use the lightning nodes connected to the selected stores to create BOLT11 invoices.")},
+                    {Policies.Unrestricted, ("Unrestricted access", "Grants unrestricted access to your account.")},
+                    {Policies.CanViewUsers, ("View users", "Allows seeing all users on this server.")},
+                    {Policies.CanCreateUser, ("Create new users", "Allows creating new users on this server.")},
+                    {Policies.CanManageUsers, ("Manage users", "Allows creating/deleting API keys for users.")},
+                    {Policies.CanDeleteUser, ("Delete user", "Allows deleting the user to whom it is assigned. Admin users can delete any user without this permission.")},
+                    {Policies.CanModifyStoreSettings, ("Modify your stores", "Allows managing invoices on all your stores and modify their settings.")},
+                    {$"{Policies.CanModifyStoreSettings}:", ("Manage selected stores", "Allows managing invoices on the selected stores and modify their settings.")},
+                    {Policies.CanViewCustodianAccounts, ("View exchange accounts linked to your stores", "Allows seeing exchange accounts linked to your stores.")},
+                    {$"{Policies.CanViewCustodianAccounts}:", ("View exchange accounts linked to selected stores", "Allows seeing exchange accounts linked to the selected stores.")},
+                    {Policies.CanManageCustodianAccounts, ("Manage exchange accounts linked to your stores", "Allows modifying exchange accounts linked to your stores.")},
+                    {$"{Policies.CanManageCustodianAccounts}:", ("Manage exchange accounts linked to selected stores", "Allows modifying exchange accounts linked to selected stores.")},
+                    {Policies.CanDepositToCustodianAccounts, ("Deposit funds to exchange accounts linked to your stores", "Allows depositing funds to your exchange accounts.")},
+                    {$"{Policies.CanDepositToCustodianAccounts}:", ("Deposit funds to exchange accounts linked to selected stores", "Allows depositing funds to selected store's exchange accounts.")},
+                    {Policies.CanWithdrawFromCustodianAccounts, ("Withdraw funds from exchange accounts to your store", "Allows withdrawing funds from your exchange accounts to your store.")},
+                    {$"{Policies.CanWithdrawFromCustodianAccounts}:", ("Withdraw funds from selected store's exchange accounts", "Allows withdrawing funds from your selected store's exchange accounts.")},
+                    {Policies.CanTradeCustodianAccount, ("Trade funds on your store's exchange accounts", "Allows trading funds on your store's exchange accounts.")},
+                    {$"{Policies.CanTradeCustodianAccount}:", ("Trade funds on selected store's exchange accounts", "Allows trading funds on selected store's exchange accounts.")},
+                    {Policies.CanModifyStoreWebhooks, ("Modify stores webhooks", "Allows modifying the webhooks of all your stores.")},
+                    {$"{Policies.CanModifyStoreWebhooks}:", ("Modify selected stores' webhooks", "Allows modifying the webhooks of the selected stores.")},
+                    {Policies.CanViewStoreSettings, ("View your stores", "Allows viewing stores settings.")},
+                    {$"{Policies.CanViewStoreSettings}:", ("View your stores", "Allows viewing the selected stores' settings.")},
+                    {Policies.CanModifyServerSettings, ("Manage your server", "Grants total control on the server settings of your server.")},
+                    {Policies.CanViewProfile, ("View your profile", "Allows viewing your user profile.")},
+                    {Policies.CanModifyProfile, ("Manage your profile", "Allows viewing and modifying your user profile.")},
+                    {Policies.CanManageNotificationsForUser, ("Manage your notifications", "Allows viewing and modifying your user notifications.")},
+                    {Policies.CanViewNotificationsForUser, ("View your notifications", "Allows viewing your user notifications.")},
+                    {Policies.CanCreateInvoice, ("Create an invoice", "Allows creating new invoices.")},
+                    {$"{Policies.CanCreateInvoice}:", ("Create an invoice", "Allows creating new invoices on the selected stores.")},
+                    {Policies.CanViewInvoices, ("View invoices", "Allows viewing invoices.")},
+                    {Policies.CanModifyInvoices, ("Modify invoices", "Allows viewing and modifying invoices.")},
+                    {$"{Policies.CanViewInvoices}:", ("View invoices", "Allows viewing invoices on the selected stores.")},
+                    {$"{Policies.CanModifyInvoices}:", ("Modify invoices", "Allows viewing and modifying invoices on the selected stores.")},
+                    {Policies.CanModifyPaymentRequests, ("Modify your payment requests", "Allows viewing, modifying, deleting and creating new payment requests on all your stores.")},
+                    {$"{Policies.CanModifyPaymentRequests}:", ("Manage selected stores' payment requests", "Allows viewing, modifying, deleting and creating new payment requests on the selected stores.")},
+                    {Policies.CanViewPaymentRequests, ("View your payment requests", "Allows viewing payment requests.")},
+                    {$"{Policies.CanViewPaymentRequests}:", ("View your payment requests", "Allows viewing the selected stores' payment requests.")},
+                    {Policies.CanManagePullPayments, ("Manage your pull payments", "Allows viewing, modifying, deleting and creating pull payments on all your stores.")},
+                    {$"{Policies.CanManagePullPayments}:", ("Manage selected stores' pull payments", "Allows viewing, modifying, deleting and creating pull payments on the selected stores.")},
+                    {Policies.CanCreatePullPayments, ("Create pull payments", "Allows creating pull payments on all your stores.")},
+                    {$"{Policies.CanCreatePullPayments}:", ("Create pull payments in selected stores", "Allows creating pull payments on the selected stores.")},
+                    {Policies.CanCreateNonApprovedPullPayments, ("Create non-approved pull payments", "Allows creating pull payments without automatic approval on all your stores.")},
+                    {$"{Policies.CanCreateNonApprovedPullPayments}:", ("Create non-approved pull payments in selected stores", "Allows viewing, modifying, deleting and creating pull payments without automatic approval on the selected stores.")},
+                    {Policies.CanUseInternalLightningNode, ("Use the internal lightning node", "Allows using the internal BTCPay Server lightning node to create BOLT11 invoices, connect to other nodes, open new channels and pay BOLT11 invoices.")},
+                    {Policies.CanViewLightningInvoiceInternalNode, ("View invoices from internal lightning node", "Allows using the internal BTCPay Server lightning node to view BOLT11 invoices.")},
+                    {Policies.CanCreateLightningInvoiceInternalNode, ("Create invoices with internal lightning node", "Allows using the internal BTCPay Server lightning node to create BOLT11 invoices.")},
+                    {Policies.CanUseLightningNodeInStore, ("Use the lightning nodes associated with your stores", "Allows using the lightning nodes connected to all your stores to create BOLT11 invoices, connect to other nodes, open new channels and pay BOLT11 invoices.")},
+                    {Policies.CanViewLightningInvoiceInStore, ("View the lightning invoices associated with your stores", "Allows viewing the lightning invoices connected to all your stores.")},
+                    {Policies.CanCreateLightningInvoiceInStore, ("Create invoices from the lightning nodes associated with your stores", "Allows using the lightning nodes connected to all your stores to create BOLT11 invoices.")},
+                    {$"{Policies.CanUseLightningNodeInStore}:", ("Use the lightning nodes associated with your stores", "Allows using the lightning nodes connected to the selected stores to create BOLT11 invoices, connect to other nodes, open new channels and pay BOLT11 invoices.")},
+                    {$"{Policies.CanViewLightningInvoiceInStore}:", ("View the lightning invoices associated with your stores", "Allows viewing the lightning invoices connected to the selected stores.")},
+                    {$"{Policies.CanCreateLightningInvoiceInStore}:", ("Create invoices from the lightning nodes associated with your stores", "Allows using the lightning nodes connected to the selected stores to create BOLT11 invoices.")},
                 };
                 public string Title
                 {

BTCPayServer/Controllers/UIPaymentRequestController.cs

@@ -78,16 +78,20 @@ namespace BTCPayServer.Controllers
             model = this.ParseListQuery(model ?? new ListPaymentRequestsViewModel());
 
             var store = GetCurrentStore();
-            var includeArchived = new SearchString(model.SearchTerm, model.TimezoneOffset ?? 0).GetFilterBool("includearchived") == true;
+            var fs = new SearchString(model.SearchTerm, model.TimezoneOffset ?? 0);
             var result = await _PaymentRequestRepository.FindPaymentRequests(new PaymentRequestQuery
             {
                 UserId = GetUserId(),
                 StoreId = store.Id,
                 Skip = model.Skip,
                 Count = model.Count,
-                IncludeArchived = includeArchived
+                Status = fs.GetFilterArray("status")?.Select(s => Enum.Parse<Client.Models.PaymentRequestData.PaymentRequestStatus>(s, true)).ToArray(),
+                IncludeArchived = fs.GetFilterBool("includearchived") ?? false
             });
-
+            
+            model.Search = fs;
+            model.SearchText = fs.TextSearch;
+            
             model.Items = result.Select(data =>
             {
                 var blob = data.GetBlob();

BTCPayServer/Controllers/UIPullPaymentController.cs

@@ -29,6 +29,7 @@ namespace BTCPayServer.Controllers
         private readonly CurrencyNameTable _currencyNameTable;
         private readonly DisplayFormatter _displayFormatter;
         private readonly PullPaymentHostedService _pullPaymentHostedService;
+        private readonly BTCPayNetworkProvider _networkProvider;
         private readonly BTCPayNetworkJsonSerializerSettings _serializerSettings;
         private readonly IEnumerable<IPayoutHandler> _payoutHandlers;
         private readonly StoreRepository _storeRepository;
@@ -37,6 +38,7 @@ namespace BTCPayServer.Controllers
             CurrencyNameTable currencyNameTable,
             DisplayFormatter displayFormatter,
             PullPaymentHostedService pullPaymentHostedService,
+            BTCPayNetworkProvider networkProvider,
             BTCPayNetworkJsonSerializerSettings serializerSettings,
             IEnumerable<IPayoutHandler> payoutHandlers,
             StoreRepository storeRepository)
@@ -48,6 +50,7 @@ namespace BTCPayServer.Controllers
             _serializerSettings = serializerSettings;
             _payoutHandlers = payoutHandlers;
             _storeRepository = storeRepository;
+            _networkProvider = networkProvider;
         }
 
         [AllowAnonymous]
@@ -102,6 +105,13 @@ namespace BTCPayServer.Controllers
                           }).ToList()
             };
             vm.IsPending &= vm.AmountDue > 0.0m;
+            
+            if (_pullPaymentHostedService.SupportsLNURL(blob))
+            {
+                var url = Url.Action("GetLNURLForPullPayment", "UILNURL", new { cryptoCode = _networkProvider.DefaultNetwork.CryptoCode, pullPaymentId = vm.Id }, Request.Scheme, Request.Host.ToString());
+                vm.LnurlEndpoint = url != null ? new Uri(url) : null;
+            }
+            
             return View(nameof(ViewPullPayment), vm);
         }
 

BTCPayServer/Controllers/UIServerController.cs

@@ -29,6 +29,7 @@ using BTCPayServer.Storage.Services;
 using BTCPayServer.Storage.Services.Providers;
 using BTCPayServer.Validation;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -664,6 +665,8 @@ namespace BTCPayServer.Controllers
 
         [Route("lnd-config/{configKey}/lnd.config")]
         [AllowAnonymous]
+        [EnableCors(CorsPolicies.All)]
+        [IgnoreAntiforgeryToken]
         public IActionResult GetLNDConfig(ulong configKey)
         {
             var conf = _LnConfigProvider.GetConfig(configKey);

BTCPayServer/Controllers/UIWalletsController.cs

@@ -212,7 +212,9 @@ namespace BTCPayServer.Controllers
             WalletId walletId,
             string? labelFilter = null,
             int skip = 0,
-            int count = 50
+            int count = 50,
+            bool loadTransactions = false,
+            CancellationToken cancellationToken = default
         )
         {
             var paymentMethod = GetDerivationSchemeSettings(walletId);
@@ -223,25 +225,25 @@ namespace BTCPayServer.Controllers
 
             // 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 walletTransactionsInfo = await WalletRepository.GetWalletTransactionsInfo(walletId, transactions.Select(t => t.TransactionId.ToString()).ToArray());
             var model = new ListTransactionsViewModel { Skip = skip, Count = count };
             model.Labels.AddRange(
                 (await WalletRepository.GetWalletLabels(walletId))
                 .Select(c => (c.Label, c.Color, ColorPalette.Default.TextColor(c.Color))));
 
+            IList<TransactionHistoryLine>? transactions = null;
+            Dictionary<string, WalletTransactionInfo>? walletTransactionsInfo = null;
+            if (loadTransactions)
+            {
+                transactions = await wallet.FetchTransactionHistory(paymentMethod.AccountDerivation, preFiltering ? skip : null, preFiltering ? count : null, cancellationToken: cancellationToken);
+                walletTransactionsInfo = await WalletRepository.GetWalletTransactionsInfo(walletId, transactions.Select(t => t.TransactionId.ToString()).ToArray());
+            }
+
             if (labelFilter != null)
             {
                 model.PaginationQuery = new Dictionary<string, object> { { "labelFilter", labelFilter } };
             }
-            if (transactions == null)
+            if (transactions == null || walletTransactionsInfo is null)
             {
-                TempData.SetStatusMessageModel(new StatusMessageModel()
-                {
-                    Severity = StatusMessageModel.StatusSeverity.Error,
-                    Message =
-                        "There was an error retrieving the transactions list. Is NBXplorer configured correctly?"
-                });
                 model.Transactions = new List<ListTransactionsViewModel.TransactionViewModel>();
             }
             else
@@ -1311,7 +1313,7 @@ namespace BTCPayServer.Controllers
         [HttpGet("{walletId}/export")]
         public async Task<IActionResult> Export(
             [ModelBinder(typeof(WalletIdModelBinder))] WalletId walletId,
-            string format, string? labelFilter = null)
+            string format, string? labelFilter = null, CancellationToken cancellationToken = default)
         {
             var paymentMethod = GetDerivationSchemeSettings(walletId);
             if (paymentMethod == null)
@@ -1319,7 +1321,7 @@ namespace BTCPayServer.Controllers
 
             var wallet = _walletProvider.GetWallet(paymentMethod.Network);
             var walletTransactionsInfoAsync = WalletRepository.GetWalletTransactionsInfo(walletId, (string[]?)null);
-            var input = await wallet.FetchTransactionHistory(paymentMethod.AccountDerivation);
+            var input = await wallet.FetchTransactionHistory(paymentMethod.AccountDerivation, cancellationToken: cancellationToken);
             var walletTransactionsInfo = await walletTransactionsInfoAsync;
             var export = new TransactionsExport(wallet, walletTransactionsInfo);
             var res = export.Process(input, format);

BTCPayServer/Data/StoreBlob.cs

@@ -199,7 +199,9 @@ namespace BTCPayServer.Data
             { "GTQ", "bitpay" },
             { "COP", "yadio" },
             { "JPY", "bitbank" },
-            { "TRY", "btcturk" }
+            { "TRY", "btcturk" },
+            { "UGX", "exchangeratehost"},
+            { "RSD", "bitpay"}
         };
 
         public string GetRecommendedExchange() =>

BTCPayServer/Extensions.cs

@@ -105,16 +105,23 @@ namespace BTCPayServer
 
         public static decimal RoundUp(decimal value, int precision)
         {
-            for (int i = 0; i < precision; i++)
+            try
             {
-                value = value * 10m;
+                for (int i = 0; i < precision; i++)
+                {
+                    value = value * 10m;
+                }
+                value = Math.Ceiling(value);
+                for (int i = 0; i < precision; i++)
+                {
+                    value = value / 10m;
+                }
+                return value;
             }
-            value = Math.Ceiling(value);
-            for (int i = 0; i < precision; i++)
+            catch (OverflowException)
             {
-                value = value / 10m;
+                return value;
             }
-            return value;
         }
 
         public static IServiceCollection AddScheduledTask<T>(this IServiceCollection services, TimeSpan every)

BTCPayServer/HostedServices/PullPaymentHostedService.cs

@@ -46,6 +46,8 @@ namespace BTCPayServer.HostedServices
 
     public class PullPaymentHostedService : BaseAsyncService
     {
+        private readonly string[] _lnurlSupportedCurrencies = { "BTC", "SATS" };
+        
         public class CancelRequest
         {
             public CancelRequest(string pullPaymentId)
@@ -337,6 +339,14 @@ namespace BTCPayServer.HostedServices
             }
         }
 
+        public bool SupportsLNURL(PullPaymentBlob blob)
+        {
+            var pms = blob.SupportedPaymentMethods.FirstOrDefault(id => 
+                id.PaymentType == LightningPaymentType.Instance && 
+                _networkProvider.DefaultNetwork.CryptoCode == id.CryptoCode);
+            return pms is not null && _lnurlSupportedCurrencies.Contains(blob.Currency);
+        }
+
         public Task<RateResult> GetRate(PayoutData payout, string explicitRateRule, CancellationToken cancellationToken)
         {
             var ppBlob = payout.PullPaymentData?.GetBlob();

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -520,6 +520,8 @@ namespace BTCPayServer.Hosting
             services.AddRateProvider<BitflyerRateProvider>();
             services.AddRateProvider<YadioRateProvider>();
             services.AddRateProvider<BtcTurkRateProvider>();
+            services.AddRateProvider<FreeCurrencyRatesRateProvider>();
+            services.AddRateProvider<ExchangeRateHostRateProvider>();
 
             // Broken
             // Providers.Add("argoneum", new ArgoneumRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_ARGONEUM")));

BTCPayServer/Hosting/MigrationStartupTask.cs

@@ -640,8 +640,6 @@ WHERE cte.""Id""=p.""Id""
             await using var ctx = _DBContextFactory.CreateContext();
             foreach (var app in await ctx.Apps.Include(data => data.StoreData).AsQueryable().ToArrayAsync())
             {
-                ViewPointOfSaleViewModel.Item[] items;
-                string newTemplate;
                 switch (app.AppType)
                 {
                     case CrowdfundAppType.AppType:

BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs

@@ -18,6 +18,9 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
     {
         public List<ViewPaymentRequestViewModel> Items { get; set; }
         public override int CurrentPageCount => Items.Count;
+        
+        public SearchString Search { get; set; }
+        public string SearchText { get; set; }
     }
 
     public class UpdatePaymentRequestViewModel

BTCPayServer/Models/ViewPullPaymentModel.cs

@@ -96,6 +96,7 @@ namespace BTCPayServer.Models
         public DateTimeOffset StartDate { get; set; }
         public DateTime LastRefreshed { get; set; }
         public CurrencyData CurrencyData { get; set; }
+        public Uri LnurlEndpoint { get; set; }
         public bool Archived { get; set; }
         public bool AutoApprove { get; set; }
 

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -9,6 +9,7 @@ using BTCPayServer.Configuration;
 using BTCPayServer.Data;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Lightning;
+using BTCPayServer.Lightning.LndHub;
 using BTCPayServer.Logging;
 using BTCPayServer.Models;
 using BTCPayServer.Models.InvoicingModels;
@@ -122,11 +123,16 @@ namespace BTCPayServer.Payments.Lightning
         {
             if (!_Dashboard.IsFullySynched(network.CryptoCode, out var summary))
                 throw new PaymentMethodUnavailableException("Full node not available");
-
+            
             try
             {
                 using var cts = new CancellationTokenSource(LightningTimeout);
                 var client = CreateLightningClient(supportedPaymentMethod, network);
+
+                // LNDhub-compatible implementations might not offer all of GetInfo data.
+                // Skip checks in those cases, see https://github.com/lnbits/lnbits/issues/1182
+                var isLndHub = client is LndHubLightningClient;
+                
                 LightningNodeInformation info;
                 try
                 {
@@ -136,6 +142,10 @@ namespace BTCPayServer.Payments.Lightning
                 {
                     throw new PaymentMethodUnavailableException("The lightning node did not reply in a timely manner");
                 }
+                catch (NotSupportedException) when (isLndHub)
+                {
+                    return new NodeInfo[] {};
+                }
                 catch (Exception ex)
                 {
                     throw new PaymentMethodUnavailableException($"Error while connecting to the API: {ex.Message}" +
@@ -146,9 +156,9 @@ namespace BTCPayServer.Payments.Lightning
                 var nodeInfo = preferOnion != null && info.NodeInfoList.Any(i => i.IsTor == preferOnion)
                     ? info.NodeInfoList.Where(i => i.IsTor == preferOnion.Value).ToArray()
                     : info.NodeInfoList.Select(i => i).ToArray();
-
+                
                 var blocksGap = summary.Status.ChainHeight - info.BlockHeight;
-                if (blocksGap > 10)
+                if (blocksGap > 10 && !(isLndHub && info.BlockHeight == 0))
                 {
                     throw new PaymentMethodUnavailableException($"The lightning node is not synched ({blocksGap} blocks left)");
                 }

BTCPayServer/Payments/Lightning/LightningLikePaymentMethodDetails.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using BTCPayServer.Lightning;
 using BTCPayServer.Services.Invoices;
 using NBitcoin;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Payments.Lightning
@@ -10,7 +11,9 @@ namespace BTCPayServer.Payments.Lightning
     public class LightningLikePaymentMethodDetails : IPaymentMethodDetails
     {
         public string BOLT11 { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.UInt256JsonConverter))]
         public uint256 PaymentHash { get; set; }
+        [JsonConverter(typeof(NBitcoin.JsonConverters.UInt256JsonConverter))]
         public uint256 Preimage { get; set; }
         public string InvoiceId { get; set; }
         public string NodeInfo { get; set; }

BTCPayServer/Plugins/Crowdfund/Controllers/UICrowdfundController.cs

@@ -17,7 +17,6 @@ using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using NBitpayClient;
@@ -267,6 +266,7 @@ namespace BTCPayServer.Plugins.Crowdfund.Controllers
             if (app == null)
                 return NotFound();
 
+            vm.AppId = app.Id;
             vm.TargetCurrency = await GetStoreDefaultCurrentIfEmpty(app.StoreDataId, vm.TargetCurrency);
             if (_currencies.GetCurrencyData(vm.TargetCurrency, false) == null)
                 ModelState.AddModelError(nameof(vm.TargetCurrency), "Invalid currency");

BTCPayServer/Plugins/PointOfSale/Controllers/UIPointOfSaleController.cs

@@ -131,6 +131,9 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
         public async Task<IActionResult> ViewPointOfSale(string appId,
                                                         PosViewType? viewType = null,
                                                         [ModelBinder(typeof(InvariantDecimalModelBinder))] decimal? amount = null,
+                                                        [ModelBinder(typeof(InvariantDecimalModelBinder))] decimal? tip = null,
+                                                        [ModelBinder(typeof(InvariantDecimalModelBinder))] decimal? discount = null,
+                                                        [ModelBinder(typeof(InvariantDecimalModelBinder))] decimal? customAmount = null,
                                                         string email = null,
                                                         string orderId = null,
                                                         string notificationUrl = null,
@@ -197,15 +200,14 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
                 if (!settings.ShowCustomAmount && currentView != PosViewType.Cart && currentView != PosViewType.Light)
                     return NotFound();
 
-                price = amount;
                 title = settings.Title;
                 //if cart IS enabled and we detect posdata that matches the cart system's, check inventory for the items
-
+                price = amount;
                 if (currentView == PosViewType.Cart &&
                     AppService.TryParsePosCartItems(jposData, out cartItems))
                 {
+                    price = 0.0m;
                     choices = AppService.Parse(settings.Template, false);
-                    var expectedMinimumAmount = 0m;
                     foreach (var cartItem in cartItems)
                     {
                         var itemChoice = choices.FirstOrDefault(c => c.Id == cartItem.Key);
@@ -229,13 +231,14 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
                             expectedCartItemPrice = itemChoice.Price ?? 0;
                         }
 
-                        expectedMinimumAmount += expectedCartItemPrice * cartItem.Value;
-                    }
-
-                    if (expectedMinimumAmount > amount)
-                    {
-                        return RedirectToAction(nameof(ViewPointOfSale), new { appId });
+                        price += expectedCartItemPrice * cartItem.Value;
                     }
+                    if (customAmount is { } c)
+                        price += c;
+                    if (discount is { } d)
+                        price -= price * d/100.0m;
+                    if (tip is { } t)
+                        price += t;
                 }
             }
 
@@ -343,10 +346,8 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
 
                             if (appPosData.Tip > 0)
                             {
-                                receiptData.Add("Tip",
-                                    $"{_displayFormatter.Currency(appPosData.Tip, settings.Currency, DisplayFormatter.CurrencyFormat.Symbol)}");
+                                receiptData.Add("Tip", _displayFormatter.Currency(appPosData.Tip, settings.Currency, DisplayFormatter.CurrencyFormat.Symbol));
                             }
-
                         }
                         entity.Metadata.SetAdditionalData("receiptData", receiptData);
 
@@ -565,6 +566,7 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
             if (app == null)
                 return NotFound();
 
+            vm.Id = app.Id;
             if (!ModelState.IsValid)
                 return View("PointOfSale/UpdatePointOfSale", vm);
 

BTCPayServer/Plugins/PointOfSale/Models/ViewPointOfSaleViewModel.cs

@@ -1,7 +1,10 @@
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using BTCPayServer.JsonConverters;
 using BTCPayServer.Services.Apps;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
@@ -24,6 +27,8 @@ namespace BTCPayServer.Plugins.PointOfSale.Models
             public string Description { get; set; }
             public string Id { get; set; }
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public string[] Categories { get; set; }
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             public string Image { get; set; }
             [JsonConverter(typeof(StringEnumConverter))]
             public ItemPriceType PriceType { get; set; }
@@ -63,7 +68,35 @@ namespace BTCPayServer.Plugins.PointOfSale.Models
         public bool EnableTips { get; set; }
         public string Step { get; set; }
         public string Title { get; set; }
-        public Item[] Items { get; set; }
+        Item[] _Items;
+        public Item[] Items
+        {
+            get
+            {
+                return _Items;
+            }
+            set
+            {
+                _Items = value;
+                UpdateGroups();
+            }
+        }
+
+        private void UpdateGroups()
+        {
+            AllCategories = null;
+            if (Items is null)
+                return;
+            var groups = Items.SelectMany(g => g.Categories ?? Array.Empty<string>())
+                              .ToHashSet()
+                              .Select(o => new KeyValuePair<string, string>(o, o))
+                              .ToList();
+            if (groups.Count == 0)
+                return;
+            groups.Insert(0, new KeyValuePair<string, string>("All items", "*"));
+            AllCategories = new SelectList(groups, "Value", "Key", "*");
+        }
+
         public string CurrencyCode { get; set; }
         public string CurrencySymbol { get; set; }
         public string AppId { get; set; }
@@ -76,6 +109,7 @@ namespace BTCPayServer.Plugins.PointOfSale.Models
         public string CustomCSSLink { get; set; }
         public string CustomLogoLink { get; set; }
         public string Description { get; set; }
+        public SelectList AllCategories { get; set; }
         [Display(Name = "Custom CSS Code")]
         public string EmbeddedCSS { get; set; }
         public RequiresRefundEmail RequiresRefundEmail { get; set; } = RequiresRefundEmail.InheritFromStore;

BTCPayServer/Security/GreenField/GreenFieldConstants.cs

@@ -2,6 +2,7 @@ namespace BTCPayServer.Security.Greenfield
 {
     public static class GreenfieldConstants
     {
+        public const decimal MaxAmount = ulong.MaxValue;
         public const string AuthenticationType = "Greenfield";
 
         public static class ClaimTypes

BTCPayServer/Services/Altcoins/Monero/Configuration/MoneroLikeConfiguration.cs

@@ -15,6 +15,8 @@ namespace BTCPayServer.Services.Altcoins.Monero.Configuration
         public Uri DaemonRpcUri { get; set; }
         public Uri InternalWalletRpcUri { get; set; }
         public string WalletDirectory { get; set; }
+        public string Username { get; set; }
+        public string Password { get; set; }
     }
 }
 #endif

BTCPayServer/Services/Altcoins/Monero/MoneroLikeExtensions.cs

@@ -1,6 +1,8 @@
 #if ALTCOINS
 using System;
 using System.Linq;
+using System.Net;
+using System.Net.Http;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Services;
 using BTCPayServer.Configuration;
@@ -19,6 +21,19 @@ namespace BTCPayServer.Services.Altcoins.Monero
         {
             serviceCollection.AddSingleton(provider =>
                 provider.ConfigureMoneroLikeConfiguration());
+            serviceCollection.AddHttpClient("XMRclient")
+                .ConfigurePrimaryHttpMessageHandler(provider =>
+                {
+                    var configuration = provider.GetRequiredService<MoneroLikeConfiguration>();
+                    if(!configuration.MoneroLikeConfigurationItems.TryGetValue("XMR", out var xmrConfig) || xmrConfig.Username is null || xmrConfig.Password is null){
+                        return new HttpClientHandler();
+                    }
+                    return new HttpClientHandler
+                    {
+                        Credentials = new NetworkCredential(xmrConfig.Username, xmrConfig.Password),
+                        PreAuthenticate = true
+                    };
+                });
             serviceCollection.AddSingleton<MoneroRPCProvider>();
             serviceCollection.AddHostedService<MoneroLikeSummaryUpdaterHostedService>();
             serviceCollection.AddHostedService<MoneroListener>();
@@ -55,6 +70,12 @@ namespace BTCPayServer.Services.Altcoins.Monero
                 var walletDaemonWalletDirectory =
                     configuration.GetOrDefault<string>(
                         $"{moneroLikeSpecificBtcPayNetwork.CryptoCode}_wallet_daemon_walletdir", null);
+                var daemonUsername =
+                    configuration.GetOrDefault<string>(
+                        $"{moneroLikeSpecificBtcPayNetwork.CryptoCode}_daemon_username", null);
+                var daemonPassword =
+                    configuration.GetOrDefault<string>(
+                        $"{moneroLikeSpecificBtcPayNetwork.CryptoCode}_daemon_password", null);
                 if (daemonUri == null || walletDaemonUri == null)
                 {
                     throw new ConfigException($"{moneroLikeSpecificBtcPayNetwork.CryptoCode} is misconfigured");
@@ -63,6 +84,8 @@ namespace BTCPayServer.Services.Altcoins.Monero
                 result.MoneroLikeConfigurationItems.Add(moneroLikeSpecificBtcPayNetwork.CryptoCode, new MoneroLikeConfigurationItem()
                 {
                     DaemonRpcUri = daemonUri,
+                    Username = daemonUsername,
+                    Password = daemonPassword,
                     InternalWalletRpcUri = walletDaemonUri,
                     WalletDirectory = walletDaemonWalletDirectory
                 });

BTCPayServer/Services/Altcoins/Monero/Services/MoneroRPCProvider.cs

@@ -29,10 +29,10 @@ namespace BTCPayServer.Services.Altcoins.Monero.Services
             _eventAggregator = eventAggregator;
             DaemonRpcClients =
                 _moneroLikeConfiguration.MoneroLikeConfigurationItems.ToImmutableDictionary(pair => pair.Key,
-                    pair => new JsonRpcClient(pair.Value.DaemonRpcUri, "", "", httpClientFactory.CreateClient()));
+                    pair => new JsonRpcClient(pair.Value.DaemonRpcUri, pair.Value.Username, pair.Value.Password, httpClientFactory.CreateClient($"{pair.Key}client")));
             WalletRpcClients =
                 _moneroLikeConfiguration.MoneroLikeConfigurationItems.ToImmutableDictionary(pair => pair.Key,
-                    pair => new JsonRpcClient(pair.Value.InternalWalletRpcUri, "", "", httpClientFactory.CreateClient()));
+                    pair => new JsonRpcClient(pair.Value.InternalWalletRpcUri, "", "", httpClientFactory.CreateClient($"{pair.Key}client")));
         }
 
         public bool IsAvailable(string cryptoCode)

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -272,6 +272,7 @@ namespace BTCPayServer.Services.Invoices
         public SpeedPolicy SpeedPolicy { get; set; }
         public string DefaultLanguage { get; set; }
         [Obsolete("Use GetPaymentMethod(network) instead")]
+        [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal Rate { get; set; }
         public DateTimeOffset InvoiceTime { get; set; }
         public DateTimeOffset ExpirationTime { get; set; }
@@ -280,7 +281,7 @@ namespace BTCPayServer.Services.Invoices
         public string DepositAddress { get; set; }
 
         public InvoiceMetadata Metadata { get; set; }
-
+        [JsonConverter(typeof(NumericStringJsonConverter))]
         public decimal Price { get; set; }
         public string Currency { get; set; }
         public string DefaultPaymentMethod { get; set; }
@@ -1006,6 +1007,11 @@ namespace BTCPayServer.Services.Invoices
                 };
             }
 
+            // A bug in previous version of BTCPay Server wasn't properly serializing those fields
+            if (PaymentMethodDetails["PaymentHash"] is JObject)
+                PaymentMethodDetails["PaymentHash"] = null;
+            if (PaymentMethodDetails["Preimage"] is JObject)
+                PaymentMethodDetails["Preimage"] = null;
             IPaymentMethodDetails details = GetId().PaymentType.DeserializePaymentMethodDetails(Network, PaymentMethodDetails.ToString());
             switch (details)
             {
@@ -1072,7 +1078,8 @@ namespace BTCPayServer.Services.Invoices
             var cryptoPaid = 0.0m;
 
             int precision = Network?.Divisibility ?? 8;
-            var totalDueNoNetworkCost = Money.Coins(Extensions.RoundUp(totalDue, precision));
+
+            var totalDueNoNetworkCost = Coins(Extensions.RoundUp(totalDue, precision));
             bool paidEnough = paid >= Extensions.RoundUp(totalDue, precision);
             int txRequired = 0;
             decimal networkFeeAlreadyPaid = 0.0m;
@@ -1107,14 +1114,14 @@ namespace BTCPayServer.Services.Invoices
                 totalDue += GetTxFee();
             }
 
-            accounting.TotalDue = Money.Coins(Extensions.RoundUp(totalDue, precision));
-            accounting.Paid = Money.Coins(Extensions.RoundUp(paid, precision));
+            accounting.TotalDue = Coins(Extensions.RoundUp(totalDue, precision));
+            accounting.Paid = Coins(Extensions.RoundUp(paid, precision));
             accounting.TxRequired = txRequired;
-            accounting.CryptoPaid = Money.Coins(Extensions.RoundUp(cryptoPaid, precision));
+            accounting.CryptoPaid = Coins(Extensions.RoundUp(cryptoPaid, precision));
             accounting.Due = Money.Max(accounting.TotalDue - accounting.Paid, Money.Zero);
             accounting.DueUncapped = accounting.TotalDue - accounting.Paid;
             accounting.NetworkFee = accounting.TotalDue - totalDueNoNetworkCost;
-            accounting.NetworkFeeAlreadyPaid = Money.Coins(Extensions.RoundUp(networkFeeAlreadyPaid, precision));
+            accounting.NetworkFeeAlreadyPaid = Coins(Extensions.RoundUp(networkFeeAlreadyPaid, precision));
             // If the total due is 0, there is no payment tolerance to calculate
             var minimumTotalDueSatoshi = accounting.TotalDue.Satoshi == 0
                 ? 0
@@ -1124,6 +1131,20 @@ namespace BTCPayServer.Services.Invoices
             return accounting;
         }
 
+        const decimal MaxCoinValue = decimal.MaxValue / 1_0000_0000m;
+        private Money Coins(decimal v)
+        {
+            if (v > MaxCoinValue)
+                v = MaxCoinValue;
+            // Clamp the value to not crash on degenerate invoices
+            v *= 1_0000_0000m;
+            if (v > long.MaxValue)
+                return Money.Satoshis(long.MaxValue);
+            if (v < long.MinValue)
+                return Money.Satoshis(long.MinValue);
+            return Money.Satoshis(v);
+        }
+
         private decimal GetTxFee()
         {
             return GetPaymentMethodDetails()?.GetNextNetworkFee() ?? 0m;

BTCPayServer/Services/Invoices/PosAppData.cs

@@ -1,6 +1,8 @@
-using BTCPayServer.Models.AppViewModels;
+using System;
+using System.Globalization;
 using BTCPayServer.Plugins.PointOfSale.Models;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Services.Invoices;
 
@@ -34,6 +36,7 @@ public class PosAppCartItem
     public string Id { get; set; }
 
     [JsonProperty(PropertyName = "price")]
+    [JsonConverter(typeof(PosAppCartItemPriceJsonConverter))]
     public decimal Price { get; set; }
 
     [JsonProperty(PropertyName = "title")]
@@ -49,12 +52,40 @@ public class PosAppCartItem
     public string Image { get; set; }
 }
 
-public class PosAppCartItemPrice
+public class PosAppCartItemPriceJsonConverter : JsonConverter
 {
-    [JsonProperty(PropertyName = "formatted")]
-    public string Formatted { get; set; }
+    public override bool CanConvert(Type objectType)
+    {
+        return objectType == typeof(decimal) || objectType == typeof(object);
+    }
 
+    public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
+        JsonSerializer serializer)
+    {
+        JToken token = JToken.Load(reader);
+        switch (token.Type)
+        {
+            case JTokenType.Float:
+                if (objectType == typeof(decimal))
+                    return token.Value<decimal>();
+                throw new JsonSerializationException($"Unexpected object type: {objectType}");
+            case JTokenType.Integer:
+            case JTokenType.String:
+                if (objectType == typeof(decimal))
+                    return decimal.Parse(token.ToString(), NumberStyles.Any, CultureInfo.InvariantCulture);
+                throw new JsonSerializationException($"Unexpected object type: {objectType}");
+            case JTokenType.Null:
+                return null;
+            case JTokenType.Object:
+                return token.ToObject<JObject>()?["value"]?.Value<decimal?>();
+            default:
+                throw new JsonSerializationException($"Unexpected token type: {token.Type}");
+        }
+    }
 
-    [JsonProperty(PropertyName = "type")]
-    public ViewPointOfSaleViewModel.ItemPriceType Type { get; set; }
+    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+    {
+        if (value is decimal x)
+            writer.WriteValue(x);
+    }
 }

BTCPayServer/Services/Wallets/BTCPayWallet.cs

@@ -215,7 +215,7 @@ namespace BTCPayServer.Services.Wallets
             return await completionSource.Task;
         }
         List<TransactionInformation> dummy = new List<TransactionInformation>();
-        public async Task<IList<TransactionHistoryLine>> FetchTransactionHistory(DerivationStrategyBase derivationStrategyBase, int? skip = null, int? count = null, TimeSpan? interval = null)
+        public async Task<IList<TransactionHistoryLine>> FetchTransactionHistory(DerivationStrategyBase derivationStrategyBase, int? skip = null, int? count = null, TimeSpan? interval = null, CancellationToken cancellationToken = default)
         {
             // This is two paths:
             // * Sometimes we can ask the DB to do the filtering of rows: If that's the case, we should try to filter at the DB level directly as it is the most efficient.
@@ -243,18 +243,21 @@ namespace BTCPayServer.Services.Wallets
             else
             {
                 await using var ctx = await NbxplorerConnectionFactory.OpenConnection();
-                var rows = await ctx.QueryAsync<(string tx_id, DateTimeOffset seen_at, string blk_id, long? blk_height, long balance_change, string asset_id, long confs)>(
-                    "SELECT r.tx_id, r.seen_at, t.blk_id, t.blk_height, r.balance_change, r.asset_id, COALESCE((SELECT height FROM get_tip('BTC')) - t.blk_height + 1, 0) AS confs " +
+                var cmd = new CommandDefinition(
+                    commandText: "SELECT r.tx_id, r.seen_at, t.blk_id, t.blk_height, r.balance_change, r.asset_id, COALESCE((SELECT height FROM get_tip('BTC')) - t.blk_height + 1, 0) AS confs " +
                     "FROM get_wallets_recent(@wallet_id, @code, @interval, @count, @skip) r " +
                     "JOIN txs t USING (code, tx_id) " +
-                    "ORDER BY r.seen_at DESC", new
+                    "ORDER BY r.seen_at DESC",
+                    parameters: new
                     {
                         wallet_id = NBXplorer.Client.DBUtils.nbxv1_get_wallet_id(Network.CryptoCode, derivationStrategyBase.ToString()),
                         code = Network.CryptoCode,
                         count = count,
                         skip = skip,
                         interval = interval is TimeSpan t ? t : TimeSpan.FromDays(365 * 1000)
-                    });
+                    },
+                    cancellationToken: cancellationToken);
+                var rows = await ctx.QueryAsync<(string tx_id, DateTimeOffset seen_at, string blk_id, long? blk_height, long balance_change, string asset_id, long confs)>(cmd);
                 rows.TryGetNonEnumeratedCount(out int c);
                 var lines = new List<TransactionHistoryLine>(c);
                 foreach (var row in rows)

BTCPayServer/Views/Shared/Crowdfund/Public/ContributeForm.cshtml

@@ -1,4 +1,3 @@
-@using BTCPayServer.Models.AppViewModels
 @using BTCPayServer.Plugins.PointOfSale.Models
 @model BTCPayServer.Plugins.Crowdfund.Models.ContributeToCrowdfund
 
@@ -28,7 +27,7 @@
                         @(string.IsNullOrEmpty(item.Title) ? item.Id : item.Title)
                     </label>
                     <span class="text-muted">
-                        @if (item.Price.Value > 0)
+                        @if (item.Price is > 0)
                         {
                             <span>@item.Price.Value</span>
                             <span>@vm.TargetCurrency</span>

BTCPayServer/Views/Shared/Crowdfund/Public/ViewCrowdfund.cshtml

@@ -17,7 +17,7 @@
 <head>
     <partial name="LayoutHead"/>
     <partial name="LayoutHeadStoreBranding" model="@(Model.BrandColor, Model.CssFileId, Model.CustomCSSLink, Model.EmbeddedCSS)" />
-    <link href="~/vendor/bootstrap-vue/bootstrap-vue.css" asp-append-version="true"  rel="stylesheet" />
+    <link href="~/vendor/bootstrap-vue/bootstrap-vue.min.css" asp-append-version="true"  rel="stylesheet" />
     <link href="~/crowdfund/styles/main.css" asp-append-version="true"  rel="stylesheet" />
 
     @if (!string.IsNullOrEmpty(Model.CustomCSSLink))
@@ -81,16 +81,14 @@
                 }
                 @if (Model.EnforceTargetAmount)
                 {
-                    <span v-if="srvModel.enforceTargetAmount" class="h5 ms-2">
+                    <span v-if="srvModel.enforceTargetAmount" class="h5 ms-2" v-b-tooltip title="No contributions allowed after the goal has been reached">
                         Hardcap Goal
-                        <span v-b-tooltip title="No contributions allowed after the goal has been reached"><vc:icon symbol="info" /></span>
                     </span>
                 }
                 else
                 {
-                    <span v-if="!srvModel.enforceTargetAmount" class="h5 ms-2">
+                    <span v-if="!srvModel.enforceTargetAmount" class="h5 ms-2" v-b-tooltip title="Contributions allowed even after goal is reached">
                         Softcap Goal
-                        <span v-b-tooltip title="Contributions allowed even after goal is reached"><vc:icon symbol="info" /></span>
                     </span>
                 }
             </span>
@@ -279,7 +277,7 @@
 <template id="perks-template">
     <div class="perks-container">
         <perk v-if="!perks || perks.length === 0"
-              :perk="{title: 'Donate Custom Amount', price: { type: 0, value: null }}"
+              :perk="{title: 'Donate Custom Amount', priceType: 'Topup', price: { type: 'Topup' } }"
               :target-currency="targetCurrency"
               :active="active"
               :loading="loading"
@@ -393,7 +391,7 @@
     <script src="~/vendor/moment/moment.min.js" asp-append-version="true"></script>
     <script src="~/vendor/vue-qrcode/vue-qrcode.min.js" asp-append-version="true"></script>
     <script src="~/vendor/vue-toasted/vue-toasted.min.js" asp-append-version="true"></script>
-    <script src="~/vendor/bootstrap-vue/bootstrap-vue.js" asp-append-version="true"></script>
+    <script src="~/vendor/bootstrap-vue/bootstrap-vue.min.js" asp-append-version="true"></script>
     <script src="~/vendor/signalr/signalr.js" asp-append-version="true"></script>
     <script src="~/vendor/animejs/anime.min.js" asp-append-version="true"></script>
     <script src="~/crowdfund/app.js" asp-append-version="true"></script>

BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml

@@ -165,19 +165,8 @@
             </div>
         </div>
     </div>
-    <div class="row">
-        <div class="col-xl-10 col-xxl-constrain">
-            <partial name="TemplateEditor" model="@(nameof(Model.PerksTemplate), "Perks", Model.TargetCurrency ?? Model.StoreDefaultCurrency)" />
-        </div>
-    </div>
-    <div class="row collapse" id="RawEditor">
-        <div class="col-xl-10 col-xxl-constrain">
-            <div class="form-group pt-3">
-                <label asp-for="PerksTemplate" class="form-label"></label>
-                <textarea asp-for="PerksTemplate" rows="10" cols="40" class="form-control"></textarea>
-                <span asp-validation-for="PerksTemplate" class="text-danger"></span>
-            </div>
-        </div>
+    <div id="perks">
+        <partial name="TemplateEditor" model="@(nameof(Model.PerksTemplate), Model.PerksTemplate, "Perks", Model.TargetCurrency ?? Model.StoreDefaultCurrency)" />
     </div>
     <div class="row">
         <div class="col-xl-8 col-xxl-constrain">

BTCPayServer/Views/Shared/Forms/FieldSetElement.cshtml

@@ -5,7 +5,7 @@
 @if (!Model.Constant)
 {
     <fieldset>
-        <legend class="h3 mt-4 mb-3">@Model.Label</legend>
+        <legend class="h3 mt-4 mb-3">@Safe.Raw(Model.Label)</legend>
         @foreach (var field in Model.Fields)
         {
 			if (FormComponentProviders.TypeToComponentProvider.TryGetValue(field.Type, out var partial) && !string.IsNullOrEmpty(partial.View))

BTCPayServer/Views/Shared/Forms/InputElement.cshtml

@@ -5,7 +5,7 @@
 }
 <div class="form-group">
     <label class="form-label" for="@Model.Name"@(Model.Required ? " data-required" : "")>
-        @Model.Label
+        @Safe.Raw(Model.Label)
     </label>
     <input id="@Model.Name" type="@Model.Type" class="form-control @(errors is null ? "" : "is-invalid")"
            name="@Model.Name" value="@Model.Value" data-val="true"

BTCPayServer/Views/Shared/Forms/SelectElement.cshtml

@@ -12,17 +12,15 @@
 }
 <div class="form-group">
     <label class="form-label" for="@Model.Name"@(Model.Required ? " data-required" : "")>
-        @Model.Label
+        @Safe.Raw(Model.Label)
     </label>
-
     <select id="@selectField.Name" asp-items="selectField.Options" class="form-select @(errors is null ? "" : "is-invalid")"
             name="@selectField.Name" data-val="true" aria-describedby="HelpText-@selectField.Name" required="@selectField.Required"
             data-val-required="@selectField.Label is required.">
     </select>
-
     <span class="text-danger" data-valmsg-for="@selectField.Name" data-valmsg-replace="true">@(isInvalid && errors.Any() ? errors.First().ErrorMessage : string.Empty)</span>
     @if (!string.IsNullOrEmpty(selectField.HelpText))
     {
-        <div id="@($"HelpText-{selectField.Name}")" class="form-text">@selectField.HelpText</div>
+        <div id="@($"HelpText-{selectField.Name}")" class="form-text">@Safe.Raw(selectField.HelpText)</div>
     }
 </div>

BTCPayServer/Views/Shared/Forms/TextareaElement.cshtml

@@ -5,7 +5,7 @@
 }
 <div class="form-group">
     <label class="form-label" for="@Model.Name"@(Model.Required ? " data-required" : "")>
-        @Model.Label
+        @Safe.Raw(Model.Label)
     </label>
     <textarea id="@Model.Name" class="form-control @(errors is null ? "" : "is-invalid")"
            name="@Model.Name" data-val="true"

BTCPayServer/Views/Shared/NFC/CheckoutEnd.cshtml

@@ -21,8 +21,23 @@
         </div>
     </template>
 </template>
-<script type="text/javascript">
-// https://developer.chrome.com/articles/nfc/
+<script>
+class NDEFReaderWrapper {
+    constructor() {
+        this.onreading = null;
+        this.onreadingerror = null;
+    }
+
+    async scan(opts) {
+        if (opts && opts.signal){
+            opts.signal.addEventListener('abort', () => {
+                window.parent.postMessage('nfc:abort', '*');
+            });
+        }
+        window.parent.postMessage('nfc:startScan', '*');
+    }
+}
+
 Vue.component("lnurl-withdraw-checkout", {
     template: "#lnurl-withdraw-template",
     props: {
@@ -69,7 +84,7 @@ Vue.component("lnurl-withdraw-checkout", {
     data () {
         return {
             url: @Safe.Json(Context.Request.GetAbsoluteUri(Url.Action("SubmitLNURLWithdrawForInvoice", "NFC"))),
-            supported: 'NDEFReader' in window && window.self === window.top,
+            supported: 'NDEFReader' in window,
             scanning: false,
             submitting: false,
             permissionGranted: false,
@@ -80,6 +95,7 @@ Vue.component("lnurl-withdraw-checkout", {
         }
     },
     async mounted () {
+        if (!this.supported) return;
         try {
             this.permissionGranted = navigator.permissions &&
                 (await navigator.permissions.query({ name: 'nfc' })).state === 'granted'
@@ -134,7 +150,8 @@ Vue.component("lnurl-withdraw-checkout", {
             this.submitting = false;
             this.scanning = true;
             try {
-                const ndef = new NDEFReader()
+                const inModal = window.self !== window.top;
+                const ndef = inModal ? new NDEFReaderWrapper() : new NDEFReader();
                 this.readerAbortController = new AbortController()
                 this.readerAbortController.signal.onabort = () => {
                     this.scanning = false;
@@ -142,17 +159,33 @@ Vue.component("lnurl-withdraw-checkout", {
                 
                 await ndef.scan({ signal: this.readerAbortController.signal })
 
-                ndef.onreadingerror = () => {
-                    this.errorMessage = "Could not read NFC tag";
-                }
+                ndef.onreadingerror = this.reportNfcError
 
-                ndef.onreading = async ({ message, serialNumber }) => {
+                ndef.onreading = async ({ message }) => {
                     const record = message.records[0]
                     const textDecoder = new TextDecoder('utf-8')
                     const lnurl = textDecoder.decode(record.data)
                     await this.sendData(lnurl)
                 }
                 
+                if (inModal) {
+                    // receive messages from iframe
+                    window.addEventListener('message', async event => {
+                        // deny messages from other origins
+                        if (event.origin !== window.location.origin) return
+                        
+                        const { action, data } = event.data
+                        switch (action) {
+                            case 'nfc:data':
+                                await this.sendData(data)
+                                break;
+                            case 'nfc:error':
+                                this.reportNfcError()
+                                break;
+                        }
+                    });
+                }
+                
                 // we came here, so the user must have allowed NFC access
                 this.permissionGranted = true;
             } catch (error) {
@@ -181,6 +214,9 @@ Vue.component("lnurl-withdraw-checkout", {
                 this.errorMessage = error;
             }
             this.submitting = false;
+        },
+        reportNfcError() {
+            this.errorMessage = 'Could not read NFC tag';    
         }
     }
 });

BTCPayServer/Views/Shared/PayButton/PayButton.cshtml

@@ -1,5 +1,6 @@
 @using BTCPayServer.Views.Stores
-@inject BTCPayServer.Security.ContentSecurityPolicies Csp
+@inject Security.ContentSecurityPolicies Csp
+@inject BTCPayNetworkProvider NetworkProvider
 @model BTCPayServer.Plugins.PayButton.Models.PayButtonViewModel
 @{
     ViewData.SetActivePage(StoreNavPages.PayButton, "Pay Button", Context.GetStoreData().Id);
@@ -14,6 +15,7 @@
     <script src="~/vendor/highlightjs/highlight.min.js" asp-append-version="true"></script>
     <script src="~/vendor/vuejs/vue.min.js" asp-append-version="true"></script>
     <script src="~/vendor/vuejs-vee-validate/vee-validate.js" asp-append-version="true"></script>
+    <script src="~/vendor/vue-qrcode/vue-qrcode.min.js" asp-append-version="true"></script>
     <script src="~/paybutton/paybutton.js" asp-append-version="true"></script>
     <template id="template-modal" csp-allow>
     if (!window.btcpay) {
@@ -116,13 +118,34 @@
     </template>
     
     <script>
+        window.lnurlEndpoint = @Safe.Json(Url.Action("GetLNUrlForStore", "UILNURL", new
+                               {
+                                   storeId = Model.StoreId, 
+                                   cryptoCode = NetworkProvider.DefaultNetwork.CryptoCode
+                               }, "lnurlp", Context.Request.Host.ToString()));
         const srvModel = @Safe.Json(Model);
         const payButtonCtrl = new Vue({
             el: '#payButtonCtrl',
+            components: {
+                qrcode: VueQrcode
+            },
             data: {
                 srvModel: srvModel,
                 originalButtonImageUrl: srvModel.payButtonImageUrl,
-                buttonInlineTextMode: false
+                buttonInlineTextMode: false,
+                previewLink: "",
+                lnurlLink: "",
+                alternativeMode: 'link',
+                qrOptions: {
+                    width: 256,
+                    height: 256,
+                    margin: 1,
+                    color: {
+                        dark: '#000',
+                        light: '#f5f5f7'
+                    }
+                }
+                
             },
             computed: {
                 imageUrlRequired() {
@@ -131,7 +154,7 @@
             },
             methods: {
                 inputChanges(event, buttonSize) {
-                    inputChanges(event, buttonSize);
+                    inputChanges(payButtonCtrl, event, buttonSize, );
                 }
             },
             watch: {
@@ -145,8 +168,9 @@
                     }
                     this.inputChanges();
                 }
-            }
+            },
         });
+        inputChanges(payButtonCtrl);
     </script>
 }
 
@@ -311,10 +335,6 @@
         <div class="col-xl-4 mt-4 mt-xl-0">
             <h5 class="mb-3">Preview</h5>
             <div id="preview"></div>
-            <div v-show="!srvModel.appIdEndpoint">
-                <h5 class="mt-4 mb-3">Link</h5>
-                <span>Alternatively, you can share <a id="preview-link" href="#">this link</a> or encode it in a QR code.</span>
-            </div>
         </div>
     </div>
 
@@ -388,7 +408,6 @@
     </div>
 
     <h4 class="mt-5 mb-3">Generated Code</h4>
-
     <div class="row" v-show="!errors.any()">
         <div class="col-xxl-8">
             <pre><code id="mainCode" class="html"></code></pre>
@@ -402,6 +421,49 @@
             Please fix errors shown in order for code generation to successfully execute.
         </div>
     </div>
+    
+    <div v-if="!srvModel.appIdEndpoint && (previewLink || lnurlLink)">
+        <h4 class="mt-4 mb-3">Alternatives</h4>
+        <p>You can also share the link/LNURL or encode it in a QR code.</p>
+        <div class="align-items-center" style="width:256px">
+            <ul class="nav my-3 btcpay-pills align-items-center gap-2">
+                <li class="nav-item" v-if="previewLink">
+                    <a class="btcpay-pill" :class="{ active: alternativeMode === 'link' }" data-bs-toggle="tab" data-bs-target="#Alternative-Link" role="tab" href="#Alternative-Link">
+                        Link
+                    </a>
+                </li>
+                <li class="nav-item" v-if="previewLink">
+                    <a class="btcpay-pill" :class="{ active: alternativeMode === 'lnurl' }" data-bs-toggle="tab" data-bs-target="#Alternative-LNURL" role="tab" href="#Alternative-LNURL">
+                        LNURL
+                    </a>
+                </li>
+            </ul>
+            <div class="tab-content">
+                <div class="tab-pane" :class="{ active: alternativeMode === 'link' }" id="Alternative-Link" role="tabpanel">
+                    <a class="qr-container d-inline-block" :class="{ active: true }" :href="previewLink">
+                        <qrcode :value="previewLink" :options="qrOptions" tag="img"></qrcode>
+                    </a>
+                    <div class="input-group mt-3">
+                        <div class="form-floating">
+                            <vc:truncate-center text="previewLink" is-vue="true" padding="15" elastic="true" classes="form-control-plaintext" />
+                            <label>Link URL</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="tab-pane" :class="{ active: alternativeMode === 'lnurl' }" id="Alternative-LNURL" role="tabpanel">
+                    <a class="qr-container d-inline-block" :href="lnurlLink">
+                        <qrcode :value="lnurlLink" :options="qrOptions" tag="img"></qrcode>
+                    </a>
+                    <div class="input-group mt-3">
+                        <div class="form-floating">
+                            <vc:truncate-center text="lnurlLink" is-vue="true" padding="15" elastic="true" classes="form-control-plaintext" />
+                            <label>LNURL</label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 
 <script id="template-paybutton-styles" type="text/template">

BTCPayServer/Views/Shared/PointOfSale/Public/Cart.cshtml

@@ -1,6 +1,8 @@
 @using BTCPayServer.Plugins.PointOfSale.Models
 @using BTCPayServer.Services
+@using Newtonsoft.Json.Linq;
 @model BTCPayServer.Plugins.PointOfSale.Models.ViewPointOfSaleViewModel
+
 @inject DisplayFormatter DisplayFormatter
 @{
     Layout = "PointOfSale/Public/_Layout";
@@ -20,6 +22,10 @@
             justify-content: center;
             align-items: center;
         }
+        .card:not(.d-none:only-of-type) {
+            max-width: 320px;
+            margin: auto !important;
+        }
     </style>
 }
 @section PageFootContent {
@@ -45,17 +51,15 @@
             <td class="align-middle text-end">{price}</td>
         </tr>
     </script>
-
     <script id="template-cart-item-image" type="text/template">
         <img class="cart-item-image" src="{image}" alt="">
     </script>
-
     <script id="template-cart-custom-amount" type="text/template">
         <tr>
             <td colspan="5">
                 <div class="input-group">
                     <span class="input-group-text"><i class="fa fa-shopping-cart fa-fw"></i></span>
-                    <input class="js-cart-custom-amount form-control" type="number" min="0" step="@Model.Step" name="amount" placeholder="Pay what you want">
+                    <input class="js-cart-custom-amount form-control" type="number" min="0" step="@Model.Step" name="amount" placeholder="Pay what you want" id="CartCustomAmount">
                     <div class="input-group-text">
                         <a class="js-cart-custom-amount-remove btn btn-danger" href="#"><i class="fa fa-times"></i></a>
                     </div>
@@ -63,34 +67,32 @@
             </td>
         </tr>
     </script>
-
     <script id="template-cart-extra" type="text/template">
-       @if (Model.ShowCustomAmount)
-       {
-           <tr>
+        @if (Model.ShowCustomAmount)
+        {
+            <tr>
                 <th colspan="5" class="border-0 pb-0">
                     <div class="input-group">
                         <span class="input-group-text"><i class="fa fa-shopping-cart fa-fw"></i></span>
-                        <input class="js-cart-custom-amount form-control" type="number" min="0" step="@Model.Step" name="amount" value="{customAmount}" placeholder="Pay what you want">
+                        <input class="js-cart-custom-amount form-control" type="number" min="0" step="@Model.Step" name="amount" value="{customAmount}" placeholder="Pay what you want" id="CartCustomAmount">
                         <a class="js-cart-custom-amount-remove btn btn-danger" href="#"><i class="fa fa-times"></i></a>
                     </div>
                 </th>
             </tr>
-       }
+        }
         @if (Model.ShowDiscount)
         {
             <tr>
                 <th colspan="5" class="border-top-0">
                     <div class="input-group">
                         <span class="input-group-text"><i class="fa fa-percent fa-fw"></i></span>
-                        <input class="js-cart-discount form-control" type="number" min="0" step="@Model.Step" value="{discount}" name="discount" placeholder="Discount in %">
+                        <input class="js-cart-discount form-control" type="number" min="0" step="@Model.Step" value="{discount}" name="discount" placeholder="Discount in %" id="CartDiscount">
                         <a class="js-cart-discount-remove btn btn-danger" href="#"><i class="fa fa-times"></i></a>
                     </div>
                 </th>
             </tr>
         }
     </script>
-
     <script id="template-cart-tip" type="text/template">
         @if (Model.EnableTips)
         {
@@ -127,14 +129,13 @@
                     </div>
                 </th>
             </tr>
-            }
+        }
     </script>
-
     <script id="template-cart-total" type="text/template">
         <tr>
             <th colspan="1" class="pb-4 h4">Total</th>
             <th colspan="4" class="pb-4 h4 text-end">
-                <span class="js-cart-total">{total}</span>
+                <span class="js-cart-total" id="CartTotal">{total}</span>
             </th>
         </tr>
     </script>
@@ -156,7 +157,7 @@
                         </tr>
                         <tr>
                             <td class="border-0 pb-0 h6">Total products</td>
-                            <td align="right" class="border-0 pb-0 h6">
+                            <td class="text-end border-0 pb-0 h6">
                                 <span class="js-cart-summary-products text-nowrap"></span>
                             </td>
                         </tr>
@@ -164,8 +165,8 @@
                         {
                             <tr>
                                 <td class="border-0 pb-y h6">Discount</td>
-                                <td align="right" class="border-0 pb-y h6">
-                                    <span class="js-cart-summary-discount text-nowrap"></span>
+                                <td class="text-end border-0 pb-y h6">
+                                    <span class="js-cart-summary-discount text-nowrap" id="CartSummaryDiscount"></span>
                                 </td>
                             </tr>
                         }
@@ -173,15 +174,15 @@
                         {
                             <tr>
                                 <td class="border-top-0 pt-0 h6">Tip</td>
-                                <td align="right" class="border-top-0 pt-0 h6">
-                                    <span class="js-cart-summary-tip text-nowrap"></span>
+                                <td class="text-end border-top-0 pt-0 h6">
+                                    <span class="js-cart-summary-tip text-nowrap" id="CartSummaryTip"></span>
                                 </td>
                             </tr>
                         }
                         <tr>
                             <td class="h3 table-light">Total</td>
                             <td class="h3 table-light text-end">
-                                <span class="js-cart-summary-total text-nowrap"></span>
+                                <span class="js-cart-summary-total text-nowrap" id="CartSummaryTotal"></span>
                             </td>
                         </tr>
                     </tbody>
@@ -196,8 +197,11 @@
                     asp-antiforgery="false"
                     data-buy
                 >
-                    <input id="js-cart-amount" class="form-control" type="hidden" name="amount">
-                    <input id="js-cart-posdata" class="form-control" type="hidden" name="posdata">
+                    <input id="js-cart-amount" type="hidden" name="amount">
+                    <input id="js-cart-custom-amount" type="hidden" name="customAmount">
+                    <input id="js-cart-tip" type="hidden" name="tip">
+                    <input id="js-cart-discount" type="hidden" name="discount">
+                    <input id="js-cart-posdata" type="hidden" name="posdata">
                     <button id="js-cart-pay" class="btn btn-primary btn-lg" type="submit">
                         <b>@Model.CustomButtonText</b>
                     </button>
@@ -230,6 +234,16 @@
             {
                 <div class="lead text-center mt-3">@Safe.Raw(Model.Description)</div>
             }
+			@if (Model.AllCategories != null)
+			{
+				<div class="btcpay-pills d-flex flex-wrap align-items-center justify-content-center gap-3 mt-3" data-toggle="buttons" v-pre>
+				    @foreach (var g in Model.AllCategories)
+				    {
+				        <input id="Category-@g.Value" type="radio" name="category" class="js-categories" value="@g.Value" @(g.Selected ? "checked" : "") autocomplete="off">
+					    <label class="btcpay-pill" for="Category-@g.Value">@g.Text</label>
+				    }
+				</div>
+			}
         </div>
         <div id="js-pos-list" class="text-center mx-auto px-2 px-sm-4 py-4 py-sm-2">
             <div class="card-deck">
@@ -243,7 +257,7 @@
                     var image = item.Image;
                     var description = item.Description;
 
-                    <div class="js-add-cart card px-0 card-wrapper" data-index="@index">
+                    <div class="js-add-cart card px-0 card-wrapper" data-index="@index" data-categories="@(new JArray(item.Categories).ToString())">
                         @if (!string.IsNullOrWhiteSpace(image))
                         {
                             <img class="card-img-top" src="@image" alt="@Safe.Raw(item.Title)" asp-append-version="true">
@@ -256,7 +270,6 @@
                             }
                         </div>
                         <div class="card-footer bg-transparent border-0 pt-0 pb-3">
-
                             <span class="text-muted small">
                                 @{
                                     var buttonText = string.IsNullOrEmpty(item.BuyButtonText) ? item.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Topup ? Model.CustomButtonText : Model.ButtonText : item.BuyButtonText;
@@ -282,7 +295,8 @@
                                          <span>Sold out</span>
                                      }
                                  </div>
-                             } else if (anyInventoryItems)
+                             }
+                             else if (anyInventoryItems)
                              {
                                  <div class="w-100 pt-2">&nbsp;</div>
                              }
@@ -300,7 +314,7 @@
             <a class="js-cart btn btn-sm bg-white text-black pull-right ms-5" href="#">
                 <i class="fa fa-times fa-lg"></i>
             </a>
-            <a class="js-cart-destroy btn btn-danger pull-right" href="#" style="display: none;">Empty cart <i class="fa fa-trash fa-fw fa-lg"></i></a>
+            <a class="js-cart-destroy btn btn-danger pull-right" href="#" style="display: none;" id="CartClear">Empty cart <i class="fa fa-trash fa-fw fa-lg"></i></a>
         </div>
 
         <table id="js-cart-list" class="table table-responsive table-light mt-0 mb-0">

BTCPayServer/Views/Shared/PointOfSale/Public/Static.cshtml

@@ -7,6 +7,13 @@
     var anyInventoryItems = Model.Items.Any(item => item.Inventory.HasValue);
 }
 
+<style>
+    .card:only-of-type {
+        max-width: 320px;
+        margin: auto !important;
+    }
+</style>
+
 <div class="container public-page-wrap flex-column">
     <partial name="_StatusMessage" />
     <partial name="_StoreHeader" model="(string.IsNullOrEmpty(Model.Title) ? Model.StoreName : Model.Title, Model.LogoFileId)" />

BTCPayServer/Views/Shared/PointOfSale/Public/VueLight.cshtml

@@ -4,13 +4,13 @@
 <form id="app" method="post" asp-action="ViewPointOfSale" asp-route-appId="@Model.AppId" asp-antiforgery="false" data-buy v-on:submit="handleFormSubmit" class="d-flex flex-column gap-4 my-auto" v-cloak>
     <input id="posdata" type="hidden" name="posdata" v-model="posdata">
     <div ref="display" class="d-flex flex-column align-items-center px-4 mb-auto">
-        <div class="fw-semibold text-muted">{{srvModel.currencyCode}}</div>
-        <div class="fw-bold lh-sm" ref="amount" v-bind:style="{ fontSize: `${fontSize}px` }">{{ formatCurrency(total, false) }}</div>
+        <div class="fw-semibold text-muted" id="Currency">{{srvModel.currencyCode}}</div>
+        <div class="fw-bold lh-sm" ref="amount" v-bind:style="{ fontSize: `${fontSize}px` }" id="Amount">{{ formatCurrency(total, false) }}</div>
         <div class="text-muted text-center mt-2" id="Calculation" v-if="srvModel.showDiscount || srvModel.enableTips">{{ calculation }}</div>
     </div>
     <div id="ModeTabs" class="tab-content mb-n2" v-if="srvModel.showDiscount || srvModel.enableTips">
         <div id="Mode-Discount" class="tab-pane fade px-2" :class="{ show: mode === 'discount', active: mode === 'discount' }" role="tabpanel" aria-labelledby="ModeTablist-Discount" v-if="srvModel.showDiscount">
-            <div class="h4 fw-semibold text-muted text-center">
+            <div class="h4 fw-semibold text-muted text-center" id="Discount">
                 <span class="h3 text-body me-1">{{discountPercent || 0}}%</span> discount
             </div>
         </div>
@@ -18,6 +18,7 @@
             <div class="btcpay-pills d-flex flex-wrap align-items-center justify-content-center gap-2">
                 <template v-if="srvModel.customTipPercentages">
                     <button
+                        id="Tip-Custom"
                         type="button"
                         class="btcpay-pill"
                         :class="{ active: !tipPercent }"
@@ -30,6 +31,7 @@
                         type="button"
                         class="btcpay-pill"
                         :class="{ active: tipPercent == percentage }"
+                        :id="`Tip-${percentage}`"
                         v-on:click.prevent="tipPercentage(percentage)">
                         {{ percentage }}%
                     </button>

BTCPayServer/Views/Shared/PointOfSale/Public/_Layout.cshtml

@@ -50,10 +50,6 @@
         .card { 
             page-break-inside: avoid;
         }
-        .card:only-of-type {
-            max-width: 320px;
-            margin: auto !important;
-        }
     </style>
     @await RenderSectionAsync("PageHeadContent", false)
 </head>

BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml

@@ -76,20 +76,7 @@
         </div>
     </div>
     <div id="products">
-        <div class="row">
-            <div class="col-xxl-constrain">
-                <partial name="TemplateEditor" model="@(nameof(Model.Template), "Products", Model.Currency ?? Model.StoreDefaultCurrency)" />
-            </div>
-        </div>
-        <div class="row collapse" id="RawEditor">
-            <div class="col-xxl-constrain">
-                <div class="form-group pt-3">
-                    <label asp-for="Template" class="form-label"></label>
-                    <textarea asp-for="Template" rows="10" cols="40" class="form-control"></textarea>
-                    <span asp-validation-for="Template" class="text-danger"></span>
-                </div>
-            </div>
-        </div>
+        <partial name="TemplateEditor" model="@(nameof(Model.Template), Model.Template, "Products", Model.Currency ?? Model.StoreDefaultCurrency)" />
     </div>
     <div class="row mt-5">
         <div class="col-sm-10 col-md-9 col-xl-7 col-xxl-6">
@@ -362,7 +349,6 @@
             el.removeAttribute('hidden');
         }
         function updateFormForDefaultView(type) {
-            console.log(type)
             switch (type) {
                 case 'Static':
                 case 'Print':

BTCPayServer/Views/Shared/PosData.cshtml

@@ -1,4 +1,3 @@
-@using System.Text.RegularExpressions
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @model (Dictionary<string, object> Items, int Level)
 

BTCPayServer/Views/Shared/ShowQR.cshtml

@@ -11,7 +11,7 @@
                 <div class="modal-body text-center">
                     <div class="text-center my-2" :style="{height: `${qrOptions.height}px`}">
                         <component v-if="currentFragment" :is="currentMode.href ? 'a': 'div'" class="qr-container d-inline-block" :href="currentMode.href">
-                            <qrcode :value="currentFragment" :options="qrOptions"></qrcode>
+                            <qrcode  :value="currentFragment" :options="qrOptions"></qrcode>
                         </component>
                     </div>
                     <ul class="nav btcpay-pills justify-content-center mt-4 mb-3" v-if="modes && Object.keys(modes).length > 1">

BTCPayServer/Views/Shared/TemplateEditor.cshtml

@@ -1,230 +1,286 @@
-@model (string templateId, string title, string currency)
+@model (string templateId, string template, string title, string currency)
 
 <div id="template-editor-app" v-cloak>
-    <div class="form-group mb-0">
-        <h3 class="mt-5 mb-4">@Model.title</h3>
-        @if (ViewContext.ViewData.ModelState.TryGetValue(Model.templateId, out var errors))
-        {
-            foreach (var error in errors.Errors)
-            {
-                <br/>
-                <span class="text-danger" v-pre>@error.ErrorMessage</span>
-            }
-        }
-
-        <div class="bg-light card">
-            <div class="card-body " v-bind:class="{ 'card-deck': items.length > 0}">
-                <div v-for="(item, index) of items" class="card my-2 card-wrapper template-item me-0 ms-0" v-bind:key="item.id">
-                    <div v-if="anyImages" class="card-img-top border-bottom" v-bind:style="getImage(item)"></div>
-                    <div class="card-body">
-                        <h6 class="card-title" v-html="item.title"></h6>
-                        <div class="gap-3 d-flex">
-                            <button type="button" class="btn btn-primary" v-on:click="editItem(index)">Edit</button>
-                            <button type="button" class="btn btn-danger" v-on:click="removeItem(index)">
-                                <i class="fa fa-trash"></i>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-                <div v-if="!items || items.length === 0" class="col-12 text-center">
-                    No items.<br/>
-                    <button type="button" class="btn btn-link" v-on:click="editItem(-1)" id="btn-add-first">
-                        Add your first item
+    <div class="modal" id="product-modal" tabindex="-1" role="dialog" ref="productModal">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">{{editingItem && editingItem.id ? "Edit" : "Add"}} Item</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" ref="close">
+                        <vc:icon symbol="close" />
                     </button>
                 </div>
-            </div>
-            <div class="card-footer text-start p-3 gap-3 d-flex">
-                <button type="button" class="btn btn-primary" v-on:click="editItem(-1)" id="btn-add">
-                    <i class="fa fa-plus fa-fw"></i> Add
-                </button>
-                <button type="button" class="btn btn-secondary" id="ToggleRawEditor" data-bs-toggle="collapse" data-bs-target="#RawEditor" aria-expanded="false" aria-controls="RawEditor">
-                    Toggle raw editor
-                </button>
+                <div class="modal-body">
+                    <div class="mb-3">
+                        <div class="text-danger mb-3" v-for="error of errors">{{error}}</div>
+                        <div class="form-group">
+                            <label for="EditorTitle" class="form-label" data-required>Title</label>
+                            <input id="EditorTitle" required pattern="[^\*#]+" class="form-control mb-2" v-model="editingItem && editingItem.title" autofocus ref="txtTitle" />
+                        </div>
+                        <div class="form-group row">
+                            <div class="col-sm-6">
+                                <label for="EditorPrice" class="form-label">Price</label>
+                                <select id="EditorPrice" class="form-select" v-model="editingItem && editingItem.priceType">
+                                    <option v-for="option in customPriceOptions" :value="option.value">{{option.text}}</option>
+                                </select>
+                            </div>
+                            <div class="col-sm-6" v-show="editingItem && editingItem.priceType !== 'Topup'">
+                                <label for="EditorAmount" class="form-label">&nbsp;</label>
+                                <div class="input-group mb-2">
+                                    <input class="form-control"
+                                           id="EditorAmount"
+                                           inputmode="decimal"
+                                           pattern="\d*"
+                                           step="any"
+                                           min="0"
+                                           type="number"
+                                           required
+                                           v-model="editingItem && editingItem.price"
+                                           ref="txtPrice"
+                                           aria-describedby="currency-addon" />
+                                    <span class="input-group-text" id="currency-addon" v-pre>@Model.currency</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="EditorImage" class="form-label">Image Url</label>
+                            <input id="EditorImageUrl" class="form-control mb-2" pattern="[^\*#]+" v-model="editingItem && editingItem.image" ref="txtImage" />
+                            <div class="d-flex align-items-center gap-2">
+                                <input id="EditorImage" type="file" class="form-control" ref="editorImage" v-on:change="uploadFileChanged">
+                                <button class="btn btn-primary" type="button" id="EditorUploadButton" v-on:click="uploadFile" :disabled="uploadDisabled">Upload</button>
+                            </div>
+                            <span v-if="uploadError" v-text="uploadError" class="text-danger"></span>
+                        </div>
+                        <div class="form-group">
+                            <label for="EditorDescription" class="form-label">Description</label>
+                            <textarea id="EditorDescription" rows="3" cols="40" class="form-control mb-2" v-model="editingItem && editingItem.description" ref="txtDescription"></textarea>
+                        </div>
+                        <div class="form-group">
+                            <label for="EditorCategories" class="form-label">Categories</label>
+                            <input id="EditorCategories" class="form-control mb-2" autocomplete="off" ref="editorCategories" />
+                            <div class="form-text">Easily filter the different items using categories, used only in the product list with cart.</div>
+                        </div>
+                        <div class="form-group">
+                            <label for="EditorInventory" class="form-label">Inventory</label>
+                            <input id="EditorInventory" type="number" inputmode="numeric" min="0" step="1" class="form-control mb-2" v-model="editingItem && editingItem.inventory" ref="txtInventory" />
+                            <div class="form-text">Leave blank to not use this feature.</div>
+                        </div>
+                        <div class="form-group">
+                            <label for="EditorId" class="form-label">ID</label>
+                            <input id="EditorId" required pattern="[^\*#]+" class="form-control mb-2" v-model="editingItem && editingItem.id" ref="txtId" />
+                            <div class="form-text">Leave blank to generate ID from title.</div>
+                        </div>
+                        <div class="form-group">
+                            <label for="BuyButtonText" class="form-label">Buy Button Text</label>
+                            <input id="BuyButtonText" type="text" class="form-control mb-2" v-model="editingItem && editingItem.buyButtonText" ref="txtBuyButtonText" />
+                        </div>
+                        <div class="form-group d-flex align-items-center">
+                            <input type="checkbox" id="Disabled" class="btcpay-toggle me-3" v-model="editingItem && editingItem.disabled" />
+                            <label for="Disabled" class="form-label mb-0">Disabled</label>
+                        </div>
+                        <vc:ui-extension-point location="app-template-editor-item-detail" model="Model"></vc:ui-extension-point>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-primary" v-on:click="saveItem()" id="SaveItemChanges">Save</button>
+                </div>
             </div>
         </div>
-        <div class="modal" id="product-modal" tabindex="-1" role="dialog">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" v-if="editingItem">{{editingItem.index>=0? "Edit" : "Add"}} Item</h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" ref="close">
-                            <vc:icon symbol="close"/>
-                        </button>
-                    </div>
-                    <div class="modal-body" v-if="editingItem">
-                        <div class="mb-3">
-                            <span class="text-danger row m-2" v-for="error of errors">{{error}}</span>
-                            <div class="form-group">
-                                <label class="form-label" data-required>Title</label>
-                                <input type="text" required pattern="[^\*#]+" class="form-control mb-2" v-model="editingItem.title" autofocus ref="txtTitle" />
-                            </div>
-                            <div class="form-group row">
-                                <div class="col-sm-6">
-                                    <label class="form-label">Price</label>
-                                    <select class="form-select" v-model="editingItem.priceType">
-                                        <option v-for="option in customPriceOptions" :value="option.value">{{option.text}}</option>
-                                    </select>
+    </div>
+    <div class="row">
+        <div class="col-xxl-constrain">
+            <div class="form-group mb-0">
+                <h3 class="mt-5 mb-4" v-pre>@Model.title</h3>
+                @if (ViewContext.ViewData.ModelState.TryGetValue(Model.templateId, out var errors))
+                {
+                    foreach (var error in errors.Errors)
+                    {
+                        <br />
+                        <span class="text-danger" v-pre>@error.ErrorMessage</span>
+                    }
+                }
+                <div class="bg-light card">
+                    <div class="card-body " v-bind:class="{ 'card-deck': config.length > 0}">
+                        <div v-if="!config || config.length === 0" class="col-12 text-center">
+                            No items.<br />
+                            <button type="button" class="btn btn-link" v-on:click="addItem()" id="btn-add-first">
+                                Add your first item
+                            </button>
+                        </div>
+                        <div v-else v-for="(item, index) of config" class="card my-2 card-wrapper template-item me-0 ms-0" v-bind:key="item.id">
+                            <div class="card-img-top border-bottom" v-bind:style="getImage(item)"></div>
+                            <div class="card-body">
+                                <h6 class="card-title" v-html="item.title"></h6>
+                                <div class="gap-3 d-flex">
+                                    <button type="button" class="btn btn-primary" v-on:click="editItem(index)">Edit</button>
+                                    <button type="button" class="btn btn-danger" v-on:click="removeItem(index)">
+                                        <i class="fa fa-trash"></i>
+                                    </button>
                                 </div>
-                                <div class="col-sm-6" v-show="editingItem.priceType !== 'Topup'">
-                                    <label class="form-label">&nbsp;</label>
-                                    <div class="input-group mb-2">
-                                        <input class="form-control"
-                                               inputmode="decimal"
-                                               pattern="\d*"
-                                               step="any"
-                                               min="0"
-                                               type="number"
-                                               required
-                                               v-model="editingItem.price"
-                                               ref="txtPrice"
-                                               aria-describedby="currency-addon"/>
-                                        <span class="input-group-text" id="currency-addon">@Model.currency</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="form-label">Image Url</label>
-                                <input type="text" class="form-control mb-2" pattern="[^\*#]+" v-model="editingItem.image" ref="txtImage" />
-                            </div>
-                            <div class="form-group">
-                                <label class="form-label">Description</label>
-                                <textarea rows="3" cols="40" class="form-control mb-2" v-model="editingItem.description" ref="txtDescription"></textarea>
-                            </div>
-                            <div class="form-group">
-                                <label class="form-label">Inventory</label>
-                                <input type="number" inputmode="numeric" min="0" step="1" class="form-control mb-2" v-model="editingItem.inventory" ref="txtInventory" />
-                                <div class="form-text">Leave blank to not use this feature.</div>
-                            </div>
-                            <div class="form-group">
-                                <label class="form-label">ID</label>
-                                <input type="text" required pattern="[^\*#]+" class="form-control mb-2" v-model="editingItem.id" ref="txtId" />
-                                <div class="form-text">Leave blank to generate ID from title.</div>
-                            </div>
-                            <div class="form-group">
-                                <label class="form-label">Buy Button Text</label>
-                                <input type="text" id="BuyButtonText" class="form-control mb-2" v-model="editingItem.buyButtonText" ref="txtBuyButtonText" />
-                            </div>
-                            <div class="form-group d-flex align-items-center">
-                                <input type="checkbox" id="Disabled" class="btcpay-toggle me-3" v-model="editingItem.disabled" />
-                                <label class="form-label mb-0">Disabled</label>
                             </div>
                         </div>
                     </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" v-on:click="clearEditingItem()">Close</button>
-                        <button type="button" class="btn btn-primary" v-on:click="saveEditingItem()" id="SaveItemChanges">Save</button>
+                    <div class="card-footer text-start p-3 gap-3 d-flex">
+                        <button type="button" class="btn btn-primary" v-on:click="addItem()" id="btn-add">
+                            <i class="fa fa-plus fa-fw"></i> Add
+                        </button>
+                        <button type="button" class="btn btn-secondary" id="ToggleRawEditor" data-bs-toggle="collapse" data-bs-target="#RawEditor" aria-expanded="false" aria-controls="RawEditor">
+                            Toggle raw editor
+                        </button>
                     </div>
                 </div>
             </div>
         </div>
     </div>
+    <div class="row collapse" id="RawEditor">
+        <div class="col-xxl-constrain">
+            <div class="form-group pt-3">
+                <label for="@Model.templateId" class="form-label">Template</label>
+                <textarea id="@Model.templateId" name="@Model.templateId" rows="10" cols="40" class="form-control" v-model="configJSON" v-on:change="updateFromJSON"></textarea>
+            </div>
+        </div>
+    </div>
 </div>
 
+<link href="~/vendor/tom-select/tom-select.bootstrap5.min.css" asp-append-version="true" rel="stylesheet">
+<script src="~/vendor/tom-select/tom-select.complete.min.js" asp-append-version="true"></script>
 <script>
-document.addEventListener("DOMContentLoaded", function () {
+document.addEventListener("DOMContentLoaded", () => {
+    const fileUploadUrl = @Safe.Json(Url.Action("FileUpload", "UIApps", new { appId = Context.GetRouteValue("appId") }));
+    const parseConfig = str => {
+        try {
+            return JSON.parse(str)
+        } catch (err) {
+            console.error('Error deserializing template config:', err)
+        }
+    }
+    const template = @Safe.Json(Model.template)
+    let config = parseConfig(template) || []
+    
     new Vue({
         el: '#template-editor-app',
-        data: {
-            errors: [],
-            items: [],
-            editingItem: null,
-            customPriceOptions: [
-                { text: 'Fixed', value: "Fixed" },
-                { text: 'Minimum', value: "Minimum" },
-                { text: 'Custom', value: 'Topup' },
-            ],
-            elementId: "@Model.templateId"
-        },
-        computed: {
-            anyImages: function(){
-                return !!this.items.find(function(i){ return !!i.image;});
+        data () {
+            return {
+                config,
+                errors: [],
+                editingIndex: null,
+                editingItem: null,
+                customPriceOptions: [
+                    { text: 'Fixed', value: "Fixed" },
+                    { text: 'Minimum', value: "Minimum" },
+                    { text: 'Custom', value: 'Topup' },
+                ],
+                categoriesSelect: null,
+                productModal: null,
+                uploadDisabled: true,
+                uploadError: null
             }
         },
-        mounted: function() {
-            this.load();
-            this.getInputElement().on("input change", this.load.bind(this));            
-            this.getModalElement().on("hide.bs.modal", this.clearEditingItem.bind(this));
+        mounted() {
+            // modal
+            const $modalEl = this.$refs.productModal;
+            $modalEl.addEventListener('hide.bs.modal', () => { this.setEditingItem(null, null); });
+            this.productModal = new bootstrap.Modal($modalEl, {})
+            
+            // categories
+            this.categoriesSelect = new TomSelect(this.$refs.editorCategories, {
+                persist: false,
+                createOnBlur: true,
+                create: true,
+                options: this.allCategories.map(value => ({ value, text: value })),
+            });          
+            this.categoriesSelect.on('change', () => {
+                const value = this.categoriesSelect.getValue();
+                this.editingItem.categories = Array.from(value.split(',').reduce((res,  item) => {
+                    const category = item.trim();
+                    if (category) res.add(category);
+                    return res;
+                }, new Set()));
+            });
+        },
+        beforeDestroy () {
+            this.categoriesSelect.destroy();
+        },
+        computed: {
+            allCategories() {
+                return Array.from(this.config.reduce((res,  item) => {
+                    (item.categories || []).forEach(category => { res.add(category); });
+                    return res;
+                }, new Set()));
+            },
+            configJSON() {
+                return JSON.stringify(this.config, null, 2)
+            }
         },
         methods: {
-            getImage: function(item){
-                var image = this.unEscapeKey(item.image) || "~/img/img-placeholder.svg";
-                var url = image.startsWith("~") ? image.replace('~', window.location.pathname.substring(0, image.indexOf('/apps'))) : image;
+            updateFromJSON(event) {
+                const config = parseConfig(event.target.value)
+                if (!config) return
+                this.config = config
+            },
+            getImage(item) {
+                const image = item.image || "~/img/img-placeholder.svg";
+                const url = image.startsWith("~") ? image.replace('~', window.location.pathname.substring(0, image.indexOf('/apps'))) : image;
                 return {
                     "background-image" : "url('" + url +"')",
                     "opacity": item.image? 1: 0.5
                 }
             },
-            getInputElement : function(){ return $("#" + this.elementId); },
-            getModalElement : function(){ return $("#product-modal"); },
-            load: function(){
-                const template = this.getInputElement().val().trim();
-                if (!template){
-                    this.items = [];
-                } else {
-                    this.items =  JSON.parse(template);
-                }
+            removeItem(index) {
+                this.config.splice(index, 1);
             },
-            save: function(){
-                let template = JSON.stringify(this.items);
-                this.getInputElement().val(template);
+            addItem() {
+                this.setEditingItem(null, { id: '', title: '', price: 0, image: '', description: '', categories: [], priceType: 'Fixed', inventory: null, disabled: false });
             },
-            editItem: function(index){
-                this.errors = [];
-                if(index < 0){
-                    this.editingItem = {index:-1, id:"", title: "", price: 0, image: "", description: "", priceType: "Fixed", inventory: null, disabled: false};
-                }else{
-                    this.editingItem = {...this.items[index], index};
-                }
-                
-                this.editingItem = this.unEscape(this.editingItem);
-                this.getModalElement().modal("show");
+            editItem(index) {
+                this.setEditingItem(index, Object.assign({}, this.config[index]));
             },
-            removeItem: function(index){
-                this.items.splice(index,1);
-                this.save();
+            saveItem() {
+                // set id from title if not set
+                if (!this.editingItem.id) this.editingItem.id = this.editingItem.title.toLowerCase().trim();
+                // validate
+                if (!this.validate()) return;
+                // add or update
+                const idx = this.editingIndex === null ? this.config.length : this.editingIndex;
+                this.$set(this.config, idx, this.editingItem);
+                // update categories
+                this.categoriesSelect.clearOptions();
+                this.categoriesSelect.addOptions(this.allCategories.map(value => ({ value, text: value })));
+                // hide modal
+                this.productModal.hide();
             },
-            clearEditingItem: function(){
-                this.editingItem = null;
-                this.errors = [];
-            },
-            validate: function(){
+            validate () {
                 this.errors = [];
                 if (this.editingItem.id) {
-                    var matchedId = this.items.findIndex((x)=> { return this.unEscapeKey(x.id) === this.editingItem.id;});
-                    if( matchedId>= 0 && matchedId != this.editingItem.index)
+                    const matchedId = this.config.findIndex(x => x.id === this.editingItem.id);
+                    if (matchedId >= 0 && matchedId !== this.editingIndex)
                         this.errors.push("You cannot have multiple items with the same id");
-                    
-                    if (!this.$refs.txtId.checkValidity()) {
-                        this.errors.push("Id is required and cannot have * or #");
-                    }
-                    if(this.editingItem.id.startsWith("- ")){
+                    if (this.editingItem.id.startsWith("- "))
                         this.errors.push("Id cannot start with \"- \"");
-                    }else if(this.editingItem.id.trim() == ""){
+                    else if (this.editingItem.id.trim() === "")
                         this.errors.push("Id is required");
-                    }                   
                 }   
-                
                 if (this.editingItem.description.indexOf("*") >= 0 || this.editingItem.description.indexOf("#") >= 0) {
                     this.errors.push("Description cannot have * or #");
                 }
-                if(this.editingItem.description.startsWith("- ")){
+                if (this.editingItem.description.startsWith("- ")){
                     this.errors.push("Description cannot start with \"- \"");
                 }
-                if (!this.$refs.txtImage.checkValidity()) {
+                if (!this.$refs.editorImage.checkValidity()) {
                     this.errors.push("Image cannot have * or #");
                 }
-                if(this.editingItem.image.startsWith("- ")){
+                if (this.editingItem.image.startsWith("- ")){
                     this.errors.push("Image cannot start with \"- \"");
                 }
-                
                 if (this.editingItem["priceType"] !== "Topup" && !this.$refs.txtPrice.checkValidity()) {
                     this.errors.push("Price must be a valid number");
                 }
                 if (!this.$refs.txtTitle.checkValidity()) {
                     this.errors.push("Title is required and cannot have * or #");
-                }else if(this.editingItem.title.startsWith("- ")){
+                } else if (this.editingItem.title.startsWith("- ")){
                     this.errors.push("Title cannot start with \"- \"");
-                }else if(this.editingItem.title.trim() == ""){
+                } else if (!this.editingItem.title.trim()){
                     this.errors.push("Title is required");
                 }                
                 if (!this.$refs.txtInventory.checkValidity()) {
@@ -232,57 +288,48 @@ document.addEventListener("DOMContentLoaded", function () {
                 }
                 return this.errors.length === 0;
             },
-            saveEditingItem: function(){
-                const fallbackId = this.editingItem.title.toLowerCase().trim();
-                if(!this.editingItem.id && fallbackId){
-                    this.editingItem.id = fallbackId;
-                    this.$nextTick(this.saveEditingItem.bind(this));
-                    return;
+            setEditingItem(index, item) {
+                this.errors = [];
+                this.editingIndex = index;
+                this.editingItem = item;
+                if (this.editingItem != null) {
+                    this.categoriesSelect.setValue(this.editingItem.categories);
+                    this.productModal.show();
                 }
-                if(!this.validate()){
-                    return;
-                }
-                this.editingItem = this.escape(this.editingItem);
+            },
+            uploadFileChanged () {
+                this.uploadDisabled = !this.$refs.editorImage || this.$refs.editorImage.files.length === 0;
+            },
+            async uploadFile() {
+                const file = this.$refs.editorImage.files[0];
+                if (!file) return this.uploadError = 'No file selected';
                 
-                if(this.editingItem.index < 0){
-                    this.items.push(this.editingItem);
-                }else{
-                    this.items.splice(this.editingItem.index,1,this.editingItem);
-                }
-                this.save();
-                this.getModalElement().modal("hide");
-            },
-            escape: function(item) {
-                for(var k in item){
-                    if(k !== "paymentMethods" && k!=="id"){
-                        item[k] = $('<div/>').text(item[k]).html();
+                this.uploadError = null;
+                const formData = new FormData(); 
+                formData.append('file', file);
+                try {
+                    const response = await fetch(fileUploadUrl, { method: 'POST', body: formData });
+                    if (response.ok) {
+                        const { error, fileUrl } = await response.json();
+                        if (error) return this.uploadError = error;
+                        
+                        this.editingItem.image = fileUrl;
+                        this.$refs.editorImage.value = null;
+                        this.uploadDisabled = true;
+                        return;
                     }
+                } catch (e) { 
+                    console.error(e);
                 }
-                return item;
-            },
-            unEscape: function(item){
-                for(var k in item){
-                    if(k !== "paymentMethods" && k!=="id" && k !== "disabled"){
-                        item[k] = this.unEscapeKey(item[k]);
-                    }
-                }
-                return item;
-            },
-            unEscapeKey : function(k){
-                // Without this check a `false` boolean value will always be returned as an empty string
-                if (k === false) {
-                    return "false";
-                }
-
-                return $('<div/>').html(k).text();
+                this.uploadError = 'Upload failed';
             }
         }
     });
 });
 
-Number.prototype.noExponents= function(){
+Number.prototype.noExponents = function(){
     var data= String(this).split(/[eE]/);
-    if(data.length== 1) return data[0];
+    if (data.length== 1) return data[0];
 
     var  z= '', sign= this<0? '-':'',
         str= data[0].replace('.', ''),
@@ -297,5 +344,4 @@ Number.prototype.noExponents= function(){
     while(mag--) z += '0';
     return str + z;
 };
-
 </script>

BTCPayServer/Views/Shared/_Layout.cshtml

@@ -17,7 +17,7 @@
         notificationDisabled = user?.DisabledNotifications == "all";
     }
 	var expectedScheme = _context.HttpContext.Request.Scheme;
-	var expectedHost = _context.HttpContext.Request.Host.ToString();
+	var expectedHost = _context.HttpContext.Request.Host.ToString().ToLower();
 }
 
 <!DOCTYPE html>
@@ -79,7 +79,7 @@
     {
         <script>
 			var mainContent = document.getElementById("mainContent");
-			if (window.location.protocol != "@(expectedScheme):" || window.location.host != "@expectedHost")
+			if (window.location.protocol != "@(expectedScheme):" || window.location.host.toLowerCase() != "@expectedHost")
 			{
 				var tmpl = document.getElementById("badUrl");
 				mainContent.prepend(tmpl.content.cloneNode(true));

BTCPayServer/Views/UIForms/Modify.cshtml

@@ -62,7 +62,7 @@
                         </button>
                         <div class="field flex-grow-1">
                             <label :for="`field-option-value-${index}`" class="form-label">Value</label>
-                            <input :for="`field-option-value-${index}`" class="form-control" v-model="option.value" />
+                            <input :for="`field-option-value-${index}`" class="form-control" v-model.lazy="option.value" />
                         </div>
                         <div class="field flex-grow-1">
                             <label :for="`field-option-text-${index}`" class="form-label">Text</label>
@@ -122,25 +122,25 @@
     </template>
     <template id="field-type-input">
         <div class="form-group mb-0">
-            <label class="form-label" :for="name" :data-required="required" v-text="label"></label>
+            <label class="form-label" :for="name" :data-required="required" v-sanitize="label"></label>
             <input class="form-control" :id="name" :name="name" :type="type" v-model="value" />
-            <div v-if="helpText" :id="`HelpText-{name}`" class="form-text" v-text="helpText"></div>
+            <div v-if="helpText" :id="`HelpText-{name}`" class="form-text" v-sanitize="helpText"></div>
         </div>
     </template>
     <template id="field-type-textarea">
         <div class="form-group mb-0">
-            <label class="form-label" :for="name" :data-required="required" v-text="label"></label>
+            <label class="form-label" :for="name" :data-required="required" v-sanitize="label"></label>
             <textarea class="form-control" :id="name" :name="name" v-model="value"></textarea>
-            <div v-if="helpText" :id="`HelpText-${name}`" class="form-text" v-text="helpText"></div>
+            <div v-if="helpText" :id="`HelpText-${name}`" class="form-text" v-sanitize="helpText"></div>
         </div>
     </template>
     <template id="field-type-select">
         <div class="form-group mb-0">
-            <label class="form-label" :for="name" :data-required="required" v-text="label"></label>
+            <label class="form-label" :for="name" :data-required="required" v-sanitize="label"></label>
             <select class="form-select" :id="name" :name="name">
                 <option v-for="option in options" :key="option.value" :value="option.value" :selected="option.value === value" v-text="option.text"></option>
             </select>
-            <div v-if="helpText" :id="`HelpText-${name}`" class="form-text" v-text="helpText"></div>
+            <div v-if="helpText" :id="`HelpText-${name}`" class="form-text" v-sanitize="helpText"></div>
         </div>
     </template>
     <template id="field-type-fieldset">
@@ -150,6 +150,7 @@
         </fieldset>
     </template>
     <script src="~/vendor/vuejs/vue.min.js" asp-append-version="true"></script>
+    <script src="~/vendor/vue-sanitize-directive/vue-sanitize-directive.umd.min.js" asp-append-version="true"></script>
     <script src="~/vendor/vue-sortable/sortable.min.js" asp-append-version="true"></script>
     <script src="~/vendor/vue-sortable/vue-sortable.js" asp-append-version="true"></script>
     <script src="~/js/form-editor.js" asp-append-version="true"></script>

BTCPayServer/Views/UIInvoice/CheckoutV2.cshtml

@@ -105,7 +105,9 @@
                             <div id="confetti" v-if="srvModel.celebratePayment" v-on:click="celebratePayment(5000)"></div>
                             <vc:icon symbol="payment-sent" />
                         </span>
-                        <h4 v-t="'payment_received'"></h4>
+                        <h4 v-t="'payment_received'" class="mb-4"></h4>
+                        <p class="text-center" v-t="'payment_received_body'"></p>
+                        <p class="text-center" v-if="srvModel.receivedConfirmations !== null && srvModel.requiredConfirmations" v-t="{ path: 'payment_received_confirmations', args: { cryptoCode: realCryptoCode, receivedConfirmations: srvModel.receivedConfirmations, requiredConfirmations: srvModel.requiredConfirmations } }"></p>
                         <div id="PaymentDetails" class="payment-details">
                             <dl class="mb-0">
                                 <div>
@@ -130,8 +132,10 @@
                             <span class="fw-semibold" v-t="'view_details'"></span>
                             <vc:icon symbol="caret-down" />
                         </button>
-                        <p class="text-center mt-3" v-t="'payment_received_body'"></p>
-                        <p class="text-center" v-if="srvModel.receivedConfirmations !== null && srvModel.requiredConfirmations" v-t="{ path: 'payment_received_confirmations', args: { cryptoCode: realCryptoCode, receivedConfirmations: srvModel.receivedConfirmations, requiredConfirmations: srvModel.requiredConfirmations } }"></p>
+                    </div>
+                    <div class="buttons mt-3" v-if="storeLink || isModal">
+                        <a v-if="storeLink" class="btn btn-secondary rounded-pill w-100" :href="storeLink" :target="isModal ? '_top' : null" v-html="$t('return_to_store', { storeName: srvModel.storeName })" id="StoreLink"></a>
+                        <button v-else-if="isModal" class="btn btn-secondary rounded-pill w-100" v-on:click="close" v-t="'Close'"></button>
                     </div>
                 </div>
                 <div v-if="isSettled" id="settled" key="settled">
@@ -162,7 +166,7 @@
                                 class="mb-5" />
                         </div>
                     </div>
-                    <div class="buttons">
+                    <div class="buttons" v-if="srvModel.receiptLink || storeLink || isModal">
                         <a v-if="srvModel.receiptLink" class="btn btn-primary rounded-pill w-100" :href="srvModel.receiptLink" :target="isModal ? '_top' : null" v-t="'view_receipt'" id="ReceiptLink"></a>
                         <a v-if="storeLink" class="btn btn-secondary rounded-pill w-100" :href="storeLink" :target="isModal ? '_top' : null" v-html="$t('return_to_store', { storeName: srvModel.storeName })" id="StoreLink"></a>
                         <button v-else-if="isModal" class="btn btn-secondary rounded-pill w-100" v-on:click="close" v-t="'Close'"></button>
@@ -200,7 +204,7 @@
                         </button>
                         <p class="text-center mt-3" v-html="replaceNewlines($t(isPaidPartial ? 'invoice_paidpartial_body' : 'invoice_expired_body', { storeName: srvModel.storeName, minutes: srvModel.maxTimeMinutes }))"></p>
                     </div>
-                    <div class="buttons">
+                    <div class="buttons" v-if="(isPaidPartial && srvModel.storeSupportUrl) || storeLink || isModal">
                         <a v-if="isPaidPartial && srvModel.storeSupportUrl" class="btn btn-primary rounded-pill w-100" :href="srvModel.storeSupportUrl" v-t="'contact_us'" id="ContactLink"></a>
                         <a v-if="storeLink" class="btn btn-primary rounded-pill w-100" :href="storeLink" :target="isModal ? '_top' : null" v-html="$t('return_to_store', { storeName: srvModel.storeName })" id="StoreLink"></a>
                         <button v-else-if="isModal" class="btn btn-primary rounded-pill w-100" v-on:click="close" v-t="'Close'"></button>

BTCPayServer/Views/UIInvoice/InvoiceReceipt.cshtml

@@ -71,9 +71,7 @@
                             <dl class="d-flex flex-column gap-4 mb-0 flex-fill">
                                 <div class="d-flex flex-column">
                                     <div class="d-flex align-items-center justify-content-between">
-                                        <button type="button" class="btn btn-link p-0 d-print-none fw-semibold order-1" onclick="window.print()">
-                                            Print
-                                        </button>
+                                        <a href="?print=true" class="btn btn-link p-0 d-print-none fw-semibold order-1" target="_blank">Print</a>
                                         <dd class="text-muted mb-0 fw-semibold">Amount Paid</dd>
                                     </div>
                                     <dt class="fs-2 mb-0 text-nowrap fw-semibold">@DisplayFormatter.Currency(Model.Amount, Model.Currency, DisplayFormatter.CurrencyFormat.Symbol)</dt>

BTCPayServer/Views/UIInvoice/InvoiceReceiptPrint.cshtml

@@ -0,0 +1,72 @@
+@model BTCPayServer.Models.InvoicingModels.InvoiceReceiptViewModel
+@using BTCPayServer.Client.Models
+@using BTCPayServer.Components.QRCode
+@using BTCPayServer.Services
+@using Microsoft.AspNetCore.Mvc.TagHelpers
+@using BTCPayServer.Abstractions.TagHelpers
+@inject DisplayFormatter DisplayFormatter
+@{
+    Layout = null;
+    ViewData["Title"] = $"Receipt from {Model.StoreName}";
+    var isProcessing = Model.Status == InvoiceStatus.Processing;
+    var isSettled = Model.Status == InvoiceStatus.Settled;
+}
+
+<link href="~/main/bootstrap/bootstrap.css" asp-append-version="true"  rel="stylesheet" />
+<link href="~/main/site.css" asp-append-version="true"  rel="stylesheet" />
+
+
+<p class="text-center">@Model.StoreName</p>
+<p class="text-center">@Model.Timestamp.ToBrowserDate()</p>
+<p>&nbsp;</p>
+
+@if (isProcessing)
+{
+    <div class="lead text-center p-4 fw-semibold" id="invoice-processing">
+        The invoice has detected a payment but is still waiting to be settled.
+    </div>
+}
+else if (!isSettled)
+{
+    <div class="lead text-center p-4 fw-semibold" id="invoice-unsettled">
+        The invoice is not settled.
+    </div>
+}
+else
+{
+    <h3 class="text-center">
+        <strong>@DisplayFormatter.Currency(Model.Amount, Model.Currency, DisplayFormatter.CurrencyFormat.Symbol)</strong>
+    </h3>
+    
+    @if (Model.Payments?.Any() is true)
+    {
+        <p>&nbsp;</p>
+        <p class="text-center"><strong>Payments</strong></p>
+        @foreach (var payment in Model.Payments)
+        {
+            <p>&nbsp;</p>
+            <p class="text-center">@payment.Amount <span class="text-nowrap">@payment.PaymentMethod</span></p>
+            <p class="text-center">Rate: @payment.RateFormatted</p>
+            <p class="text-center">= @payment.PaidFormatted</p>
+        }
+    }
+    if (Model.AdditionalData?.Any() is true)
+    {
+        <p>&nbsp;</p>
+        <p class="text-center"><strong>Additional Data</strong></p>
+        <partial name="PosData" model="(Model.AdditionalData, 1)"/>
+    }
+    
+    @if (!string.IsNullOrEmpty(Model.OrderId))
+    {
+        <p>&nbsp;</p>
+        <p class="text-break">Order ID: @Model.OrderId</p>
+    }
+}
+
+@if (Model.ReceiptOptions.ShowQR is true)
+{
+    <vc:qr-code data="@Context.Request.GetCurrentUrl()"></vc:qr-code>
+}
+
+<script>window.print();</script>

BTCPayServer/Views/UIInvoice/ListInvoices.cshtml

@@ -2,10 +2,10 @@
 @using BTCPayServer.Client.Models
 @using BTCPayServer.Services
 @inject DisplayFormatter DisplayFormatter
+@inject PaymentMethodHandlerDictionary PaymentMethodHandlerDictionary
 @model InvoicesModel
 @{
     ViewData.SetActivePage(InvoiceNavPages.Index, "Invoices");
-
     var statusFilterCount = CountArrayFilter("status") + CountArrayFilter("exceptionstatus") + (HasBooleanFilter("includearchived") ? 1 : 0) + (HasBooleanFilter("unusual") ? 1 : 0);
     var hasDateFilter = HasArrayFilter("startdate") || HasArrayFilter("enddate");
     var appFilterCount = Model.Apps.Count(app => HasArrayFilter("orderid", app.AppOrderId));
@@ -234,7 +234,7 @@
     </div>
 </div>
 
-<form class="d-flex flex-wrap flex-sm-nowrap align-items-center gap-3 mb-4 @(Model.Invoices.Any() ? "col-xl-7 col-xxl-8" : null)" asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" method="get">
+<form class="d-flex flex-wrap flex-sm-nowrap align-items-center gap-3 mb-4 @(Model.Invoices.Any() ? "col-xxl-8" : null)" asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" method="get">
     <input asp-for="Count" type="hidden" />
     <input asp-for="TimezoneOffset" type="hidden" />
     <input asp-for="SearchTerm" type="hidden" value="@Model.Search.WithoutSearchText()"/>
@@ -322,13 +322,13 @@
 @if (Model.Invoices.Any())
 {
     <form method="post" id="MassAction" asp-action="MassAction" class="">
-        <div class="d-inline-flex align-items-center pb-2 float-xl-end mb-2 gap-3">
+        <div class="d-inline-flex align-items-center pb-2 float-xxl-end mb-2 gap-3">
             <input type="hidden" name="storeId" value="@Model.StoreId" />
-            <div class="dropdown order-xl-1">
+            <div class="dropdown order-xxl-1">
                 <button class="btn btn-secondary dropdown-toggle dropdown-toggle-custom-caret" type="button" id="ActionsDropdownToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     Actions
                 </button>
-                <div class="dropdown-menu dropdown-menu-xl-end" aria-labelledby="ActionsDropdownToggle">
+                <div class="dropdown-menu dropdown-menu-xxl-end" aria-labelledby="ActionsDropdownToggle">
                     <button type="submit" class="dropdown-item" name="command" value="archive" id="ActionsDropdownArchive">Archive</button>
                     @if (HasBooleanFilter("includearchived"))
                     {
@@ -338,7 +338,7 @@
                 </div>
             </div>
             <div class="dropdown d-inline-flex align-items-center gap-3">
-                <button class="btn btn-secondary dropdown-toggle dropdown-toggle-custom-caret order-xl-1" type="button" id="ExportDropdownToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button class="btn btn-secondary dropdown-toggle dropdown-toggle-custom-caret order-xxl-1" type="button" id="ExportDropdownToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     Export
                 </button>
                 <div class="dropdown-menu" aria-labelledby="ExportDropdownToggle">
@@ -392,50 +392,66 @@
                             </td>
                             <td class="text-break">@invoice.InvoiceId</td>
                             <td>
-                                @if (invoice.Details.Archived)
-                                {
-                                    <span class="badge bg-warning">archived</span>
-                                }
-                                @if (invoice.CanMarkStatus)
-                                {
-                                    <div id="pavpill_@invoice.InvoiceId" class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
-                                        <span class="dropdown-toggle changeInvoiceStateToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            @invoice.Status.ToString()
-                                        </span>
-                                        <div class="dropdown-menu">
-                                            @if (invoice.CanMarkInvalid)
-                                            {
-                                                <button type="button" class="dropdown-item lh-base changeInvoiceState" data-invoice-id="@invoice.InvoiceId" data-new-state="invalid">
-                                                    Mark as invalid
-                                                </button>
-                                            }
-                                            @if (invoice.CanMarkSettled)
-                                            {
-                                                <button type="button" class="dropdown-item lh-base changeInvoiceState" data-invoice-id="@invoice.InvoiceId" data-new-state="settled">
-                                                    Mark as settled
-                                                </button>
-                                            }
+                                <div class="d-flex align-items-center gap-2">
+                                    @if (invoice.Details.Archived)
+                                    {
+                                        <span class="badge bg-warning">archived</span>
+                                    }
+                                    @if (invoice.CanMarkStatus)
+                                    {
+                                        <div id="pavpill_@invoice.InvoiceId" class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
+                                            <span class="dropdown-toggle changeInvoiceStateToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                @invoice.Status.ToString()
+                                            </span>
+                                            <div class="dropdown-menu">
+                                                @if (invoice.CanMarkInvalid)
+                                                {
+                                                    <button type="button" class="dropdown-item lh-base changeInvoiceState" data-invoice-id="@invoice.InvoiceId" data-new-state="invalid">
+                                                        Mark as invalid
+                                                    </button>
+                                                }
+                                                @if (invoice.CanMarkSettled)
+                                                {
+                                                    <button type="button" class="dropdown-item lh-base changeInvoiceState" data-invoice-id="@invoice.InvoiceId" data-new-state="settled">
+                                                        Mark as settled
+                                                    </button>
+                                                }
+                                            </div>
                                         </div>
-                                    </div>
-                                }
-                                else
-                                {
-                                    <span class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
-                                        @invoice.Status.Status.ToModernStatus().ToString()
-                                        @if (invoice.Status.ExceptionStatus != InvoiceExceptionStatus.None)
+                                    }
+                                    else
+                                    {
+                                        <span class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
+                                            @invoice.Status.Status.ToModernStatus().ToString()
+                                            @if (invoice.Status.ExceptionStatus != InvoiceExceptionStatus.None)
+                                            {
+                                                @($"({invoice.Status.ExceptionStatus.ToString()})")
+                                            }
+                                        </span>
+                                    }
+                                    @foreach (var paymentMethodId in invoice.Details.Payments.Select(payment => payment.GetPaymentMethodId()).Distinct())
+                                    {
+                                        var image = PaymentMethodHandlerDictionary[paymentMethodId]?.GetCryptoImage(paymentMethodId);
+                                        var badge = paymentMethodId.PaymentType.GetBadge();
+                                        if (!string.IsNullOrEmpty(image) || !string.IsNullOrEmpty(badge))
                                         {
-                                            @($"({invoice.Status.ExceptionStatus.ToString()})")
+                                            <span class="d-inline-flex align-items-center gap-1">
+                                                @if (!string.IsNullOrEmpty(image))
+                                                {
+                                                    <img src="@Context.Request.GetRelativePathOrAbsolute(image)" alt="@paymentMethodId.PaymentType.ToString()" style="height:1.5em" />
+                                                }
+                                                @if (!string.IsNullOrEmpty(badge))
+                                                {
+                                                    @badge
+                                                }
+                                            </span>
                                         }
-                                    </span>
-                                }
-                                @foreach (var paymentType in invoice.Details.Payments.Select(payment => payment.GetPaymentMethodId()?.PaymentType).Distinct().Where(type => type != null && !string.IsNullOrEmpty(type.GetBadge())))
-                                {
-                                    <span class="badge">@paymentType.GetBadge()</span>
-                                }
-                                @if (invoice.HasRefund)
-                                {
-                                    <span class="badge bg-warning">Refund</span>
-                                }
+                                    }
+                                    @if (invoice.HasRefund)
+                                    {
+                                        <span class="badge bg-warning">Refund</span>
+                                    }
+                                </div>
                             </td>
                             <td class="text-end text-nowrap">
                                 <span data-sensitive>@DisplayFormatter.Currency(invoice.Amount, invoice.Currency)</span>

BTCPayServer/Views/UIManage/AddApiKey.cshtml

@@ -57,7 +57,7 @@
                                 <input type="hidden" asp-for="PermissionValues[i].StoreMode" value="@Model.PermissionValues[i].StoreMode" />
                                 @if (Model.PermissionValues[i].StoreMode == UIManageController.AddApiKeyViewModel.ApiKeyStoreMode.AllStores)
                                 {
-                                    <div class="form-check">
+                                    <div class="form-check mb-0">
                                         <input id="@Model.PermissionValues[i].Permission" type="checkbox" asp-for="PermissionValues[i].Value" class="form-check-input ms-n4"/>
                                         <label for="@Model.PermissionValues[i].Permission" class="h5 form-check-label me-2 mb-1">
                                             <span class="me-lg-1">@Model.PermissionValues[i].Title</span>
@@ -108,7 +108,7 @@
                                     }
                                     @if (Model.PermissionValues[i].SpecificStores.Count < Model.Stores.Length)
                                     {
-                                        <div class="mt-3 mb-2">
+                                        <div class="mt-3">
                                             <button type="submit" name="command" value="@($"{Model.PermissionValues[i].Permission}:add-store")" class="btn btn-secondary">Add another store</button>
                                         </div>
                                     }
@@ -116,7 +116,7 @@
                             }
                             else
                             {
-                                <div class="form-check">
+                                <div class="form-check mb-0">
                                     <input id="@Model.PermissionValues[i].Permission" type="checkbox" asp-for="PermissionValues[i].Value" class="form-check-input ms-n4" />
                                     <label for="@Model.PermissionValues[i].Permission" class="h5 form-check-label me-2 mb-1">
                                         <span class="me-lg-1">@Model.PermissionValues[i].Title</span>

BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml

@@ -6,6 +6,20 @@
 @{
     Layout = "_Layout";
     ViewData["Title"] = "Payment Requests";
+    var storeId = Context.GetStoreData().Id;
+    var statusFilterCount = CountArrayFilter("status") + (HasBooleanFilter("includearchived") ? 1 : 0);
+}
+
+@functions
+{
+    private int CountArrayFilter(string type) =>
+        Model.Search.ContainsFilter(type) ? Model.Search.GetFilterArray(type).Length : 0;
+    
+    private bool HasArrayFilter(string type, string key = null) =>
+        Model.Search.ContainsFilter(type) && (key is null || Model.Search.GetFilterArray(type).Contains(key));
+
+    private bool HasBooleanFilter(string key) =>
+        Model.Search.ContainsFilter(key) && Model.Search.GetFilterBool(key) is true;
 }
 
 <div class="sticky-header-setup"></div>
@@ -16,9 +30,8 @@
             <vc:icon symbol="info" />
         </a>
     </h2>
-    <a asp-action="EditPaymentRequest" asp-route-storeId="@Context.GetStoreData().Id" class="btn btn-primary mt-3 mt-sm-0" role="button" id="CreatePaymentRequest">
-        <span class="fa fa-plus"></span>
-        Create Payment Request
+    <a asp-action="EditPaymentRequest" asp-route-storeId="@storeId" class="btn btn-primary mt-3 mt-sm-0" role="button" id="CreatePaymentRequest">
+        Create Request
     </a>
 </div>
 
@@ -37,86 +50,91 @@
 
 <partial name="_StatusMessage" />
 
-<div class="row mb-2">
-    <div class="col col-lg-8 col-xl-6 mr-auto">
-        <form asp-action="GetPaymentRequests" method="get">
-            <input type="hidden" asp-for="Count" />
-            <input type="hidden" asp-for="TimezoneOffset" />
-            <div class="input-group">
-                <input asp-for="SearchTerm" class="form-control" />
-                <button type="submit" class="btn btn-secondary text-nowrap" title="Search invoice">
-                    <span class="fa fa-search"></span> Search
-                </button>
-                <button type="button" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="SearchDropdownToggle">
-                    <span class="visually-hidden">Toggle Dropdown</span>
-                </button>
-                <div class="dropdown-menu dropdown-menu-end" aria-labelledby="SearchDropdownToggle">
-                    <a class="dropdown-item" asp-action="GetPaymentRequests" asp-route-storeId="@Context.GetStoreData().Id" asp-route-count="@Model.Count" asp-route-searchTerm="includearchived:true" id="SearchIncludeArchived">Include Archived</a>
-                    <div role="separator" class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="?searchTerm=" id="SearchUnfiltered">Unfiltered</a>
-                </div>
-            </div>
-            <span asp-validation-for="SearchTerm" class="text-danger"></span>
-        </form>
+<form asp-action="GetPaymentRequests" method="get" class="d-flex flex-wrap flex-sm-nowrap align-items-center gap-3 mb-4 col-lg-9 col-xl-8 col-xxl-6">
+    <input type="hidden" asp-for="Count" />
+    <input type="hidden" asp-for="TimezoneOffset" />
+    <input asp-for="SearchTerm" type="hidden" value="@Model.Search.WithoutSearchText()"/>
+    <input asp-for="SearchText" class="form-control" placeholder="Search…" />
+    <div class="dropdown">
+        <button id="StatusOptionsToggle" class="btn btn-secondary dropdown-toggle dropdown-toggle-custom-caret" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+            @if (statusFilterCount > 0)
+            {
+                <span>@statusFilterCount Status</span>
+            }
+            else
+            {
+                <span>All Status</span>
+            }
+        </button>
+        <div class="dropdown-menu" aria-labelledby="StatusOptionsToggle">
+            <a asp-action="GetPaymentRequests" asp-route-storeId="@storeId" asp-route-count="@Model.Count" asp-route-searchTerm="@Model.Search.Toggle("status", "pending")" class="dropdown-item @(HasArrayFilter("status", "pending") ? "custom-active" : "")">Pending</a>
+            <a asp-action="GetPaymentRequests" asp-route-storeId="@storeId" asp-route-count="@Model.Count" asp-route-searchTerm="@Model.Search.Toggle("status", "completed")" class="dropdown-item @(HasArrayFilter("status", "completed") ? "custom-active" : "")">Settled</a>
+            <a asp-action="GetPaymentRequests" asp-route-storeId="@storeId" asp-route-count="@Model.Count" asp-route-searchTerm="@Model.Search.Toggle("status", "expired")" class="dropdown-item @(HasArrayFilter("status", "expired") ? "custom-active" : "")">Expired</a>
+            <div role="separator" class="dropdown-divider"></div>
+            <a asp-action="GetPaymentRequests" asp-route-storeId="@storeId" asp-route-count="@Model.Count" asp-route-searchTerm="@Model.Search.Toggle("includearchived", "true")" class="dropdown-item @(HasBooleanFilter("includearchived") ? "custom-active" : "")" id="StatusOptionsIncludeArchived">Archived</a>
+        </div>
     </div>
-</div>
+</form>
 
-<div class="row">
-    <div class="col-lg-12">
-        @if (Model.Items.Count > 0)
-        {
-            <table class="table table-hover table-responsive-md">
-                <thead>
-                    <tr>
-                        <th>Title</th>
-                        <th class="w-150px">
-                            <div class="d-flex align-items-center gap-1">
-                                Expiry
-                                <button type="button" class="btn btn-link p-0 fa fa-clock-o switch-time-format only-for-js" title="Switch date format"></button>
+@if (Model.Items.Any())
+{
+    <table class="table table-hover table-responsive-md" id="tableId">
+        <thead>
+            <tr>
+                <th>Title</th>
+                <th class="w-150px">
+                    <div class="d-flex align-items-center gap-1">
+                        Expiry
+                        <button type="button" class="btn btn-link p-0 fa fa-clock-o switch-time-format only-for-js" title="Switch date format"></button>
+                    </div>
+                </th>
+                <th>Price</th>
+                <th>Status</th>
+                <th class="text-end">Actions</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var item in Model.Items)
+            {
+                <tr>
+                    <td>
+                        <a asp-action="ViewPaymentRequest" asp-route-storeId="@item.StoreId" asp-route-payReqId="@item.Id" id="PaymentRequest-@item.Id">@item.Title</a>
+                    </td>
+                    <td>
+                        @(item.ExpiryDate?.ToBrowserDate() ?? new HtmlString("<span class=\"text-muted\">No Expiry</span>"))
+                    </td>
+                    <td>
+                        <span data-sensitive>@item.AmountFormatted</span>
+                    </td>
+                    <td>
+                        <span class="badge badge-@item.Status.ToLower() status-badge">@item.Status</span>
+                    </td>
+                    <td class="text-end">
+                        <div class="d-inline-flex align-items-center gap-3">
+                            <a asp-action="EditPaymentRequest" asp-route-storeId="@item.StoreId" asp-route-payReqId="@item.Id" id="Edit-@item.Id">Edit</a>
+                            <div class="dropdown">
+                                <button class="btn btn-link dropdown-toggle p-0 dropdown-toggle-no-caret" type="button" data-bs-toggle="dropdown" aria-expanded="false" id="ToggleActions-@item.Id">
+                                    <i class="fa fa-ellipsis-h"></i>
+                                </button>
+                                <ul class="dropdown-menu" aria-labelledby="actionDropdown">
+                                    <li><a class="dropdown-item" asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@item.StoreId" asp-route-searchterm="@($"orderid:{PaymentRequestRepository.GetOrderIdForPaymentRequest(item.Id)}")">Invoices</a></li>
+                                    <li><a class="dropdown-item" asp-action="ClonePaymentRequest" asp-route-storeId="@item.StoreId" asp-route-payReqId="@item.Id" id="Clone-@item.Id">Clone</a></li>
+                                    <li class="dropdown-divider"></li>
+                                    <li><a class="dropdown-item" asp-action="TogglePaymentRequestArchival" asp-route-storeId="@item.StoreId" asp-route-payReqId="@item.Id" id="ToggleArchival-@item.Id">@(item.Archived ? "Unarchive" : "Archive")</a></li>
+                                </ul>
                             </div>
-                        </th>
-                        <th>Status</th>
-                        <th class="text-end">Amount</th>
-                        <th class="text-end">Actions</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    @foreach (var item in Model.Items)
-                    {
-                        <tr>
-                            <td>
-                                <a asp-action="EditPaymentRequest" asp-route-storeId="@item.StoreId" asp-route-payReqId="@item.Id" id="Edit-@item.Id">@item.Title</a>
-                            </td>
-                            <td>
-                                @(item.ExpiryDate?.ToBrowserDate() ?? new HtmlString($"<span class=\"text-muted\">No Expiry</span>"))
-                            </td>
-                            <td>
-                                <span class="badge badge-@item.Status.ToLower()">@item.Status</span>
-                            </td>
-                            <td class="text-end">
-                                <span data-sensitive>@item.AmountFormatted</span>
-                            </td>
-                            <td class="text-end">
-                                <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@item.StoreId" asp-route-searchterm="@($"orderid:{PaymentRequestRepository.GetOrderIdForPaymentRequest(item.Id)}")">Invoices</a>
-                                <span> - </span>
-                                <a asp-action="ClonePaymentRequest" asp-route-storeId="@item.StoreId" asp-route-payReqId="@item.Id" id="Clone-@item.Id">Clone</a>
-                                <span> - </span>
-                                <a asp-action="TogglePaymentRequestArchival" asp-route-storeId="@item.StoreId" asp-route-payReqId="@item.Id" id="ToggleArchival-@item.Id">@(item.Archived ? "Unarchive" : "Archive")</a>
-                                <span> - </span>
-                                <a asp-action="ViewPaymentRequest" asp-route-payReqId="@item.Id" id="PaymentRequest-@item.Id">View</a>
-                            </td>
-                        </tr>
-                    }
-                </tbody>
-            </table>
+                        </div>
+                    </td>
+                </tr>
+            }
+        </tbody>
+    </table>
 
-            <vc:pager view-model="Model" />
-        }
-        else
-        {
-            <p class="text-secondary mt-3">
-                There are no payment requests matching your criteria.
-            </p>
-        }
-    </div>
-</div>
+    <vc:pager view-model="Model" />
+}
+else
+{
+    <p class="text-secondary mt-3">
+        There are no payment requests matching your criteria.
+    </p>
+}

BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml

@@ -38,13 +38,13 @@
 <head>
     <partial name="LayoutHead" />
     <partial name="LayoutHeadStoreBranding" model="@(Model.BrandColor, Model.CssFileId, Model.CustomCSSLink, Model.EmbeddedCSS)" />
-    <link href="~/vendor/bootstrap-vue/bootstrap-vue.css" asp-append-version="true"  rel="stylesheet" />
+    <link href="~/vendor/bootstrap-vue/bootstrap-vue.min.css" asp-append-version="true"  rel="stylesheet" />
     <script type="text/javascript">
         var srvModel = @Safe.Json(Model);
     </script>
     <script src="~/vendor/vuejs/vue.min.js" asp-append-version="true"></script>
     <script src="~/vendor/vue-toasted/vue-toasted.min.js" asp-append-version="true"></script>
-    <script src="~/vendor/bootstrap-vue/bootstrap-vue.js" asp-append-version="true"></script>
+    <script src="~/vendor/bootstrap-vue/bootstrap-vue.min.js" asp-append-version="true"></script>
     <script src="~/vendor/signalr/signalr.js" asp-append-version="true"></script>
     <script src="~/vendor/animejs/anime.min.js" asp-append-version="true"></script>
     <script src="~/payment-request/app.js" asp-append-version="true"></script>

BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml

@@ -1,11 +1,9 @@
 @using BTCPayServer.Client
-@using BTCPayServer.Payments
 @using BTCPayServer.Services
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @using BTCPayServer.Abstractions.TagHelpers
 @inject BTCPayServer.Security.ContentSecurityPolicies Csp
 @inject BTCPayServerEnvironment Env
-@inject BTCPayNetworkProvider BtcPayNetworkProvider
 @inject DisplayFormatter DisplayFormatter
 @model BTCPayServer.Models.ViewPullPaymentModel
 @{
@@ -25,29 +23,13 @@
                 return "bg-warning";
         }
     }
-    
-    
-    string lnurl = null;
-    string lnurlUri = null;
-
-    var pms = Model.PaymentMethods.FirstOrDefault(id => id.PaymentType == LightningPaymentType.Instance && BtcPayNetworkProvider.DefaultNetwork.CryptoCode == id.CryptoCode);
-    if (pms is not null && Model.Currency.Equals(pms.CryptoCode, StringComparison.InvariantCultureIgnoreCase))
-    {
-        var lnurlEndpoint = new Uri(Url.Action("GetLNURLForPullPayment", "UILNURL", new
-        {
-            cryptoCode = pms.CryptoCode,
-            pullPaymentId = Model.Id
-        }, Context.Request.Scheme, Context.Request.Host.ToString()));
-        lnurl = LNURL.LNURL.EncodeUri(lnurlEndpoint, "withdrawRequest", true).ToString();
-        lnurlUri = LNURL.LNURL.EncodeUri(lnurlEndpoint, "withdrawRequest", false).ToString();
-    }
 }
 <!DOCTYPE html>
 <html lang="en" @(Env.IsDeveloping ? " data-devenv" : "")>
 <head>
     <partial name="LayoutHead" />
     <partial name="LayoutHeadStoreBranding" model="@(Model.BrandColor, Model.CssFileId, Model.CustomCSSLink, Model.EmbeddedCSS)" />
-    <link href="~/vendor/bootstrap-vue/bootstrap-vue.css" asp-append-version="true"  rel="stylesheet" />
+    <link href="~/vendor/bootstrap-vue/bootstrap-vue.min.css" asp-append-version="true"  rel="stylesheet" />
     <style>
         .no-marker > ul { list-style-type: none; }
     </style>
@@ -62,7 +44,7 @@
                         <div class="row align-items-center" style="width:calc(100% + 30px)">
                             <div class="col-12 mb-3 col-lg-6 mb-lg-0">
                                 <div class="input-group">
-                                    @if (lnurl is not null)
+                                    @if (Model.LnurlEndpoint is not null)
                                     {
                                         <button type="button" class="input-group-prepend btn btn-outline-secondary" id="lnurlwithdraw-button" data-bs-toggle="modal" data-bs-target="#scan-qr-modal">
                                             <span class="fa fa-qrcode  fa-2x" title="LNURL-Withdraw"></span>
@@ -223,8 +205,10 @@
         </footer>
     </div>
     <partial name="LayoutFoot" />
-  @if (lnurl is not null)
+  @if (Model.LnurlEndpoint is not null)
   {
+      var lnurlUri = LNURL.LNURL.EncodeUri(Model.LnurlEndpoint, "withdrawRequest", false).ToString();
+      var lnurlBech32 = LNURL.LNURL.EncodeUri(Model.LnurlEndpoint, "withdrawRequest", true).ToString();
       var note = "You can scan or open this link with a <a href='https://github.com/fiatjaf/lnurl-rfc#lnurl-documents' target='_blank' rel='noreferrer noopener'>LNURL-Withdraw</a> enabled wallet.";
       if (!Model.AutoApprove)
       {
@@ -237,16 +221,17 @@
         document.addEventListener("DOMContentLoaded", () => {
             const modes = {
                 uri: { title: "URI", fragments: [@Safe.Json(lnurlUri)], showData: true, href: @Safe.Json(lnurlUri) },
-                bech32: { title: "Bech32", fragments: [@Safe.Json(lnurl)], showData: true, href: @Safe.Json(lnurl) }
+                bech32: { title: "Bech32", fragments: [@Safe.Json(lnurlBech32)], showData: true, href: @Safe.Json(lnurlBech32) }
             };
             initQRShow({ title: "LNURL Withdraw", note: @Safe.Json(note), modes })
     });
     </script>
   }
-    <script>
+<script>
         document.addEventListener("DOMContentLoaded", () => {
             document.getElementById("copyLink").addEventListener("click", window.copyUrlToClipboard);
         });
 </script>
+<vc:ui-extension-point location="pullpayment-foot"  model="@Model"></vc:ui-extension-point>
 </body>
 </html>

BTCPayServer/Views/UIServer/Files.cshtml

@@ -8,11 +8,11 @@
         <div class="d-flex align-items-center justify-content-between mt-n1 mb-4">
             <h3 class="mb-0">@ViewData["Title"]</h3>
             <a asp-action="storage" asp-route-forceChoice="true" asp-route-returnurl="@ViewData["ReturnUrl"]" class="btn btn-secondary d-flex align-items-center">
-                <vc:icon symbol="settings"/>
+                <vc:icon symbol="settings" />
                 <span class="ms-1">Settings</span>
             </a>
         </div>
-        
+
         @if (!Model.StorageConfigured)
         {
             <p>
@@ -42,66 +42,87 @@
                 </form>
             }
 
+            @if (Model.DirectUrlByFiles is { Count: > 0 })
+            {
+                foreach (var fileUrlPair in Model.DirectUrlByFiles)
+                {
+                    var fileId = fileUrlPair.Key;
+                    var file = Model.Files.Single(storedFile => storedFile.Id.Equals(fileId, StringComparison.InvariantCultureIgnoreCase));
+                    var url = Url.Action("GetFile", "UIStorage", new { fileId }, Context.Request.Scheme, Context.Request.Host.ToString());
+                    <div class="border border-light rounded bg-tile mt-3">
+                        <div class="row">
+                            <div class="col-sm-12 col-md-4">
+                                <div class="input-group">
+                                    <div class="form-floating">
+                                        <input id="@fileId-name" class="form-control-plaintext" readonly="readonly" value="@file.FileName">
+                                        <label>File name</label>
+                                    </div>
+                                    <button type="button" class="btn btn-link" data-clipboard="@file.FileName">
+                                        <vc:icon symbol="copy" />
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="col-sm-12 col-md-4 ">
+                                <div class="input-group  ">
+                                    <div class="form-floating">
+                                        <input id="@fileId" class="form-control-plaintext" readonly="readonly" value="@fileId">
+                                        <label>File Id</label>
+                                    </div>
+                                    <button type="button" class="btn btn-link" data-clipboard="@fileId">
+                                        <vc:icon symbol="copy" />
+                                    </button>
+                                </div>
+                            </div>
+                            <div class=" col-sm-12 col-md-4">
+                                <div class="input-group">
+                                    <div class="form-floating">
+                                        <input id="@fileId-url" class="form-control-plaintext" readonly="readonly" value="@url">
+                                        <label>Permanent Url</label>
+                                    </div>
+                                    <button type="button" class="btn btn-link" data-clipboard="@url">
+                                        <vc:icon symbol="copy" />
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                }
+            }
+
             @if (Model.Files.Any())
             {
-                <table class="table table-hover table-responsive-md">
-                    <thead>
-                    <tr>
-                        <th>Name</th>
-                        <th>Timestamp</th>
-                        <th>User</th>
-                        <th class="text-end">Actions</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    @foreach (var file in Model.Files)
-                    {
+                <div class="table-responsive">
+                    <table class="table table-hover">
+                        <thead>
                         <tr>
-                            <td>@file.FileName</td>
-                            <td>@file.Timestamp.ToBrowserDate()</td>
-                            <td>@file.ApplicationUser.UserName</td>
-                            <td class="text-end">
-                                <a href="@Url.Action("Files", "UIServer", new { fileIds = new string[] { file.Id } })">Get Link</a>
-                                - <a asp-action="DeleteFile" asp-route-fileId="@file.Id">Remove</a>
-                            </td>
+                            <th>Name</th>
+                            <th>Timestamp</th>
+                            <th>User</th>
+                            <th class="text-end">Actions</th>
                         </tr>
-                    }
-                    </tbody>
-                </table>
+                        </thead>
+                        <tbody>
+                        @foreach (var file in Model.Files)
+                        {
+                            <tr>
+                                <td>
+                                    <a asp-action="Files" asp-route-fileIds="@file.Id">@file.FileName</a>
+                                </td>
+                                <td>@file.Timestamp.ToBrowserDate()</td>
+                                <td>@file.ApplicationUser.UserName</td>
+                                <td class="text-end">
+                                    <a href="@Url.Action("Files", "UIServer", new {fileIds = new [] { file.Id }})" class="text-nowrap">Get Link</a>
+                                    - <a asp-action="DeleteFile" asp-route-fileId="@file.Id">Remove</a>
+                                </td>
+                            </tr>
+                        }
+                        </tbody>
+                    </table>
+                </div>
             }
             else
             {
-                <p class="text-secondary mt-3">
-                    There are no files yet.
-                </p>
-            }
-        }
-
-        @if (Model.DirectUrlByFiles != null && Model.DirectUrlByFiles.Count > 0)
-        {
-            foreach (KeyValuePair<string, string> fileUrlPair in Model.DirectUrlByFiles)
-            {
-                var fileId = fileUrlPair.Key;
-                var file = Model.Files.Single(storedFile => storedFile.Id.Equals(fileId, StringComparison.InvariantCultureIgnoreCase));
-
-                <div class="card mb-2">
-                    <div class="card-text">
-                        <ul class="list-group list-group-flush">
-                            <li class="list-group-item">
-                                @file.FileName
-                            </li>
-                            <li class="list-group-item">
-                                <strong>URL:</strong>
-                                <a asp-action="GetFile" asp-controller="UIStorage" asp-route-fileId="@fileId" target="_blank">
-                                    @Url.Action("GetFile", "UIStorage", new
-                                    {
-                                        fileId = fileId
-                                    }, Context.Request.Scheme, Context.Request.Host.ToString())
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
+                <p class="text-secondary mt-3">There are no files yet.</p>
             }
         }
     </div>

BTCPayServer/Views/UIWallets/WalletTransactions.cshtml

@@ -49,10 +49,10 @@
     <script src="~/modal/btcpay.js" asp-append-version="true" async></script>
     @* Custom Range Modal *@
     <script>
-        let observer = null;
-        let $loadMore = document.getElementById('LoadMore');
         const $actions = document.getElementById('ListActions');
+        const $transactions = document.getElementById('WalletTransactions');
         const $list = document.getElementById('WalletTransactionsList');
+        const $dropdowns = document.getElementById('Dropdowns');
         const $indicator = document.getElementById('LoadingIndicator');
         
         delegate('click', '#selectAllCheckbox', e => {
@@ -65,19 +65,15 @@
             window.scrollTo({ top: 0, behavior: 'smooth' });
         });
         
-        delegate('click', '#LoadMore', async () => {
-            $loadMore.setAttribute('disabled', 'disabled');
-            await loadMoreTransactions();
-        });
-        
         if ($actions && $actions.offsetTop - window.innerHeight > 0) {
             document.getElementById('GoToTop').classList.remove('d-none');
         }
         
         const count = @Safe.Json(Model.Count);
         const skipInitial = @Safe.Json(Model.Skip);
-        const loadMoreUrl = @Safe.Json(Url.Action("WalletTransactions", new { walletId, labelFilter, skip = Model.Skip, count = Model.Count }));
-        let skip = @Safe.Json(Model.Skip);
+		const loadMoreUrl = @Safe.Json(Url.Action("WalletTransactions", new { walletId, labelFilter, skip = Model.Skip, count = Model.Count, loadTransactions = true }));
+		// The next time we load transactions, skip will become 0
+        let skip = @Safe.Json(Model.Skip) - count;
         
         async function loadMoreTransactions() {
             $indicator.classList.remove('d-none');
@@ -93,38 +89,38 @@
             
             if (response.ok) {
                 const html = await response.text();
+                const responseEmpty = html.trim() === '';
                 $list.insertAdjacentHTML('beforeend', html);
                 skip = skipNext;
                 
-                if ($loadMore) {
-                    // remove load more button
-                    $loadMore.remove();
-                    $loadMore = null;
-                    
-                    // switch to infinite scroll mode
-                    observer = new IntersectionObserver(async entries => {
-                        const { isIntersecting } = entries[0];
-                        if (isIntersecting) {
-                            await loadMoreTransactions();
-                        }
-                    }, { rootMargin: '128px' });
-                    
-                    // the actions div marks the end of the list table
-                    observer.observe($actions);
-                }
-                
-                if (html.trim() === '') {
+                if (responseEmpty) {
                     // in case the response html was empty, remove the observer and stop loading
                     observer.unobserve($actions);
                 }
-            } else if ($loadMore) {
-                $loadMore.removeAttribute('disabled');
+                if (!$transactions.dataset.loaded) {
+                    $transactions.dataset.loaded = 'true';
+                    // replace table and dropdowns if initial response was empty
+                    if (responseEmpty) {
+                        $dropdowns.remove();
+                        $transactions.innerHTML = '<div class="text-secondary" data-loaded="true">There are no transactions yet.</div>';
+                    }
+                }
             }
             
             $indicator.classList.add('d-none');
             formatDateTimes(document.getElementById('switchTimeFormat').dataset.mode);
             initLabelManagers();
         }
+        
+		const observer = new IntersectionObserver(async entries => {
+            const { isIntersecting } = entries[0];
+            if (isIntersecting) {
+                await loadMoreTransactions();
+            }
+        }, { rootMargin: '128px' });
+        
+        // the actions div marks the end of the list table
+        observer.observe($actions);
     </script>
 }
 
@@ -147,80 +143,66 @@
     </div>
 }
 
-@if (Model.Transactions.Any())
-{
-    <div class="d-inline-flex align-items-center gap-3" id="Dropdowns">
-        <div class="dropdown ms-auto" id="Actions">
-            <button class="btn btn-secondary dropdown-toggle" type="button" id="ActionsDropdownToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Actions
-            </button>
-            <div class="dropdown-menu dropdown-menu-end" aria-labelledby="ActionsDropdownToggle">
-                <form id="WalletActions" method="post" asp-action="WalletActions" asp-route-walletId="@walletId">
-                    <button id="BumpFee" name="command" type="submit" class="dropdown-item" value="cpfp">Bump fee (CPFP)</button>
-                </form>
-            </div>
-        </div>
-        <div class="dropdown d-inline-flex align-items-center gap-3" id="Export">
-            <button class="btn btn-secondary dropdown-toggle" type="button" id="ExportDropdownToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Export
-            </button>
-            <div class="dropdown-menu" aria-labelledby="ExportDropdownToggle">
-                <a asp-action="Export" asp-route-walletId="@walletId" asp-route-format="csv" asp-route-labelFilter="@labelFilter" class="dropdown-item export-link" target="_blank" id="ExportCSV">CSV</a>
-                <a asp-action="Export" asp-route-walletId="@walletId" asp-route-format="json" asp-route-labelFilter="@labelFilter" class="dropdown-item export-link" target="_blank" id="ExportJSON">JSON</a>
-                <a asp-action="Export" asp-route-walletId="@walletId" asp-route-format="bip329" asp-route-labelFilter="@labelFilter" class="dropdown-item export-link" target="_blank" id="ExportBIP329">Wallet Labels (BIP-329)</a>
-            </div>
-        </div>
-    </div>
-    <div style="clear:both"></div>
-
-    <div class="row">
-        <div class="col table-responsive-md" id="walletTable">
-            <table class="table table-hover">
-                <thead class="thead-inverse">
-                <tr>
-                    <th style="width:2rem;" class="only-for-js">
-                        <input id="selectAllCheckbox" type="checkbox" class="form-check-input" />
-                    </th>
-                    <th class="w-150px">
-                        <div class="d-flex align-items-center gap-1">
-                            Date
-                            <button type="button" class="btn btn-link p-0 fa fa-clock-o switch-time-format" title="Switch date format" id="switchTimeFormat"></button>
-                        </div>
-                    </th>
-                    <th class="text-start">Label</th>
-                    <th>Transaction Id</th>
-                    <th class="text-end">Amount</th>
-                    <th class="text-end" style="min-width:60px"></th>
-                </tr>
-                </thead>
-                <tbody id="WalletTransactionsList">
-                    <partial name="_WalletTransactionsList" model="Model" />
-                </tbody>
-            </table>
-        </div>
-    </div>
-    <noscript>
-        <vc:pager view-model="Model"/>
-    </noscript>
-    
-    <div class="text-center only-for-js d-none" id="LoadingIndicator">
-        <div class="spinner-border spinner-border-sm text-secondary ms-2" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-    <div class="d-flex flex-wrap align-items-center justify-content-center gap-3 mb-5 only-for-js" id="ListActions">
-        <button type="button" class="btn btn-secondary d-flex align-items-center" id="LoadMore">
-            Load more
+<div class="d-inline-flex align-items-center gap-3" id="Dropdowns">
+    <div class="dropdown ms-auto" id="Actions">
+        <button class="btn btn-secondary dropdown-toggle" type="button" id="ActionsDropdownToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            Actions
         </button>
-        <button type="button" class="btn btn-secondary d-none" id="GoToTop">Go to top</button>
+        <div class="dropdown-menu dropdown-menu-end" aria-labelledby="ActionsDropdownToggle">
+            <form id="WalletActions" method="post" asp-action="WalletActions" asp-route-walletId="@walletId">
+                <button id="BumpFee" name="command" type="submit" class="dropdown-item" value="cpfp">Bump fee (CPFP)</button>
+            </form>
+        </div>
     </div>
-}
-else
-{
-    <p class="text-secondary mt-3">
-        There are no transactions @(string.IsNullOrEmpty(labelFilter) ? "yet" : $"labeled with \"{labelFilter}\"").
-    </p>
-}
+    <div class="dropdown d-inline-flex align-items-center gap-3" id="Export">
+        <button class="btn btn-secondary dropdown-toggle" type="button" id="ExportDropdownToggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            Export
+        </button>
+        <div class="dropdown-menu" aria-labelledby="ExportDropdownToggle">
+            <a asp-action="Export" asp-route-walletId="@walletId" asp-route-format="csv" asp-route-labelFilter="@labelFilter" class="dropdown-item export-link" target="_blank" id="ExportCSV">CSV</a>
+            <a asp-action="Export" asp-route-walletId="@walletId" asp-route-format="json" asp-route-labelFilter="@labelFilter" class="dropdown-item export-link" target="_blank" id="ExportJSON">JSON</a>
+            <a asp-action="Export" asp-route-walletId="@walletId" asp-route-format="bip329" asp-route-labelFilter="@labelFilter" class="dropdown-item export-link" target="_blank" id="ExportBIP329">Wallet Labels (BIP-329)</a>
+        </div>
+    </div>
+</div>
+<div style="clear:both"></div>
+
+<div id="WalletTransactions" class="table-responsive-md">
+    <table class="table table-hover">
+        <thead class="thead-inverse">
+        <tr>
+            <th style="width:2rem;" class="only-for-js">
+                <input id="selectAllCheckbox" type="checkbox" class="form-check-input" />
+            </th>
+            <th class="w-150px">
+                <div class="d-flex align-items-center gap-1">
+                    Date
+                    <button type="button" class="btn btn-link p-0 fa fa-clock-o switch-time-format" title="Switch date format" id="switchTimeFormat"></button>
+                </div>
+            </th>
+            <th class="text-start">Label</th>
+            <th>Transaction Id</th>
+            <th class="text-end">Amount</th>
+            <th class="text-end" style="min-width:60px"></th>
+        </tr>
+        </thead>
+        <tbody id="WalletTransactionsList">
+            <partial name="_WalletTransactionsList" model="Model" />
+        </tbody>
+    </table>
+</div>
+<noscript>
+    <vc:pager view-model="Model"/>
+</noscript>
+    
+<div class="text-center only-for-js d-none" id="LoadingIndicator">
+    <div class="spinner-border spinner-border-sm text-secondary ms-2" role="status">
+        <span class="visually-hidden">Loading...</span>
+    </div>
+</div>
+<div class="d-flex flex-wrap align-items-center justify-content-center gap-3 mb-5 only-for-js" id="ListActions">
+    <button type="button" class="btn btn-secondary d-none" id="GoToTop">Go to top</button>
+</div>
 
 <p class="mt-4 mb-0">
     If BTCPay Server shows you an invalid balance, <a asp-action="WalletRescan" asp-route-walletId="@Context.GetRouteValue("walletId")">rescan your wallet</a>.

BTCPayServer/wwwroot/cart/css/style.css

@@ -16,7 +16,7 @@
 
 .card-img-top {
     width: 100%;
-    max-height: 180px;
+    max-height: 210px;
     object-fit: scale-down;
 }
 

BTCPayServer/wwwroot/cart/js/cart.js

@@ -15,7 +15,7 @@ function Cart() {
     this.$summaryTip = $('.js-cart-summary-tip');
     this.$destroy = $('.js-cart-destroy');
     this.$confirm = $('#js-cart-confirm');
-
+    this.$categories = $('.js-categories');
     this.listItems();
     this.bindEmptyCart();
 
@@ -328,9 +328,11 @@ Cart.prototype.updateTip = function(amount) {
 // Update hidden total amount value to be sent to the checkout page
 Cart.prototype.updateAmount = function() {
     $('#js-cart-amount').val(this.getTotal(true));
+    $('#js-cart-tip').val(this.tip);
+    $('#js-cart-discount').val(this.discount);
+    $('#js-cart-custom-amount').val(this.customAmount);
 }
 Cart.prototype.updatePosData = function() {
-
     var result = {
       cart: this.content,
       customAmount: this.fromCents(this.getCustomAmount()),
@@ -419,7 +421,18 @@ Cart.prototype.listItems = function() {
         self = this,
         list = [],
         tableTemplate = '';
-
+    this.$categories.on('change', function (event) {
+        if ($(this).is(':checked')) {
+            var selectedCategory = $(this).val();
+            $(".js-add-cart").each(function () {
+                var categories = JSON.parse(this.getAttribute("data-categories"));
+                if (selectedCategory === "*" || categories.includes(selectedCategory))
+                    this.classList.remove("d-none");
+                else
+                    this.classList.add("d-none");
+            });
+        }
+    });
     if (this.content.length > 0) {
         // Prepare the list of items in the cart
         for (var key in this.content) {
@@ -690,7 +703,6 @@ Cart.prototype.destroy = function(keepAmount) {
     } else {
         this.removeItemAll();
     }
-
     localStorage.removeItem(this.getStorageKey('cart'));
 }
 

BTCPayServer/wwwroot/checkout-v2/checkout.js

@@ -265,6 +265,7 @@ function initApp() {
                 }
             },
             listenIn () {
+                const self = this;
                 let socket = null;
                 const updateFn = this.fetchData;
                 const supportsWebSockets = 'WebSocket' in window && window.WebSocket.CLOSING === 2;
@@ -279,6 +280,9 @@ function initApp() {
                         socket.onerror = function (e) {
                             console.error('Error while connecting to websocket for invoice notifications (callback):', e);
                         };
+                        socket.onclose = function () {
+                            self.pollUpdates(2000, socket);
+                        };
                     }
                     catch (e) {
                         console.error('Error while connecting to websocket for invoice notifications', e);

BTCPayServer/wwwroot/js/form-editor.js

@@ -119,6 +119,7 @@ document.addEventListener('DOMContentLoaded', () => {
     })
 
     Vue.use(vSortable)
+    Vue.use(VueSanitizeDirective.default)
 
     new Vue({
         el: '#FormEditor',

BTCPayServer/wwwroot/light-pos/app.js

@@ -74,11 +74,11 @@ document.addEventListener("DOMContentLoaded",function () {
             },
             posdata () {
                 const data = {
-                    subTotal: this.formatCurrency(this.amountNumeric),
-                    total: this.formatCurrency(this.totalNumeric)
+                    subTotal: this.amountNumeric,
+                    total: this.totalNumeric
                 }
-                if (this.tipNumeric > 0) data.tip = this.formatCurrency(this.tipNumeric)
-                if (this.discountNumeric > 0) data.discountAmount = this.formatCurrency(this.discountNumeric)
+                if (this.tipNumeric > 0) data.tip = this.tipNumeric
+                if (this.discountNumeric > 0) data.discountAmount = this.discountNumeric
                 if (this.discountPercentNumeric > 0) data.discountPercentage = this.discountPercentNumeric
                 return JSON.stringify(data)
             }
@@ -138,7 +138,7 @@ document.addEventListener("DOMContentLoaded",function () {
                 const currency = this.srvModel.currencyCode;
                 if (currency === 'BTC' || currency === 'SATS') return this.formatCrypto(value, withSymbol); 
                 const divisibility = this.srvModel.currencyInfo.divisibility;
-                const locale = currency === 'USD' ? 'en-US' : navigator.language;
+                const locale = this.getLocale(currency);
                 const style = withSymbol ? 'currency' : 'decimal';
                 const opts = { currency, style, maximumFractionDigits: divisibility, minimumFractionDigits: divisibility };
                 try {
@@ -179,6 +179,14 @@ document.addEventListener("DOMContentLoaded",function () {
                 this.tipPercent = this.tipPercent !== percentage
                     ? percentage
                     : null;
+            },
+            getLocale(currency) {
+                switch (currency) {
+                    case 'USD': return 'en-US';
+                    case 'EUR': return 'de-DE';
+                    case 'JPY': return 'ja-JP';
+                    default: return navigator.language;
+                }
             }
         },
         created () {

BTCPayServer/wwwroot/main/site.css

@@ -157,7 +157,7 @@ h2 svg.icon.icon-info {
     cursor: pointer;
     padding: 0;
 }
-@media (min-width: 1200px) {
+@media (min-width: 1400px) {
     #MassAction {
         margin-top: -4rem;
     }

BTCPayServer/wwwroot/main/themes/default-dark.css

@@ -17,7 +17,8 @@
   --btcpay-body-text: var(--btcpay-white);
   --btcpay-body-text-muted: var(--btcpay-neutral-600);
   --btcpay-body-text-rgb: 255, 255, 255;
-  --btcpay-body-link-accent: var(--btcpay-primary-300);
+  --btcpay-body-link-accent: var(--btcpay-primary-accent);
+  --btcpay-body-link-accent-rgb: var(--btcpay-primary-accent-rgb);
   --btcpay-form-bg: var(--btcpay-bg-dark);
   --btcpay-form-text: var(--btcpay-neutral-800);
   --btcpay-form-text-label: var(--btcpay-neutral-900);
@@ -27,6 +28,8 @@
   --btcpay-nav-link-active: var(--btcpay-white);
   --btcpay-footer-link-accent: var(--btcpay-neutral-800);
   --btcpay-pre-bg: var(--btcpay-bg-dark);
+  --btcpay-primary-accent: rgb(var(--btcpay-primary-accent-rgb));
+  --btcpay-primary-accent-rgb: 30, 122, 68;
   --btcpay-secondary: transparent;
   --btcpay-secondary-text-active: var(--btcpay-primary);
   --btcpay-secondary-rgb: 22, 27, 34;
@@ -34,7 +37,6 @@
   --btcpay-warning-text-hover: var(--btcpay-neutral-100);
   --btcpay-warning-text-active: var(--btcpay-neutral-100);
   --btcpay-warning-dim-text: var(--btcpay-neutral-200);
-  --btcpay-warning-dim-text-active: var(--btcpay-yellow-100);
   --btcpay-light-accent: var(--btcpay-black);
   --btcpay-light-dim-bg: var(--btcpay-neutral-50);
   --btcpay-light-shadow: rgba(66, 70, 73, 0.33);

BTCPayServer/wwwroot/main/themes/default.css

@@ -15,74 +15,137 @@
   --btcpay-black: #000000;
   --btcpay-black-rgb: 0, 0, 0;
   --btcpay-neutral-light-100: #f8f9fa;
+  --btcpay-neutral-light-100-rgb: 248,249,250;
   --btcpay-neutral-light-200: #e9ecef;
+  --btcpay-neutral-light-200-rgb: 233,236,239;
   --btcpay-neutral-light-300: #dee2e6;
+  --btcpay-neutral-light-300-rgb: 222,226,230;
   --btcpay-neutral-light-400: #ced4da;
+  --btcpay-neutral-light-400-rgb: 206,212,218;
   --btcpay-neutral-light-500: #8f979e;
+  --btcpay-neutral-light-500-rgb: 143,151,158;
   --btcpay-neutral-light-600: #6c757d;
+  --btcpay-neutral-light-600-rgb: 108,117,125;
   --btcpay-neutral-light-700: #495057;
+  --btcpay-neutral-light-700-rgb: 73,80,87;
   --btcpay-neutral-light-800: #343a40;
+  --btcpay-neutral-light-800-rgb: 52,58,64;
   --btcpay-neutral-light-900: #292929;
+  --btcpay-neutral-light-900-rgb: 41,41,41;
   --btcpay-neutral-light-rgb: 143,151,158;
   --btcpay-neutral-dark-100: #F0F6FC;
+  --btcpay-neutral-dark-100-rgb: 240,246,252;
   --btcpay-neutral-dark-200: #C9D1D9;
+  --btcpay-neutral-dark-200-rgb: 201,209,217;
   --btcpay-neutral-dark-300: #B1BAC4;
+  --btcpay-neutral-dark-300-rgb: 177,186,196;
   --btcpay-neutral-dark-400: #8B949E;
+  --btcpay-neutral-dark-400-rgb: 139,148,158;
   --btcpay-neutral-dark-500: #6E7681;
+  --btcpay-neutral-dark-500-rgb: 110,118,129;
   --btcpay-neutral-dark-600: #484F58;
+  --btcpay-neutral-dark-600-rgb: 72,79,88;
   --btcpay-neutral-dark-700: #30363D;
+  --btcpay-neutral-dark-700-rgb: 48,54,61;
   --btcpay-neutral-dark-800: #21262D;
+  --btcpay-neutral-dark-800-rgb: 33,38,45;
   --btcpay-neutral-dark-900: #161B22;
+  --btcpay-neutral-dark-900-rgb: 22,27,34;
   --btcpay-neutral-dark-rgb: 110,118,129;
   --btcpay-primary-100: #c7e6c1;
+  --btcpay-primary-100-rgb: 199,230,193;
   --btcpay-primary-200: #b5dead;
+  --btcpay-primary-200-rgb: 181,222,173;
   --btcpay-primary-300: #9dd392;
+  --btcpay-primary-300-rgb: 157,211,146;
   --btcpay-primary-400: #7cc46e;
+  --btcpay-primary-400-rgb: 124,196,110;
   --btcpay-primary-500: #44a431;
+  --btcpay-primary-500-rgb: 68,164,49;
   --btcpay-primary-600: #389725;
+  --btcpay-primary-600-rgb: 56,151,37;
   --btcpay-primary-700: #2e8a1b;
+  --btcpay-primary-700-rgb: 46,138,27;
   --btcpay-primary-800: #247d12;
+  --btcpay-primary-800-rgb: 36,125,18;
   --btcpay-primary-900: #1c710b;
+  --btcpay-primary-900-rgb: 28,113,11;
   --btcpay-primary-rgb: 68,164,49;
   --btcpay-green-100: #EEFAEB;
+  --btcpay-green-100-rgb: 238,250,235;
   --btcpay-green-200: #C7E8C0;
+  --btcpay-green-200-rgb: 199,232,192;
   --btcpay-green-300: #A0D695;
+  --btcpay-green-300-rgb: 160,214,149;
   --btcpay-green-400: #78C369;
+  --btcpay-green-400-rgb: 120,195,105;
   --btcpay-green-500: #51B13E;
+  --btcpay-green-500-rgb: 81,177,62;
   --btcpay-green-600: #419437;
+  --btcpay-green-600-rgb: 65,148,55;
   --btcpay-green-700: #307630;
+  --btcpay-green-700-rgb: 48,118,48;
   --btcpay-green-800: #205928;
+  --btcpay-green-800-rgb: 32,89,40;
   --btcpay-green-900: #0F3B21;
+  --btcpay-green-900-rgb: 15,59,33;
   --btcpay-green-rgb: 81,177,62;
   --btcpay-blue-100: #b5e1e8;
+  --btcpay-blue-100-rgb: 181,225,232;
   --btcpay-blue-200: #9dd7e1;
+  --btcpay-blue-200-rgb: 157,215,225;
   --btcpay-blue-300: #7ccad7;
+  --btcpay-blue-300-rgb: 124,202,215;
   --btcpay-blue-400: #51b9c9;
+  --btcpay-blue-400-rgb: 81,185,201;
   --btcpay-blue-500: #17a2b8;
+  --btcpay-blue-500-rgb: 23,162,184;
   --btcpay-blue-600: #03899e;
+  --btcpay-blue-600-rgb: 3,137,158;
   --btcpay-blue-700: #007d91;
+  --btcpay-blue-700-rgb: 0,125,145;
   --btcpay-blue-800: #007284;
+  --btcpay-blue-800-rgb: 0,114,132;
   --btcpay-blue-900: #006778;
+  --btcpay-blue-900-rgb: 0,103,120;
   --btcpay-blue-rgb: 23,162,184;
   --btcpay-yellow-100: #FFFAF0;
+  --btcpay-yellow-100-rgb: 255,250,240;
   --btcpay-yellow-200: #FFF2D9;
+  --btcpay-yellow-200-rgb: 255,242,217;
   --btcpay-yellow-300: #FFE3AC;
+  --btcpay-yellow-300-rgb: 255,227,172;
   --btcpay-yellow-400: #FFCF70;
+  --btcpay-yellow-400-rgb: 255,207,112;
   --btcpay-yellow-500: #FFC043;
+  --btcpay-yellow-500-rgb: 255,192,67;
   --btcpay-yellow-600: #BC8B2C;
+  --btcpay-yellow-600-rgb: 188,139,44;
   --btcpay-yellow-700: #997328;
+  --btcpay-yellow-700-rgb: 153,115,40;
   --btcpay-yellow-800: #674D1B;
+  --btcpay-yellow-800-rgb: 103,77,27;
   --btcpay-yellow-900: #543D10;
+  --btcpay-yellow-900-rgb: 84,61,16;
   --btcpay-yellow-rgb: 255,192,67;
   --btcpay-red-100: #FFEFED;
+  --btcpay-red-100-rgb: 255,239,237;
   --btcpay-red-200: #FED7D2;
+  --btcpay-red-200-rgb: 254,215,210;
   --btcpay-red-300: #F1998E;
+  --btcpay-red-300-rgb: 241,153,142;
   --btcpay-red-400: #E85C4A;
+  --btcpay-red-400-rgb: 232,92,74;
   --btcpay-red-500: #E11900;
+  --btcpay-red-500-rgb: 225,25,0;
   --btcpay-red-600: #AB1300;
+  --btcpay-red-600-rgb: 171,19,0;
   --btcpay-red-700: #870F00;
+  --btcpay-red-700-rgb: 135,15,0;
   --btcpay-red-800: #5A0A00;
+  --btcpay-red-800-rgb: 90,10,0;
   --btcpay-red-900: #420105;
+  --btcpay-red-900-rgb: 66,1,5;
   --btcpay-red-rgb: 225,25,0;
   --btcpay-space-xs: 4px;
   --btcpay-space-s: 8px;
@@ -132,7 +195,9 @@
   --btcpay-body-text-muted: var(--btcpay-neutral-500);
   --btcpay-body-text-rgb: 41, 41, 41;
   --btcpay-body-link: var(--btcpay-primary);
+  --btcpay-body-link-rgb: var(--btcpay-primary-rgb);
   --btcpay-body-link-accent: var(--btcpay-primary-accent);
+  --btcpay-body-link-accent-rgb: 30, 122, 68;
   --btcpay-body-shadow: rgba(25, 135, 84, 0.33);
 
   --btcpay-wizard-bg: var(--btcpay-body-bg);
@@ -295,7 +360,7 @@
   --btcpay-warning-dim-bg-active: var(--btcpay-yellow-300);
   --btcpay-warning-dim-border: var(--btcpay-warning-dim-bg);
   --btcpay-warning-dim-border-active: var(--btcpay-warning-dim-bg-active);
-  --btcpay-warning-dim-text: var(--btcpay-neutral-800);
+  --btcpay-warning-dim-text: var(--btcpay-warning-800);
   --btcpay-warning-dim-text-striped: var(--btcpay-warning-dim-text);
   --btcpay-warning-dim-text-hover: var(--btcpay-warning-dim-text);
   --btcpay-warning-dim-text-active: var(--btcpay-yellow-900);

BTCPayServer/wwwroot/modal/btcpay.js

@@ -48,7 +48,7 @@
     var scriptMatch = thisScript.match(scriptSrcRegex)
     if (scriptMatch) {
         // We can't just take the domain as btcpay can run under a sub path with RootPath
-        origin = thisScript.substr(0, thisScript.length - scriptMatch[0].length);
+        origin = thisScript.slice(0, thisScript.length - scriptMatch[0].length);
     }
     // urlPrefix should be site root without trailing slash
     function setApiUrlPrefix(urlPrefix) {
@@ -88,10 +88,36 @@
     function onModalReceiveMessage(customOnModalReceiveMessage) {
         onModalReceiveMessageMethod = customOnModalReceiveMessage;
     }
+    var readerAbortController = null;
 
+    function startNfcScan() {
+        const ndef = new NDEFReader();
+        readerAbortController = new AbortController()
+        readerAbortController.signal.onabort = () => {
+            this.scanning = false;
+        };
+        ndef.scan({ signal:readerAbortController.signal }).then(() => {
+            ndef.onreading = event => {
+                const message = event.message;
+                const record = message.records[0];
+                const textDecoder = new TextDecoder('utf-8');
+                const data = textDecoder.decode(record.data);
+
+                // Send NFC data back to the iframe
+                if (iframe) {
+                    iframe.contentWindow.postMessage({ action: 'nfc:data', data }, '*');
+                }
+            };
+            ndef.onreadingerror = () => {
+                // Send error message back to the iframe
+                if (iframe) {
+                    iframe.contentWindow.postMessage({ action: 'nfc:error' }, '*');
+                }
+            };
+        }).catch(console.error);
+    }
+    
     function receiveMessage(event) {
-        var uri;
-
         if (!origin.startsWith(event.origin) || !showingInvoice) {
             return;
         }
@@ -99,8 +125,14 @@
             hideFrame();
         } else if (event.data === 'loaded') {
             showFrame();
+        } else if (event.data === 'nfc:startScan') {
+            startNfcScan();
+        } else if (event.data === 'nfc:abort') {
+            if (readerAbortController) {
+                readerAbortController.abort()
+            }
         } else if (event.data && event.data.open) {
-            uri = event.data.open;
+            const uri = event.data.open;
             if (uri.indexOf('bitcoin:') === 0) {
                 window.location = uri;
             }
@@ -149,5 +181,4 @@
         setApiUrlPrefix: setApiUrlPrefix,
         onModalReceiveMessage: onModalReceiveMessage
     };
-
 })();

BTCPayServer/wwwroot/paybutton/paybutton.js

@@ -1,6 +1,3 @@
-$(function () {
-    inputChanges();
-});
 
 function esc(input) {
     return ('' + input) /* Forces the conversion to string. */
@@ -61,7 +58,7 @@ function getScripts(srvModel) {
     return scripts
 }
 
-function inputChanges(event, buttonSize) {
+function inputChanges(vueApp, event, buttonSize) {
     if (buttonSize !== null && buttonSize !== undefined) {
         srvModel.buttonSize = buttonSize;
     }
@@ -187,8 +184,22 @@ function inputChanges(event, buttonSize) {
         }
     });
     url = url.href;
-    
-    $("#preview-link").attr('href', url);
+    vueApp.previewLink = url;
+    if (window.lnurlEndpoint){
+        let lnurlResult = lnurlEndpoint + "?";
+        if (srvModel.currency){
+            lnurlResult += `&currency=${srvModel.currency}`;
+        }
+        if (srvModel.price){
+            lnurlResult += `&amount=${srvModel.price}`;
+        }
+        if (srvModel.orderId){
+            lnurlResult += `&orderId=${srvModel.orderId}`;
+        }
+        lnurlResult= lnurlResult.replace("?&", "?");
+
+        vueApp.lnurlLink = lnurlResult;
+    }
     
     $('pre code').each(function (i, block) {
         hljs.highlightBlock(block);

BTCPayServer/wwwroot/swagger/v1/swagger.template.webhooks.json

@@ -68,7 +68,7 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "#/components/schemas/WebhookDataCreate"
+                                    "$ref": "#/components/schemas/WebhookDataCreateResult"
                                 }
                             }
                         }
@@ -526,9 +526,6 @@
             },
             "WebhookData": {
                 "allOf": [
-                    {
-                        "$ref": "#/components/schemas/WebhookDataBase"
-                    },
                     {
                         "type": "object",
                         "properties": {
@@ -538,10 +535,30 @@
                                 "nullable": false
                             }
                         }
+                    },
+                    {
+                        "$ref": "#/components/schemas/WebhookDataBase"
                     }
                 ]
             },
             "WebhookDataCreate": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/WebhookDataBase"
+                    },
+                    {
+                        "type": "object",
+                        "properties": {
+                            "secret": {
+                                "type": "string",
+                                "description": "Must be used by the callback receiver to ensure the delivery comes from BTCPay Server. BTCPay Server includes the `BTCPay-Sig` HTTP header, whose format is `sha256=HMAC256(UTF8(webhook's secret), body)`. The pattern to authenticate the webhook is similar to [how to secure webhooks in Github](https://docs.github.com/webhooks/securing/). If left out, null, or empty, the secret will be auto-generated.",
+                                "nullable": true
+                            }
+                        }
+                    }
+                ]
+            },
+            "WebhookDataCreateResult": {
                 "allOf": [
                     {
                         "$ref": "#/components/schemas/WebhookData"
@@ -551,8 +568,8 @@
                         "properties": {
                             "secret": {
                                 "type": "string",
-                                "description": "Must be used by the callback receiver to ensure the delivery comes from BTCPay Server. BTCPay Server includes the `BTCPay-Sig` HTTP header, whose format is `sha256=HMAC256(UTF8(webhook's secret), body)`. The pattern to authenticate the webhook is similar to [how to secure webhooks in Github](https://docs.github.com/webhooks/securing/).",
-                                "nullable": false
+                                "description": "Must be used by the callback receiver to ensure the delivery comes from BTCPay Server. BTCPay Server includes the `BTCPay-Sig` HTTP header, whose format is `sha256=HMAC256(UTF8(webhook's secret), body)`. The pattern to authenticate the webhook is similar to [how to secure webhooks in Github](https://docs.github.com/webhooks/securing/). Value of the auto-generated or custom secret.",
+                                "nullable": true
                             }
                         }
                     }
@@ -579,11 +596,6 @@
                 "type": "object",
                 "additionalProperties": false,
                 "properties": {
-                    "id": {
-                        "type": "string",
-                        "description": "The id of the webhook",
-                        "nullable": false
-                    },
                     "enabled": {
                         "type": "boolean",
                         "description": "Whether this webhook is enabled or not",

BTCPayServer/wwwroot/vendor/bootstrap-vue/bootstrap-vue.css

@@ -1,311 +0,0 @@
-.fade-enter-active, .fade-leave-active {
-    transition: opacity .15s linear;
-}
-.fade-enter, .fade-leave-to {
-    opacity: 0;
-}
-
-/* workaround for https://github.com/bootstrap-vue/bootstrap-vue/issues/1560 */
-/* source: _input-group.scss */
-
-.input-group > .input-group-prepend > .b-dropdown > .btn,
-.input-group > .input-group-append:not(:last-child) > .b-dropdown > .btn,
-.input-group > .input-group-append:last-child > .b-dropdown:not(:last-child):not(.dropdown-toggle) > .btn {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-.input-group > .input-group-append > .b-dropdown > .btn,
-.input-group > .input-group-prepend:not(:first-child) > .b-dropdown > .btn,
-.input-group > .input-group-prepend:first-child > .b-dropdown:not(:first-child) > .btn {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-}
-
-/* Special styling for type=range and type=color input */
-input.form-control[type="range"],
-input.form-control[type="color"] {
-    height: 2.25rem;
-}
-input.form-control.form-control-sm[type="range"],
-input.form-control.form-control-sm[type="color"] {
-    height: 1.9375rem;
-}
-input.form-control.form-control-lg[type="range"],
-input.form-control.form-control-lg[type="color"] {
-    height: 3rem;
-}
-
-/* Less padding on type=color */
-input.form-control[type="color"] {
-    padding: 0.25rem 0.25rem;
-}
-input.form-control.form-control-sm[type="color"] {
-    padding: 0.125rem 0.125rem;
-}
-
-/* Add support for fixed layout table */
-table.b-table.b-table-fixed {
-    table-layout: fixed;
-}
-
-/* Busy table styling */
-table.b-table[aria-busy='false'] {
-    opacity: 1;
-}
-table.b-table[aria-busy='true'] {
-    opacity: 0.6;
-}
-
-/* Sort styling */
-table.b-table > thead > tr > th,
-table.b-table > tfoot > tr > th {
-    position: relative;
-}
-table.b-table > thead > tr > th.sorting,
-table.b-table > tfoot > tr > th.sorting {
-    padding-right: 1.5em;
-    cursor: pointer;
-}
-table.b-table > thead > tr > th.sorting::before,
-table.b-table > thead > tr > th.sorting::after,
-table.b-table > tfoot > tr > th.sorting::before,
-table.b-table > tfoot > tr > th.sorting::after {
-    position: absolute;
-    bottom: 0;
-    display: block;
-    opacity: 0.4;
-    padding-bottom: inherit;
-    font-size: inherit;
-    line-height: 180%;
-}
-table.b-table > thead > tr > th.sorting::before,
-table.b-table > tfoot > tr > th.sorting::before {
-    right: 0.75em;
-    content: '\2191';
-}
-table.b-table > thead > tr > th.sorting::after,
-table.b-table > tfoot > tr > th.sorting::after {
-    right: 0.25em;
-    content: '\2193';
-}
-table.b-table > thead > tr > th.sorting_asc::after,
-table.b-table > thead > tr > th.sorting_desc::before,
-table.b-table > tfoot > tr > th.sorting_asc::after,
-table.b-table > tfoot > tr > th.sorting_desc::before {
-    opacity: 1;
-}
-
-/* Stacked table layout */
-/* Derived from http://blog.adrianroselli.com/2017/11/a-responsive-accessible-table.html */
-/* Always stacked */
-table.b-table.b-table-stacked {
-    width: 100%;
-}
-table.b-table.b-table-stacked,
-table.b-table.b-table-stacked > tbody,
-table.b-table.b-table-stacked > tbody > tr,
-table.b-table.b-table-stacked > tbody > tr > td,
-table.b-table.b-table-stacked > tbody > tr > th,
-table.b-table.b-table-stacked > caption {
-    display: block;
-}
-
-/* Hide stuff we can't deal with, or shouldn't show */
-table.b-table.b-table-stacked > thead,
-table.b-table.b-table-stacked > tfoot,
-table.b-table.b-table-stacked > tbody > tr.b-table-top-row,
-table.b-table.b-table-stacked > tbody > tr.b-table-bottom-row {
-    display: none;
-}
-
-/* inter-row top border */
-table.b-table.b-table-stacked > tbody > tr > :first-child {
-    border-top-width: 0.4rem;
-}
-
-/* convert TD/TH contents to "cells". Caveat: child elements become cells! */
-table.b-table.b-table-stacked > tbody > tr > [data-label] {
-    display: grid;
-    grid-template-columns: 40% auto;
-    grid-gap: 0.25rem 1rem;
-}
-
-/* generate row cell "heading" */
-table.b-table.b-table-stacked > tbody > tr > [data-label]::before {
-    content: attr(data-label);
-    display: inline;
-    text-align: right;
-    overflow-wrap: break-word;
-    font-weight: bold;
-    font-style: normal;
-}
-
-@media all and (max-width: 575.99px) {
-    /* Under SM */
-    table.b-table.b-table-stacked-sm {
-        width: 100%;
-    }
-    table.b-table.b-table-stacked-sm,
-    table.b-table.b-table-stacked-sm > tbody,
-    table.b-table.b-table-stacked-sm > tbody > tr,
-    table.b-table.b-table-stacked-sm > tbody > tr > td,
-    table.b-table.b-table-stacked-sm > tbody > tr > th,
-    table.b-table.b-table-stacked-sm > caption {
-        display: block;
-    }
-    /* hide stuff we can't deal with, or shouldn't show */
-    table.b-table.b-table-stacked-sm > thead,
-    table.b-table.b-table-stacked-sm > tfoot,
-    table.b-table.b-table-stacked-sm > tbody > tr.b-table-top-row,
-    table.b-table.b-table-stacked-sm > tbody > tr.b-table-bottom-row {
-        display: none;
-    }
-    /* inter-row top border */
-    table.b-table.b-table-stacked-sm > tbody > tr > :first-child {
-        border-top-width: 0.4rem;
-    }
-    /* convert TD/TH contents to "cells". Caveat: child elements become cells! */
-    table.b-table.b-table-stacked-sm > tbody > tr > [data-label] {
-        display: grid;
-        grid-template-columns: 40% auto;
-        grid-gap: 0.25rem 1rem;
-    }
-    /* generate row cell "heading" */
-    table.b-table.b-table-stacked-sm > tbody > tr > [data-label]::before {
-        content: attr(data-label);
-        display: inline;
-        text-align: right;
-        overflow-wrap: break-word;
-        font-weight: bold;
-        font-style: normal;
-    }
-}
-
-@media all and (max-width: 767.99px) {
-    /* under MD  */
-    table.b-table.b-table-stacked-md {
-        width: 100%;
-    }
-    table.b-table.b-table-stacked-md,
-    table.b-table.b-table-stacked-md > tbody,
-    table.b-table.b-table-stacked-md > tbody > tr,
-    table.b-table.b-table-stacked-md > tbody > tr > td,
-    table.b-table.b-table-stacked-md > tbody > tr > th,
-    table.b-table.b-table-stacked-md > caption {
-        display: block;
-    }
-    /* hide stuff we can't deal with, or shouldn't show */
-    table.b-table.b-table-stacked-md > thead,
-    table.b-table.b-table-stacked-md > tfoot,
-    table.b-table.b-table-stacked-md > tbody > tr.b-table-top-row,
-    table.b-table.b-table-stacked-md > tbody > tr.b-table-bottom-row {
-        display: none;
-    }
-    /* inter-row top border */
-    table.b-table.b-table-stacked-md > tbody > tr > :first-child {
-        border-top-width: 0.4rem;
-    }
-    /* convert TD/TH contents to "cells". Caveat: child elements become cells! */
-    table.b-table.b-table-stacked-md > tbody > tr > [data-label] {
-        display: grid;
-        grid-template-columns: 40% auto;
-        grid-gap: 0.25rem 1rem;
-    }
-    /* generate row cell "heading" */
-    table.b-table.b-table-stacked-md > tbody > tr > [data-label]::before {
-        content: attr(data-label);
-        display: inline;
-        text-align: right;
-        overflow-wrap: break-word;
-        font-weight: bold;
-        font-style: normal;
-    }
-}
-
-@media all and (max-width: 991.99px) {
-    /* under LG  */
-    table.b-table.b-table-stacked-lg {
-        width: 100%;
-    }
-    table.b-table.b-table-stacked-lg,
-    table.b-table.b-table-stacked-lg > tbody,
-    table.b-table.b-table-stacked-lg > tbody > tr,
-    table.b-table.b-table-stacked-lg > tbody > tr > td,
-    table.b-table.b-table-stacked-lg > tbody > tr > th,
-    table.b-table.b-table-stacked-lg > caption {
-        display: block;
-    }
-    /* hide stuff we can't deal with, or shouldn't show */
-    table.b-table.b-table-stacked-lg > thead,
-    table.b-table.b-table-stacked-lg > tfoot,
-    table.b-table.b-table-stacked-lg > tbody > tr.b-table-top-row,
-    table.b-table.b-table-stacked-lg > tbody > tr.b-table-bottom-row {
-        display: none;
-    }
-    /* inter-row top border */
-    table.b-table.b-table-stacked-lg > tbody > tr > :first-child {
-        border-top-width: 0.4rem;
-    }
-    /* convert TD/TH contents to "cells". Caveat: child elements become cells! */
-    table.b-table.b-table-stacked-lg > tbody > tr > [data-label] {
-        display: grid;
-        grid-template-columns: 40% auto;
-        grid-gap: 0.25rem 1rem;
-    }
-    /* generate row cell "heading" */
-    table.b-table.b-table-stacked-lg > tbody > tr > [data-label]::before {
-        content: attr(data-label);
-        display: inline;
-        text-align: right;
-        overflow-wrap: break-word;
-        font-weight: bold;
-        font-style: normal;
-    }
-}
-
-@media all and (max-width: 1199.99px) {
-    /* under XL  */
-    table.b-table.b-table-stacked-xl {
-        width: 100%;
-    }
-    table.b-table.b-table-stacked-xl,
-    table.b-table.b-table-stacked-xl > tbody,
-    table.b-table.b-table-stacked-xl > tbody > tr,
-    table.b-table.b-table-stacked-xl > tbody > tr > td,
-    table.b-table.b-table-stacked-xl > tbody > tr > th,
-    table.b-table.b-table-stacked-xl > caption {
-        display: block;
-    }
-    /* hide stuff we can't deal with, or shouldn't show */
-    table.b-table.b-table-stacked-xl > thead,
-    table.b-table.b-table-stacked-xl > tfoot,
-    table.b-table.b-table-stacked-xl > tbody > tr.b-table-top-row,
-    table.b-table.b-table-stacked-xl > tbody > tr.b-table-bottom-row {
-        display: none;
-    }
-    /* inter-row top border */
-    table.b-table.b-table-stacked-xl > tbody > tr > :first-child {
-        border-top-width: 0.4rem;
-    }
-    /* convert TD/TH contents to "cells". Caveat: child elements become cells! */
-    table.b-table.b-table-stacked-xl > tbody > tr > [data-label] {
-        display: grid;
-        grid-template-columns: 40% auto;
-        grid-gap: 0.25rem 1rem;
-    }
-    /* generate row cell "heading" */
-    table.b-table.b-table-stacked-xl > tbody > tr > [data-label]::before {
-        content: attr(data-label);
-        display: inline;
-        text-align: right;
-        overflow-wrap: break-word;
-        font-weight: bold;
-        font-style: normal;
-    }
-}
-
-/* Details row styling */
-table.b-table > tbody > tr.b-table-details > td {
-    border-top: none;
-}