From b744fd6167e36c813802f81cc6238cb0c3eecb7d Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 7 Oct 2024 14:51:29 +0900
Subject: [PATCH 01/11] Allow payment methods to modify all the payment model

---
 .../Controllers/UIInvoiceController.UI.cs     | 15 +++++++++----
 .../Models/InvoicingModels/PaymentModel.cs    | 15 +++++++++++--
 .../Bitcoin/BitcoinPaymentModelExtension.cs   |  4 ++--
 .../Payments/IPaymentModelExtension.cs        |  3 ++-
 .../LNURLPay/LNURLPayPaymentModelExtension.cs |  2 ++
 .../LightningPaymentModelExtension.cs         |  2 +-
 .../Payments/MoneroPaymentModelExtension.cs   | 21 ++++++++++---------
 .../Payments/ZcashPaymentModelExtension.cs    | 20 +++++++++---------
 8 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
index ae594d3cf..6e2e4cc32 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
@@ -922,7 +922,6 @@ namespace BTCPayServer.Controllers
                 Status = invoice.Status.ToString(),
                 // The Tweak is part of the PaymentMethodFee, but let's not show it in the UI as it's negligible.
                 NetworkFee = prompt.PaymentMethodFee - prompt.TweakFee,
-                IsMultiCurrency = invoice.GetPayments(false).Select(p => p.PaymentMethodId).Concat(new[] { prompt.PaymentMethodId }).Distinct().Count() > 1,
                 StoreId = store.Id,
                 AvailableCryptos = invoice.GetPaymentPrompts()
                                           .Select(kv =>
@@ -930,8 +929,9 @@ namespace BTCPayServer.Controllers
                                               var handler = _handlers[kv.PaymentMethodId];
                                               return new PaymentModel.AvailableCrypto
                                               {
+												  Handler = handler,
                                                   Displayed = displayedPaymentMethods.Contains(kv.PaymentMethodId),
-                                                  PaymentMethodId = kv.PaymentMethodId.ToString(),
+                                                  PaymentMethodId = kv.PaymentMethodId,
                                                   CryptoCode = kv.Currency,
                                                   PaymentMethodName = _prettyName.PrettyName(kv.PaymentMethodId),
                                                   IsLightning = handler is ILightningPaymentHandler,
@@ -947,8 +947,15 @@ namespace BTCPayServer.Controllers
                                           .OrderByDescending(a => a.CryptoCode == _NetworkProvider.DefaultNetwork.CryptoCode).ThenBy(a => a.PaymentMethodName).ThenBy(a => a.IsLightning ? 1 : 0)
                                           .ToList()
             };
-            if (_paymentModelExtensions.TryGetValue(paymentMethodId, out var extension))
-                extension.ModifyPaymentModel(new PaymentModelContext(model, store, storeBlob, invoice, Url, prompt, handler));
+
+			foreach (var kv in invoice.GetPaymentPrompts())
+			{
+				if (_paymentModelExtensions.TryGetValue(kv.PaymentMethodId, out var extension) &&
+					_handlers.TryGetValue(kv.PaymentMethodId, out var h))
+				{
+					extension.ModifyPaymentModel(new PaymentModelContext(model, store, storeBlob, invoice, Url, kv, h, paymentMethodId == kv.PaymentMethodId));
+				}
+			}
             model.UISettings = _viewProvider.TryGetViewViewModel(prompt, "CheckoutUI")?.View as CheckoutUIPaymentMethodSettings;
             model.PaymentMethodId = paymentMethodId.ToString();
             model.OrderAmountFiat = OrderAmountFromInvoice(model.CryptoCode, invoice, DisplayFormatter.CurrencyFormat.Symbol);
diff --git a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs b/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
index 5518ffd67..15898ae72 100644
--- a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
+++ b/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
@@ -1,6 +1,9 @@
 using System.Collections.Generic;
 using BTCPayServer.Client.Models;
+using BTCPayServer.JsonConverters;
 using BTCPayServer.Payments;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Models.InvoicingModels
 {
@@ -9,13 +12,19 @@ namespace BTCPayServer.Models.InvoicingModels
         public CheckoutUIPaymentMethodSettings UISettings;
         public class AvailableCrypto
         {
-            public string PaymentMethodId { get; set; }
+            [JsonConverter(typeof(PaymentMethodIdJsonConverter))]
+            public PaymentMethodId PaymentMethodId { get; set; }
             public string CryptoImage { get; set; }
             public string Link { get; set; }
             public string PaymentMethodName { get; set; }
             public bool IsLightning { get; set; }
             public string CryptoCode { get; set; }
             public bool Displayed { get; set; }
+            [JsonIgnore]
+            public IPaymentMethodHandler Handler { get; internal set; }
+
+            [JsonExtensionData]
+            public Dictionary<string, JToken> AdditionalData { get; set; } = new();
         }
         public StoreBrandingViewModel StoreBranding { get; set; }
         public string PaymentSoundUrl { get; set; }
@@ -58,7 +67,6 @@ namespace BTCPayServer.Models.InvoicingModels
 
         public string OrderId { get; set; }
         public decimal NetworkFee { get; set; }
-        public bool IsMultiCurrency { get; set; }
         public int MaxTimeMinutes { get; set; }
         public string PaymentMethodId { get; set; }
         public string PaymentMethodName { get; set; }
@@ -73,6 +81,9 @@ namespace BTCPayServer.Models.InvoicingModels
         public int? RequiredConfirmations { get; set; }
         public long? ReceivedConfirmations { get; set; }
 
+        [JsonIgnore]
         public HashSet<string> ExtensionPartials { get; } = new HashSet<string>();
+        [JsonExtensionData]
+        public Dictionary<string, JToken> AdditionalData { get; set; } = new();
     }
 }
diff --git a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
index 1b22e46e3..273cccd01 100644
--- a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
@@ -46,9 +46,9 @@ namespace BTCPayServer.Payments.Bitcoin
         public PaymentMethodId PaymentMethodId { get; }
         public void ModifyPaymentModel(PaymentModelContext context)
         {
-            var prompt = context.Prompt;
-            if (!_handlers.TryGetValue(PaymentMethodId, out var o) || o is not BitcoinLikePaymentHandler handler)
+            if (context is not { IsSelected: true, Handler: BitcoinLikePaymentHandler handler})
                 return;
+            var prompt = context.Prompt;
             var details = handler.ParsePaymentPromptDetails(prompt.Details);
             context.Model.ShowRecommendedFee = context.StoreBlob.ShowRecommendedFee;
             context.Model.FeeRate = details.RecommendedFeeRate.SatoshiPerByte;
diff --git a/BTCPayServer/Payments/IPaymentModelExtension.cs b/BTCPayServer/Payments/IPaymentModelExtension.cs
index 3881396e7..a50755bbe 100644
--- a/BTCPayServer/Payments/IPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/IPaymentModelExtension.cs
@@ -11,7 +11,8 @@ namespace BTCPayServer.Payments
         InvoiceEntity InvoiceEntity,
         IUrlHelper UrlHelper,
         PaymentPrompt Prompt,
-        IPaymentMethodHandler Handler);
+        IPaymentMethodHandler Handler,
+        bool IsSelected);
     public interface IPaymentModelExtension
     {
         public PaymentMethodId PaymentMethodId { get; }
diff --git a/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs b/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
index b9abe91f3..14b19dfd2 100644
--- a/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
@@ -39,6 +39,8 @@ namespace BTCPayServer.Payments.LNURLPay
         private const string UriScheme = "lightning:";
         public void ModifyPaymentModel(PaymentModelContext context)
         {
+            if (context is not { IsSelected: true, Handler: LNURLPayPaymentHandler handler })
+                return;
             var lnurl = paymentLinkExtension.GetPaymentLink(context.Prompt, context.UrlHelper);
             if (lnurl is not null)
             {
diff --git a/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs b/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
index 7a47ae7c1..7f1573625 100644
--- a/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
@@ -39,7 +39,7 @@ namespace BTCPayServer.Payments.Lightning
         public string Badge => "⚡";
         public void ModifyPaymentModel(PaymentModelContext context)
         {
-            if (!Handlers.TryGetValue(PaymentMethodId, out var o) || o is not LightningLikePaymentHandler handler)
+            if (context is not { IsSelected: true, Handler: LightningLikePaymentHandler handler })
                 return;
             var paymentPrompt = context.InvoiceEntity.GetPaymentPrompt(PaymentMethodId);
             if (paymentPrompt is null)
diff --git a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs
index 6af2fbdcc..092cdb105 100644
--- a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs
+++ b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Bitcoin;
+using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Services.Altcoins.Monero.Services;
 using BTCPayServer.Services.Invoices;
 
@@ -33,20 +34,20 @@ namespace BTCPayServer.Services.Altcoins.Monero.Payments
 
         public void ModifyPaymentModel(PaymentModelContext context)
         {
+            if (context is not { IsSelected: true, Handler: MoneroLikePaymentMethodHandler handler })
+                return;
             if (context.Model.Activated)
             {
-                if (_handlers.TryGetValue(PaymentMethodId, out var handler))
+                var details = context.InvoiceEntity.GetPayments(true)
+                    .Select(p => p.GetDetails<MoneroLikePaymentData>(handler))
+                    .Where(p => p is not null)
+                    .FirstOrDefault();
+                if (details is not null)
                 {
-                    var details = context.InvoiceEntity.GetPayments(true)
-                        .Select(p => p.GetDetails<MoneroLikePaymentData>(handler))
-                        .Where(p => p is not null)
-                        .FirstOrDefault();
-                    if (details is not null)
-                    {
-                        context.Model.ReceivedConfirmations = details.ConfirmationCount;
-                        context.Model.RequiredConfirmations = (int)MoneroListener.ConfirmationsRequired(details, context.InvoiceEntity.SpeedPolicy);
-                    }
+                    context.Model.ReceivedConfirmations = details.ConfirmationCount;
+                    context.Model.RequiredConfirmations = (int)MoneroListener.ConfirmationsRequired(details, context.InvoiceEntity.SpeedPolicy);
                 }
+
                 context.Model.InvoiceBitcoinUrl = paymentLinkExtension.GetPaymentLink(context.Prompt, context.UrlHelper);
                 context.Model.InvoiceBitcoinUrlQR = context.Model.InvoiceBitcoinUrl;
             }
diff --git a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs
index f0fb35265..47a0527cd 100644
--- a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs
+++ b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using BTCPayServer.Payments;
+using BTCPayServer.Services.Altcoins.Monero.Payments;
 using BTCPayServer.Services.Altcoins.Zcash.Services;
 using BTCPayServer.Services.Invoices;
 
@@ -32,19 +33,18 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Payments
 
         public void ModifyPaymentModel(PaymentModelContext context)
         {
+            if (context is not { IsSelected: true, Handler: ZcashLikePaymentMethodHandler handler })
+                return;
             if (context.Model.Activated)
             {
-                if (_handlers.TryGetValue(PaymentMethodId, out var handler))
+                var details = context.InvoiceEntity.GetPayments(true)
+                    .Select(p => p.GetDetails<ZcashLikePaymentData>(handler))
+                    .Where(p => p is not null)
+                    .FirstOrDefault();
+                if (details is not null)
                 {
-                    var details = context.InvoiceEntity.GetPayments(true)
-                       .Select(p => p.GetDetails<ZcashLikePaymentData>(handler))
-                       .Where(p => p is not null)
-                       .FirstOrDefault();
-                    if (details is not null)
-                    {
-                        context.Model.ReceivedConfirmations = details.ConfirmationCount;
-                        context.Model.RequiredConfirmations = (int)ZcashListener.ConfirmationsRequired(context.InvoiceEntity.SpeedPolicy);
-                    }
+                    context.Model.ReceivedConfirmations = details.ConfirmationCount;
+                    context.Model.RequiredConfirmations = (int)ZcashListener.ConfirmationsRequired(context.InvoiceEntity.SpeedPolicy);
                 }
                 context.Model.InvoiceBitcoinUrl = paymentLinkExtension.GetPaymentLink(context.Prompt, context.UrlHelper);
                 context.Model.InvoiceBitcoinUrlQR = context.Model.InvoiceBitcoinUrl;

From 8dcd7e6966bcd9ae7462f7775c48b294ea657315 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 7 Oct 2024 15:18:41 +0900
Subject: [PATCH 02/11] Remove no javascript for checkout

---
 .../Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs | 1 -
 .../Lightning/LightningPaymentMethodViewExtension.cs     | 3 +--
 .../Zcash/Payments/ZcashLikePaymentMethodHandler.cs      | 3 +--
 BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml     | 9 +--------
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs b/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
index bc09fc254..7df2d77cb 100644
--- a/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
@@ -19,7 +19,6 @@ namespace BTCPayServer.Payments.LNURLPay
                 ExtensionPartial = "Lightning/LightningLikeMethodCheckout",
                 CheckoutBodyVueComponentName = "LightningLikeMethodCheckout",
                 CheckoutHeaderVueComponentName = "LightningLikeMethodCheckoutHeader",
-                NoScriptPartialName = "Lightning/LightningLikeMethodCheckoutNoScript"
             });
         }
     }
diff --git a/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs b/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs
index 41eb3ff4d..533c54feb 100644
--- a/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs
@@ -14,8 +14,7 @@ namespace BTCPayServer.Payments.Lightning
             {
                 ExtensionPartial = "Lightning/LightningLikeMethodCheckout",
                 CheckoutBodyVueComponentName = "LightningLikeMethodCheckout",
-                CheckoutHeaderVueComponentName = "LightningLikeMethodCheckoutHeader",
-                NoScriptPartialName = "Lightning/LightningLikeMethodCheckoutNoScript"
+                CheckoutHeaderVueComponentName = "LightningLikeMethodCheckoutHeader"
             });
         }
     }
diff --git a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs
index 76714b2f3..252ba7b37 100644
--- a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs
+++ b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs
@@ -108,8 +108,7 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Payments
             {
                 ExtensionPartial = "Bitcoin/BitcoinLikeMethodCheckout",
                 CheckoutBodyVueComponentName = "BitcoinLikeMethodCheckout",
-                CheckoutHeaderVueComponentName = "BitcoinLikeMethodCheckoutHeader",
-                NoScriptPartialName = "Bitcoin/BitcoinLikeMethodCheckoutNoScript"
+                CheckoutHeaderVueComponentName = "BitcoinLikeMethodCheckoutHeader"
             };
         }
 
diff --git a/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml b/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml
index f4bb0114c..957eaa250 100644
--- a/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml
+++ b/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml
@@ -17,14 +17,7 @@
     <h1>Pay with @Model.StoreName</h1>
     @if (Model.Status == "new")
     {
-        if (!string.IsNullOrEmpty(Model.UISettings?.NoScriptPartialName))
-        {
-            <partial model="@Model" name="@Model.UISettings.NoScriptPartialName"/>
-        }
-        else
-        {
-            <h1 class="text-danger">This payment method requires javascript.</h1>
-        }
+		<h1 class="text-danger">This payment method requires javascript.</h1>
         @if (displayedPaymentMethods.Count > 1)
         {
             <div>

From 0a2d8880ba5110514d428379edc18b467acaec3d Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 7 Oct 2024 15:20:26 +0900
Subject: [PATCH 03/11] Remove CheckoutBodyVueComponentName

---
 .../Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs     | 4 +---
 BTCPayServer/Payments/IPaymentMethodViewExtension.cs          | 2 --
 .../Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs      | 3 +--
 .../Payments/Lightning/LightningPaymentMethodViewExtension.cs | 3 +--
 .../Monero/Payments/MoneroLikePaymentMethodHandler.cs         | 4 +---
 .../Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs  | 4 +---
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs
index bfcb6e07a..477f3b7dd 100644
--- a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs
@@ -13,9 +13,7 @@ namespace BTCPayServer.Payments.Bitcoin
             context.RegisterCheckoutUI(new CheckoutUIPaymentMethodSettings
             {
                 ExtensionPartial = "Bitcoin/BitcoinLikeMethodCheckout",
-                CheckoutBodyVueComponentName = "BitcoinLikeMethodCheckout",
-                CheckoutHeaderVueComponentName = "BitcoinLikeMethodCheckoutHeader",
-                NoScriptPartialName = "Bitcoin/BitcoinLikeMethodCheckoutNoScript"
+                CheckoutBodyVueComponentName = "BitcoinLikeMethodCheckout"
             });
         }
     }
diff --git a/BTCPayServer/Payments/IPaymentMethodViewExtension.cs b/BTCPayServer/Payments/IPaymentMethodViewExtension.cs
index 00641483d..8cb7d5a10 100644
--- a/BTCPayServer/Payments/IPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/IPaymentMethodViewExtension.cs
@@ -64,7 +64,5 @@ namespace BTCPayServer.Payments
     {
         public string? ExtensionPartial { get; set; }
         public string? CheckoutBodyVueComponentName { get; set; }
-        public string? CheckoutHeaderVueComponentName { get; set; }
-        public string? NoScriptPartialName { get; set; }
     }
 }
diff --git a/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs b/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
index 7df2d77cb..156fe233e 100644
--- a/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
@@ -17,8 +17,7 @@ namespace BTCPayServer.Payments.LNURLPay
             context.RegisterCheckoutUI(new CheckoutUIPaymentMethodSettings()
             {
                 ExtensionPartial = "Lightning/LightningLikeMethodCheckout",
-                CheckoutBodyVueComponentName = "LightningLikeMethodCheckout",
-                CheckoutHeaderVueComponentName = "LightningLikeMethodCheckoutHeader",
+                CheckoutBodyVueComponentName = "LightningLikeMethodCheckout"
             });
         }
     }
diff --git a/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs b/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs
index 533c54feb..697305651 100644
--- a/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs
@@ -13,8 +13,7 @@ namespace BTCPayServer.Payments.Lightning
             context.RegisterCheckoutUI(new CheckoutUIPaymentMethodSettings()
             {
                 ExtensionPartial = "Lightning/LightningLikeMethodCheckout",
-                CheckoutBodyVueComponentName = "LightningLikeMethodCheckout",
-                CheckoutHeaderVueComponentName = "LightningLikeMethodCheckoutHeader"
+                CheckoutBodyVueComponentName = "LightningLikeMethodCheckout"
             });
         }
     }
diff --git a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs
index 1e216c3cc..7a535da1d 100644
--- a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs
+++ b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs
@@ -113,9 +113,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.Payments
             return new CheckoutUIPaymentMethodSettings
             {
                 ExtensionPartial = "Bitcoin/BitcoinLikeMethodCheckout",
-                CheckoutBodyVueComponentName = "BitcoinLikeMethodCheckout",
-                CheckoutHeaderVueComponentName = "BitcoinLikeMethodCheckoutHeader",
-                NoScriptPartialName = "Bitcoin/BitcoinLikeMethodCheckoutNoScript"
+                CheckoutBodyVueComponentName = "BitcoinLikeMethodCheckout"
             };
         }
 
diff --git a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs
index 252ba7b37..8984459f7 100644
--- a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs
+++ b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs
@@ -106,9 +106,7 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Payments
         {
             return new CheckoutUIPaymentMethodSettings
             {
-                ExtensionPartial = "Bitcoin/BitcoinLikeMethodCheckout",
-                CheckoutBodyVueComponentName = "BitcoinLikeMethodCheckout",
-                CheckoutHeaderVueComponentName = "BitcoinLikeMethodCheckoutHeader"
+                ExtensionPartial = "Bitcoin/BitcoinLikeMethodCheckout"
             };
         }
 

From ef0ba7b0c41b4d9f95126609a04b3418517d6f15 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 7 Oct 2024 15:49:56 +0900
Subject: [PATCH 04/11] Remove useless properties

---
 .../Controllers/UIInvoiceController.UI.cs         | 15 ---------------
 .../Bitcoin/BitcoinPaymentMethodViewExtension.cs  |  1 -
 .../Payments/IPaymentMethodViewExtension.cs       |  1 -
 .../LNURLPay/LNURLPaymentMethodViewExtension.cs   |  3 +--
 .../LightningPaymentMethodViewExtension.cs        |  3 +--
 .../Payments/MoneroLikePaymentMethodHandler.cs    |  3 +--
 .../Bitcoin/BitcoinLikeMethodCheckout.cshtml      |  6 +++---
 .../BitcoinLikeMethodCheckoutNoScript.cshtml      |  8 --------
 .../Lightning/LightningLikeMethodCheckout.cshtml  |  6 +++---
 .../LightningLikeMethodCheckoutNoScript.cshtml    | 12 ------------
 BTCPayServer/Views/UIInvoice/Checkout.cshtml      |  4 ++--
 BTCPayServer/wwwroot/checkout/checkout.js         |  6 +++---
 12 files changed, 14 insertions(+), 54 deletions(-)
 delete mode 100644 BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckoutNoScript.cshtml
 delete mode 100644 BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckoutNoScript.cshtml

diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
index 6e2e4cc32..4e095a01f 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
@@ -711,21 +711,6 @@ namespace BTCPayServer.Controllers
             return View(model);
         }
 
-        [HttpGet("invoice-noscript")]
-        public async Task<IActionResult> CheckoutNoScript(string? invoiceId, string? id = null, string? paymentMethodId = null, [FromQuery] string? lang = null)
-        {
-            //Keep compatibility with Bitpay
-            invoiceId = invoiceId ?? id;
-            //
-            if (invoiceId is null)
-                return NotFound();
-            var model = await GetInvoiceModel(invoiceId, paymentMethodId is null ? null : PaymentMethodId.Parse(paymentMethodId), lang);
-            if (model == null)
-                return NotFound();
-
-            return View(model);
-        }
-
         private async Task<PaymentModel?> GetInvoiceModel(string invoiceId, PaymentMethodId? paymentMethodId, string? lang)
         {
             var invoice = await _InvoiceRepository.GetInvoice(invoiceId);
diff --git a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs
index 477f3b7dd..0850a48d5 100644
--- a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs
@@ -13,7 +13,6 @@ namespace BTCPayServer.Payments.Bitcoin
             context.RegisterCheckoutUI(new CheckoutUIPaymentMethodSettings
             {
                 ExtensionPartial = "Bitcoin/BitcoinLikeMethodCheckout",
-                CheckoutBodyVueComponentName = "BitcoinLikeMethodCheckout"
             });
         }
     }
diff --git a/BTCPayServer/Payments/IPaymentMethodViewExtension.cs b/BTCPayServer/Payments/IPaymentMethodViewExtension.cs
index 8cb7d5a10..1266b5ac7 100644
--- a/BTCPayServer/Payments/IPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/IPaymentMethodViewExtension.cs
@@ -63,6 +63,5 @@ namespace BTCPayServer.Payments
     public class CheckoutUIPaymentMethodSettings
     {
         public string? ExtensionPartial { get; set; }
-        public string? CheckoutBodyVueComponentName { get; set; }
     }
 }
diff --git a/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs b/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
index 156fe233e..6777c6433 100644
--- a/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
@@ -16,8 +16,7 @@ namespace BTCPayServer.Payments.LNURLPay
             context.RegisterPaymentMethodDetails("LNURL/AdditionalPaymentMethodDetails");
             context.RegisterCheckoutUI(new CheckoutUIPaymentMethodSettings()
             {
-                ExtensionPartial = "Lightning/LightningLikeMethodCheckout",
-                CheckoutBodyVueComponentName = "LightningLikeMethodCheckout"
+                ExtensionPartial = "Lightning/LightningLikeMethodCheckout"
             });
         }
     }
diff --git a/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs b/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs
index 697305651..2ef202aef 100644
--- a/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs
@@ -12,8 +12,7 @@ namespace BTCPayServer.Payments.Lightning
         {
             context.RegisterCheckoutUI(new CheckoutUIPaymentMethodSettings()
             {
-                ExtensionPartial = "Lightning/LightningLikeMethodCheckout",
-                CheckoutBodyVueComponentName = "LightningLikeMethodCheckout"
+                ExtensionPartial = "Lightning/LightningLikeMethodCheckout"
             });
         }
     }
diff --git a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs
index 7a535da1d..b8e8001a6 100644
--- a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs
+++ b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs
@@ -112,8 +112,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.Payments
         {
             return new CheckoutUIPaymentMethodSettings
             {
-                ExtensionPartial = "Bitcoin/BitcoinLikeMethodCheckout",
-                CheckoutBodyVueComponentName = "BitcoinLikeMethodCheckout"
+                ExtensionPartial = "Bitcoin/BitcoinLikeMethodCheckout"
             };
         }
 
diff --git a/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml b/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
index ad2e89e2f..ccb8dd4b6 100644
--- a/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
+++ b/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
@@ -3,7 +3,7 @@
 @using BTCPayServer.Abstractions.TagHelpers
 @model BTCPayServer.Models.InvoicingModels.PaymentModel
 
-<template id="bitcoin-method-checkout-template">
+<template id="checkout-template">
     @await Component.InvokeAsync("UiExtensionPoint", new {location = "checkout-bitcoin-pre-content", model = Model})
     <div class="payment-box">
         <div v-if="model.invoiceBitcoinUrlQR" class="qr-container" :data-qr-value="model.invoiceBitcoinUrlQR" :data-clipboard="model.invoiceBitcoinUrl" data-clipboard-confirm-element="#Address_@Model.PaymentMethodId [data-clipboard]">
@@ -31,9 +31,9 @@
 </template>
 
 <script>
-    Vue.component('BitcoinLikeMethodCheckout', {
+	Vue.component('checkout-template', {
         props: ['model', 'nfcSupported', 'nfcScanning', 'nfcErrorMessage'],
-        template: "#bitcoin-method-checkout-template",
+		template: "#checkout-template",
         components: {
             qrcode: VueQrcode
         },
diff --git a/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckoutNoScript.cshtml b/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckoutNoScript.cshtml
deleted file mode 100644
index abea18980..000000000
--- a/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckoutNoScript.cshtml
+++ /dev/null
@@ -1,8 +0,0 @@
-@model PaymentModel
-<div>
-    <p>To complete payment, please send <b>@(Model.IsUnsetTopUp ? "any amount of" : Model.BtcDue) @Model.CryptoCode</b> to <b style="word-break: break-word;">@Model.BtcAddress</b></p>
-    <p>Time remaining: @Model.TimeLeft</p>
-    <p>
-        <a href="@Model.InvoiceBitcoinUrl" style="word-break: break-word;" rel="noreferrer noopener">@Model.InvoiceBitcoinUrl</a>
-    </p>
-</div>
diff --git a/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml b/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
index 112901f7a..2f3d436dc 100644
--- a/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
+++ b/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
@@ -1,6 +1,6 @@
 @model BTCPayServer.Models.InvoicingModels.PaymentModel
 
-<template id="lightning-method-checkout-template">
+<template id="checkout-template">
     <div class="payment-box">
         @await Component.InvokeAsync("UiExtensionPoint" ,  new { location="checkout-lightning-pre-content", model = Model})
         <div v-if="model.invoiceBitcoinUrlQR" class="qr-container" :data-qr-value="model.invoiceBitcoinUrlQR" :data-clipboard="model.invoiceBitcoinUrl" data-clipboard-confirm-element="#Lightning_@Model.PaymentMethodId [data-clipboard]">
@@ -23,9 +23,9 @@
 </template>
 
 <script>
-    Vue.component('LightningLikeMethodCheckout', {
+	Vue.component('checkout-template', {
         props: ['model', 'nfcSupported', 'nfcScanning', 'nfcErrorMessage'],
-        template: "#lightning-method-checkout-template",
+		template: "#checkout-template",
         components: {
             qrcode: VueQrcode
         },
diff --git a/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckoutNoScript.cshtml b/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckoutNoScript.cshtml
deleted file mode 100644
index cb8095fbe..000000000
--- a/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckoutNoScript.cshtml
+++ /dev/null
@@ -1,12 +0,0 @@
-@model PaymentModel
-<div>
-    <p>To complete payment, please send <b>@Model.BtcDue @Model.CryptoCode</b> to <b style="word-break: break-word;">@Model.BtcAddress</b></p>
-    <p>Time remaining: @Model.TimeLeft</p>
-    <p>
-        <a href="@Model.InvoiceBitcoinUrl" style="word-break: break-word;" rel="noreferrer noopener">@Model.InvoiceBitcoinUrl</a>
-    </p>
-    @if (!string.IsNullOrEmpty(Model.PeerInfo))
-    {
-        <p>Peer Info: <b>@Model.PeerInfo</b></p>
-    }
-</div>
diff --git a/BTCPayServer/Views/UIInvoice/Checkout.cshtml b/BTCPayServer/Views/UIInvoice/Checkout.cshtml
index e67aab96d..7b0ac06a0 100644
--- a/BTCPayServer/Views/UIInvoice/Checkout.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Checkout.cshtml
@@ -17,7 +17,7 @@
 @functions {
     private string ToJsValue(object value)
     {
-        return Safe.Json(value).ToString()?.Replace("\"", "'");
+        return Safe.Json(value?.ToString()).ToString()?.Replace("\"", "'");
     }
 }
 <!DOCTYPE html>
@@ -108,7 +108,7 @@
                         </div>
                     </div>
                 }
-                <component v-if="paymentMethodComponent" :is="paymentMethodComponent"
+				<component v-if="paymentMethodComponent" :is="paymentMethodComponent"
                            :model="srvModel"
                            :nfc-scanning="nfc.scanning"
                            :nfc-supported="nfc.supported"
diff --git a/BTCPayServer/wwwroot/checkout/checkout.js b/BTCPayServer/wwwroot/checkout/checkout.js
index 52d2b4fb6..7fbdfce5e 100644
--- a/BTCPayServer/wwwroot/checkout/checkout.js
+++ b/BTCPayServer/wwwroot/checkout/checkout.js
@@ -152,7 +152,7 @@ function initApp() {
             btcPaid () {
                 return this.asNumber(this.srvModel.btcPaid);
             },
-            pmId () {
+            pmId() {
                 return this.paymentMethodId || this.srvModel.paymentMethodId;
             },
             minutesLeft () {
@@ -174,10 +174,10 @@ function initApp() {
             paymentMethodIds () {
                 return this.srvModel.availableCryptos.map(function (c) { return c.paymentMethodId });
             },
-            paymentMethodComponent () {
+            paymentMethodComponent() {
                 return this.isPluginPaymentMethod
                     ? `${this.pmId}Checkout`
-                    : this.srvModel.activated && this.srvModel.uiSettings.checkoutBodyVueComponentName;
+                    : this.srvModel.activated && 'checkout-template';
             },
             isPluginPaymentMethod () {
                 return !this.paymentMethodIds.includes(this.pmId);

From e1bfc04451f12baba1631f54ca15f09146abcabf Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 7 Oct 2024 17:38:02 +0900
Subject: [PATCH 05/11] Move checkout registration to the UI Extension

---
 .../Controllers/UIInvoiceController.UI.cs     | 10 ----------
 BTCPayServer/Extensions.cs                    |  9 +++++++++
 BTCPayServer/Hosting/BTCPayServerServices.cs  |  7 +++----
 .../Models/InvoicingModels/PaymentModel.cs    |  5 +----
 .../BitcoinPaymentMethodViewExtension.cs      | 19 -------------------
 .../Bitcoin/BitcoinPaymentModelExtension.cs   |  2 ++
 .../Payments/IPaymentMethodViewExtension.cs   |  8 --------
 .../LNURLPay/LNURLPayPaymentModelExtension.cs |  1 +
 .../LNURLPaymentMethodViewExtension.cs        |  4 ----
 .../LightningPaymentMethodViewExtension.cs    | 19 -------------------
 .../LightningPaymentModelExtension.cs         |  2 ++
 .../Altcoins/Monero/AltcoinsPlugin.Monero.cs  |  2 --
 .../Altcoins/Zcash/AltcoinsPlugin.Zcash.cs    |  2 --
 .../MoneroLikePaymentMethodHandler.cs         |  8 --------
 .../Payments/MoneroPaymentModelExtension.cs   |  1 +
 .../Payments/ZcashLikePaymentMethodHandler.cs |  8 --------
 .../Payments/ZcashPaymentModelExtension.cs    |  4 +++-
 .../Bitcoin/BitcoinLikeMethodCheckout.cshtml  |  7 ++++---
 .../LightningLikeMethodCheckout.cshtml        |  7 ++++---
 BTCPayServer/Views/UIInvoice/Checkout.cshtml  |  4 ----
 BTCPayServer/wwwroot/checkout/checkout.js     |  2 +-
 21 files changed, 31 insertions(+), 100 deletions(-)
 delete mode 100644 BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs
 delete mode 100644 BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs

diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
index 4e095a01f..1f6a8f198 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
@@ -941,19 +941,9 @@ namespace BTCPayServer.Controllers
 					extension.ModifyPaymentModel(new PaymentModelContext(model, store, storeBlob, invoice, Url, kv, h, paymentMethodId == kv.PaymentMethodId));
 				}
 			}
-            model.UISettings = _viewProvider.TryGetViewViewModel(prompt, "CheckoutUI")?.View as CheckoutUIPaymentMethodSettings;
             model.PaymentMethodId = paymentMethodId.ToString();
             model.OrderAmountFiat = OrderAmountFromInvoice(model.CryptoCode, invoice, DisplayFormatter.CurrencyFormat.Symbol);
 
-            foreach (var paymentPrompt in invoice.GetPaymentPrompts())
-            {
-                var vvm = _viewProvider.TryGetViewViewModel(paymentPrompt, "CheckoutUI");
-                if (vvm?.View is CheckoutUIPaymentMethodSettings { ExtensionPartial: { } partial })
-                {
-                    model.ExtensionPartials.Add(partial);
-                }
-            }
-
             if (storeBlob.PlaySoundOnPayment)
             {
                 model.PaymentSoundUrl = storeBlob.PaymentSoundUrl is null
diff --git a/BTCPayServer/Extensions.cs b/BTCPayServer/Extensions.cs
index 3e8721b80..b270fe7ab 100644
--- a/BTCPayServer/Extensions.cs
+++ b/BTCPayServer/Extensions.cs
@@ -14,6 +14,8 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using BTCPayServer.Abstractions.Contracts;
+using BTCPayServer.Abstractions.Services;
 using BTCPayServer.BIP78.Sender;
 using BTCPayServer.Configuration;
 using BTCPayServer.Data;
@@ -289,6 +291,13 @@ namespace BTCPayServer
             }
         }
 
+
+        public static IServiceCollection AddUIExtension(this IServiceCollection services, string key, string partialView)
+        {
+            services.AddSingleton<IUIExtension>(new UIExtension(partialView,
+                key));
+            return services;
+        }
         public static IServiceCollection AddReportProvider<T>(this IServiceCollection services)
     where T : ReportProvider
         {
diff --git a/BTCPayServer/Hosting/BTCPayServerServices.cs b/BTCPayServer/Hosting/BTCPayServerServices.cs
index 80c045533..3fb78f7f6 100644
--- a/BTCPayServer/Hosting/BTCPayServerServices.cs
+++ b/BTCPayServer/Hosting/BTCPayServerServices.cs
@@ -365,6 +365,9 @@ namespace BTCPayServer.Hosting
                 o.ModelMetadataDetailsProviders.Add(new SuppressChildValidationMetadataProvider(typeof(DerivationStrategyBase)));
             });
 
+            services.AddUIExtension("checkout-end", "Bitcoin/BitcoinLikeMethodCheckout");
+            services.AddUIExtension("checkout-end", "Lightning/LightningLikeMethodCheckout");
+
             services.AddSingleton<Services.NBXplorerConnectionFactory>();
             services.AddSingleton<IHostedService, Services.NBXplorerConnectionFactory>(o => o.GetRequiredService<Services.NBXplorerConnectionFactory>());
             services.AddSingleton<HostedServices.CheckConfigurationHostedService>();
@@ -631,8 +634,6 @@ o.GetRequiredService<IEnumerable<IPaymentLinkExtension>>().ToDictionary(o => o.P
     (BitcoinPaymentModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(BitcoinPaymentModelExtension), new object[] { network, pmi }));
                 services.AddSingleton<IPaymentMethodBitpayAPIExtension>(provider =>
 (IPaymentMethodBitpayAPIExtension)ActivatorUtilities.CreateInstance(provider, typeof(BitcoinPaymentMethodBitpayAPIExtension), new object[] { pmi }));
-                services.AddSingleton<IPaymentMethodViewExtension>(provider =>
-(IPaymentMethodViewExtension)ActivatorUtilities.CreateInstance(provider, typeof(BitcoinPaymentMethodViewExtension), new object[] { pmi }));
 
                 if (!network.ReadonlyWallet && network.WalletSupported)
                 {
@@ -652,8 +653,6 @@ o.GetRequiredService<IEnumerable<IPaymentLinkExtension>>().ToDictionary(o => o.P
 (IPaymentLinkExtension)ActivatorUtilities.CreateInstance(provider, typeof(LightningPaymentLinkExtension), new object[] { network, pmi }));
                     services.AddSingleton<IPaymentModelExtension>(provider =>
                     (IPaymentModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(LightningPaymentModelExtension), new object[] { network, pmi }));
-                    services.AddSingleton<IPaymentMethodViewExtension>(provider =>
-(IPaymentMethodViewExtension)ActivatorUtilities.CreateInstance(provider, typeof(LightningPaymentMethodViewExtension), new object[] { pmi }));
                     services.AddSingleton<IPaymentMethodBitpayAPIExtension>(provider =>
 (IPaymentMethodBitpayAPIExtension)ActivatorUtilities.CreateInstance(provider, typeof(LightningPaymentMethodBitpayAPIExtension), new object[] { pmi }));
                     var payoutMethodId = PayoutTypes.LN.GetPayoutMethodId(network.CryptoCode);
diff --git a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs b/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
index 15898ae72..586dd74ad 100644
--- a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
+++ b/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
@@ -9,7 +9,7 @@ namespace BTCPayServer.Models.InvoicingModels
 {
     public class PaymentModel
     {
-        public CheckoutUIPaymentMethodSettings UISettings;
+        public string CheckoutBodyComponentName { get; set; }
         public class AvailableCrypto
         {
             [JsonConverter(typeof(PaymentMethodIdJsonConverter))]
@@ -80,9 +80,6 @@ namespace BTCPayServer.Models.InvoicingModels
         public string ReceiptLink { get; set; }
         public int? RequiredConfirmations { get; set; }
         public long? ReceivedConfirmations { get; set; }
-
-        [JsonIgnore]
-        public HashSet<string> ExtensionPartials { get; } = new HashSet<string>();
         [JsonExtensionData]
         public Dictionary<string, JToken> AdditionalData { get; set; } = new();
     }
diff --git a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs
deleted file mode 100644
index 0850a48d5..000000000
--- a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentMethodViewExtension.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace BTCPayServer.Payments.Bitcoin
-{
-    public class BitcoinPaymentMethodViewExtension : IPaymentMethodViewExtension
-    {
-        public BitcoinPaymentMethodViewExtension(PaymentMethodId paymentMethodId)
-        {
-            PaymentMethodId = paymentMethodId;
-        }
-        public PaymentMethodId PaymentMethodId { get; }
-
-        public void RegisterViews(PaymentMethodViewContext context)
-        {
-            context.RegisterCheckoutUI(new CheckoutUIPaymentMethodSettings
-            {
-                ExtensionPartial = "Bitcoin/BitcoinLikeMethodCheckout",
-            });
-        }
-    }
-}
diff --git a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
index 273cccd01..25e1fb59c 100644
--- a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
@@ -14,6 +14,7 @@ namespace BTCPayServer.Payments.Bitcoin
 {
     public class BitcoinPaymentModelExtension : IPaymentModelExtension
     {
+        public const string CheckoutBodyComponentName = "BitcoinCheckoutBody";
         private readonly PaymentMethodHandlerDictionary _handlers;
         private readonly BTCPayNetwork _Network;
         private readonly DisplayFormatter _displayFormatter;
@@ -50,6 +51,7 @@ namespace BTCPayServer.Payments.Bitcoin
                 return;
             var prompt = context.Prompt;
             var details = handler.ParsePaymentPromptDetails(prompt.Details);
+            context.Model.CheckoutBodyComponentName = CheckoutBodyComponentName;
             context.Model.ShowRecommendedFee = context.StoreBlob.ShowRecommendedFee;
             context.Model.FeeRate = details.RecommendedFeeRate.SatoshiPerByte;
 
diff --git a/BTCPayServer/Payments/IPaymentMethodViewExtension.cs b/BTCPayServer/Payments/IPaymentMethodViewExtension.cs
index 1266b5ac7..72ad805b5 100644
--- a/BTCPayServer/Payments/IPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/IPaymentMethodViewExtension.cs
@@ -51,17 +51,9 @@ namespace BTCPayServer.Payments
         {
             _Views.Add("AdditionalPaymentMethodDetails", partialName);
         }
-        public void RegisterCheckoutUI(CheckoutUIPaymentMethodSettings settings)
-        {
-            _Views.Add("CheckoutUI", settings);
-        }
         public void Register(string key, object value)
         {
             _Views.Add(key, value);
         }
     }
-    public class CheckoutUIPaymentMethodSettings
-    {
-        public string? ExtensionPartial { get; set; }
-    }
 }
diff --git a/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs b/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
index 14b19dfd2..d7c2c01f3 100644
--- a/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
@@ -48,6 +48,7 @@ namespace BTCPayServer.Payments.LNURLPay
                 context.Model.InvoiceBitcoinUrl = lnurl;
                 context.Model.InvoiceBitcoinUrlQR = lnurl.ToUpperInvariant().Replace(UriScheme.ToUpperInvariant(), UriScheme);
             }
+            context.Model.CheckoutBodyComponentName = LightningPaymentModelExtension.CheckoutBodyComponentName;
             context.Model.PeerInfo = handler.ParsePaymentPromptDetails(context.Prompt.Details).NodeInfo;
             if (context.StoreBlob.LightningAmountInSatoshi && context.Model.CryptoCode == "BTC")
             {
diff --git a/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs b/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
index 6777c6433..d1677ec22 100644
--- a/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
+++ b/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
@@ -14,10 +14,6 @@ namespace BTCPayServer.Payments.LNURLPay
             if (details is not LNURLPayPaymentMethodDetails d)
                 return;
             context.RegisterPaymentMethodDetails("LNURL/AdditionalPaymentMethodDetails");
-            context.RegisterCheckoutUI(new CheckoutUIPaymentMethodSettings()
-            {
-                ExtensionPartial = "Lightning/LightningLikeMethodCheckout"
-            });
         }
     }
 }
diff --git a/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs b/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs
deleted file mode 100644
index 2ef202aef..000000000
--- a/BTCPayServer/Payments/Lightning/LightningPaymentMethodViewExtension.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace BTCPayServer.Payments.Lightning
-{
-    public class LightningPaymentMethodViewExtension : IPaymentMethodViewExtension
-    {
-        public LightningPaymentMethodViewExtension(PaymentMethodId paymentMethodId)
-        {
-            PaymentMethodId = paymentMethodId;
-        }
-        public PaymentMethodId PaymentMethodId { get; }
-
-        public void RegisterViews(PaymentMethodViewContext context)
-        {
-            context.RegisterCheckoutUI(new CheckoutUIPaymentMethodSettings()
-            {
-                ExtensionPartial = "Lightning/LightningLikeMethodCheckout"
-            });
-        }
-    }
-}
diff --git a/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs b/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
index 7f1573625..ab113585b 100644
--- a/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
@@ -11,6 +11,7 @@ namespace BTCPayServer.Payments.Lightning
 {
     public class LightningPaymentModelExtension : IPaymentModelExtension
     {
+        public const string CheckoutBodyComponentName = "LightningCheckoutBody";
         private readonly DisplayFormatter _displayFormatter;
         IPaymentLinkExtension _PaymentLinkExtension;
         public LightningPaymentModelExtension(
@@ -44,6 +45,7 @@ namespace BTCPayServer.Payments.Lightning
             var paymentPrompt = context.InvoiceEntity.GetPaymentPrompt(PaymentMethodId);
             if (paymentPrompt is null)
                 return;
+            context.Model.CheckoutBodyComponentName = CheckoutBodyComponentName;
             context.Model.InvoiceBitcoinUrl = _PaymentLinkExtension.GetPaymentLink(context.Prompt, context.UrlHelper);
             if (context.Model.InvoiceBitcoinUrl is not null)
                 context.Model.InvoiceBitcoinUrlQR = $"lightning:{context.Model.InvoiceBitcoinUrl.ToUpperInvariant()?.Substring("LIGHTNING:".Length)}";
diff --git a/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs b/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs
index e51e16dcd..fe829c86a 100644
--- a/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs
+++ b/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs
@@ -42,8 +42,6 @@ public partial class AltcoinsPlugin
         var pmi = PaymentTypes.CHAIN.GetPaymentMethodId("XMR");
         services.AddBTCPayNetwork(network)
                 .AddTransactionLinkProvider(pmi, new SimpleTransactionLinkProvider(blockExplorerLink));
-        services.AddSingleton<IPaymentMethodViewExtension>(provider =>
-(IPaymentMethodViewExtension)ActivatorUtilities.CreateInstance(provider, typeof(BitcoinPaymentMethodViewExtension), new object[] { pmi }));
 
 
         services.AddSingleton(provider =>
diff --git a/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs b/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs
index a6ffd2610..8cec5a8bf 100644
--- a/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs
+++ b/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs
@@ -43,8 +43,6 @@ public partial class AltcoinsPlugin
         var pmi = PaymentTypes.CHAIN.GetPaymentMethodId("ZEC");
         services.AddBTCPayNetwork(network)
                 .AddTransactionLinkProvider(pmi, new SimpleTransactionLinkProvider(blockExplorerLink));
-        services.AddSingleton<IPaymentMethodViewExtension>(provider =>
-(IPaymentMethodViewExtension)ActivatorUtilities.CreateInstance(provider, typeof(BitcoinPaymentMethodViewExtension), new object[] { pmi }));
 
 
         services.AddSingleton(provider =>
diff --git a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs
index b8e8001a6..04f01016b 100644
--- a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs
+++ b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs
@@ -108,14 +108,6 @@ namespace BTCPayServer.Services.Altcoins.Monero.Payments
             return details.ToObject<MoneroLikeOnChainPaymentMethodDetails>(Serializer);
         }
 
-        public CheckoutUIPaymentMethodSettings GetCheckoutUISettings()
-        {
-            return new CheckoutUIPaymentMethodSettings
-            {
-                ExtensionPartial = "Bitcoin/BitcoinLikeMethodCheckout"
-            };
-        }
-
         public MoneroLikePaymentData ParsePaymentDetails(JToken details)
         {
             return details.ToObject<MoneroLikePaymentData>(Serializer) ?? throw new FormatException($"Invalid {nameof(MoneroLikePaymentMethodHandler)}");
diff --git a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs
index 092cdb105..cb1c52a9f 100644
--- a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs
+++ b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs
@@ -36,6 +36,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.Payments
         {
             if (context is not { IsSelected: true, Handler: MoneroLikePaymentMethodHandler handler })
                 return;
+            context.Model.CheckoutBodyComponentName = BitcoinPaymentModelExtension.CheckoutBodyComponentName;
             if (context.Model.Activated)
             {
                 var details = context.InvoiceEntity.GetPayments(true)
diff --git a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs
index 8984459f7..7db54a244 100644
--- a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs
+++ b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashLikePaymentMethodHandler.cs
@@ -102,14 +102,6 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Payments
             public long AccountIndex { get; internal set; }
         }
 
-        public CheckoutUIPaymentMethodSettings GetCheckoutUISettings()
-        {
-            return new CheckoutUIPaymentMethodSettings
-            {
-                ExtensionPartial = "Bitcoin/BitcoinLikeMethodCheckout"
-            };
-        }
-
         public ZcashLikePaymentData ParsePaymentDetails(JToken details)
         {
             return details.ToObject<ZcashLikePaymentData>(Serializer) ?? throw new FormatException($"Invalid {nameof(ZcashLikePaymentData)}");
diff --git a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs
index 47a0527cd..6e824274a 100644
--- a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs
+++ b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using BTCPayServer.Payments;
+using BTCPayServer.Payments.Bitcoin;
 using BTCPayServer.Services.Altcoins.Monero.Payments;
 using BTCPayServer.Services.Altcoins.Zcash.Services;
 using BTCPayServer.Services.Invoices;
@@ -35,7 +36,8 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Payments
         {
             if (context is not { IsSelected: true, Handler: ZcashLikePaymentMethodHandler handler })
                 return;
-            if (context.Model.Activated)
+			context.Model.CheckoutBodyComponentName = BitcoinPaymentModelExtension.CheckoutBodyComponentName;
+			if (context.Model.Activated)
             {
                 var details = context.InvoiceEntity.GetPayments(true)
                     .Select(p => p.GetDetails<ZcashLikePaymentData>(handler))
diff --git a/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml b/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
index ccb8dd4b6..4dc23a5e5 100644
--- a/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
+++ b/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
@@ -1,9 +1,10 @@
 @using BTCPayServer.BIP78.Sender
 @using BTCPayServer.Components.TruncateCenter
 @using BTCPayServer.Abstractions.TagHelpers
+@using BTCPayServer.Payments.Bitcoin
 @model BTCPayServer.Models.InvoicingModels.PaymentModel
 
-<template id="checkout-template">
+<template id="@BitcoinPaymentModelExtension.CheckoutBodyComponentName">
     @await Component.InvokeAsync("UiExtensionPoint", new {location = "checkout-bitcoin-pre-content", model = Model})
     <div class="payment-box">
         <div v-if="model.invoiceBitcoinUrlQR" class="qr-container" :data-qr-value="model.invoiceBitcoinUrlQR" :data-clipboard="model.invoiceBitcoinUrl" data-clipboard-confirm-element="#Address_@Model.PaymentMethodId [data-clipboard]">
@@ -31,9 +32,9 @@
 </template>
 
 <script>
-	Vue.component('checkout-template', {
+	Vue.component(@Safe.Json(BitcoinPaymentModelExtension.CheckoutBodyComponentName), {
         props: ['model', 'nfcSupported', 'nfcScanning', 'nfcErrorMessage'],
-		template: "#checkout-template",
+		template: @Safe.Json("#" + BitcoinPaymentModelExtension.CheckoutBodyComponentName),
         components: {
             qrcode: VueQrcode
         },
diff --git a/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml b/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
index 2f3d436dc..a84d680d6 100644
--- a/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
+++ b/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
@@ -1,6 +1,7 @@
+@using BTCPayServer.Payments.Lightning
 @model BTCPayServer.Models.InvoicingModels.PaymentModel
 
-<template id="checkout-template">
+<template id="@LightningPaymentModelExtension.CheckoutBodyComponentName">
     <div class="payment-box">
         @await Component.InvokeAsync("UiExtensionPoint" ,  new { location="checkout-lightning-pre-content", model = Model})
         <div v-if="model.invoiceBitcoinUrlQR" class="qr-container" :data-qr-value="model.invoiceBitcoinUrlQR" :data-clipboard="model.invoiceBitcoinUrl" data-clipboard-confirm-element="#Lightning_@Model.PaymentMethodId [data-clipboard]">
@@ -23,9 +24,9 @@
 </template>
 
 <script>
-	Vue.component('checkout-template', {
+	Vue.component(@Safe.Json(LightningPaymentModelExtension.CheckoutBodyComponentName), {
         props: ['model', 'nfcSupported', 'nfcScanning', 'nfcErrorMessage'],
-		template: "#checkout-template",
+		template: @Safe.Json("#" + LightningPaymentModelExtension.CheckoutBodyComponentName),
         components: {
             qrcode: VueQrcode
         },
diff --git a/BTCPayServer/Views/UIInvoice/Checkout.cshtml b/BTCPayServer/Views/UIInvoice/Checkout.cshtml
index 7b0ac06a0..5110eb6db 100644
--- a/BTCPayServer/Views/UIInvoice/Checkout.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Checkout.cshtml
@@ -316,10 +316,6 @@
     @if (Env.CheatMode)
     {
         <partial name="Checkout-Cheating" model="@Model" />
-    }
-	@foreach (var extensionPartial in Model.ExtensionPartials)
-    {
-		<partial name="@extensionPartial" model="@Model" />
     }
     @await Component.InvokeAsync("UiExtensionPoint", new { location = "checkout-payment", model = Model })
     @await Component.InvokeAsync("UiExtensionPoint", new { location = "checkout-end", model = Model })
diff --git a/BTCPayServer/wwwroot/checkout/checkout.js b/BTCPayServer/wwwroot/checkout/checkout.js
index 7fbdfce5e..619921fa1 100644
--- a/BTCPayServer/wwwroot/checkout/checkout.js
+++ b/BTCPayServer/wwwroot/checkout/checkout.js
@@ -177,7 +177,7 @@ function initApp() {
             paymentMethodComponent() {
                 return this.isPluginPaymentMethod
                     ? `${this.pmId}Checkout`
-                    : this.srvModel.activated && 'checkout-template';
+                    : this.srvModel.activated && this.srvModel.checkoutBodyComponentName;
             },
             isPluginPaymentMethod () {
                 return !this.paymentMethodIds.includes(this.pmId);

From 34b2cca4928112434c928bb63c6d30e030913369 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 7 Oct 2024 18:19:19 +0900
Subject: [PATCH 06/11] Simplify extension of payments extensions

---
 BTCPayServer.Tests/SeleniumTests.cs           |  7 +++
 BTCPayServer.Tests/TestAccount.cs             |  2 -
 .../StoreRecentInvoices.cs                    |  2 +-
 .../Controllers/UIInvoiceController.UI.cs     |  2 +
 .../Controllers/UIInvoiceController.cs        |  3 -
 BTCPayServer/Extensions.cs                    |  5 +-
 BTCPayServer/Hosting/BTCPayServerServices.cs  |  8 +--
 .../InvoicingModels/InvoiceDetailsModel.cs    |  1 +
 .../Payments/IPaymentMethodViewExtension.cs   | 59 -------------------
 .../LNURLPaymentMethodViewExtension.cs        | 19 ------
 .../Lightning/LightningLikePaymentHandler.cs  |  4 +-
 .../Bitcoin/ViewBitcoinLikePaymentData.cshtml |  4 +-
 .../AdditionalPaymentMethodDetails.cshtml     | 18 ------
 .../ViewLightningLikePaymentData.cshtml       | 38 ++++++++++--
 .../ListInvoicesPaymentsPartial.cshtml        |  9 +--
 15 files changed, 55 insertions(+), 126 deletions(-)
 delete mode 100644 BTCPayServer/Payments/IPaymentMethodViewExtension.cs
 delete mode 100644 BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
 delete mode 100644 BTCPayServer/Views/Shared/LNURL/AdditionalPaymentMethodDetails.cshtml

diff --git a/BTCPayServer.Tests/SeleniumTests.cs b/BTCPayServer.Tests/SeleniumTests.cs
index cdf579e9f..aae22c9b0 100644
--- a/BTCPayServer.Tests/SeleniumTests.cs
+++ b/BTCPayServer.Tests/SeleniumTests.cs
@@ -3264,6 +3264,7 @@ namespace BTCPayServer.Tests
         public async Task CanUseLNAddress()
         {
             using var s = CreateSeleniumTester();
+            s.Server.DeleteStore = false;
             s.Server.ActivateLightning();
             await s.StartAsync();
             await s.Server.EnsureChannelsSetup();
@@ -3416,7 +3417,13 @@ namespace BTCPayServer.Tests
                 var succ = JsonConvert.DeserializeObject<LNURLPayRequest.LNURLPayRequestCallbackResponse>(str);
                 Assert.NotNull(succ.Pr);
                 Assert.Equal(new LightMoney(2001), BOLT11PaymentRequest.Parse(succ.Pr, Network.RegTest).MinimumAmount);
+                await s.Server.CustomerLightningD.Pay(succ.Pr);
             }
+
+            // Can we find our comment and address in the payment list?
+            s.GoToInvoices();
+            var source = s.Driver.PageSource;
+            Assert.Contains(lnUsername, source);
         }
 
         [Fact]
diff --git a/BTCPayServer.Tests/TestAccount.cs b/BTCPayServer.Tests/TestAccount.cs
index 3a3b7e8a6..b143c441c 100644
--- a/BTCPayServer.Tests/TestAccount.cs
+++ b/BTCPayServer.Tests/TestAccount.cs
@@ -609,9 +609,7 @@ retry:
             var methods = await client.GetInvoicePaymentMethods(StoreId, invoiceId);
             var method = methods.First(m => m.PaymentMethodId == $"{cryptoCode}-LN");
             var bolt11 = method.Destination;
-            TestLogs.LogInformation("PAYING");
             await parent.CustomerLightningD.Pay(bolt11);
-            TestLogs.LogInformation("PAID");
             await WaitInvoicePaid(invoiceId);
         }
 
diff --git a/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs b/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs
index d8876ed4c..c90e4fa61 100644
--- a/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs
+++ b/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs
@@ -68,7 +68,7 @@ public class StoreRecentInvoices : ViewComponent
                 Details = new InvoiceDetailsModel
                 {
                     Archived = invoice.Archived,
-                    Payments = invoice.GetPayments(false) 
+                    Payments = invoice.GetPayments(false)
                 }
            }).ToList();
 
diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
index 1f6a8f198..dc5444209 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
@@ -128,6 +128,7 @@ namespace BTCPayServer.Controllers
                 StoreLink = Url.Action(nameof(UIStoresController.GeneralSettings), "UIStores", new { storeId = store.Id }),
                 PaymentRequestLink = Url.Action(nameof(UIPaymentRequestController.ViewPaymentRequest), "UIPaymentRequest", new { payReqId = invoice.Metadata.PaymentRequestId }),
                 Id = invoice.Id,
+                Entity = invoice,
                 State = invoiceState,
                 TransactionSpeed = invoice.SpeedPolicy == SpeedPolicy.HighSpeed ? "high" :
                                    invoice.SpeedPolicy == SpeedPolicy.MediumSpeed ? "medium" :
@@ -554,6 +555,7 @@ namespace BTCPayServer.Controllers
             {
                 Archived = invoice.Archived,
                 Payments = invoice.GetPayments(false),
+                Entity = invoice,
                 CryptoPayments = invoice.GetPaymentPrompts().Select(
                     data =>
                     {
diff --git a/BTCPayServer/Controllers/UIInvoiceController.cs b/BTCPayServer/Controllers/UIInvoiceController.cs
index 3793800d8..b4dc71d39 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.cs
@@ -63,7 +63,6 @@ namespace BTCPayServer.Controllers
         private readonly IAuthorizationService _authorizationService;
         private readonly TransactionLinkProviders _transactionLinkProviders;
         private readonly Dictionary<PaymentMethodId, IPaymentModelExtension> _paymentModelExtensions;
-        private readonly PaymentMethodViewProvider _viewProvider;
         private readonly PrettyNameProvider _prettyName;
         private readonly AppService _appService;
         private readonly IFileService _fileService;
@@ -99,7 +98,6 @@ namespace BTCPayServer.Controllers
             IAuthorizationService authorizationService,
             TransactionLinkProviders transactionLinkProviders,
             Dictionary<PaymentMethodId, IPaymentModelExtension> paymentModelExtensions,
-            PaymentMethodViewProvider viewProvider,
             PrettyNameProvider prettyName)
         {
             _displayFormatter = displayFormatter;
@@ -124,7 +122,6 @@ namespace BTCPayServer.Controllers
             _authorizationService = authorizationService;
             _transactionLinkProviders = transactionLinkProviders;
             _paymentModelExtensions = paymentModelExtensions;
-            _viewProvider = viewProvider;
             _prettyName = prettyName;
             _fileService = fileService;
             _uriResolver = uriResolver;
diff --git a/BTCPayServer/Extensions.cs b/BTCPayServer/Extensions.cs
index b270fe7ab..255f43db8 100644
--- a/BTCPayServer/Extensions.cs
+++ b/BTCPayServer/Extensions.cs
@@ -292,10 +292,9 @@ namespace BTCPayServer
         }
 
 
-        public static IServiceCollection AddUIExtension(this IServiceCollection services, string key, string partialView)
+        public static IServiceCollection AddUIExtension(this IServiceCollection services, string location, string partialViewName)
         {
-            services.AddSingleton<IUIExtension>(new UIExtension(partialView,
-                key));
+            services.AddSingleton<IUIExtension>(new UIExtension(partialViewName, location));
             return services;
         }
         public static IServiceCollection AddReportProvider<T>(this IServiceCollection services)
diff --git a/BTCPayServer/Hosting/BTCPayServerServices.cs b/BTCPayServer/Hosting/BTCPayServerServices.cs
index 3fb78f7f6..ebf6f6369 100644
--- a/BTCPayServer/Hosting/BTCPayServerServices.cs
+++ b/BTCPayServer/Hosting/BTCPayServerServices.cs
@@ -158,8 +158,7 @@ namespace BTCPayServer.Hosting
             //
 
             AddOnchainWalletParsers(services);
-            services.AddSingleton<IUIExtension>(new UIExtension("Bitcoin/ViewBitcoinLikePaymentData", "store-invoices-payments"));
-            services.AddSingleton<IUIExtension>(new UIExtension("Lightning/ViewLightningLikePaymentData", "store-invoices-payments"));
+            
 
             services.AddStartupTask<BlockExplorerLinkStartupTask>();
             services.AddStartupTask<LoadCurrencyNameTableStartupTask>();
@@ -367,6 +366,8 @@ namespace BTCPayServer.Hosting
 
             services.AddUIExtension("checkout-end", "Bitcoin/BitcoinLikeMethodCheckout");
             services.AddUIExtension("checkout-end", "Lightning/LightningLikeMethodCheckout");
+            services.AddUIExtension("store-invoices-payments", "Bitcoin/ViewBitcoinLikePaymentData");
+            services.AddUIExtension("store-invoices-payments", "Lightning/ViewLightningLikePaymentData");
 
             services.AddSingleton<Services.NBXplorerConnectionFactory>();
             services.AddSingleton<IHostedService, Services.NBXplorerConnectionFactory>(o => o.GetRequiredService<Services.NBXplorerConnectionFactory>());
@@ -407,7 +408,6 @@ o.GetRequiredService<IEnumerable<IPaymentLinkExtension>>().ToDictionary(o => o.P
             services.AddSingleton<IHostedService, LightningPendingPayoutListener>();
 
             services.AddSingleton<PaymentMethodHandlerDictionary>();
-            services.AddSingleton<PaymentMethodViewProvider>();
 
             services.AddSingleton<PayoutMethodHandlerDictionary>();
 
@@ -668,8 +668,6 @@ o.GetRequiredService<IEnumerable<IPaymentLinkExtension>>().ToDictionary(o => o.P
                     (IPaymentLinkExtension)ActivatorUtilities.CreateInstance(provider, typeof(LNURLPayPaymentLinkExtension), new object[] { network, pmi }));
                     services.AddSingleton<IPaymentModelExtension>(provider =>
 (IPaymentModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(LNURLPayPaymentModelExtension), new object[] { network, pmi }));
-                    services.AddSingleton<IPaymentMethodViewExtension>(provider =>
-(IPaymentMethodViewExtension)ActivatorUtilities.CreateInstance(provider, typeof(LNURLPaymentMethodViewExtension), new object[] { pmi }));
                     services.AddSingleton<IPaymentMethodBitpayAPIExtension>(provider =>
 (IPaymentMethodBitpayAPIExtension)ActivatorUtilities.CreateInstance(provider, typeof(LNURLPayPaymentMethodBitpayAPIExtension), new object[] { pmi }));
                 }
diff --git a/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs b/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs
index 401456411..d62d6f6fd 100644
--- a/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs
+++ b/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs
@@ -136,5 +136,6 @@ namespace BTCPayServer.Models.InvoicingModels
         public bool HasRefund { get; set; }
         public bool StillDue { get; set; }
         public bool HasRates { get; set; }
+        public InvoiceEntity Entity { get; internal set; }
     }
 }
diff --git a/BTCPayServer/Payments/IPaymentMethodViewExtension.cs b/BTCPayServer/Payments/IPaymentMethodViewExtension.cs
deleted file mode 100644
index 72ad805b5..000000000
--- a/BTCPayServer/Payments/IPaymentMethodViewExtension.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-#nullable enable
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using BTCPayServer.Services.Invoices;
-
-namespace BTCPayServer.Payments
-{
-    public interface IPaymentMethodViewExtension
-    {
-        PaymentMethodId PaymentMethodId { get; }
-        void RegisterViews(PaymentMethodViewContext context);
-    }
-    public record ViewViewModel(object View, object ViewModel);
-    public class PaymentMethodViewProvider
-    {
-        private readonly Dictionary<PaymentMethodId, IPaymentMethodViewExtension> _extensions;
-        private readonly PaymentMethodHandlerDictionary _handlers;
-
-        public PaymentMethodViewProvider(
-            IEnumerable<IPaymentMethodViewExtension> extensions,
-            PaymentMethodHandlerDictionary handlers)
-        {
-            _extensions = extensions.ToDictionary(o => o.PaymentMethodId, o => o);
-            _handlers = handlers;
-        }
-        public ViewViewModel? TryGetViewViewModel(PaymentPrompt paymentPrompt, string key)
-        {
-            if (!_extensions.TryGetValue(paymentPrompt.PaymentMethodId, out var extension))
-                return null;
-            if (!_handlers.TryGetValue(paymentPrompt.PaymentMethodId, out var handler) || paymentPrompt.Details is null)
-                return null;
-            var ctx = new PaymentMethodViewContext()
-            {
-                Details = handler.ParsePaymentPromptDetails(paymentPrompt.Details)
-            };
-            extension.RegisterViews(ctx);
-            object? view = null;
-            if (!ctx._Views.TryGetValue(key, out view))
-                return null;
-            return new ViewViewModel(view, handler.ParsePaymentPromptDetails(paymentPrompt.Details));
-        }
-    }
-    public class PaymentMethodViewContext
-    {
-        internal Dictionary<string, object> _Views = new Dictionary<string, object>();
-
-        public object? Details { get; internal set; }
-
-        public void RegisterPaymentMethodDetails(string partialName)
-        {
-            _Views.Add("AdditionalPaymentMethodDetails", partialName);
-        }
-        public void Register(string key, object value)
-        {
-            _Views.Add(key, value);
-        }
-    }
-}
diff --git a/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs b/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
deleted file mode 100644
index d1677ec22..000000000
--- a/BTCPayServer/Payments/LNURLPay/LNURLPaymentMethodViewExtension.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace BTCPayServer.Payments.LNURLPay
-{
-    public class LNURLPaymentMethodViewExtension : IPaymentMethodViewExtension
-    {
-        public LNURLPaymentMethodViewExtension(PaymentMethodId paymentMethodId)
-        {
-            PaymentMethodId = paymentMethodId;
-        }
-        public PaymentMethodId PaymentMethodId { get; }
-
-        public void RegisterViews(PaymentMethodViewContext context)
-        {
-            var details = context.Details;
-            if (details is not LNURLPayPaymentMethodDetails d)
-                return;
-            context.RegisterPaymentMethodDetails("LNURL/AdditionalPaymentMethodDetails");
-        }
-    }
-}
diff --git a/BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs b/BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs
index 3bca13009..520e0e0b7 100644
--- a/BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs
+++ b/BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs
@@ -21,9 +21,9 @@ using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Payments.Lightning
 {
-    public interface ILightningPaymentHandler : IHasNetwork
+    public interface ILightningPaymentHandler : IHasNetwork, IPaymentMethodHandler
     {
-        LightningPaymentData ParsePaymentDetails(JToken details);
+        new LightningPaymentData ParsePaymentDetails(JToken details);
     }
     public class LightningLikePaymentHandler : IPaymentMethodHandler, ILightningPaymentHandler
     {
diff --git a/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml b/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml
index d8978c28f..61c2273a4 100644
--- a/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml
+++ b/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml
@@ -7,10 +7,10 @@
 @inject DisplayFormatter DisplayFormatter
 @inject TransactionLinkProviders TransactionLinkProviders
 @inject PaymentMethodHandlerDictionary handlers
-@model IEnumerable<BTCPayServer.Services.Invoices.PaymentEntity>
+@model InvoiceDetailsModel
 @{
 	PayjoinInformation payjoinInformation = null;
-	var payments = Model
+	var payments = Model.Payments
 		.Select(payment =>
         {
 			if (!handlers.TryGetValue(payment.PaymentMethodId, out var h) || h is not BitcoinLikePaymentHandler handler)
diff --git a/BTCPayServer/Views/Shared/LNURL/AdditionalPaymentMethodDetails.cshtml b/BTCPayServer/Views/Shared/LNURL/AdditionalPaymentMethodDetails.cshtml
deleted file mode 100644
index c3a93c5fa..000000000
--- a/BTCPayServer/Views/Shared/LNURL/AdditionalPaymentMethodDetails.cshtml
+++ /dev/null
@@ -1,18 +0,0 @@
-@model BTCPayServer.Payments.LNURLPayPaymentMethodDetails
-
-@if (!string.IsNullOrEmpty(Model.ProvidedComment))
-{
-    <tr>
-        <td colspan="100% bg-tile">
-            LNURL Comment: @Model.ProvidedComment
-        </td>
-    </tr>
-}
-@if (!string.IsNullOrEmpty(Model.ConsumedLightningAddress))
-{
-    <tr>
-        <td colspan="100% bg-tile">
-            Lightning address used: @Model.ConsumedLightningAddress
-        </td>
-    </tr>
-}
diff --git a/BTCPayServer/Views/Shared/Lightning/ViewLightningLikePaymentData.cshtml b/BTCPayServer/Views/Shared/Lightning/ViewLightningLikePaymentData.cshtml
index c303a815a..9c3860e81 100644
--- a/BTCPayServer/Views/Shared/Lightning/ViewLightningLikePaymentData.cshtml
+++ b/BTCPayServer/Views/Shared/Lightning/ViewLightningLikePaymentData.cshtml
@@ -7,16 +7,31 @@
 @inject DisplayFormatter DisplayFormatter
 @inject PaymentMethodHandlerDictionary handlers
 @inject PrettyNameProvider prettyName
-@model IEnumerable<BTCPayServer.Services.Invoices.PaymentEntity>
+@model InvoiceDetailsModel
 
 @{
+	string providedComment = null;
+	string consumedLightningAddress = null;
 	var payments = Model
+		.Payments
 		.Select(payment =>
 			{
-				
+
 				if (handlers.TryGet(payment.PaymentMethodId) is not ILightningPaymentHandler handler)
 					return null;
 				var offChainPaymentData = handler.ParsePaymentDetails(payment.Details);
+
+				if (handler.ParsePaymentPromptDetails(Model.Entity.GetPaymentPrompt(payment.PaymentMethodId)?.Details) is LNURLPayPaymentMethodDetails lnurlPrompt)
+				{
+					if (lnurlPrompt.ConsumedLightningAddress is string consumed)
+					{
+						consumedLightningAddress = consumed;
+					}
+					if (lnurlPrompt.ProvidedComment is string comment)
+					{
+						providedComment = comment;
+					}
+				}
 				return new OffChainPaymentViewModel
 				{
 					Type = prettyName.PrettyName(payment.PaymentMethodId),
@@ -25,8 +40,8 @@
 					Amount = DisplayFormatter.Currency(payment.Value, handler.Network.CryptoCode, divisibility: payment.Divisibility)
 				};
 			})
-        .Where(model => model != null)
-        .ToList();
+		.Where(model => model != null)
+		.ToList();
 }
 
 @if (payments.Any())
@@ -37,7 +52,7 @@
             <table class="table table-hover mb-0">
                 <thead>
                     <tr>
-						<th class="w-75px">Type</th>
+						<th class="w-175px">Type</th>
                         <th class="w-175px">Destination</th>
                         <th class="text-nowrap">Payment Proof</th>
                         <th class="w-150px text-end">Paid</th>
@@ -61,6 +76,19 @@
                     }
                 </tbody>
             </table>
+			@if (!string.IsNullOrEmpty(providedComment))
+			{
+				<div>
+					<b>LNURL Comment</b>: @providedComment
+				</div>
+			}
+			@if (!string.IsNullOrEmpty(consumedLightningAddress))
+			{
+				<div>
+					<b>Lightning address used</b>: @consumedLightningAddress
+				</div>
+			}
+
         </div>
     </section>
 }
diff --git a/BTCPayServer/Views/UIInvoice/ListInvoicesPaymentsPartial.cshtml b/BTCPayServer/Views/UIInvoice/ListInvoicesPaymentsPartial.cshtml
index 4b9d4f48f..37ec67b42 100644
--- a/BTCPayServer/Views/UIInvoice/ListInvoicesPaymentsPartial.cshtml
+++ b/BTCPayServer/Views/UIInvoice/ListInvoicesPaymentsPartial.cshtml
@@ -1,5 +1,4 @@
 @using BTCPayServer.Payments
-@inject PaymentMethodViewProvider paymentMethodViewProvider
 @model (InvoiceDetailsModel Invoice, bool ShowAddress)
 @{
     var invoice = Model.Invoice;
@@ -87,14 +86,10 @@
                         }
                     </td>
                 </tr>
-				var vvm = paymentMethodViewProvider.TryGetViewViewModel(payment.PaymentMethodRaw, "AdditionalPaymentMethodDetails");;
-				if (vvm != null)
-                {
-                    <partial name="@((string)vvm.View)" model="@vvm.ViewModel" />
-                }
+				<vc:ui-extension-point location="invoice-payments-list" />
             }
         </tbody>
     </table>
 </div>
 
-<vc:ui-extension-point location="store-invoices-payments" model="@invoice.Payments" />
+<vc:ui-extension-point location="store-invoices-payments" model="@invoice" />

From c35e7406cd1f5573b0fe95e09b5d685a5ab19497 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 7 Oct 2024 19:15:40 +0900
Subject: [PATCH 07/11] Cleanup AvailableCrypto from the model

---
 .../Controllers/UIInvoiceController.UI.cs     | 38 ++++++++-----------
 .../Models/InvoicingModels/PaymentModel.cs    |  9 +----
 .../Bitcoin/BitcoinPaymentModelExtension.cs   |  2 +-
 .../Payments/IPaymentModelExtension.cs        |  3 +-
 .../LNURLPay/LNURLPayPaymentModelExtension.cs |  2 +-
 .../LightningPaymentModelExtension.cs         |  2 +-
 .../Payments/MoneroPaymentModelExtension.cs   |  2 +-
 .../Payments/ZcashPaymentModelExtension.cs    |  2 +-
 8 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
index dc5444209..d8ae2de74 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
@@ -726,7 +726,7 @@ namespace BTCPayServer.Controllers
             bool isDefaultPaymentId = false;
             var storeBlob = store.GetStoreBlob();
 
-            var displayedPaymentMethods = invoice.GetPaymentPrompts().Select(p => p.PaymentMethodId).ToList();
+            var displayedPaymentMethods = invoice.GetPaymentPrompts().Select(p => p.PaymentMethodId).ToHashSet();
 
             
             var btcId = PaymentTypes.CHAIN.GetPaymentMethodId("BTC");
@@ -916,33 +916,21 @@ namespace BTCPayServer.Controllers
                                               var handler = _handlers[kv.PaymentMethodId];
                                               return new PaymentModel.AvailableCrypto
                                               {
-												  Handler = handler,
                                                   Displayed = displayedPaymentMethods.Contains(kv.PaymentMethodId),
                                                   PaymentMethodId = kv.PaymentMethodId,
-                                                  CryptoCode = kv.Currency,
-                                                  PaymentMethodName = _prettyName.PrettyName(kv.PaymentMethodId),
-                                                  IsLightning = handler is ILightningPaymentHandler,
-                                                  CryptoImage = Request.GetRelativePathOrAbsolute(GetPaymentMethodImage(kv.PaymentMethodId)),
-                                                  Link = Url.Action(nameof(Checkout),
-                                                      new
-                                                      {
-                                                          invoiceId,
-                                                          paymentMethodId = kv.PaymentMethodId.ToString()
-                                                      })
+                                                  Order = kv.PaymentMethodId switch
+                                                  {
+                                                      _ when PaymentTypes.CHAIN.GetPaymentMethodId(_NetworkProvider.DefaultNetwork.CryptoCode) == kv.PaymentMethodId => 0,
+                                                      _ when PaymentTypes.LN.GetPaymentMethodId(_NetworkProvider.DefaultNetwork.CryptoCode) == kv.PaymentMethodId => 1,
+                                                      _ when handler is ILightningPaymentHandler => 2,
+                                                      _ => 3
+                                                  }
                                               };
-                                          }).Where(c => c.CryptoImage != "/")
-                                          .OrderByDescending(a => a.CryptoCode == _NetworkProvider.DefaultNetwork.CryptoCode).ThenBy(a => a.PaymentMethodName).ThenBy(a => a.IsLightning ? 1 : 0)
+                                          })
+                                          .OrderBy(a => a.Order)
                                           .ToList()
             };
 
-			foreach (var kv in invoice.GetPaymentPrompts())
-			{
-				if (_paymentModelExtensions.TryGetValue(kv.PaymentMethodId, out var extension) &&
-					_handlers.TryGetValue(kv.PaymentMethodId, out var h))
-				{
-					extension.ModifyPaymentModel(new PaymentModelContext(model, store, storeBlob, invoice, Url, kv, h, paymentMethodId == kv.PaymentMethodId));
-				}
-			}
             model.PaymentMethodId = paymentMethodId.ToString();
             model.OrderAmountFiat = OrderAmountFromInvoice(model.CryptoCode, invoice, DisplayFormatter.CurrencyFormat.Symbol);
 
@@ -957,6 +945,12 @@ namespace BTCPayServer.Controllers
 
             var expiration = TimeSpan.FromSeconds(model.ExpirationSeconds);
             model.TimeLeft = expiration.PrettyPrint();
+
+            if (_paymentModelExtensions.TryGetValue(paymentMethodId, out var extension) &&
+                    _handlers.TryGetValue(paymentMethodId, out var h))
+            {
+                extension.ModifyPaymentModel(new PaymentModelContext(model, store, storeBlob, invoice, Url, prompt, h));
+            }
             return model;
         }
 
diff --git a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs b/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
index 586dd74ad..3170fb04f 100644
--- a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
+++ b/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
@@ -14,15 +14,8 @@ namespace BTCPayServer.Models.InvoicingModels
         {
             [JsonConverter(typeof(PaymentMethodIdJsonConverter))]
             public PaymentMethodId PaymentMethodId { get; set; }
-            public string CryptoImage { get; set; }
-            public string Link { get; set; }
-            public string PaymentMethodName { get; set; }
-            public bool IsLightning { get; set; }
-            public string CryptoCode { get; set; }
             public bool Displayed { get; set; }
-            [JsonIgnore]
-            public IPaymentMethodHandler Handler { get; internal set; }
-
+            public string Order { get; set; }
             [JsonExtensionData]
             public Dictionary<string, JToken> AdditionalData { get; set; } = new();
         }
diff --git a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
index 25e1fb59c..c0d20cfe0 100644
--- a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
@@ -47,7 +47,7 @@ namespace BTCPayServer.Payments.Bitcoin
         public PaymentMethodId PaymentMethodId { get; }
         public void ModifyPaymentModel(PaymentModelContext context)
         {
-            if (context is not { IsSelected: true, Handler: BitcoinLikePaymentHandler handler})
+            if (context is not { Handler: BitcoinLikePaymentHandler handler})
                 return;
             var prompt = context.Prompt;
             var details = handler.ParsePaymentPromptDetails(prompt.Details);
diff --git a/BTCPayServer/Payments/IPaymentModelExtension.cs b/BTCPayServer/Payments/IPaymentModelExtension.cs
index a50755bbe..3881396e7 100644
--- a/BTCPayServer/Payments/IPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/IPaymentModelExtension.cs
@@ -11,8 +11,7 @@ namespace BTCPayServer.Payments
         InvoiceEntity InvoiceEntity,
         IUrlHelper UrlHelper,
         PaymentPrompt Prompt,
-        IPaymentMethodHandler Handler,
-        bool IsSelected);
+        IPaymentMethodHandler Handler);
     public interface IPaymentModelExtension
     {
         public PaymentMethodId PaymentMethodId { get; }
diff --git a/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs b/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
index d7c2c01f3..016af162f 100644
--- a/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
@@ -39,7 +39,7 @@ namespace BTCPayServer.Payments.LNURLPay
         private const string UriScheme = "lightning:";
         public void ModifyPaymentModel(PaymentModelContext context)
         {
-            if (context is not { IsSelected: true, Handler: LNURLPayPaymentHandler handler })
+            if (context is not { Handler: LNURLPayPaymentHandler handler })
                 return;
             var lnurl = paymentLinkExtension.GetPaymentLink(context.Prompt, context.UrlHelper);
             if (lnurl is not null)
diff --git a/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs b/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
index ab113585b..38f4ccb97 100644
--- a/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
@@ -40,7 +40,7 @@ namespace BTCPayServer.Payments.Lightning
         public string Badge => "⚡";
         public void ModifyPaymentModel(PaymentModelContext context)
         {
-            if (context is not { IsSelected: true, Handler: LightningLikePaymentHandler handler })
+            if (context is not { Handler: LightningLikePaymentHandler handler })
                 return;
             var paymentPrompt = context.InvoiceEntity.GetPaymentPrompt(PaymentMethodId);
             if (paymentPrompt is null)
diff --git a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs
index cb1c52a9f..734b68776 100644
--- a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs
+++ b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs
@@ -34,7 +34,7 @@ namespace BTCPayServer.Services.Altcoins.Monero.Payments
 
         public void ModifyPaymentModel(PaymentModelContext context)
         {
-            if (context is not { IsSelected: true, Handler: MoneroLikePaymentMethodHandler handler })
+            if (context is not { Handler: MoneroLikePaymentMethodHandler handler })
                 return;
             context.Model.CheckoutBodyComponentName = BitcoinPaymentModelExtension.CheckoutBodyComponentName;
             if (context.Model.Activated)
diff --git a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs
index 6e824274a..aa9d5a14c 100644
--- a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs
+++ b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs
@@ -34,7 +34,7 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Payments
 
         public void ModifyPaymentModel(PaymentModelContext context)
         {
-            if (context is not { IsSelected: true, Handler: ZcashLikePaymentMethodHandler handler })
+            if (context is not { Handler: ZcashLikePaymentMethodHandler handler })
                 return;
 			context.Model.CheckoutBodyComponentName = BitcoinPaymentModelExtension.CheckoutBodyComponentName;
 			if (context.Model.Activated)

From 2f287874e33eff894ab0753eca887a2f6e8511d0 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 7 Oct 2024 19:29:05 +0900
Subject: [PATCH 08/11] Rename legacy fields

---
 .../AltcoinTests/AltcoinTests.cs              |  6 +--
 BTCPayServer.Tests/UnitTest1.cs               |  4 +-
 .../Controllers/UIInvoiceController.UI.cs     | 11 ++---
 .../Models/InvoicingModels/PaymentModel.cs    | 11 ++---
 .../Bitcoin/BitcoinPaymentModelExtension.cs   | 12 +++---
 .../LNURLPay/LNURLPayPaymentModelExtension.cs |  4 +-
 .../LightningPaymentModelExtension.cs         |  2 +-
 .../Bitcoin/BitcoinLikeMethodCheckout.cshtml  |  4 +-
 .../LightningLikeMethodCheckout.cshtml        |  6 +--
 .../Views/UIInvoice/Checkout-Cheating.cshtml  |  4 +-
 .../Views/UIInvoice/Checkout-Testing.cshtml   |  8 ++--
 BTCPayServer/Views/UIInvoice/Checkout.cshtml  | 42 +++++++++----------
 BTCPayServer/wwwroot/checkout/checkout.js     | 18 ++++----
 13 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs b/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
index 382f5071a..563af1a57 100644
--- a/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
+++ b/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
@@ -323,7 +323,7 @@ namespace BTCPayServer.Tests
                     (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id)
                         .GetAwaiter().GetResult()).Value;
                 Assert.Single(checkout.AvailableCryptos);
-                Assert.Equal("LTC", checkout.CryptoCode);
+                Assert.Equal("LTC", checkout.PaymentMethodCurrency);
 
                 //////////////////////
 
@@ -478,7 +478,7 @@ namespace BTCPayServer.Tests
                     (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, null)
                         .GetAwaiter().GetResult()).Value;
                 Assert.Single(checkout.AvailableCryptos);
-                Assert.Equal("BTC", checkout.CryptoCode);
+                Assert.Equal("BTC", checkout.PaymentMethodCurrency);
 
                 Assert.Single(invoice.PaymentCodes);
                 Assert.Single(invoice.SupportedTransactionCurrencies);
@@ -539,7 +539,7 @@ namespace BTCPayServer.Tests
                 checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, "LTC")
                     .GetAwaiter().GetResult()).Value;
                 Assert.Equal(2, checkout.AvailableCryptos.Count);
-                Assert.Equal("LTC", checkout.CryptoCode);
+                Assert.Equal("LTC", checkout.PaymentMethodCurrency);
 
                 Assert.Equal(2, invoice.PaymentCodes.Count());
                 Assert.Equal(2, invoice.SupportedTransactionCurrencies.Count());
diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs
index 69f713662..4b0f44e1e 100644
--- a/BTCPayServer.Tests/UnitTest1.cs
+++ b/BTCPayServer.Tests/UnitTest1.cs
@@ -1655,8 +1655,8 @@ namespace BTCPayServer.Tests
 
             // Standard for all uppercase characters in QR codes is still not implemented in all wallets
             // But we're proceeding with BECH32 being uppercase
-            Assert.Equal($"bitcoin:{paymentMethodUnified.BtcAddress}", paymentMethodUnified.InvoiceBitcoinUrl.Split('?')[0]);
-            Assert.Equal($"bitcoin:{paymentMethodUnified.BtcAddress.ToUpperInvariant()}", paymentMethodUnified.InvoiceBitcoinUrlQR.Split('?')[0]);
+            Assert.Equal($"bitcoin:{paymentMethodUnified.Address}", paymentMethodUnified.InvoiceBitcoinUrl.Split('?')[0]);
+            Assert.Equal($"bitcoin:{paymentMethodUnified.Address.ToUpperInvariant()}", paymentMethodUnified.InvoiceBitcoinUrlQR.Split('?')[0]);
 
             // Fallback lightning invoice should be uppercase inside the QR code, lowercase in payment URI
             var lightningFallback = paymentMethodUnified.InvoiceBitcoinUrl.Split(new[] { "&lightning=" }, StringSplitOptions.None)[1];
diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
index d8ae2de74..5e075f651 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
@@ -867,7 +867,7 @@ namespace BTCPayServer.Controllers
             {
                 Activated = prompt.Activated,
                 PaymentMethodName = _prettyName.PrettyName(paymentMethodId),
-                CryptoCode = prompt.Currency,
+                PaymentMethodCurrency = prompt.Currency,
                 RootPath = Request.PathBase.Value.WithTrailingSlash(),
                 OrderId = orderId,
                 InvoiceId = invoiceId,
@@ -879,9 +879,9 @@ namespace BTCPayServer.Controllers
                 CelebratePayment = storeBlob.CelebratePayment,
                 OnChainWithLnInvoiceFallback = storeBlob.OnChainWithLnInvoiceFallback,
                 CryptoImage = Request.GetRelativePathOrAbsolute(GetPaymentMethodImage(paymentMethodId)),
-                BtcAddress = prompt.Destination,
-                BtcDue = ShowMoney(accounting.Due),
-                BtcPaid = ShowMoney(accounting.Paid),
+                Address = prompt.Destination,
+                Due = ShowMoney(accounting.Due),
+                Paid = ShowMoney(accounting.Paid),
                 InvoiceCurrency = invoice.Currency,
                 // The Tweak is part of the PaymentMethodFee, but let's not show it in the UI as it's negligible.
                 OrderAmount = ShowMoney(accounting.TotalDue - (prompt.PaymentMethodFee - prompt.TweakFee)),
@@ -918,6 +918,7 @@ namespace BTCPayServer.Controllers
                                               {
                                                   Displayed = displayedPaymentMethods.Contains(kv.PaymentMethodId),
                                                   PaymentMethodId = kv.PaymentMethodId,
+                                                  PaymentMethodName = _prettyName.PrettyName(kv.PaymentMethodId),
                                                   Order = kv.PaymentMethodId switch
                                                   {
                                                       _ when PaymentTypes.CHAIN.GetPaymentMethodId(_NetworkProvider.DefaultNetwork.CryptoCode) == kv.PaymentMethodId => 0,
@@ -932,7 +933,7 @@ namespace BTCPayServer.Controllers
             };
 
             model.PaymentMethodId = paymentMethodId.ToString();
-            model.OrderAmountFiat = OrderAmountFromInvoice(model.CryptoCode, invoice, DisplayFormatter.CurrencyFormat.Symbol);
+            model.OrderAmountFiat = OrderAmountFromInvoice(model.PaymentMethodCurrency, invoice, DisplayFormatter.CurrencyFormat.Symbol);
 
             if (storeBlob.PlaySoundOnPayment)
             {
diff --git a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs b/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
index 3170fb04f..1528e69d0 100644
--- a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
+++ b/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
@@ -15,7 +15,8 @@ namespace BTCPayServer.Models.InvoicingModels
             [JsonConverter(typeof(PaymentMethodIdJsonConverter))]
             public PaymentMethodId PaymentMethodId { get; set; }
             public bool Displayed { get; set; }
-            public string Order { get; set; }
+			public string PaymentMethodName { get; set; }
+			public int Order { get; set; }
             [JsonExtensionData]
             public Dictionary<string, JToken> AdditionalData { get; set; } = new();
         }
@@ -33,10 +34,10 @@ namespace BTCPayServer.Models.InvoicingModels
         public bool IsUnsetTopUp { get; set; }
         public bool OnChainWithLnInvoiceFallback { get; set; }
         public bool CelebratePayment { get; set; }
-        public string CryptoCode { get; set; }
+        public string PaymentMethodCurrency { get; set; }
         public string InvoiceId { get; set; }
-        public string BtcAddress { get; set; }
-        public string BtcDue { get; set; }
+        public string Address { get; set; }
+        public string Due { get; set; }
         public string CustomerEmail { get; set; }
         public bool ShowRecommendedFee { get; set; }
         public decimal FeeRate { get; set; }
@@ -55,7 +56,7 @@ namespace BTCPayServer.Models.InvoicingModels
         public string InvoiceBitcoinUrlQR { get; set; }
         public int TxCount { get; set; }
         public int TxCountForFee { get; set; }
-        public string BtcPaid { get; set; }
+        public string Paid { get; set; }
         public string StoreSupportUrl { get; set; }
 
         public string OrderId { get; set; }
diff --git a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
index c0d20cfe0..7dc1dfd2e 100644
--- a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
@@ -57,7 +57,7 @@ namespace BTCPayServer.Payments.Bitcoin
 
             
             var bip21Case = _Network.SupportLightning && context.StoreBlob.OnChainWithLnInvoiceFallback;
-            var amountInSats = bip21Case && context.StoreBlob.LightningAmountInSatoshi && context.Model.CryptoCode == "BTC";
+            var amountInSats = bip21Case && context.StoreBlob.LightningAmountInSatoshi && context.Model.PaymentMethodCurrency == "BTC";
             string? lightningFallback = null;
             if (context.Model.Activated && bip21Case)
             {
@@ -119,10 +119,10 @@ namespace BTCPayServer.Payments.Bitcoin
                     // model.InvoiceBitcoinUrlQR: bitcoin:bcrt1qxp2qa5dhn7?amount=0.00044007&lightning=LNBCRT4400...
                 }
 
-                if (_Network.CryptoCode.Equals("BTC", StringComparison.InvariantCultureIgnoreCase) && _bech32Prefix is not null && context.Model.BtcAddress.StartsWith(_bech32Prefix, StringComparison.OrdinalIgnoreCase))
+                if (_Network.CryptoCode.Equals("BTC", StringComparison.InvariantCultureIgnoreCase) && _bech32Prefix is not null && context.Model.Address.StartsWith(_bech32Prefix, StringComparison.OrdinalIgnoreCase))
                 {
                     context.Model.InvoiceBitcoinUrlQR = context.Model.InvoiceBitcoinUrlQR.Replace(
-                        $"{_Network.NBitcoinNetwork.UriScheme}:{context.Model.BtcAddress}", $"{_Network.NBitcoinNetwork.UriScheme}:{context.Model.BtcAddress.ToUpperInvariant()}",
+                        $"{_Network.NBitcoinNetwork.UriScheme}:{context.Model.Address}", $"{_Network.NBitcoinNetwork.UriScheme}:{context.Model.Address.ToUpperInvariant()}",
                         StringComparison.OrdinalIgnoreCase);
                     // model.InvoiceBitcoinUrlQR: bitcoin:BCRT1QXP2QA5DHN...?amount=0.00044007&lightning=LNBCRT4400...
                 }
@@ -144,9 +144,9 @@ namespace BTCPayServer.Payments.Bitcoin
             {
                 NumberFormat = { NumberGroupSeparator = " " }
             };
-            model.CryptoCode = "sats";
-            model.BtcDue = Money.Parse(model.BtcDue).ToUnit(MoneyUnit.Satoshi).ToString("N0", satoshiCulture);
-            model.BtcPaid = Money.Parse(model.BtcPaid).ToUnit(MoneyUnit.Satoshi).ToString("N0", satoshiCulture);
+            model.PaymentMethodCurrency = "sats";
+            model.Due = Money.Parse(model.Due).ToUnit(MoneyUnit.Satoshi).ToString("N0", satoshiCulture);
+            model.Paid = Money.Parse(model.Paid).ToUnit(MoneyUnit.Satoshi).ToString("N0", satoshiCulture);
             model.OrderAmount = Money.Parse(model.OrderAmount).ToUnit(MoneyUnit.Satoshi).ToString("N0", satoshiCulture);
             model.NetworkFee = new Money(model.NetworkFee, MoneyUnit.BTC).ToUnit(MoneyUnit.Satoshi);
             model.Rate = model.InvoiceCurrency is "BTC" or "SATS"
diff --git a/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs b/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
index 016af162f..ad4224054 100644
--- a/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
@@ -44,13 +44,13 @@ namespace BTCPayServer.Payments.LNURLPay
             var lnurl = paymentLinkExtension.GetPaymentLink(context.Prompt, context.UrlHelper);
             if (lnurl is not null)
             {
-                context.Model.BtcAddress = lnurl.Replace(UriScheme, "");
+                context.Model.Address = lnurl.Replace(UriScheme, "");
                 context.Model.InvoiceBitcoinUrl = lnurl;
                 context.Model.InvoiceBitcoinUrlQR = lnurl.ToUpperInvariant().Replace(UriScheme.ToUpperInvariant(), UriScheme);
             }
             context.Model.CheckoutBodyComponentName = LightningPaymentModelExtension.CheckoutBodyComponentName;
             context.Model.PeerInfo = handler.ParsePaymentPromptDetails(context.Prompt.Details).NodeInfo;
-            if (context.StoreBlob.LightningAmountInSatoshi && context.Model.CryptoCode == "BTC")
+            if (context.StoreBlob.LightningAmountInSatoshi && context.Model.PaymentMethodCurrency == "BTC")
             {
                 BitcoinPaymentModelExtension.PreparePaymentModelForAmountInSats(context.Model, context.Prompt.Rate, _displayFormatter);
             }
diff --git a/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs b/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
index 38f4ccb97..8ac3e7b36 100644
--- a/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
@@ -50,7 +50,7 @@ namespace BTCPayServer.Payments.Lightning
             if (context.Model.InvoiceBitcoinUrl is not null)
                 context.Model.InvoiceBitcoinUrlQR = $"lightning:{context.Model.InvoiceBitcoinUrl.ToUpperInvariant()?.Substring("LIGHTNING:".Length)}";
             context.Model.PeerInfo = handler.ParsePaymentPromptDetails(paymentPrompt.Details).NodeInfo;
-            if (context.StoreBlob.LightningAmountInSatoshi && context.Model.CryptoCode == "BTC")
+            if (context.StoreBlob.LightningAmountInSatoshi && context.Model.PaymentMethodCurrency == "BTC")
             {
                 BitcoinPaymentModelExtension.PreparePaymentModelForAmountInSats(context.Model, paymentPrompt.Rate, _displayFormatter);
             }
diff --git a/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml b/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
index 4dc23a5e5..9a742cd67 100644
--- a/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
+++ b/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
@@ -13,9 +13,9 @@
             </div>
             <img class="qr-icon" :src="model.cryptoImage" :alt="model.paymentMethodName"/>
         </div>
-        <div v-if="model.btcAddress" class="input-group mt-3">
+        <div v-if="model.address" class="input-group mt-3">
             <div class="form-floating" id="Address_@Model.PaymentMethodId">
-                <vc:truncate-center text="model.btcAddress" is-vue="true" padding="15" elastic="true" classes="form-control-plaintext" />
+                <vc:truncate-center text="model.address" is-vue="true" padding="15" elastic="true" classes="form-control-plaintext" />
                 <label v-t="{ path: 'address', args: { paymentMethod: model.paymentMethodName }}"></label>
             </div>
         </div>
diff --git a/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml b/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
index a84d680d6..6ba1b168a 100644
--- a/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
+++ b/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
@@ -10,15 +10,15 @@
             </div>
             <img class="qr-icon" :src="model.cryptoImage" :alt="model.paymentMethodName"/>
         </div>
-        <div v-if="model.btcAddress" class="input-group mt-3">
+        <div v-if="model.address" class="input-group mt-3">
             <div class="form-floating" id="Lightning_@Model.PaymentMethodId">
-                <vc:truncate-center text="model.btcAddress" is-vue="true" padding="15" elastic="true" classes="form-control-plaintext" />
+                <vc:truncate-center text="model.address" is-vue="true" padding="15" elastic="true" classes="form-control-plaintext" />
                 <label v-t="'lightning'"></label>
             </div>
         </div>
         <a v-if="model.invoiceBitcoinUrl && model.showPayInWalletButton" class="btn btn-primary rounded-pill w-100 mt-4" id="PayInWallet" target="_blank" 
            :href="model.invoiceBitcoinUrl" v-t="'pay_in_wallet'"></a>
-        <div v-if="!model.invoiceBitcoinUrl && !model.btcAddress" class="alert alert-danger">This payment method is not available when using an insecure connection. Please use HTTPS or Tor.</div>
+        <div v-if="!model.invoiceBitcoinUrl && !model.address" class="alert alert-danger">This payment method is not available when using an insecure connection. Please use HTTPS or Tor.</div>
         @await Component.InvokeAsync("UiExtensionPoint", new {location = "checkout-lightning-post-content", model = Model})
     </div>          
 </template>
diff --git a/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml b/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml
index ef200378d..c489e743b 100644
--- a/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml
@@ -52,14 +52,14 @@
                 paying: false,
                 mining: false,
                 expiring: false,
-                amountRemaining: this.btcDue
+                amountRemaining: this.due
             }
         },
         props: {
             invoiceId: String,
             paymentMethodId: String,
             cryptoCode: String,
-            btcDue: Number,
+            due: Number,
             isProcessing: Boolean,
             isSettled: Boolean
         },
diff --git a/BTCPayServer/Views/UIInvoice/Checkout-Testing.cshtml b/BTCPayServer/Views/UIInvoice/Checkout-Testing.cshtml
index 962df2242..080f7ff7b 100644
--- a/BTCPayServer/Views/UIInvoice/Checkout-Testing.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Checkout-Testing.cshtml
@@ -5,12 +5,12 @@
     <p class="alert alert-danger" style="display: none; word-break: break-all;"></p>
     <p class="alert alert-success" style="display: none; word-break: break-all;"></p>
     <form id="test-payment" action="/i/@Model.InvoiceId/test-payment" method="post" class="cheat-mode form-inline my-2">
-        <input name="CryptoCode" type="hidden" value="@Model.CryptoCode">
+        <input name="CryptoCode" type="hidden" value="@Model.PaymentMethodCurrency">
         <div class="form-group mb-1">
-            <label for="test-payment-amount" class="control-label">{{$t("Fake a @Model.CryptoCode payment for testing")}}</label>
+            <label for="test-payment-amount" class="control-label">{{$t("Fake a @Model.PaymentMethodCurrency payment for testing")}}</label>
             <div class="input-group">
-                <input id="test-payment-amount" name="Amount" type="number" step="0.00000001" min="0" class="form-control" placeholder="Amount" value="@Model.BtcDue" />
-                <div id="test-payment-crypto-code" class="input-group-addon">@Model.CryptoCode</div>
+                <input id="test-payment-amount" name="Amount" type="number" step="0.00000001" min="0" class="form-control" placeholder="Amount" value="@Model.Due" />
+                <div id="test-payment-crypto-code" class="input-group-addon">@Model.PaymentMethodCurrency</div>
             </div>
         </div>
         <button id="FakePayment" class="btn btn-primary" type="submit">{{$t("Fake Payment")}}</button>
diff --git a/BTCPayServer/Views/UIInvoice/Checkout.cshtml b/BTCPayServer/Views/UIInvoice/Checkout.cshtml
index 5110eb6db..2ad7bbc0a 100644
--- a/BTCPayServer/Views/UIInvoice/Checkout.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Checkout.cshtml
@@ -60,7 +60,7 @@
                     }
                     else
                     {
-                        <h2 id="AmountDue" v-text="`${srvModel.btcDue} ${srvModel.cryptoCode}`" :data-clipboard="asNumber(srvModel.btcDue)" data-clipboard-hover :data-amount-due="srvModel.btcDue">@Model.BtcDue @Model.CryptoCode</h2>
+                        <h2 id="AmountDue" v-text="`${srvModel.due} ${srvModel.paymentMethodCurrency}`" :data-clipboard="asNumber(srvModel.due)" data-clipboard-hover :data-amount-due="srvModel.due">@Model.Due @Model.PaymentMethodCurrency</h2>
                     }
                 </div>
                 <div id="PaymentInfo" class="info mt-3 mb-2" v-collapsible="showInfo">
@@ -73,7 +73,7 @@
                             <vc:icon symbol="info" />
                             <span v-t="'partial_payment_info'"></span>
                         </div>
-                        <div v-if="showPaymentDueInfo" v-html="replaceNewlines($t('still_due', { amount: `${srvModel.btcDue} ${srvModel.cryptoCode}` }))"></div>
+                        <div v-if="showPaymentDueInfo" v-html="replaceNewlines($t('still_due', { amount: `${srvModel.due} ${srvModel.paymentMethodCurrency}` }))"></div>
                     </div>
                 </div>
                 <button id="DetailsToggle" class="d-flex align-items-center gap-1 btn btn-link payment-details-button mb-2" type="button" :aria-expanded="displayPaymentDetails ? 'true' : 'false'" v-on:click="displayPaymentDetails = !displayPaymentDetails">
@@ -85,8 +85,8 @@
                         :srv-model="srvModel"
                         :is-active="isActive"
                         :order-amount="orderAmount"
-                        :btc-paid="btcPaid"
-                        :btc-due="btcDue"
+                        :paid="paid"
+                        :due="due"
                         :show-recommended-fee="showRecommendedFee"
                         class="pb-4" />
                 </div>
@@ -127,7 +127,7 @@
                         </span>
                         <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>
+						<p class="text-center" v-if="srvModel.receivedConfirmations !== null && srvModel.requiredConfirmations" v-t="{ path: 'payment_received_confirmations', args: { cryptoCode: realPaymentMethodCurrency, receivedConfirmations: srvModel.receivedConfirmations, requiredConfirmations: srvModel.requiredConfirmations } }"></p>
                         <div id="PaymentDetails" class="payment-details">
                             <dl class="mb-0">
                                 <div>
@@ -143,8 +143,8 @@
                                 :srv-model="srvModel"
                                 :is-active="isActive"
                                 :order-amount="orderAmount"
-                                :btc-paid="btcPaid"
-                                :btc-due="btcDue"
+                                :paid="paid"
+                                :due="due"
                                 :show-recommended-fee="showRecommendedFee"
                                 v-collapsible="displayPaymentDetails" />
                         </div>
@@ -180,8 +180,8 @@
                                 :srv-model="srvModel"
                                 :is-active="isActive"
                                 :order-amount="orderAmount"
-                                :btc-paid="btcPaid"
-                                :btc-due="btcDue"
+                                :paid="paid"
+                                :due="due"
                                 :show-recommended-fee="showRecommendedFee"
                                 class="mb-5" />
                         </div>
@@ -213,8 +213,8 @@
                                 :srv-model="srvModel"
                                 :is-active="isActive"
                                 :order-amount="orderAmount"
-                                :btc-paid="btcPaid"
-                                :btc-due="btcDue"
+                                :paid="paid"
+                                :due="due"
                                 :show-recommended-fee="showRecommendedFee"
                                 v-collapsible="displayPaymentDetails" />
                         </div>
@@ -234,7 +234,7 @@
         </main>
         @if (Env.CheatMode)
         {
-            <checkout-cheating invoice-id="@Model.InvoiceId" :btc-due="btcDue" :is-settled="isSettled" :is-processing="isProcessing" :payment-method-id="pmId" :crypto-code="srvModel.cryptoCode"></checkout-cheating>
+            <checkout-cheating invoice-id="@Model.InvoiceId" :due="due" :is-settled="isSettled" :is-processing="isProcessing" :payment-method-id="pmId" :crypto-code="srvModel.paymentMethodCurrency"></checkout-cheating>
         }
         <footer class="store-footer">
             <a class="store-powered-by" href="https://btcpayserver.org" target="_blank" rel="noreferrer noopener">
@@ -257,33 +257,33 @@
         <dl>
             <div v-if="orderAmount > 0" id="PaymentDetails-TotalPrice" key="TotalPrice">
                 <dt v-t="'total_price'"></dt>
-                <dd :data-clipboard="asNumber(srvModel.orderAmount)" data-clipboard-hover="start">{{srvModel.orderAmount}} {{ srvModel.cryptoCode }}</dd>
+                <dd :data-clipboard="asNumber(srvModel.orderAmount)" data-clipboard-hover="start">{{srvModel.orderAmount}} {{ srvModel.paymentMethodCurrency }}</dd>
             </div>
             <div v-if="orderAmount > 0 && srvModel.orderAmountFiat" id="PaymentDetails-TotalFiat" key="TotalFiat">
                 <dt v-t="'total_fiat'"></dt>
                 <dd :data-clipboard="asNumber(srvModel.orderAmountFiat)" data-clipboard-hover="start">{{srvModel.orderAmountFiat}}</dd>
             </div>
-            <div v-if="srvModel.rate && srvModel.cryptoCode" id="PaymentDetails-ExchangeRate" key="ExchangeRate">
+            <div v-if="srvModel.rate && srvModel.paymentMethodCurrency" id="PaymentDetails-ExchangeRate" key="ExchangeRate">
                 <dt v-t="'exchange_rate'"></dt>
                 <dd :data-clipboard="asNumber(srvModel.rate)" data-clipboard-hover="start">
-                    <template v-if="srvModel.cryptoCode === 'sats'">1 sat = {{ srvModel.rate }}</template>
-                    <template v-else>1 {{ srvModel.cryptoCode }} = {{ srvModel.rate }}</template>
+                    <template v-if="srvModel.paymentMethodCurrency === 'sats'">1 sat = {{ srvModel.rate }}</template>
+                    <template v-else>1 {{ srvModel.paymentMethodCurrency }} = {{ srvModel.rate }}</template>
                 </dd>
             </div>
             <div v-if="srvModel.networkFee" id="PaymentDetails-NetworkCost" key="NetworkCost">
                 <dt v-t="'network_cost'"></dt>
                 <dd :data-clipboard="asNumber(srvModel.networkFee)" data-clipboard-hover="start">
                     <div v-if="srvModel.txCountForFee > 0" v-t="{ path: 'tx_count', args: { count: srvModel.txCount } }"></div>
-                    <div v-text="`${srvModel.networkFee} ${srvModel.cryptoCode}`"></div>
+                    <div v-text="`${srvModel.networkFee} ${srvModel.paymentMethodCurrency}`"></div>
                 </dd>
             </div>
-            <div v-if="btcPaid > 0" id="PaymentDetails-AmountPaid" key="AmountPaid">
+            <div v-if="paid > 0" id="PaymentDetails-AmountPaid" key="AmountPaid">
                 <dt v-t="'amount_paid'"></dt>
-                <dd :data-clipboard="asNumber(srvModel.btcPaid)" data-clipboard-hover="start" v-text="`${srvModel.btcPaid} ${srvModel.cryptoCode}`"></dd>
+                <dd :data-clipboard="asNumber(srvModel.paid)" data-clipboard-hover="start" v-text="`${srvModel.paid} ${srvModel.paymentMethodCurrency}`"></dd>
             </div>
-            <div v-if="btcDue > 0" id="PaymentDetails-AmountDue" key="AmountDue">
+            <div v-if="due > 0" id="PaymentDetails-AmountDue" key="AmountDue">
                 <dt v-t="'amount_due'"></dt>
-                <dd :data-clipboard="asNumber(srvModel.btcDue)" data-clipboard-hover="start" v-text="`${srvModel.btcDue} ${srvModel.cryptoCode}`"></dd>
+                <dd :data-clipboard="asNumber(srvModel.due)" data-clipboard-hover="start" v-text="`${srvModel.due} ${srvModel.paymentMethodCurrency}`"></dd>
             </div>
             <div v-if="showRecommendedFee" id="PaymentDetails-RecommendedFee" key="RecommendedFee">
                 <dt v-t="'recommended_fee'"></dt>
diff --git a/BTCPayServer/wwwroot/checkout/checkout.js b/BTCPayServer/wwwroot/checkout/checkout.js
index 619921fa1..0f2fc5584 100644
--- a/BTCPayServer/wwwroot/checkout/checkout.js
+++ b/BTCPayServer/wwwroot/checkout/checkout.js
@@ -73,8 +73,8 @@ const PaymentDetails = {
         isActive: Boolean,
         showRecommendedFee: Boolean,
         orderAmount: Number,
-        btcPaid: Number,
-        btcDue: Number
+        paid: Number,
+        due: Number
     },
     methods: {
         asNumber
@@ -129,7 +129,7 @@ function initApp() {
                 return STATUS_PAYABLE.includes(this.srvModel.status);
             },
             isPaidPartial () {
-                return this.btcPaid > 0 && this.btcDue > 0;
+                return this.paid > 0 && this.due > 0;
             },
             showInfo () {
                 return this.showTimer || this.showPaymentDueInfo;
@@ -146,11 +146,11 @@ function initApp() {
             orderAmount () {
                 return this.asNumber(this.srvModel.orderAmount);
             },
-            btcDue () {
-                return this.asNumber(this.srvModel.btcDue);
+            due () {
+                return this.asNumber(this.srvModel.due);
             },
-            btcPaid () {
-                return this.asNumber(this.srvModel.btcPaid);
+            paid () {
+                return this.asNumber(this.srvModel.paid);
             },
             pmId() {
                 return this.paymentMethodId || this.srvModel.paymentMethodId;
@@ -182,8 +182,8 @@ function initApp() {
             isPluginPaymentMethod () {
                 return !this.paymentMethodIds.includes(this.pmId);
             },
-            realCryptoCode () {
-                return this.srvModel.cryptoCode.toLowerCase() === 'sats' ? 'BTC' : this.srvModel.cryptoCode;
+            realPaymentMethodCurrency () {
+                return this.srvModel.paymentMethodCurrency.toLowerCase() === 'sats' ? 'BTC' : this.srvModel.paymentMethodCurrency;
             }
         },
         watch: {

From 968223a95303597549b5d5eaec3a2c94d108035c Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 7 Oct 2024 19:58:08 +0900
Subject: [PATCH 09/11] Rename PaymentModel to CheckoutModel

---
 .../AltcoinTests/AltcoinTests.cs              |  8 +++----
 BTCPayServer.Tests/GreenfieldAPITests.cs      |  2 +-
 BTCPayServer.Tests/UnitTest1.cs               |  8 +++----
 .../Components/InvoiceStatus/Default.cshtml   |  2 +-
 .../Controllers/UIInvoiceController.UI.cs     | 14 +++++------
 .../Controllers/UIInvoiceController.cs        |  4 ++--
 .../UIPublicLightningNodeInfoController.cs    |  4 ++--
 .../Controllers/UIWalletsController.cs        |  4 ++--
 BTCPayServer/Hosting/BTCPayServerServices.cs  | 16 ++++++-------
 .../{PaymentModel.cs => CheckoutModel.cs}     |  2 +-
 ...on.cs => BitcoinCheckoutModelExtension.cs} |  8 +++----
 ...xtension.cs => ICheckoutModelExtension.cs} |  8 +++----
 ...sion.cs => LNURLCheckoutModelExtension.cs} | 10 ++++----
 ...tension.cs => LNCheckoutModelExtension.cs} |  8 +++----
 .../Altcoins/Monero/AltcoinsPlugin.Monero.cs  |  4 ++--
 .../Altcoins/Zcash/AltcoinsPlugin.Zcash.cs    |  4 ++--
 ...ion.cs => MoneroCheckoutModelExtension.cs} |  8 +++----
 ...sion.cs => ZcashCheckoutModelExtension.cs} |  8 +++----
 BTCPayServer/Services/PrettyNameProvider.cs   |  4 ++--
 .../Bitcoin/BitcoinLikeMethodCheckout.cshtml  |  8 +++----
 .../LightningLikeMethodCheckout.cshtml        |  8 +++----
 .../Views/UIInvoice/Checkout-Cheating.cshtml  |  2 +-
 .../Views/UIInvoice/Checkout-Testing.cshtml   |  2 +-
 BTCPayServer/Views/UIInvoice/Checkout.cshtml  |  2 +-
 .../Views/UIInvoice/CheckoutNoScript.cshtml   | 24 +------------------
 25 files changed, 75 insertions(+), 97 deletions(-)
 rename BTCPayServer/Models/InvoicingModels/{PaymentModel.cs => CheckoutModel.cs} (99%)
 rename BTCPayServer/Payments/Bitcoin/{BitcoinPaymentModelExtension.cs => BitcoinCheckoutModelExtension.cs} (96%)
 rename BTCPayServer/Payments/{IPaymentModelExtension.cs => ICheckoutModelExtension.cs} (74%)
 rename BTCPayServer/Payments/LNURLPay/{LNURLPayPaymentModelExtension.cs => LNURLCheckoutModelExtension.cs} (84%)
 rename BTCPayServer/Payments/Lightning/{LightningPaymentModelExtension.cs => LNCheckoutModelExtension.cs} (88%)
 rename BTCPayServer/Services/Altcoins/Monero/Payments/{MoneroPaymentModelExtension.cs => MoneroCheckoutModelExtension.cs} (88%)
 rename BTCPayServer/Services/Altcoins/Zcash/Payments/{ZcashPaymentModelExtension.cs => ZcashCheckoutModelExtension.cs} (88%)

diff --git a/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs b/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
index 563af1a57..34530a2bd 100644
--- a/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
+++ b/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
@@ -320,7 +320,7 @@ namespace BTCPayServer.Tests
 
                 var controller = tester.PayTester.GetController<UIInvoiceController>(null);
                 var checkout =
-                    (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id)
+                    (Models.InvoicingModels.CheckoutModel)((JsonResult)controller.GetStatus(invoice.Id)
                         .GetAwaiter().GetResult()).Value;
                 Assert.Single(checkout.AvailableCryptos);
                 Assert.Equal("LTC", checkout.PaymentMethodCurrency);
@@ -337,7 +337,7 @@ namespace BTCPayServer.Tests
                 {
                     invoice = user.BitPay.GetInvoice(invoice.Id);
                     Assert.Equal("paid", invoice.Status);
-                    checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id)
+                    checkout = (Models.InvoicingModels.CheckoutModel)((JsonResult)controller.GetStatus(invoice.Id)
                         .GetAwaiter().GetResult()).Value;
                     Assert.Equal("Processing", checkout.Status);
                 });
@@ -475,7 +475,7 @@ namespace BTCPayServer.Tests
 
                 var controller = tester.PayTester.GetController<UIInvoiceController>(null);
                 var checkout =
-                    (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, null)
+                    (Models.InvoicingModels.CheckoutModel)((JsonResult)controller.GetStatus(invoice.Id, null)
                         .GetAwaiter().GetResult()).Value;
                 Assert.Single(checkout.AvailableCryptos);
                 Assert.Equal("BTC", checkout.PaymentMethodCurrency);
@@ -536,7 +536,7 @@ namespace BTCPayServer.Tests
                 });
 
                 controller = tester.PayTester.GetController<UIInvoiceController>(null);
-                checkout = (Models.InvoicingModels.PaymentModel)((JsonResult)controller.GetStatus(invoice.Id, "LTC")
+                checkout = (Models.InvoicingModels.CheckoutModel)((JsonResult)controller.GetStatus(invoice.Id, "LTC")
                     .GetAwaiter().GetResult()).Value;
                 Assert.Equal(2, checkout.AvailableCryptos.Count);
                 Assert.Equal("LTC", checkout.PaymentMethodCurrency);
diff --git a/BTCPayServer.Tests/GreenfieldAPITests.cs b/BTCPayServer.Tests/GreenfieldAPITests.cs
index 7199e5859..b6e3e7744 100644
--- a/BTCPayServer.Tests/GreenfieldAPITests.cs
+++ b/BTCPayServer.Tests/GreenfieldAPITests.cs
@@ -2733,7 +2733,7 @@ namespace BTCPayServer.Tests
 
             Assert.EndsWith($"/i/{newInvoice.Id}", newInvoice.CheckoutLink);
             var controller = tester.PayTester.GetController<UIInvoiceController>(user.UserId, user.StoreId);
-            var model = (PaymentModel)((ViewResult)await controller.Checkout(newInvoice.Id)).Model;
+            var model = (CheckoutModel)((ViewResult)await controller.Checkout(newInvoice.Id)).Model;
             Assert.Equal("it-IT", model.DefaultLang);
             Assert.Equal("http://toto.com/lol", model.MerchantRefLink);
 
diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs
index 4b0f44e1e..0c8731f9d 100644
--- a/BTCPayServer.Tests/UnitTest1.cs
+++ b/BTCPayServer.Tests/UnitTest1.cs
@@ -1587,14 +1587,14 @@ namespace BTCPayServer.Tests
                    ItemDesc = "Some description",
                    FullNotifications = true
                }, Facade.Merchant);
-            var checkout = (await user.GetController<UIInvoiceController>().Checkout(invoice.Id)).AssertViewModel<PaymentModel>();
+            var checkout = (await user.GetController<UIInvoiceController>().Checkout(invoice.Id)).AssertViewModel<CheckoutModel>();
             Assert.Equal(lnMethod, checkout.PaymentMethodId);
 
             // If we change store's default, it should change the checkout's default
             vm.DefaultPaymentMethod = btcMethod;
             Assert.IsType<RedirectToActionResult>(user.GetController<UIStoresController>().CheckoutAppearance(vm)
                 .Result);
-            checkout = (await user.GetController<UIInvoiceController>().Checkout(invoice.Id)).AssertViewModel<PaymentModel>();
+            checkout = (await user.GetController<UIInvoiceController>().Checkout(invoice.Id)).AssertViewModel<CheckoutModel>();
             Assert.Equal(btcMethod, checkout.PaymentMethodId);
         }
 
@@ -1625,7 +1625,7 @@ namespace BTCPayServer.Tests
 
             // validate that invoice data model doesn't have lightning string initially
             var res = await user.GetController<UIInvoiceController>().Checkout(invoice.Id);
-            var paymentMethodFirst = Assert.IsType<PaymentModel>(
+            var paymentMethodFirst = Assert.IsType<CheckoutModel>(
                 Assert.IsType<ViewResult>(res).Model
             );
             Assert.DoesNotContain("&lightning=", paymentMethodFirst.InvoiceBitcoinUrlQR);
@@ -1641,7 +1641,7 @@ namespace BTCPayServer.Tests
 
             // validate that QR code now has both onchain and offchain payment urls
             res = await user.GetController<UIInvoiceController>().Checkout(invoice.Id);
-            var paymentMethodUnified = Assert.IsType<PaymentModel>(
+            var paymentMethodUnified = Assert.IsType<CheckoutModel>(
                 Assert.IsType<ViewResult>(res).Model
             );
             Assert.StartsWith("bitcoin:bcrt", paymentMethodUnified.InvoiceBitcoinUrl);
diff --git a/BTCPayServer/Components/InvoiceStatus/Default.cshtml b/BTCPayServer/Components/InvoiceStatus/Default.cshtml
index 27a6450a8..a66199c11 100644
--- a/BTCPayServer/Components/InvoiceStatus/Default.cshtml
+++ b/BTCPayServer/Components/InvoiceStatus/Default.cshtml
@@ -1,6 +1,6 @@
 @using BTCPayServer.Payments
 @model BTCPayServer.Components.InvoiceStatus.InvoiceStatusViewModel
-@inject Dictionary<PaymentMethodId, IPaymentModelExtension> Extensions
+@inject Dictionary<PaymentMethodId, ICheckoutModelExtension> Extensions
 
 @{
     var state = Model.State.ToString();
diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
index 5e075f651..8706918e4 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
@@ -694,7 +694,7 @@ namespace BTCPayServer.Controllers
             if (invoiceId is null)
                 return NotFound();
 
-            var model = await GetInvoiceModel(invoiceId, paymentMethodId == null ? null : PaymentMethodId.Parse(paymentMethodId), lang);
+            var model = await GetCheckoutModel(invoiceId, paymentMethodId == null ? null : PaymentMethodId.Parse(paymentMethodId), lang);
             if (model == null)
             {
                 // see if the invoice actually exists and is in a state for which we do not display the checkout
@@ -713,7 +713,7 @@ namespace BTCPayServer.Controllers
             return View(model);
         }
 
-        private async Task<PaymentModel?> GetInvoiceModel(string invoiceId, PaymentMethodId? paymentMethodId, string? lang)
+        private async Task<CheckoutModel?> GetCheckoutModel(string invoiceId, PaymentMethodId? paymentMethodId, string? lang)
         {
             var invoice = await _InvoiceRepository.GetInvoice(invoiceId);
             if (invoice == null)
@@ -822,7 +822,7 @@ namespace BTCPayServer.Controllers
             if (prompt is null)
                 return null;
             if (activated)
-                return await GetInvoiceModel(invoiceId, paymentMethodId, lang);
+                return await GetCheckoutModel(invoiceId, paymentMethodId, lang);
 
             var accounting = prompt.Calculate();
 
@@ -863,7 +863,7 @@ namespace BTCPayServer.Controllers
             }
 
 			string ShowMoney(decimal value) => MoneyExtensions.ShowMoney(value, prompt.RateDivisibility ?? prompt.Divisibility);
-            var model = new PaymentModel
+            var model = new CheckoutModel
             {
                 Activated = prompt.Activated,
                 PaymentMethodName = _prettyName.PrettyName(paymentMethodId),
@@ -914,7 +914,7 @@ namespace BTCPayServer.Controllers
                                           .Select(kv =>
                                           {
                                               var handler = _handlers[kv.PaymentMethodId];
-                                              return new PaymentModel.AvailableCrypto
+                                              return new CheckoutModel.AvailableCrypto
                                               {
                                                   Displayed = displayedPaymentMethods.Contains(kv.PaymentMethodId),
                                                   PaymentMethodId = kv.PaymentMethodId,
@@ -950,7 +950,7 @@ namespace BTCPayServer.Controllers
             if (_paymentModelExtensions.TryGetValue(paymentMethodId, out var extension) &&
                     _handlers.TryGetValue(paymentMethodId, out var h))
             {
-                extension.ModifyPaymentModel(new PaymentModelContext(model, store, storeBlob, invoice, Url, prompt, h));
+                extension.ModifyCheckoutModel(new CheckoutModelContext(model, store, storeBlob, invoice, Url, prompt, h));
             }
             return model;
         }
@@ -987,7 +987,7 @@ namespace BTCPayServer.Controllers
         {
             if (string.IsNullOrEmpty(paymentMethodId))
                 paymentMethodId = implicitPaymentMethodId;
-            var model = await GetInvoiceModel(invoiceId, paymentMethodId == null ? null : PaymentMethodId.Parse(paymentMethodId), lang);
+            var model = await GetCheckoutModel(invoiceId, paymentMethodId == null ? null : PaymentMethodId.Parse(paymentMethodId), lang);
             if (model == null)
                 return NotFound();
             return Json(model);
diff --git a/BTCPayServer/Controllers/UIInvoiceController.cs b/BTCPayServer/Controllers/UIInvoiceController.cs
index b4dc71d39..12e930a8d 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.cs
@@ -62,7 +62,7 @@ namespace BTCPayServer.Controllers
         private readonly LinkGenerator _linkGenerator;
         private readonly IAuthorizationService _authorizationService;
         private readonly TransactionLinkProviders _transactionLinkProviders;
-        private readonly Dictionary<PaymentMethodId, IPaymentModelExtension> _paymentModelExtensions;
+        private readonly Dictionary<PaymentMethodId, ICheckoutModelExtension> _paymentModelExtensions;
         private readonly PrettyNameProvider _prettyName;
         private readonly AppService _appService;
         private readonly IFileService _fileService;
@@ -97,7 +97,7 @@ namespace BTCPayServer.Controllers
             DefaultRulesCollection defaultRules,
             IAuthorizationService authorizationService,
             TransactionLinkProviders transactionLinkProviders,
-            Dictionary<PaymentMethodId, IPaymentModelExtension> paymentModelExtensions,
+            Dictionary<PaymentMethodId, ICheckoutModelExtension> paymentModelExtensions,
             PrettyNameProvider prettyName)
         {
             _displayFormatter = displayFormatter;
diff --git a/BTCPayServer/Controllers/UIPublicLightningNodeInfoController.cs b/BTCPayServer/Controllers/UIPublicLightningNodeInfoController.cs
index 07483e2a6..140462d67 100644
--- a/BTCPayServer/Controllers/UIPublicLightningNodeInfoController.cs
+++ b/BTCPayServer/Controllers/UIPublicLightningNodeInfoController.cs
@@ -21,13 +21,13 @@ namespace BTCPayServer.Controllers
     public class UIPublicLightningNodeInfoController : Controller
     {
         private readonly BTCPayNetworkProvider _BtcPayNetworkProvider;
-        private readonly Dictionary<PaymentMethodId, IPaymentModelExtension> _paymentModelExtensions;
+        private readonly Dictionary<PaymentMethodId, ICheckoutModelExtension> _paymentModelExtensions;
         private readonly UriResolver _uriResolver;
         private readonly PaymentMethodHandlerDictionary _handlers;
         private readonly StoreRepository _StoreRepository;
 
         public UIPublicLightningNodeInfoController(BTCPayNetworkProvider btcPayNetworkProvider,
-            Dictionary<PaymentMethodId, IPaymentModelExtension> paymentModelExtensions,
+            Dictionary<PaymentMethodId, ICheckoutModelExtension> paymentModelExtensions,
             UriResolver uriResolver,
             PaymentMethodHandlerDictionary handlers,
             StoreRepository storeRepository)
diff --git a/BTCPayServer/Controllers/UIWalletsController.cs b/BTCPayServer/Controllers/UIWalletsController.cs
index 65f83028b..ae3f1e6c1 100644
--- a/BTCPayServer/Controllers/UIWalletsController.cs
+++ b/BTCPayServer/Controllers/UIWalletsController.cs
@@ -70,7 +70,7 @@ namespace BTCPayServer.Controllers
         private readonly LabelService _labelService;
         private readonly PaymentMethodHandlerDictionary _handlers;
         private readonly DefaultRulesCollection _defaultRules;
-        private readonly Dictionary<PaymentMethodId, IPaymentModelExtension> _paymentModelExtensions;
+        private readonly Dictionary<PaymentMethodId, ICheckoutModelExtension> _paymentModelExtensions;
         private readonly TransactionLinkProviders _transactionLinkProviders;
         private readonly PullPaymentHostedService _pullPaymentHostedService;
         private readonly WalletHistogramService _walletHistogramService;
@@ -98,7 +98,7 @@ namespace BTCPayServer.Controllers
                                  LabelService labelService,
                                  DefaultRulesCollection defaultRules,
                                  PaymentMethodHandlerDictionary handlers,
-                                 Dictionary<PaymentMethodId, IPaymentModelExtension> paymentModelExtensions,
+                                 Dictionary<PaymentMethodId, ICheckoutModelExtension> paymentModelExtensions,
                                  TransactionLinkProviders transactionLinkProviders)
         {
             _currencyTable = currencyTable;
diff --git a/BTCPayServer/Hosting/BTCPayServerServices.cs b/BTCPayServer/Hosting/BTCPayServerServices.cs
index ebf6f6369..fadb1ce9c 100644
--- a/BTCPayServer/Hosting/BTCPayServerServices.cs
+++ b/BTCPayServer/Hosting/BTCPayServerServices.cs
@@ -390,8 +390,8 @@ namespace BTCPayServer.Hosting
             o.GetRequiredService<IEnumerable<IPaymentMethodBitpayAPIExtension>>().ToDictionary(o => o.PaymentMethodId, o => o));
             services.AddSingleton<Dictionary<PaymentMethodId, IPaymentLinkExtension>>(o =>
 o.GetRequiredService<IEnumerable<IPaymentLinkExtension>>().ToDictionary(o => o.PaymentMethodId, o => o));
-            services.AddSingleton<Dictionary<PaymentMethodId, IPaymentModelExtension>>(o =>
-            o.GetRequiredService<IEnumerable<IPaymentModelExtension>>().ToDictionary(o => o.PaymentMethodId, o => o));
+            services.AddSingleton<Dictionary<PaymentMethodId, ICheckoutModelExtension>>(o =>
+            o.GetRequiredService<IEnumerable<ICheckoutModelExtension>>().ToDictionary(o => o.PaymentMethodId, o => o));
 
             services.AddHttpClient(LightningLikePayoutHandler.LightningLikePayoutHandlerOnionNamedClient)
                 .ConfigurePrimaryHttpMessageHandler<Socks5HttpClientHandler>();
@@ -630,8 +630,8 @@ o.GetRequiredService<IEnumerable<IPaymentLinkExtension>>().ToDictionary(o => o.P
                 (BitcoinLikePaymentHandler)ActivatorUtilities.CreateInstance(provider, typeof(BitcoinLikePaymentHandler), new object[] { network, pmi }));
                 services.AddSingleton<IPaymentLinkExtension>(provider =>
 (IPaymentLinkExtension)ActivatorUtilities.CreateInstance(provider, typeof(BitcoinPaymentLinkExtension), new object[] { network, pmi }));
-                services.AddSingleton<IPaymentModelExtension>(provider =>
-    (BitcoinPaymentModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(BitcoinPaymentModelExtension), new object[] { network, pmi }));
+                services.AddSingleton<ICheckoutModelExtension>(provider =>
+    (BitcoinCheckoutModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(BitcoinCheckoutModelExtension), new object[] { network, pmi }));
                 services.AddSingleton<IPaymentMethodBitpayAPIExtension>(provider =>
 (IPaymentMethodBitpayAPIExtension)ActivatorUtilities.CreateInstance(provider, typeof(BitcoinPaymentMethodBitpayAPIExtension), new object[] { pmi }));
 
@@ -651,8 +651,8 @@ o.GetRequiredService<IEnumerable<IPaymentLinkExtension>>().ToDictionary(o => o.P
                     (LightningLikePaymentHandler)ActivatorUtilities.CreateInstance(provider, typeof(LightningLikePaymentHandler), new object[] { network, pmi }));
                     services.AddSingleton<IPaymentLinkExtension>(provider =>
 (IPaymentLinkExtension)ActivatorUtilities.CreateInstance(provider, typeof(LightningPaymentLinkExtension), new object[] { network, pmi }));
-                    services.AddSingleton<IPaymentModelExtension>(provider =>
-                    (IPaymentModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(LightningPaymentModelExtension), new object[] { network, pmi }));
+                    services.AddSingleton<ICheckoutModelExtension>(provider =>
+                    (ICheckoutModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(LNCheckoutModelExtension), new object[] { network, pmi }));
                     services.AddSingleton<IPaymentMethodBitpayAPIExtension>(provider =>
 (IPaymentMethodBitpayAPIExtension)ActivatorUtilities.CreateInstance(provider, typeof(LightningPaymentMethodBitpayAPIExtension), new object[] { pmi }));
                     var payoutMethodId = PayoutTypes.LN.GetPayoutMethodId(network.CryptoCode);
@@ -666,8 +666,8 @@ o.GetRequiredService<IEnumerable<IPaymentLinkExtension>>().ToDictionary(o => o.P
     (LNURLPayPaymentHandler)ActivatorUtilities.CreateInstance(provider, typeof(LNURLPayPaymentHandler), new object[] { network, pmi }));
                     services.AddSingleton<IPaymentLinkExtension>(provider =>
                     (IPaymentLinkExtension)ActivatorUtilities.CreateInstance(provider, typeof(LNURLPayPaymentLinkExtension), new object[] { network, pmi }));
-                    services.AddSingleton<IPaymentModelExtension>(provider =>
-(IPaymentModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(LNURLPayPaymentModelExtension), new object[] { network, pmi }));
+                    services.AddSingleton<ICheckoutModelExtension>(provider =>
+(ICheckoutModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(LNURLCheckoutModelExtension), new object[] { network, pmi }));
                     services.AddSingleton<IPaymentMethodBitpayAPIExtension>(provider =>
 (IPaymentMethodBitpayAPIExtension)ActivatorUtilities.CreateInstance(provider, typeof(LNURLPayPaymentMethodBitpayAPIExtension), new object[] { pmi }));
                 }
diff --git a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs b/BTCPayServer/Models/InvoicingModels/CheckoutModel.cs
similarity index 99%
rename from BTCPayServer/Models/InvoicingModels/PaymentModel.cs
rename to BTCPayServer/Models/InvoicingModels/CheckoutModel.cs
index 1528e69d0..c060b3fd9 100644
--- a/BTCPayServer/Models/InvoicingModels/PaymentModel.cs
+++ b/BTCPayServer/Models/InvoicingModels/CheckoutModel.cs
@@ -7,7 +7,7 @@ using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Models.InvoicingModels
 {
-    public class PaymentModel
+    public class CheckoutModel
     {
         public string CheckoutBodyComponentName { get; set; }
         public class AvailableCrypto
diff --git a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs b/BTCPayServer/Payments/Bitcoin/BitcoinCheckoutModelExtension.cs
similarity index 96%
rename from BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
rename to BTCPayServer/Payments/Bitcoin/BitcoinCheckoutModelExtension.cs
index 7dc1dfd2e..06cf0133b 100644
--- a/BTCPayServer/Payments/Bitcoin/BitcoinPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/Bitcoin/BitcoinCheckoutModelExtension.cs
@@ -12,7 +12,7 @@ using NBitcoin.DataEncoders;
 
 namespace BTCPayServer.Payments.Bitcoin
 {
-    public class BitcoinPaymentModelExtension : IPaymentModelExtension
+    public class BitcoinCheckoutModelExtension : ICheckoutModelExtension
     {
         public const string CheckoutBodyComponentName = "BitcoinCheckoutBody";
         private readonly PaymentMethodHandlerDictionary _handlers;
@@ -23,7 +23,7 @@ namespace BTCPayServer.Payments.Bitcoin
         private readonly IPaymentLinkExtension? lnurlPaymentLinkExtension;
         private readonly string? _bech32Prefix;
 
-        public BitcoinPaymentModelExtension(
+        public BitcoinCheckoutModelExtension(
             PaymentMethodId paymentMethodId,
             BTCPayNetwork network,
             IEnumerable<IPaymentLinkExtension> paymentLinkExtensions,
@@ -45,7 +45,7 @@ namespace BTCPayServer.Payments.Bitcoin
         public string Image => _Network.CryptoImagePath;
         public string Badge => "";
         public PaymentMethodId PaymentMethodId { get; }
-        public void ModifyPaymentModel(PaymentModelContext context)
+        public void ModifyCheckoutModel(CheckoutModelContext context)
         {
             if (context is not { Handler: BitcoinLikePaymentHandler handler})
                 return;
@@ -138,7 +138,7 @@ namespace BTCPayServer.Payments.Bitcoin
             }
         }
 
-        public static void PreparePaymentModelForAmountInSats(PaymentModel model, decimal rate, DisplayFormatter displayFormatter)
+        public static void PreparePaymentModelForAmountInSats(CheckoutModel model, decimal rate, DisplayFormatter displayFormatter)
         {
             var satoshiCulture = new CultureInfo(CultureInfo.InvariantCulture.Name)
             {
diff --git a/BTCPayServer/Payments/IPaymentModelExtension.cs b/BTCPayServer/Payments/ICheckoutModelExtension.cs
similarity index 74%
rename from BTCPayServer/Payments/IPaymentModelExtension.cs
rename to BTCPayServer/Payments/ICheckoutModelExtension.cs
index 3881396e7..8567c2f8a 100644
--- a/BTCPayServer/Payments/IPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/ICheckoutModelExtension.cs
@@ -4,20 +4,20 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace BTCPayServer.Payments
 {
-    public record PaymentModelContext(
-        PaymentModel Model,
+    public record CheckoutModelContext(
+        CheckoutModel Model,
         Data.StoreData Store,
         Data.StoreBlob StoreBlob,
         InvoiceEntity InvoiceEntity,
         IUrlHelper UrlHelper,
         PaymentPrompt Prompt,
         IPaymentMethodHandler Handler);
-    public interface IPaymentModelExtension
+    public interface ICheckoutModelExtension
     {
         public PaymentMethodId PaymentMethodId { get; }
         string DisplayName { get; }
         string Image { get; }
         string Badge { get; }
-        void ModifyPaymentModel(PaymentModelContext context);
+        void ModifyCheckoutModel(CheckoutModelContext context);
     }
 }
diff --git a/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs b/BTCPayServer/Payments/LNURLPay/LNURLCheckoutModelExtension.cs
similarity index 84%
rename from BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
rename to BTCPayServer/Payments/LNURLPay/LNURLCheckoutModelExtension.cs
index ad4224054..27ab08065 100644
--- a/BTCPayServer/Payments/LNURLPay/LNURLPayPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/LNURLPay/LNURLCheckoutModelExtension.cs
@@ -8,9 +8,9 @@ using NBitcoin;
 
 namespace BTCPayServer.Payments.LNURLPay
 {
-    public class LNURLPayPaymentModelExtension : IPaymentModelExtension
+    public class LNURLCheckoutModelExtension : ICheckoutModelExtension
     {
-        public LNURLPayPaymentModelExtension(
+        public LNURLCheckoutModelExtension(
             PaymentMethodId paymentMethodId,
             BTCPayNetwork network,
             DisplayFormatter displayFormatter,
@@ -37,7 +37,7 @@ namespace BTCPayServer.Payments.LNURLPay
         public string Badge => "⚡";
 
         private const string UriScheme = "lightning:";
-        public void ModifyPaymentModel(PaymentModelContext context)
+        public void ModifyCheckoutModel(CheckoutModelContext context)
         {
             if (context is not { Handler: LNURLPayPaymentHandler handler })
                 return;
@@ -48,11 +48,11 @@ namespace BTCPayServer.Payments.LNURLPay
                 context.Model.InvoiceBitcoinUrl = lnurl;
                 context.Model.InvoiceBitcoinUrlQR = lnurl.ToUpperInvariant().Replace(UriScheme.ToUpperInvariant(), UriScheme);
             }
-            context.Model.CheckoutBodyComponentName = LightningPaymentModelExtension.CheckoutBodyComponentName;
+            context.Model.CheckoutBodyComponentName = LNCheckoutModelExtension.CheckoutBodyComponentName;
             context.Model.PeerInfo = handler.ParsePaymentPromptDetails(context.Prompt.Details).NodeInfo;
             if (context.StoreBlob.LightningAmountInSatoshi && context.Model.PaymentMethodCurrency == "BTC")
             {
-                BitcoinPaymentModelExtension.PreparePaymentModelForAmountInSats(context.Model, context.Prompt.Rate, _displayFormatter);
+                BitcoinCheckoutModelExtension.PreparePaymentModelForAmountInSats(context.Model, context.Prompt.Rate, _displayFormatter);
             }
         }
     }
diff --git a/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs b/BTCPayServer/Payments/Lightning/LNCheckoutModelExtension.cs
similarity index 88%
rename from BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
rename to BTCPayServer/Payments/Lightning/LNCheckoutModelExtension.cs
index 8ac3e7b36..5a3c52c42 100644
--- a/BTCPayServer/Payments/Lightning/LightningPaymentModelExtension.cs
+++ b/BTCPayServer/Payments/Lightning/LNCheckoutModelExtension.cs
@@ -9,12 +9,12 @@ using System.Linq;
 
 namespace BTCPayServer.Payments.Lightning
 {
-    public class LightningPaymentModelExtension : IPaymentModelExtension
+    public class LNCheckoutModelExtension : ICheckoutModelExtension
     {
         public const string CheckoutBodyComponentName = "LightningCheckoutBody";
         private readonly DisplayFormatter _displayFormatter;
         IPaymentLinkExtension _PaymentLinkExtension;
-        public LightningPaymentModelExtension(
+        public LNCheckoutModelExtension(
             PaymentMethodId paymentMethodId,
             BTCPayNetwork network,
             DisplayFormatter displayFormatter,
@@ -38,7 +38,7 @@ namespace BTCPayServer.Payments.Lightning
 
         public string Image => Network.LightningImagePath;
         public string Badge => "⚡";
-        public void ModifyPaymentModel(PaymentModelContext context)
+        public void ModifyCheckoutModel(CheckoutModelContext context)
         {
             if (context is not { Handler: LightningLikePaymentHandler handler })
                 return;
@@ -52,7 +52,7 @@ namespace BTCPayServer.Payments.Lightning
             context.Model.PeerInfo = handler.ParsePaymentPromptDetails(paymentPrompt.Details).NodeInfo;
             if (context.StoreBlob.LightningAmountInSatoshi && context.Model.PaymentMethodCurrency == "BTC")
             {
-                BitcoinPaymentModelExtension.PreparePaymentModelForAmountInSats(context.Model, paymentPrompt.Rate, _displayFormatter);
+                BitcoinCheckoutModelExtension.PreparePaymentModelForAmountInSats(context.Model, paymentPrompt.Rate, _displayFormatter);
             }
         }
     }
diff --git a/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs b/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs
index fe829c86a..8f95be4a2 100644
--- a/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs
+++ b/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs
@@ -67,8 +67,8 @@ public partial class AltcoinsPlugin
                 (IPaymentMethodHandler)ActivatorUtilities.CreateInstance(provider, typeof(MoneroLikePaymentMethodHandler), new object[] { network }));
         services.AddSingleton<IPaymentLinkExtension>(provider =>
 (IPaymentLinkExtension)ActivatorUtilities.CreateInstance(provider, typeof(MoneroPaymentLinkExtension), new object[] { network, pmi }));
-        services.AddSingleton<IPaymentModelExtension>(provider =>
-(IPaymentModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(MoneroPaymentModelExtension), new object[] { network, pmi }));
+        services.AddSingleton<ICheckoutModelExtension>(provider =>
+(ICheckoutModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(MoneroCheckoutModelExtension), new object[] { network, pmi }));
 
         services.AddSingleton<IUIExtension>(new UIExtension("Monero/StoreNavMoneroExtension", "store-nav"));
         services.AddSingleton<IUIExtension>(new UIExtension("Monero/StoreWalletsNavMoneroExtension", "store-wallets-nav"));
diff --git a/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs b/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs
index 8cec5a8bf..4cb3a7dd1 100644
--- a/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs
+++ b/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs
@@ -56,8 +56,8 @@ public partial class AltcoinsPlugin
         (IPaymentMethodHandler)ActivatorUtilities.CreateInstance(provider, typeof(ZcashLikePaymentMethodHandler), new object[] { network }));
         services.AddSingleton<IPaymentLinkExtension>(provider =>
 (IPaymentLinkExtension)ActivatorUtilities.CreateInstance(provider, typeof(ZcashPaymentLinkExtension), new object[] { network, pmi }));
-        services.AddSingleton<IPaymentModelExtension>(provider =>
-(IPaymentModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(ZcashPaymentModelExtension), new object[] { network, pmi }));
+        services.AddSingleton<ICheckoutModelExtension>(provider =>
+(ICheckoutModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(ZcashCheckoutModelExtension), new object[] { network, pmi }));
 
         services.AddSingleton<ZcashLikePaymentMethodHandler>();
         services.AddSingleton<IPaymentMethodHandler>(provider => provider.GetRequiredService<ZcashLikePaymentMethodHandler>());
diff --git a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroCheckoutModelExtension.cs
similarity index 88%
rename from BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs
rename to BTCPayServer/Services/Altcoins/Monero/Payments/MoneroCheckoutModelExtension.cs
index 734b68776..1b51dcd03 100644
--- a/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentModelExtension.cs
+++ b/BTCPayServer/Services/Altcoins/Monero/Payments/MoneroCheckoutModelExtension.cs
@@ -8,13 +8,13 @@ using BTCPayServer.Services.Invoices;
 
 namespace BTCPayServer.Services.Altcoins.Monero.Payments
 {
-    public class MoneroPaymentModelExtension : IPaymentModelExtension
+    public class MoneroCheckoutModelExtension : ICheckoutModelExtension
     {
         private readonly BTCPayNetworkBase _network;
         private readonly PaymentMethodHandlerDictionary _handlers;
         private readonly IPaymentLinkExtension paymentLinkExtension;
 
-        public MoneroPaymentModelExtension(
+        public MoneroCheckoutModelExtension(
             PaymentMethodId paymentMethodId,
             IEnumerable<IPaymentLinkExtension> paymentLinkExtensions,
             BTCPayNetworkBase network,
@@ -32,11 +32,11 @@ namespace BTCPayServer.Services.Altcoins.Monero.Payments
         public string Image => _network.CryptoImagePath;
         public string Badge => "";
 
-        public void ModifyPaymentModel(PaymentModelContext context)
+        public void ModifyCheckoutModel(CheckoutModelContext context)
         {
             if (context is not { Handler: MoneroLikePaymentMethodHandler handler })
                 return;
-            context.Model.CheckoutBodyComponentName = BitcoinPaymentModelExtension.CheckoutBodyComponentName;
+            context.Model.CheckoutBodyComponentName = BitcoinCheckoutModelExtension.CheckoutBodyComponentName;
             if (context.Model.Activated)
             {
                 var details = context.InvoiceEntity.GetPayments(true)
diff --git a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashCheckoutModelExtension.cs
similarity index 88%
rename from BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs
rename to BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashCheckoutModelExtension.cs
index aa9d5a14c..234aba63f 100644
--- a/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashPaymentModelExtension.cs
+++ b/BTCPayServer/Services/Altcoins/Zcash/Payments/ZcashCheckoutModelExtension.cs
@@ -8,13 +8,13 @@ using BTCPayServer.Services.Invoices;
 
 namespace BTCPayServer.Services.Altcoins.Zcash.Payments
 {
-    public class ZcashPaymentModelExtension : IPaymentModelExtension
+    public class ZcashCheckoutModelExtension : ICheckoutModelExtension
     {
         private readonly BTCPayNetworkBase _network;
         private readonly PaymentMethodHandlerDictionary _handlers;
         private readonly IPaymentLinkExtension paymentLinkExtension;
 
-        public ZcashPaymentModelExtension(
+        public ZcashCheckoutModelExtension(
             PaymentMethodId paymentMethodId,
             IEnumerable<IPaymentLinkExtension> paymentLinkExtensions,
             BTCPayNetworkBase network,
@@ -32,11 +32,11 @@ namespace BTCPayServer.Services.Altcoins.Zcash.Payments
         public string Image => _network.CryptoImagePath;
         public string Badge => "";
 
-        public void ModifyPaymentModel(PaymentModelContext context)
+        public void ModifyCheckoutModel(CheckoutModelContext context)
         {
             if (context is not { Handler: ZcashLikePaymentMethodHandler handler })
                 return;
-			context.Model.CheckoutBodyComponentName = BitcoinPaymentModelExtension.CheckoutBodyComponentName;
+			context.Model.CheckoutBodyComponentName = BitcoinCheckoutModelExtension.CheckoutBodyComponentName;
 			if (context.Model.Activated)
             {
                 var details = context.InvoiceEntity.GetPayments(true)
diff --git a/BTCPayServer/Services/PrettyNameProvider.cs b/BTCPayServer/Services/PrettyNameProvider.cs
index 639d986fe..71b65140e 100644
--- a/BTCPayServer/Services/PrettyNameProvider.cs
+++ b/BTCPayServer/Services/PrettyNameProvider.cs
@@ -6,9 +6,9 @@ namespace BTCPayServer.Services
 {
     public class PrettyNameProvider
     {
-        private readonly Dictionary<PaymentMethodId, IPaymentModelExtension> _extensions;
+        private readonly Dictionary<PaymentMethodId, ICheckoutModelExtension> _extensions;
 
-        public PrettyNameProvider(Dictionary<PaymentMethodId, IPaymentModelExtension> extensions)
+        public PrettyNameProvider(Dictionary<PaymentMethodId, ICheckoutModelExtension> extensions)
         {
             _extensions = extensions;
         }
diff --git a/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml b/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
index 9a742cd67..ad869b63e 100644
--- a/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
+++ b/BTCPayServer/Views/Shared/Bitcoin/BitcoinLikeMethodCheckout.cshtml
@@ -2,9 +2,9 @@
 @using BTCPayServer.Components.TruncateCenter
 @using BTCPayServer.Abstractions.TagHelpers
 @using BTCPayServer.Payments.Bitcoin
-@model BTCPayServer.Models.InvoicingModels.PaymentModel
+@model BTCPayServer.Models.InvoicingModels.CheckoutModel
 
-<template id="@BitcoinPaymentModelExtension.CheckoutBodyComponentName">
+<template id="@BitcoinCheckoutModelExtension.CheckoutBodyComponentName">
     @await Component.InvokeAsync("UiExtensionPoint", new {location = "checkout-bitcoin-pre-content", model = Model})
     <div class="payment-box">
         <div v-if="model.invoiceBitcoinUrlQR" class="qr-container" :data-qr-value="model.invoiceBitcoinUrlQR" :data-clipboard="model.invoiceBitcoinUrl" data-clipboard-confirm-element="#Address_@Model.PaymentMethodId [data-clipboard]">
@@ -32,9 +32,9 @@
 </template>
 
 <script>
-	Vue.component(@Safe.Json(BitcoinPaymentModelExtension.CheckoutBodyComponentName), {
+	Vue.component(@Safe.Json(BitcoinCheckoutModelExtension.CheckoutBodyComponentName), {
         props: ['model', 'nfcSupported', 'nfcScanning', 'nfcErrorMessage'],
-		template: @Safe.Json("#" + BitcoinPaymentModelExtension.CheckoutBodyComponentName),
+		template: @Safe.Json("#" + BitcoinCheckoutModelExtension.CheckoutBodyComponentName),
         components: {
             qrcode: VueQrcode
         },
diff --git a/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml b/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
index 6ba1b168a..c14feb369 100644
--- a/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
+++ b/BTCPayServer/Views/Shared/Lightning/LightningLikeMethodCheckout.cshtml
@@ -1,7 +1,7 @@
 @using BTCPayServer.Payments.Lightning
-@model BTCPayServer.Models.InvoicingModels.PaymentModel
+@model BTCPayServer.Models.InvoicingModels.CheckoutModel
 
-<template id="@LightningPaymentModelExtension.CheckoutBodyComponentName">
+<template id="@LNCheckoutModelExtension.CheckoutBodyComponentName">
     <div class="payment-box">
         @await Component.InvokeAsync("UiExtensionPoint" ,  new { location="checkout-lightning-pre-content", model = Model})
         <div v-if="model.invoiceBitcoinUrlQR" class="qr-container" :data-qr-value="model.invoiceBitcoinUrlQR" :data-clipboard="model.invoiceBitcoinUrl" data-clipboard-confirm-element="#Lightning_@Model.PaymentMethodId [data-clipboard]">
@@ -24,9 +24,9 @@
 </template>
 
 <script>
-	Vue.component(@Safe.Json(LightningPaymentModelExtension.CheckoutBodyComponentName), {
+	Vue.component(@Safe.Json(LNCheckoutModelExtension.CheckoutBodyComponentName), {
         props: ['model', 'nfcSupported', 'nfcScanning', 'nfcErrorMessage'],
-		template: @Safe.Json("#" + LightningPaymentModelExtension.CheckoutBodyComponentName),
+		template: @Safe.Json("#" + LNCheckoutModelExtension.CheckoutBodyComponentName),
         components: {
             qrcode: VueQrcode
         },
diff --git a/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml b/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml
index c489e743b..87fae701f 100644
--- a/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml
@@ -1,4 +1,4 @@
-@model PaymentModel
+@model CheckoutModel
 
 <style>
     #checkout-cheating form + form { margin-top: var(--btcpay-space-l); }
diff --git a/BTCPayServer/Views/UIInvoice/Checkout-Testing.cshtml b/BTCPayServer/Views/UIInvoice/Checkout-Testing.cshtml
index 080f7ff7b..b3b9d1e39 100644
--- a/BTCPayServer/Views/UIInvoice/Checkout-Testing.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Checkout-Testing.cshtml
@@ -1,4 +1,4 @@
-@model PaymentModel
+@model CheckoutModel
 
 <div id="testing">
     <hr class="my-3" />
diff --git a/BTCPayServer/Views/UIInvoice/Checkout.cshtml b/BTCPayServer/Views/UIInvoice/Checkout.cshtml
index 2ad7bbc0a..229455fc1 100644
--- a/BTCPayServer/Views/UIInvoice/Checkout.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Checkout.cshtml
@@ -5,7 +5,7 @@
 @inject IEnumerable<IUIExtension> UiExtensions 
 @inject PaymentMethodHandlerDictionary PaymentMethodHandlerDictionary
 @inject BTCPayServer.Security.ContentSecurityPolicies Csp
-@model PaymentModel
+@model CheckoutModel
 @{
 	Layout = null;
 	ViewData["Title"] = Model.HtmlTitle;
diff --git a/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml b/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml
index 957eaa250..f08589927 100644
--- a/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml
+++ b/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml
@@ -1,4 +1,4 @@
-@model PaymentModel
+@model CheckoutModel
 @{
     Layout = null;
     var displayedPaymentMethods = Model.AvailableCryptos.Where(a => a.Displayed).ToList();
@@ -18,28 +18,6 @@
     @if (Model.Status == "new")
     {
 		<h1 class="text-danger">This payment method requires javascript.</h1>
-        @if (displayedPaymentMethods.Count > 1)
-        {
-            <div>
-                <hr />
-                <h2>Pay with:</h2>
-                <ul style="list-style-type: none;padding-left: 5px;">
-                    @foreach (var crypto in displayedPaymentMethods)
-                    {
-                        <li style="height: 32px; line-height: 32px;">
-                            <a asp-action="CheckoutNoScript" asp-route-invoiceId="@Model.InvoiceId" asp-route-paymentMethodId="@crypto.PaymentMethodId">
-                                <img alt="@crypto.PaymentMethodName" src="@crypto.CryptoImage" style="vertical-align:middle; height:24px; text-decoration:none; margin-top: -3px;" asp-append-version="true" />
-                            </a>
-                            <a asp-action="CheckoutNoScript" asp-route-invoiceId="@Model.InvoiceId" asp-route-paymentMethodId="@crypto.PaymentMethodId" style="padding-top: 2px;">
-                                @crypto.PaymentMethodName
-                                @(crypto.IsLightning ? Html.Raw("&#9889;") : null)
-                                (@crypto.CryptoCode)
-                            </a>
-                        </li>
-                    }
-                </ul>
-            </div>
-        }
     }
     else if (Model.Status == "paid" || Model.Status == "complete" || Model.Status == "confirmed")
     {

From 68f24e47cd48741f831004b355d109afda5276af Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 7 Oct 2024 21:14:37 +0900
Subject: [PATCH 10/11] Rename more legacy fields

---
 BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs      | 6 +++---
 BTCPayServer/Controllers/UIInvoiceController.UI.cs   | 4 ++--
 BTCPayServer/Models/InvoicingModels/CheckoutModel.cs | 4 ++--
 BTCPayServer/Plugins/NFC/NFCPlugin.cs                | 9 +++------
 BTCPayServer/Views/Shared/NFC/CheckoutEnd.cshtml     | 2 +-
 BTCPayServer/Views/UIInvoice/Checkout.cshtml         | 2 +-
 BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml | 1 -
 BTCPayServer/wwwroot/checkout/checkout.js            | 2 +-
 8 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs b/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
index 34530a2bd..5ec8f80e9 100644
--- a/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
+++ b/BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs
@@ -322,7 +322,7 @@ namespace BTCPayServer.Tests
                 var checkout =
                     (Models.InvoicingModels.CheckoutModel)((JsonResult)controller.GetStatus(invoice.Id)
                         .GetAwaiter().GetResult()).Value;
-                Assert.Single(checkout.AvailableCryptos);
+                Assert.Single(checkout.AvailablePaymentMethods);
                 Assert.Equal("LTC", checkout.PaymentMethodCurrency);
 
                 //////////////////////
@@ -477,7 +477,7 @@ namespace BTCPayServer.Tests
                 var checkout =
                     (Models.InvoicingModels.CheckoutModel)((JsonResult)controller.GetStatus(invoice.Id, null)
                         .GetAwaiter().GetResult()).Value;
-                Assert.Single(checkout.AvailableCryptos);
+                Assert.Single(checkout.AvailablePaymentMethods);
                 Assert.Equal("BTC", checkout.PaymentMethodCurrency);
 
                 Assert.Single(invoice.PaymentCodes);
@@ -538,7 +538,7 @@ namespace BTCPayServer.Tests
                 controller = tester.PayTester.GetController<UIInvoiceController>(null);
                 checkout = (Models.InvoicingModels.CheckoutModel)((JsonResult)controller.GetStatus(invoice.Id, "LTC")
                     .GetAwaiter().GetResult()).Value;
-                Assert.Equal(2, checkout.AvailableCryptos.Count);
+                Assert.Equal(2, checkout.AvailablePaymentMethods.Count);
                 Assert.Equal("LTC", checkout.PaymentMethodCurrency);
 
                 Assert.Equal(2, invoice.PaymentCodes.Count());
diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
index 8706918e4..e795f3c1b 100644
--- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs
@@ -910,11 +910,11 @@ namespace BTCPayServer.Controllers
                 // The Tweak is part of the PaymentMethodFee, but let's not show it in the UI as it's negligible.
                 NetworkFee = prompt.PaymentMethodFee - prompt.TweakFee,
                 StoreId = store.Id,
-                AvailableCryptos = invoice.GetPaymentPrompts()
+                AvailablePaymentMethods = invoice.GetPaymentPrompts()
                                           .Select(kv =>
                                           {
                                               var handler = _handlers[kv.PaymentMethodId];
-                                              return new CheckoutModel.AvailableCrypto
+                                              return new CheckoutModel.AvailablePaymentMethod
                                               {
                                                   Displayed = displayedPaymentMethods.Contains(kv.PaymentMethodId),
                                                   PaymentMethodId = kv.PaymentMethodId,
diff --git a/BTCPayServer/Models/InvoicingModels/CheckoutModel.cs b/BTCPayServer/Models/InvoicingModels/CheckoutModel.cs
index c060b3fd9..bd60cb635 100644
--- a/BTCPayServer/Models/InvoicingModels/CheckoutModel.cs
+++ b/BTCPayServer/Models/InvoicingModels/CheckoutModel.cs
@@ -10,7 +10,7 @@ namespace BTCPayServer.Models.InvoicingModels
     public class CheckoutModel
     {
         public string CheckoutBodyComponentName { get; set; }
-        public class AvailableCrypto
+        public class AvailablePaymentMethod
         {
             [JsonConverter(typeof(PaymentMethodIdJsonConverter))]
             public PaymentMethodId PaymentMethodId { get; set; }
@@ -29,7 +29,7 @@ namespace BTCPayServer.Models.InvoicingModels
         public string DefaultLang { get; set; }
         public bool ShowPayInWalletButton { get; set; }
         public bool ShowStoreHeader { get; set; }
-        public List<AvailableCrypto> AvailableCryptos { get; set; } = new();
+        public List<AvailablePaymentMethod> AvailablePaymentMethods { get; set; } = new();
         public bool IsModal { get; set; }
         public bool IsUnsetTopUp { get; set; }
         public bool OnChainWithLnInvoiceFallback { get; set; }
diff --git a/BTCPayServer/Plugins/NFC/NFCPlugin.cs b/BTCPayServer/Plugins/NFC/NFCPlugin.cs
index cdbcaa0cc..37d3a8c31 100644
--- a/BTCPayServer/Plugins/NFC/NFCPlugin.cs
+++ b/BTCPayServer/Plugins/NFC/NFCPlugin.cs
@@ -15,12 +15,9 @@ namespace BTCPayServer.Plugins.NFC
 
         public override void Execute(IServiceCollection applicationBuilder)
         {
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("NFC/CheckoutEnd",
-                "checkout-end"));
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("NFC/LNURLNFCPostContent",
-                "checkout-lightning-post-content"));
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("NFC/LNURLNFCPostContent",
-                "checkout-bitcoin-post-content"));
+            applicationBuilder.AddUIExtension("checkout-end", "NFC/CheckoutEnd");
+            applicationBuilder.AddUIExtension("checkout-lightning-post-content", "NFC/LNURLNFCPostContent");
+            applicationBuilder.AddUIExtension("checkout-bitcoin-post-content", "NFC/LNURLNFCPostContent");
             base.Execute(applicationBuilder);
         }
     }
diff --git a/BTCPayServer/Views/Shared/NFC/CheckoutEnd.cshtml b/BTCPayServer/Views/Shared/NFC/CheckoutEnd.cshtml
index ea5a4419b..e5aa25bc6 100644
--- a/BTCPayServer/Views/Shared/NFC/CheckoutEnd.cshtml
+++ b/BTCPayServer/Views/Shared/NFC/CheckoutEnd.cshtml
@@ -19,7 +19,7 @@ Vue.component("lnurl-withdraw-checkout", {
             const {
                 onChainWithLnInvoiceFallback: isUnified,
                 paymentMethodId: activePaymentMethodId,
-                availableCryptos: availablePaymentMethods,
+                availablePaymentMethods: availablePaymentMethods,
                 invoiceBitcoinUrl: paymentUrl
             } = this.model
             const lnurlwAvailable = 
diff --git a/BTCPayServer/Views/UIInvoice/Checkout.cshtml b/BTCPayServer/Views/UIInvoice/Checkout.cshtml
index 229455fc1..125b6a898 100644
--- a/BTCPayServer/Views/UIInvoice/Checkout.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Checkout.cshtml
@@ -12,7 +12,7 @@
     ViewData["StoreBranding"] = Model.StoreBranding;
 	Csp.UnsafeEval();
 	var hasPaymentPlugins = UiExtensions.Any(extension => extension.Location == "checkout-payment-method");
-	var displayedPaymentMethods = Model.AvailableCryptos.Where(c => c.Displayed).ToList();
+	var displayedPaymentMethods = Model.AvailablePaymentMethods.Where(c => c.Displayed).ToList();
 }
 @functions {
     private string ToJsValue(object value)
diff --git a/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml b/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml
index f08589927..abaa0bfe6 100644
--- a/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml
+++ b/BTCPayServer/Views/UIInvoice/CheckoutNoScript.cshtml
@@ -1,7 +1,6 @@
 @model CheckoutModel
 @{
     Layout = null;
-    var displayedPaymentMethods = Model.AvailableCryptos.Where(a => a.Displayed).ToList();
 }
 <!DOCTYPE html>
 <html>
diff --git a/BTCPayServer/wwwroot/checkout/checkout.js b/BTCPayServer/wwwroot/checkout/checkout.js
index 0f2fc5584..04770cf5d 100644
--- a/BTCPayServer/wwwroot/checkout/checkout.js
+++ b/BTCPayServer/wwwroot/checkout/checkout.js
@@ -172,7 +172,7 @@ function initApp() {
                     : null;
             },
             paymentMethodIds () {
-                return this.srvModel.availableCryptos.map(function (c) { return c.paymentMethodId });
+                return this.srvModel.availablePaymentMethod.map(function (c) { return c.paymentMethodId });
             },
             paymentMethodComponent() {
                 return this.isPluginPaymentMethod

From dd35af3c55aa4977c4e0790b0244fd2576cef048 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 7 Oct 2024 21:33:53 +0900
Subject: [PATCH 11/11] Use AddUIExtension

---
 BTCPayServer.Abstractions/Services/UIExtension.cs           | 2 ++
 BTCPayServer/Extensions.cs                                  | 2 ++
 BTCPayServer/Hosting/BTCPayServerServices.cs                | 3 +--
 .../Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs        | 6 +++---
 BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs | 4 ++--
 BTCPayServer/Plugins/Crowdfund/CrowdfundPlugin.cs           | 2 +-
 BTCPayServer/Plugins/PayButton/PayButtonPlugin.cs           | 2 +-
 BTCPayServer/Plugins/PointOfSale/PointOfSalePlugin.cs       | 2 +-
 BTCPayServer/Plugins/Shopify/ShopifyPlugin.cs               | 2 +-
 BTCPayServer/wwwroot/checkout/checkout.js                   | 2 +-
 10 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/BTCPayServer.Abstractions/Services/UIExtension.cs b/BTCPayServer.Abstractions/Services/UIExtension.cs
index ba06187dd..601b83e50 100644
--- a/BTCPayServer.Abstractions/Services/UIExtension.cs
+++ b/BTCPayServer.Abstractions/Services/UIExtension.cs
@@ -1,9 +1,11 @@
+using System;
 using BTCPayServer.Abstractions.Contracts;
 
 namespace BTCPayServer.Abstractions.Services
 {
     public class UIExtension : IUIExtension
     {
+        [Obsolete("Use extension method BTCPayServer.Extensions.AddUIExtension(this IServiceCollection services, string location, string partialViewName) instead")]
         public UIExtension(string partial, string location)
         {
             Partial = partial;
diff --git a/BTCPayServer/Extensions.cs b/BTCPayServer/Extensions.cs
index 255f43db8..ab6ace52d 100644
--- a/BTCPayServer/Extensions.cs
+++ b/BTCPayServer/Extensions.cs
@@ -294,7 +294,9 @@ namespace BTCPayServer
 
         public static IServiceCollection AddUIExtension(this IServiceCollection services, string location, string partialViewName)
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             services.AddSingleton<IUIExtension>(new UIExtension(partialViewName, location));
+#pragma warning restore CS0618 // Type or member is obsolete
             return services;
         }
         public static IServiceCollection AddReportProvider<T>(this IServiceCollection services)
diff --git a/BTCPayServer/Hosting/BTCPayServerServices.cs b/BTCPayServer/Hosting/BTCPayServerServices.cs
index fadb1ce9c..2103eeb50 100644
--- a/BTCPayServer/Hosting/BTCPayServerServices.cs
+++ b/BTCPayServer/Hosting/BTCPayServerServices.cs
@@ -402,8 +402,7 @@ o.GetRequiredService<IEnumerable<IPaymentLinkExtension>>().ToDictionary(o => o.P
             services.AddSingleton<IHostedService, NBXplorerListener>();
 
 
-            services.AddSingleton<IUIExtension>(new UIExtension("LNURL/LightningAddressNav",
-                "store-integrations-nav"));
+            services.AddUIExtension("store-integrations-nav", "LNURL/LightningAddressNav");
             services.AddSingleton<IHostedService, LightningListener>();
             services.AddSingleton<IHostedService, LightningPendingPayoutListener>();
 
diff --git a/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs b/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs
index 8f95be4a2..af0ce5568 100644
--- a/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs
+++ b/BTCPayServer/Plugins/Altcoins/Monero/AltcoinsPlugin.Monero.cs
@@ -70,9 +70,9 @@ public partial class AltcoinsPlugin
         services.AddSingleton<ICheckoutModelExtension>(provider =>
 (ICheckoutModelExtension)ActivatorUtilities.CreateInstance(provider, typeof(MoneroCheckoutModelExtension), new object[] { network, pmi }));
 
-        services.AddSingleton<IUIExtension>(new UIExtension("Monero/StoreNavMoneroExtension", "store-nav"));
-        services.AddSingleton<IUIExtension>(new UIExtension("Monero/StoreWalletsNavMoneroExtension", "store-wallets-nav"));
-        services.AddSingleton<IUIExtension>(new UIExtension("Monero/ViewMoneroLikePaymentData", "store-invoices-payments"));
+        services.AddUIExtension("store-nav", "Monero/StoreNavMoneroExtension");
+        services.AddUIExtension("store-wallets-nav", "Monero/StoreWalletsNavMoneroExtension");
+        services.AddUIExtension("store-invoices-payments", "Monero/ViewMoneroLikePaymentData");
         services.AddSingleton<ISyncSummaryProvider, MoneroSyncSummaryProvider>();
     }
     private static MoneroLikeConfiguration ConfigureMoneroLikeConfiguration(IServiceProvider serviceProvider)
diff --git a/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs b/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs
index 4cb3a7dd1..34ddaf263 100644
--- a/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs
+++ b/BTCPayServer/Plugins/Altcoins/Zcash/AltcoinsPlugin.Zcash.cs
@@ -61,8 +61,8 @@ public partial class AltcoinsPlugin
 
         services.AddSingleton<ZcashLikePaymentMethodHandler>();
         services.AddSingleton<IPaymentMethodHandler>(provider => provider.GetRequiredService<ZcashLikePaymentMethodHandler>());
-        services.AddSingleton<IUIExtension>(new UIExtension("Zcash/StoreNavZcashExtension", "store-nav"));
-        services.AddSingleton<IUIExtension>(new UIExtension("Zcash/ViewZcashLikePaymentData", "store-invoices-payments"));
+        services.AddUIExtension("store-nav", "Zcash/StoreNavZcashExtension");
+        services.AddUIExtension("store-invoices-payments", "Zcash/ViewZcashLikePaymentData");
         services.AddSingleton<ISyncSummaryProvider, ZcashSyncSummaryProvider>();
 
     }
diff --git a/BTCPayServer/Plugins/Crowdfund/CrowdfundPlugin.cs b/BTCPayServer/Plugins/Crowdfund/CrowdfundPlugin.cs
index c41893585..9dd42b491 100644
--- a/BTCPayServer/Plugins/Crowdfund/CrowdfundPlugin.cs
+++ b/BTCPayServer/Plugins/Crowdfund/CrowdfundPlugin.cs
@@ -36,7 +36,7 @@ namespace BTCPayServer.Plugins.Crowdfund
 
         public override void Execute(IServiceCollection services)
         {
-            services.AddSingleton<IUIExtension>(new UIExtension("Crowdfund/NavExtension", "header-nav"));
+            services.AddUIExtension("header-nav", "Crowdfund/NavExtension");
             services.AddSingleton<CrowdfundAppType>();
             services.AddSingleton<AppBaseType, CrowdfundAppType>();
 
diff --git a/BTCPayServer/Plugins/PayButton/PayButtonPlugin.cs b/BTCPayServer/Plugins/PayButton/PayButtonPlugin.cs
index bb7a2db4c..2b9c50022 100644
--- a/BTCPayServer/Plugins/PayButton/PayButtonPlugin.cs
+++ b/BTCPayServer/Plugins/PayButton/PayButtonPlugin.cs
@@ -13,7 +13,7 @@ namespace BTCPayServer.Plugins.PayButton
 
         public override void Execute(IServiceCollection services)
         {
-            services.AddSingleton<IUIExtension>(new UIExtension("PayButton/NavExtension", "header-nav"));
+            services.AddUIExtension("header-nav", "PayButton/NavExtension");
             base.Execute(services);
         }
     }
diff --git a/BTCPayServer/Plugins/PointOfSale/PointOfSalePlugin.cs b/BTCPayServer/Plugins/PointOfSale/PointOfSalePlugin.cs
index deb8a6b72..ccd9da1e5 100644
--- a/BTCPayServer/Plugins/PointOfSale/PointOfSalePlugin.cs
+++ b/BTCPayServer/Plugins/PointOfSale/PointOfSalePlugin.cs
@@ -28,7 +28,7 @@ namespace BTCPayServer.Plugins.PointOfSale
 
         public override void Execute(IServiceCollection services)
         {
-            services.AddSingleton<IUIExtension>(new UIExtension("PointOfSale/NavExtension", "header-nav"));
+            services.AddUIExtension("header-nav", "PointOfSale/NavExtension");
             services.AddSingleton<AppBaseType, PointOfSaleAppType>();
             base.Execute(services);
         }
diff --git a/BTCPayServer/Plugins/Shopify/ShopifyPlugin.cs b/BTCPayServer/Plugins/Shopify/ShopifyPlugin.cs
index a2cb98d51..6745d81d3 100644
--- a/BTCPayServer/Plugins/Shopify/ShopifyPlugin.cs
+++ b/BTCPayServer/Plugins/Shopify/ShopifyPlugin.cs
@@ -16,7 +16,7 @@ namespace BTCPayServer.Plugins.Shopify
         {
             applicationBuilder.AddSingleton<ShopifyService>();
             applicationBuilder.AddSingleton<IHostedService, ShopifyService>(provider => provider.GetRequiredService<ShopifyService>());
-            applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Shopify/NavExtension", "header-nav"));
+            applicationBuilder.AddUIExtension("header-nav", "Shopify/NavExtension");
             base.Execute(applicationBuilder);
         }
     }
diff --git a/BTCPayServer/wwwroot/checkout/checkout.js b/BTCPayServer/wwwroot/checkout/checkout.js
index 04770cf5d..ebecf41cb 100644
--- a/BTCPayServer/wwwroot/checkout/checkout.js
+++ b/BTCPayServer/wwwroot/checkout/checkout.js
@@ -172,7 +172,7 @@ function initApp() {
                     : null;
             },
             paymentMethodIds () {
-                return this.srvModel.availablePaymentMethod.map(function (c) { return c.paymentMethodId });
+                return this.srvModel.availablePaymentMethods.map(function (c) { return c.paymentMethodId });
             },
             paymentMethodComponent() {
                 return this.isPluginPaymentMethod